行展开

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

@@ -182,6 +182,7 @@ const EditModel = (props) => {
                 setActionData({ ...actionData, ...{ action: 'detail', modelerId: data.id||'', editable: data?.editable||false, stateId: data?.state?.id||'' } });
                 actionRef.current = 'detail';
 
+                LocalStorage.set('modelId', data.id||'');
                 LocalStorage.set('modelChange', !(LocalStorage.get('modelChange')||false));
               },
               error: () => {
@@ -199,6 +200,7 @@ const EditModel = (props) => {
             setActionData({ ...actionData, ...{ action: (_action==='flow')?'flow':'detail', modelerId: data.id||'', stateId: data?.state?.id||'', permitCheckOut: data?.permitCheckOut||false, editable: data?.editable||false } });
             actionRef.current = (_action==='flow')?'flow':'detail';
 
+            LocalStorage.set('modelId', data.id||'');
             LocalStorage.set('modelChange', !(LocalStorage.get('modelChange')||false));
           }
         },

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

@@ -7,11 +7,13 @@ import { Resizable } from 'react-resizable';
 import { useContextMenu, Menu as RcMenu, Item as RcItem } from "react-contexify";
 import ResizeObserver from 'rc-resize-observer';
 import { MenuItem, SubMenu } from 'react-contextmenu';
+import LocalStorage from 'local-storage';
 
 import DataGrid from '../../VirtualTable/test-table';
 import { dispatch } from '../../../../model'; 
 import { showMessage, getQueryParam, paginate, isSzseEnv, formatDate, getDataModelerRole } from '../../../../util';
 import { AnchorId, AnchorTimestamp, Action, CatalogId, ModelerId, DataModelerRoleReader } from '../../../../util/constant';
+import SubModelTable from "./SubModelTable";
 // import Tag from "../../Tag";
 
 import './ModelTable.less';
@@ -239,13 +241,11 @@ const ModelTable = (props) => {
 
   useEffect(() => {
 
-    if ((modelId||'') !== '') {
       window?.addEventListener("storage", modelEventChange);
     
       return () => {
         window?.removeEventListener("storage", modelEventChange);
       }
-    } 
   
     //eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
@@ -314,7 +314,7 @@ const ModelTable = (props) => {
 
   const modelEventChange = (e) => {
     if (e.key === 'modelChange') {
-      getCheckoutDataModel();
+      subDataMap.delete(LocalStorage.get('modelId'));
     }
   }
 
@@ -483,10 +483,10 @@ const ModelTable = (props) => {
 
         return (
           <div style={{ padding: 10 }}>
-            <ModelTable 
+            <SubModelTable 
               modelId={row?.checkedOutId}
               modelPid={row?.id}
-              globalSelectRows={[...subSelectedRowKeys, ...selectedRowKeys]}
+              checked={subSelectedRowKeys.indexOf(row?.checkedOutId)!==-1}
               dataMap={subDataMap}
               onSubSelect={onSubSelectChange}
               onDataMapChange={onSubDataMapChange}
@@ -593,6 +593,7 @@ const ModelTable = (props) => {
         columns={columns}
         rows={modelId?(subData||[]):(data||[])}
         rowHeight={modelId?39: 51}
+        expandedRowHeight={100}
         rowExpandable={(row) => {
           return row?.alreadyCheckedOut;
         }}

src/view/Manage/Model/Component/ModelTable.less

@@ -20,7 +20,7 @@
     display: none;
   }
 
-  .yy-table-tbody > tr:not(.yy-table-measure-row)> td  {
+  .yy-table-tbody tr:not(.yy-table-measure-row) td  {
     padding: 8px 8px !important;
   }
 }

src/view/Manage/VirtualTable/test-table.tsx

@@ -203,7 +203,7 @@ function FC<Row extends RowData, SR, K extends React.Key = React.Key>(props: Dat
     }
 
     return columns
-  }, [columns, expandRow, _rows, checkable, checkAll, setCheckAll])
+  }, [columns, expandRow, checkable])
 
   // 取得选中
   const getSelected = useCallback(() => {
@@ -266,7 +266,7 @@ function FC<Row extends RowData, SR, K extends React.Key = React.Key>(props: Dat
         sortColumns={sortColumns}
         onSortColumnsChange={setSortColumns}
 
-        selectedRows={_selectedRows}
+        selectedRows={new Set(selectedRows||[])}
         onSelectedRowsChange={(values: Set<any>) => {
           console.log('values', values);
           onSelectedRowsChange && onSelectedRowsChange(Array.from(values));