bug fix

src/view/Manage/Model/index.jsx

@@ -212,14 +212,12 @@ class Model extends React.Component {
   }
 
   onTableChange = () => {
-    const { currentView, catalogId, keyword, currentModelState } = this.state;
+    const { currentView, catalogId, keyword, currentModelState, searchProperties } = this.state;
 
     this.setState({ loadingTableData: true }, () => {
-      if (keyword === '') {
-        if (currentView === 'dir') {
-
+      if (keyword) {
         const params = {
-            easyDataModelerCatalogId: catalogId,
+          term: keyword,
         };
 
         if (currentModelState !== '') {
@@ -227,33 +225,33 @@ class Model extends React.Component {
         }
 
         dispatchLatestHomepage({
-            type: 'datamodel.getCurrentDataModelCatalog',
+          type: 'datamodel.searchModel',
           payload: params,
           callback: data => {
-              this.setState({ loadingTableData: false, tableData: data.easyDataModelerDataModels||[], filterTableData: data.easyDataModelerDataModels||[] });
+            this.setState({ loadingTableData: false, tableData: data||[], filterTableData: data||[] });
           },
           error: () => {
             this.setState({ loadingTableData: false });
           }
         })
-        } else {
-          dispatchLatestHomepage({
-            type: 'datamodel.getCurrentDataModelStateCatalog',
+      } else if (!catalogId) {
+        dispatch({
+          type: 'datamodel.searchModelBySearchProperties',
           payload: {
-              easyDataModelerStateCatalogId: catalogId
+            data: searchProperties
           },
           callback: data => {
-              this.setState({ loadingTableData: false, tableData: data.easyDataModelerDataModels||[], filterTableData: data.easyDataModelerDataModels||[] });
+            this.setState({ loadingTableData: false, tableData: data||[], filterTableData: data||[] });
           },
           error: () => {
             this.setState({ loadingTableData: false });
           }
         })
-        }
       } else {
+        if (currentView === 'dir') {
 
           const params = {
-          term: keyword,
+            easyDataModelerCatalogId: catalogId,
           };
 
           if (currentModelState !== '') {
@@ -261,17 +259,30 @@ class Model extends React.Component {
           }
 
           dispatchLatestHomepage({
-          type: 'datamodel.searchModel',
+            type: 'datamodel.getCurrentDataModelCatalog',
             payload: params,
             callback: data => {
-            this.setState({ loadingTableData: false, tableData: data||[], filterTableData: data||[] });
+              this.setState({ loadingTableData: false, tableData: data.easyDataModelerDataModels||[], filterTableData: data.easyDataModelerDataModels||[] });
+            },
+            error: () => {
+              this.setState({ loadingTableData: false });
+            }
+          })
+        } else {
+          dispatchLatestHomepage({
+            type: 'datamodel.getCurrentDataModelStateCatalog',
+            payload: {
+              easyDataModelerStateCatalogId: catalogId
+            },
+            callback: data => {
+              this.setState({ loadingTableData: false, tableData: data.easyDataModelerDataModels||[], filterTableData: data.easyDataModelerDataModels||[] });
             },
             error: () => {
               this.setState({ loadingTableData: false });
             }
           })
         }
-      
+      }
     })
   }
 
@@ -307,18 +318,7 @@ class Model extends React.Component {
     this.setState({ selectSearchPropertiesVisible: false })
     if ((searchProperties??[]).length > 0) {
       this.setState({ loadingTableData: true, keyword: '', catalogId: '', searchProperties }, () => {
-        dispatch({
-          type: 'datamodel.searchModelBySearchProperties',
-          payload: {
-            data: searchProperties
-          },
-          callback: data => {
-            this.setState({ loadingTableData: false, tableData: data||[], filterTableData: data||[] });
-          },
-          error: () => {
-            this.setState({ loadingTableData: false });
-          }
-        })
+        this.onTableChange()
       })
     }
   }