回掉

src/App.js

@@ -128,6 +128,9 @@ export class App extends React.Component {
         <AppContext.Provider value={{
           env: hostParams?.env,
           user: hostParams?.user,
+          openAdmit: hostParams?.openAdmit,
+          openDetail: hostParams?.openDetail,
+          editServer: hostParams?.editServer,
           setGlobalState,
           onGlobalStateChange
         }}>

src/view/Manage/Model/Component/ModelTable.jsx

-import React, { useState, useEffect, useRef } from "react";
+import React, { useState, useEffect, useRef, useContext } from "react";
 import { Tooltip, Modal, Pagination, Table, Typography } from 'antd';
 import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import SmoothScroll from 'smooth-scroll';
@@ -10,6 +10,7 @@ import ResizeObserver from 'rc-resize-observer';
 import { dispatch } from '../../../../model'; 
 import { showMessage, getQueryParam, paginate, isSzseEnv, formatDate, getDataModelerRole } from '../../../../util';
 import { AnchorId, AnchorTimestamp, Action, CatalogId, ModelerId, DataModelerRoleReader } from '../../../../util/constant';
+import { AppContext } from "../../../../App";
 // import Tag from "../../Tag";
 
 import './ModelTable.less';
@@ -142,6 +143,8 @@ const ModelTable = (props) => {
   const [ filterData, setFilterData ] = useState([]);
   const [ subData, setSubData ] = useState([]);
 
+  const app = useContext(AppContext);
+
   const cols = [
     {
       title: '序号',
@@ -470,11 +473,13 @@ const ModelTable = (props) => {
   // }
 
   const editItem = (record) => {
-    onItemAction && onItemAction(record, 'edit');
+    // onItemAction && onItemAction(record, 'edit');
+    app.editServer?.({ dirId: catalogId, service: record })
   }
 
   const detailItem = (record) => {
-    onItemAction && onItemAction(record, 'detail', getDataModelerRole(user)===DataModelerRoleReader);
+    // onItemAction && onItemAction(record, 'detail', getDataModelerRole(user)===DataModelerRoleReader);
+    app.openDetail?.({ dirId: catalogId, service: record })
   }
 
   const deployAction = (record) => {

src/view/Manage/Model/index.jsx

@@ -131,7 +131,7 @@ class Model extends React.Component {
     });
   }
 
-  onTableChange = () => {
+  onTableChange = (namespace = '') => {
     const { currentView, catalogId, keyword, currentModelState } = this.state;
 
     this.setState({ loadingTableData: true }, () => {
@@ -140,6 +140,7 @@ class Model extends React.Component {
 
           const params = {
             pdsDataServiceCatalogId: catalogId,
+            namespace
           };
 
           if (currentModelState !== '') {
@@ -160,7 +161,8 @@ class Model extends React.Component {
           dispatchLatestHomepage({
             type: 'pds.getStateServices',
             payload: {
-              easyDataModelerStateCatalogId: catalogId
+              pdsDataServiceCatalogId: catalogId,
+              namespace
             },
             callback: data => {
               this.setState({ loadingTableData: false, tableData: data.pdsdataServices||[], filterTableData: data.pdsdataServices||[] });
@@ -508,9 +510,11 @@ class Model extends React.Component {
           > 
             <Space>
             {
-              (getDataModelerRole(value?.user)!==DataModelerRoleReader) && <React.Fragment>
+              currentView==='dir' && (getDataModelerRole(value?.user)!==DataModelerRoleReader) && <React.Fragment>
                 <Space>
-                  <Button onClick={() => {}}>新建</Button>
+                  <Button onClick={() => {
+                    value?.editServer({ dirId: catalogId })
+                  }}>新建</Button>
                 </Space>
 
                 {/* <Space>
@@ -564,7 +568,7 @@ class Model extends React.Component {
                   </Select>
                 </Space>
               }     
-              {/* <Space>
+              <Space>
                 <InputDebounce 
                   placeholder="通过服务名称全文搜索" 
                   allowClear 
@@ -572,7 +576,7 @@ class Model extends React.Component {
                   onChange={(value) => { this.onSearchInputChange(value); }} 
                   style={{ width: inputWidth, marginLeft: 'auto' }}
                 />
-              </Space> */}
+              </Space>
 
             </Space>
 
@@ -590,7 +594,7 @@ class Model extends React.Component {
               keyword={keyword}
               selectModelerIds={selectModelerIds}
               visibleColNames={visibleColNames}
-              onChange={this.onTableChange} 
+              onChange={() => this.onTableChange(`${value.env?.domainId}`)} 
               onSelect={this.onTableSelect} 
               onItemAction={this.onTableItemAction} 
               onAutoCreateTable={this.onAutoCreateTable}