增加namespace

src/view/Manage/Model/index.jsx

@@ -131,7 +131,7 @@ class Model extends React.Component {
     });
   }
 
-  onTableChange = (namespace = '') => {
+  onTableChange = () => {
     const { currentView, catalogId, keyword, currentModelState } = this.state;
 
     this.setState({ loadingTableData: true }, () => {
@@ -140,7 +140,7 @@ class Model extends React.Component {
 
           const params = {
             pdsDataServiceCatalogId: catalogId,
-            namespace
+            namespace: `${this.props.app?.domainId}`
           };
 
           if (currentModelState !== '') {
@@ -162,7 +162,7 @@ class Model extends React.Component {
             type: 'pds.getStateServices',
             payload: {
               pdsDataServiceCatalogId: catalogId,
-              namespace
+              namespace: `${this.props.app?.domainId}`
             },
             callback: data => {
               this.setState({ loadingTableData: false, tableData: data.pdsdataServices||[], filterTableData: data.pdsdataServices||[] });
@@ -466,6 +466,7 @@ class Model extends React.Component {
   }
 
   render() {
+    const { app } = this.props;
     const { importModalVisible, catalogId, loadingTableData, selectModelerIds, keyword, filterTableData, selectModelerNames, exportDDLModalVisible, exportOtherModalVisible, importStockWordDrawerVisible , loadingStates, modelStates, currentModelState, currentView, recatalogModalVisible, exportDDLModalReference, currentModel, offset, historyAndVersionDrawerVisible, modelerId, startFlowModalVisible, expandTree, showDeleteTip, colSettingModalVisible, visibleColNames } = this.state;
 
     const classes = classNames('data-model', {
@@ -482,9 +483,7 @@ class Model extends React.Component {
     }
 
     return (
-      <AppContext.Consumer>
-      {
-        value => <div className={classes}>
+      <div className={classes}>
         <ResizableBox 
           className='left' 
           width={230} 
@@ -510,10 +509,10 @@ class Model extends React.Component {
           > 
             <Space>
             {
-              currentView==='dir' && (getDataModelerRole(value?.user)!==DataModelerRoleReader) && <React.Fragment>
+              currentView==='dir' && (getDataModelerRole(app?.user)!==DataModelerRoleReader) && <React.Fragment>
                 <Space>
                   <Button onClick={() => {
-                    value?.editServer?.({ dirId: catalogId })
+                    app?.editServer?.({ dirId: catalogId })
                   }}>新建</Button>
                 </Space>
 
@@ -585,7 +584,7 @@ class Model extends React.Component {
           <Spin spinning={loadingTableData}>
             <ModelTable 
               loading={loadingTableData}
-              user={value?.user} 
+              user={app?.user} 
               catalogId={catalogId} 
               view={currentView}
               data={filterTableData} 
@@ -594,7 +593,7 @@ class Model extends React.Component {
               keyword={keyword}
               selectModelerIds={selectModelerIds}
               visibleColNames={visibleColNames}
-              onChange={() => this.onTableChange(`${value.env?.domainId}`)} 
+              onChange={this.onTableChange} 
               onSelect={this.onTableSelect} 
               onItemAction={this.onTableItemAction} 
               onAutoCreateTable={this.onAutoCreateTable}
@@ -617,11 +616,19 @@ class Model extends React.Component {
           onCancel={this.onHistoryAndVersionDrawerCancel}
         />
       </div>
-      }
-      </AppContext.Consumer>
     );
   }
 
 }
 
-export default Model;
+const WrapModel = (props) => {
+  return (
+    <AppContext.Consumer>
+    {
+      value => <Model app={value} {...props} />
+    }  
+    </AppContext.Consumer>
+  )
+}
+
+export default WrapModel;