去掉checkCodeIsExist

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

@@ -40,43 +40,27 @@ const AddAssetModel = (props) => {
       setWaiting(true);
 
       dispatch({
-        type: 'assetmanage.checkCodeIsExist',
-        payload: { 
-          data: { elements: newElements } 
-        },
-        callback: isExist => {
-          if (isExist === 'true') {
-            setWaiting(false);
-            showMessage('warn', '已存在相同的资产目录编号,请重新输入');
-          } else {
-            dispatch({
-              type: 'assetmanage.checkIsNeedSaveAsDraft',
-              callback: (data) => {
-                const needSaveAsDraft = (data==='true')?true:false
-                
-                dispatch({
-                  type: needSaveAsDraft?'assetmanage.saveAsDraft':'assetmanage.addOrUpdateDataAsset',
-                  payload: { 
-                    params: {
-                      dirId: nodeId,
-                      operation: 'release',
-                    },
-                    data: { elements: newElements, templateType: getTemplateType(), ...postRelations } 
-                  },
-                  callback: () => {
-                    showMessage("success","新增成功");
-                    close(true)
-                  },
-                  error: () => {
-                    setWaiting(false);
-                  }
-                })
+        type: 'assetmanage.checkIsNeedSaveAsDraft',
+        callback: (data) => {
+          const needSaveAsDraft = (data==='true')?true:false
+          
+          dispatch({
+            type: needSaveAsDraft?'assetmanage.saveAsDraft':'assetmanage.addOrUpdateDataAsset',
+            payload: { 
+              params: {
+                dirId: nodeId,
+                operation: 'release',
               },
-              error: () => {
-                setWaiting(false);
-              }
-            })
-          }
+              data: { elements: newElements, templateType: getTemplateType(), ...postRelations } 
+            },
+            callback: () => {
+              showMessage("success","新增成功");
+              close(true)
+            },
+            error: () => {
+              setWaiting(false);
+            }
+          })
         },
         error: () => {
           setWaiting(false);

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

@@ -132,6 +132,28 @@ const AssetAction = (props) => {
     },
   ];
 
+  const businessActionCol = {
+    title: '操作',
+    dataIndex: 'action',
+    width: 80,
+    fixed: 'right',
+    render: (_, record, index) => {
+      return <Button 
+        size='small'
+        onClick={() => {
+          setModifyMetadataColumnList(prev => {
+            const newModifyList = [...prev]
+            newModifyList.splice(index, 1)
+
+            return newModifyList
+          })
+        }}
+      >
+      删除
+      </Button> 
+    }
+  }
+
   useEffect(() => {
     if (!readonly) {
       getSystems();
@@ -196,10 +218,19 @@ const AssetAction = (props) => {
     return [];
   }, [currentDomainGroup, currentBussinessDomain, treeDataMap])
 
-  const tableData = useMemo(() => {
+  const cols = useMemo(() => {
+    let newCols = [...businessCols]
+    if (isMetadataEdit) {
+      newCols.push(businessActionCol)
+    }
+
+    return newCols
+  }, [isMetadataEdit, modifyMetadataColumnList])
+
+  const [tableData, total] = useMemo(() => {
     let currentMetadataColumnList = isMetadataEdit ? [...modifyMetadataColumnList||[]] : [...metadataColumnList||[]]
 
-    return paginate(currentMetadataColumnList, pageNum, pageSize);
+    return [paginate(currentMetadataColumnList, pageNum, pageSize), currentMetadataColumnList.length];
   }, [metadataColumnList, modifyMetadataColumnList, pagination, keyword, isMetadataEdit, assets])
 
   const getPermission = () => {
@@ -563,44 +594,28 @@ const AssetAction = (props) => {
           }
         })
       } else {
+        let params = {
+          dirId,
+          metadataId: metadataId??'',
+          operation: 'change',
+        }
+
+        let data = action==='add' ? { elements: newElements } : { ...assets, elements: newElements }
+
+        data = {...data, businessRelations: relationAssetsRef.current?.assets}
+
         dispatch({
-          type: 'assetmanage.checkCodeIsExist',
+          type: needSaveAsDraft?'assetmanage.saveAsDraft':'assetmanage.addOrUpdateDataAsset',
           payload: { 
-            data: action==='add' ? { elements: newElements } : { ...assets, elements: newElements } 
+            params,
+            data,
           },
-          callback: isExist => {
-            if (isExist === 'true') {
-              setConfirmLoading(false);
-              showMessage('warn', '已存在相同的资产目录编号,请重新输入');
-            } else {
-              let params = {
-                dirId,
-                metadataId: metadataId??'',
-                operation: 'change',
-              }
-
-              let data = action==='add' ? { elements: newElements } : { ...assets, elements: newElements }
-
-              data = {...data, businessRelations: relationAssetsRef.current?.assets}
-  
-              dispatch({
-                type: needSaveAsDraft?'assetmanage.saveAsDraft':'assetmanage.addOrUpdateDataAsset',
-                payload: { 
-                  params,
-                  data,
-                },
-                callback: () => {
-                  setConfirmLoading(false);
-                  setCurrentAction('detail');
-                  getAsset();
-                  showMessage("success",(action==='add')?"新增成功":"修改成功");
-                  onChange && onChange();
-                },
-                error: () => {
-                  setConfirmLoading(false);
-                }
-              })
-            }
+          callback: () => {
+            setConfirmLoading(false);
+            setCurrentAction('detail');
+            getAsset();
+            showMessage("success",(action==='add')?"新增成功":"修改成功");
+            onChange && onChange();
           },
           error: () => {
             setConfirmLoading(false);
@@ -765,13 +780,13 @@ const AssetAction = (props) => {
                         <Button onClick={onActionButtonClick}>{(reference===AssetDraftReference||!needSaveAsDraft)?'保存':'保存草稿'}</Button>
                       </React.Fragment>
                     }
-                    {
+                    {/* {
                       (reference!==AssetDraftReference&&!isPostAsset(assets?.templateType)) && <Button onClick={onAuthorizationButtonClick}>授权</Button>
-                    }
+                    } */}
                   </React.Fragment>
                 }
 
-                {
+                {/* {
                   reference !== AssetRecycleReference && <Button onClick={shareAsset}>分享</Button>
                 }
                 {
@@ -801,7 +816,7 @@ const AssetAction = (props) => {
                       </Space>
                     </Button>
                   </Dropdown> 
-                }   
+                }    */}
               </Space>
             }
           </div>
@@ -951,13 +966,12 @@ const AssetAction = (props) => {
         <Table
           className='mt-3'
           loading={loadingMetadataColumnList}
-          columns={businessCols??[]} 
+          columns={cols??[]} 
           rowKey='_id'
           dataSource={tableData||[]}
           pagination={{
-            position: ['bottomLeft'],
-            size: 'small',
-            total: (metadataColumnList||[]).length,
+            position: ['bottomCenter'],
+            total,
             showTotal: (total) => `共${total}项`,
             showSizeChanger: true,
             current: pageNum,

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

@@ -151,51 +151,35 @@ const AssetTagModal = (props) => {
       setConfirmLoading(true);
 
       dispatch({
-        type: 'assetmanage.checkCodeIsExist',
+        type: 'assetmanage.addOrUpdateDataAsset',
         payload: { 
-          data: { ...asset, elements: newElements }  
+          params,
+          data: { ...asset, elements: newElements } 
         },
-        callback: isExist => {
-          if (isExist === 'true') {
-            setConfirmLoading(false);
-            showMessage('warn', '已存在相同的资产目录编号,请重新输入');
-          } else {
-            dispatch({
-              type: 'assetmanage.addOrUpdateDataAsset',
-              payload: { 
-                params,
-                data: { ...asset, elements: newElements } 
-              },
-              callback: data => {
-                const ids = [id];
-                if (data && ((data?.id||'')!=='') && (data?.id!==id)) {
-                  ids.push(data?.id);
-                }
-      
-                dispatch({
-                  type: 'tag.batchAddTagResourceByTagList',
-                  payload: {
-                    params: {
-                      tagIds: tag?.tagId,
-                      resourceIds: ids.join(','),
-                      type: 'dataAsset',
-                      creator
-                    }
-                  },
-                  callback: () => {
-                    reset();
-                    onCancel && onCancel(true);
-                  },
-                  error: () => {
-                    setConfirmLoading(false);
-                  }
-                })
-              },
-              error: () => {
-                setConfirmLoading(false);
-              }
-            })
+        callback: data => {
+          const ids = [id];
+          if (data && ((data?.id||'')!=='') && (data?.id!==id)) {
+            ids.push(data?.id);
           }
+
+          dispatch({
+            type: 'tag.batchAddTagResourceByTagList',
+            payload: {
+              params: {
+                tagIds: tag?.tagId,
+                resourceIds: ids.join(','),
+                type: 'dataAsset',
+                creator
+              }
+            },
+            callback: () => {
+              reset();
+              onCancel && onCancel(true);
+            },
+            error: () => {
+              setConfirmLoading(false);
+            }
+          })
         },
         error: () => {
           setConfirmLoading(false);