bug fix

src/view/Manage/Model/index.jsx

@@ -120,7 +120,7 @@ class Model extends React.Component {
         canBatchAddTag
       });
     }
-     
+
     if (catalogId !== prevState.catalogId || permissions !== prevState.permissions) {
       let canAdd = true;
       const index = (permissions||[]).findIndex(item => item.privilegedObjectId === catalogId);
@@ -212,10 +212,42 @@ 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 (keyword) {
+        const params = {
+          term: keyword,
+        };
+
+        if (currentModelState !== '') {
+          params.stateId = currentModelState;
+        }
+
+        dispatchLatestHomepage({
+          type: 'datamodel.searchModel',
+          payload: params,
+          callback: data => {
+            this.setState({ loadingTableData: false, tableData: data||[], filterTableData: data||[] });
+          },
+          error: () => {
+            this.setState({ loadingTableData: false });
+          }
+        })
+      } else if (!catalogId) {
+        dispatch({
+          type: 'datamodel.searchModelBySearchProperties',
+          payload: {
+            data: searchProperties
+          },
+          callback: data => {
+            this.setState({ loadingTableData: false, tableData: data||[], filterTableData: data||[] });
+          },
+          error: () => {
+            this.setState({ loadingTableData: false });
+          }
+        })
+      } else {
         if (currentView === 'dir') {
 
           const params = {
@@ -250,28 +282,7 @@ class Model extends React.Component {
             }
           })
         }
-      } else {
-
-        const params = {
-          term: keyword,
-        };
-
-        if (currentModelState !== '') {
-          params.stateId = currentModelState;
-        }
-
-        dispatchLatestHomepage({
-          type: 'datamodel.searchModel',
-          payload: params,
-          callback: data => {
-            this.setState({ loadingTableData: false, tableData: data||[], filterTableData: data||[] });
-          },
-          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()
       })
     }
   }