bug fix

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

@@ -39,6 +39,7 @@ const ModelTree = (props) => {
   const { user, env } = useContext(AppContext);
   const [ loading, setLoading ] = useState(false);
   const [ treeData, setTreeData ] = useState(null);
+  const [rootItem, setRootItem] = useState();
   const [ item, setItem ] = useState(null);
   const [ prevItem, setPrevItem ] = useState(null);
   const [ visible, setVisible ] = useState(false);
@@ -97,7 +98,7 @@ const ModelTree = (props) => {
     } else {
       if (prevItem && !item) {
         setItem(prevItem);
-        onSelect && onSelect(prevItem?.key||'');
+        onSelect && onSelect(prevItem?.key||'', null, prevItem?.key===rootId);
         setPrevItem(null);
       }
     }
@@ -176,6 +177,7 @@ const ModelTree = (props) => {
         setLoading(false);
         setTreeData(data.subCatalogs||[]);
         setRootId(data.id||'');
+        setRootItem(data);
 
         const _dataList = [];
         generateList(data.subCatalogs||[], _dataList);
@@ -205,8 +207,8 @@ const ModelTree = (props) => {
           // if (currentItem && currentItem.key) {
           //   setExpandedKeys([currentItem?.key]);
           // }
-
-          onSelect && onSelect(data?.id);
+          setItem(data);
+          onSelect && onSelect(data?.id, null, true);
           
         }
       },
@@ -310,9 +312,9 @@ const ModelTree = (props) => {
   const onTreeSelect = (keys,data) => {
 
     if ((keys||[]).length === 0) {
-      if (viewSelectedKey === 'add') {
-        setItem();
-        onSelect && onSelect(rootId);
+      if (viewSelectedKey === 'dir') {
+        setItem(rootItem);
+        onSelect && onSelect(rootId, null, true);
       }
       
       return;

src/view/Manage/Model/index.jsx

@@ -71,6 +71,7 @@ class Model extends React.Component {
       startReleaseVisible: false,
       offlineVisible: false,
       jdbcInformationVisible: false,
+      isRoot: false,
     }
   }
   
@@ -139,9 +140,8 @@ class Model extends React.Component {
     })
   }
 
-  onTreeSelect = (key, offset=null) => {
-
-    this.setState({ catalogId: key, keyword: '', offset, currentModelState: this.state.currentModelState }, () => {
+  onTreeSelect = (key, offset=null, isRoot = false) => {
+    this.setState({ catalogId: key, keyword: '', offset, currentModelState: this.state.currentModelState, isRoot }, () => {
       if (!key || key==='') {
         this.setState({ tableData: [], filterTableData: [] });
       } else {
@@ -262,7 +262,7 @@ class Model extends React.Component {
   }
 
   onSearchInputChange = (value) => {
-    this.setState({ keyword: value||'', catalogId: '' }, () => {
+    this.setState({ keyword: value||'', catalogId: '', isRoot: true }, () => {
       if (value !== '') {
         this.onTableChange();
       }
@@ -649,7 +649,7 @@ class Model extends React.Component {
           > 
             <Space>
             {
-              currentView==='dir' && (getDataModelerRole(app?.user)!==DataModelerRoleReader) && !isOnlyEnding && <React.Fragment>
+              currentView==='dir' && (getDataModelerRole(app?.user)!==DataModelerRoleReader) && !isOnlyEnding && !this.state.isRoot && <React.Fragment>
                 <Space>
                   <Dropdown 
                     overlay={