bug fix

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

@@ -99,7 +99,7 @@ const ModelTree = (props) => {
 
   useEffect(() => {
     if (viewSelectedKey !== 'branch') {
-      if (keyword!=='' || (searchProperties??[]).length > 0) {
+      if (keyword || (searchProperties??[]).length > 0) {
         if (item && !prevItem) {
           setPrevItem(item);
         }
@@ -730,7 +730,7 @@ const ModelTree = (props) => {
             showIcon={false} 
             onSelect={onTreeSelect} 
             treeData={treeData} 
-            selectedKeys={[item?item.key:'']} 
+            selectedKeys={item?.key?[item?.key]:[]} 
             titleRender={(nodeData) => {
               return <span title={nodeData?.remark||''}>{nodeData?.name||''}</span>;
             }}

src/view/Manage/Model/index.jsx

@@ -119,16 +119,21 @@ class Model extends React.Component {
       //分支管理返回的模型 都是有权限的
       if (currentView !== 'branch') {
         selectModelerIds?.forEach(id => {
-          const index = (tableData||[]).findIndex(item => item.id?.split('-')[0] === id?.split('-')[0]);
+          let index = (tableData||[]).findIndex(item => item.id === id);
+          if (index === -1) {
+            index = (tableData||[]).findIndex(item => item.id?.split('-')[0] === id?.split('-')[0]);
+          }
+
           if (index !== -1) {
-            tableData[index].optionList?.forEach(item => {
+            const modelItem = tableData[index];
+            modelItem.optionList?.forEach(item => {
               if (item.name === '导出' && item.enabled === false) {
                 canExport = false;
-              } else if (item.name === '送审' && item.enabled === false) {
+              } else if (item.name === '送审' && (item.enabled===false||modelItem.state?.id!=='1')) {
                 canStartFlow = false;
-              } else if (item.name === '变更目录' && item.enabled === false) {
+              } else if (item.name === '变更目录' && (item.enabled===false||!modelItem.supportRecatalog)) {
                 canChangeCatalog = false;
-              } else if (item.name === '删除' && item.enabled === false) {
+              } else if (item.name === '删除' && (item.enabled===false||modelItem.state?.id!=='1')) {
                 canDelete = false;
               }
             });