草稿详情 编辑

src/view/Manage/AssetDraft/draft.jsx

@@ -49,8 +49,10 @@ const FC = (props) => {
   })
   const [updateAssetParams, setUpdateAssetParams] = React.useState({
     visible: false,
+    action: undefined,
     id: undefined,
     dirId: undefined,
+    readonly: false,
   })
   const [startProcessParams, setStartProcessParams] = React.useState({
     visible: false,
@@ -395,8 +397,20 @@ const FC = (props) => {
   const onRightDetailClick = () => {
     setUpdateAssetParams({
       visible: true,
+      action: 'detail',
       id: rightRow?.id,
       dirId: rightRow?.dirId,
+      readonly: true,
+    })
+  }
+
+  const onRightEditClick = () => {
+    setUpdateAssetParams({
+      visible: true,
+      action: 'edit',
+      id: rightRow?.id,
+      dirId: rightRow?.dirId,
+      readonly: false,
     })
   }
 
@@ -404,7 +418,7 @@ const FC = (props) => {
     if (key === '查看') {
       onRightDetailClick()
     } else if (key === '编辑') {
-      
+      onRightEditClick()
     } else if (key === '删除') {
 
     } else if (key === '分配') {
@@ -543,8 +557,10 @@ const FC = (props) => {
         onCancel={(refresh) => {
           setUpdateAssetParams({
             visible: false,
+            action: undefined,
             id: undefined,
             dirId: undefined,
+            readonly: false,
           })
 
           refresh && getDrafts()

src/view/Manage/AssetDraft/index.less

@@ -4,6 +4,6 @@
   overflow: auto;
 
   .yy-tabs-nav {
-    margin: 0;
+    margin: 0 !important;
   }
 }
\ No newline at end of file

src/view/Manage/AssetManage/Component/AssetAction.jsx

@@ -54,7 +54,6 @@ const AssetAction = React.forwardRef(function (props, ref) {
   const [loadingEditPermission, setLoadingEditPermission] = useState(false); 
   const [canEdit, setEdit] = useState(false);
   const [metadata, setMetadata] = useState(undefined);
-  const [loadingMetadataColumnList, setLoadingMetadataColumnList] = useState(false);
   const [metadataColumnList, setMetadataColumnList] = useState(undefined);
   const [modifyMetadataColumnList, setModifyMetadataColumnList] = useState();
   const [ pagination, setPagination ] = useState({ pageNum: 1, pageSize: 20 });
@@ -64,6 +63,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
   const [keyword, setKeyword] = useState('');
   const [publishedAssetPaths, setPublishedAssetPaths] = useState([]);
   const [publishedAsset, setPublishedAsset] = useState();
+  const [isStructured, setStructured] = useState();
 
   const [loadingSaveAsDraft, setLoadingSaveAsDraft] = React.useState(false)
   const [needSaveAsDraft, setNeedSaveAsDraft] = React.useState()
@@ -231,7 +231,6 @@ const AssetAction = React.forwardRef(function (props, ref) {
     if (action === 'add') {
       getElements();
     } else {
-      setCurrentAction('detail');
       if (id) {
         setPagination({...pagination, pageNum: 1});
         getAssetPaths();
@@ -254,12 +253,6 @@ const AssetAction = React.forwardRef(function (props, ref) {
   }, [assets])
 
   useEffect(() => {
-    if (assets) {
-      getMetadataAttributes()
-    }
-  }, [assets])
-
-  useEffect(() => {
     if (permissionId) {
       getPermission();
     }
@@ -286,10 +279,17 @@ const AssetAction = React.forwardRef(function (props, ref) {
     return [];
   }, [currentDomainGroup, currentBussinessDomain, treeDataMap])
 
-  const isStructured = useMemo(() => {
-    return template?.structured || assets?.structured
+  useEffect(() => {
+    setStructured(template?.structured||assets?.structured)
   }, [assets, template])
 
+  useEffect(() => {
+    if (assets) {
+      setMetadataColumnList(isStructured?assets.columns:assets.businessColumns)
+      setModifyMetadataColumnList(isStructured?assets.columns:assets.businessColumns)
+    }
+  }, [assets, isStructured])
+
   const cols = useMemo(() => {
     let newCols = []
 
@@ -550,26 +550,6 @@ const AssetAction = React.forwardRef(function (props, ref) {
     })
   }
 
-  const getMetadataAttributes = () => {
-    if (assets?.id) {
-      setLoadingMetadataColumnList(true);
-      dispatch({
-        type: isStructured?'assetmanage.getColumns':'assetmanage.getBusinessColumns',
-        payload: {
-          dataAssetId: assets?.id
-        },
-        callback: data => {
-          setLoadingMetadataColumnList(false);
-          setMetadataColumnList(data);     
-          setModifyMetadataColumnList(data);     
-        },
-        error: () => {
-          setLoadingMetadataColumnList(false);
-        }
-      });
-    }
-  }
-
   const onMetadataColumnEditableItemChange = (val, dataIndex, index) => {
     const _index = (pageNum-1)*pageSize + index;
     setModifyMetadataColumnList(
@@ -949,7 +929,6 @@ const AssetAction = React.forwardRef(function (props, ref) {
         {
           isStructured ? <Table
             className='mt-3'
-            loading={loadingMetadataColumnList}
             columns={cols??[]} 
             rowKey='_id'
             dataSource={tableData||[]}
@@ -990,7 +969,6 @@ const AssetAction = React.forwardRef(function (props, ref) {
             <Form form={columnForm}>
               <Table
                 className='mt-3'
-                loading={loadingMetadataColumnList}
                 columns={cols??[]} 
                 rowKey='_id'
                 dataSource={tableData||[]}

src/view/Manage/AssetManage/Component/AssetDetailDrawer.jsx

@@ -6,7 +6,7 @@ import { AssetDraftReference } from '../../../../util/constant';
 import { dispatch } from '../../../../model';
 
 const AssetDetailDrawer = (props) => {
-  const { onCancel, visible, id, dirId, reference, readonly = false } = props;
+  const { onCancel, visible, id, dirId, action = 'detail', reference, readonly = false } = props;
   const [animated, setAnimated] = React.useState(true)
   const [draftAsset, setDraftAsset] = React.useState()
 
@@ -57,7 +57,7 @@ const AssetDetailDrawer = (props) => {
       }}
     >
     {
-      visible && !animated && <AssetAction reference={reference} id={id} dirId={dirId} action='detail' readonly={readonly} onChange={() => {
+      visible && !animated && <AssetAction reference={reference} id={id} dirId={dirId} action={action} readonly={readonly} onChange={() => {
         onCancel?.(true);
       }} />
     }

src/view/Manage/AssetManage/Component/asset-relation-assets.jsx

@@ -15,7 +15,6 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
     pageNum: 1,
     pageSize: 20,
   })
-  const [loadingAssets, setLoadingAssets] = React.useState(false)
   const [assets, setAssets] = React.useState()
   const [selectedRows, setSelectedRows] = React.useState()
   const [selectResourceParams, setSelectResourceParams] = React.useState({
@@ -41,9 +40,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
   }, [assets])
 
   React.useEffect(() => {
-    if (item?.id) {
-      getRelatedAssets()
-    }
+    setAssets(item?.businessRelations)
   }, [item])
 
   const [tableData, total] = React.useMemo(() => {
@@ -96,29 +93,6 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
     }
   ]
 
-  const getRelatedAssets = () => {
-    setLoadingAssets(true)
-
-    let url = (reference===AssetDraftReference)?'assetmanage.getDraftRelatedAssets':'assetmanage.getRelatedAssets'
-    let params = (reference===AssetDraftReference)?{
-      draftId: item?.id
-    }:{
-      dataAssetId: item?.id
-    }
-
-    dispatch({
-      type: url,
-      payload: params,
-      callback: (data) => {
-        setLoadingAssets(false)
-        setAssets(data)
-      },
-      error: () => {
-        setLoadingAssets(false)
-      }
-    })
-  }
-
   const onEditClick = () => {
     setSelectResourceParams({
       visible: true,
@@ -173,7 +147,6 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
         <Table
           extraColWidth={32}
           rowKey='relatedDataAssetId'
-          loading={loadingAssets}
           columns={assetCols}
           dataSource={tableData??[]}
           pagination={false}