bug fix

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

@@ -660,8 +660,10 @@ export const ElementItem = ({ type = 'detail', element, reference = AssetManageR
   }
 
   return (
-    <React.Fragment>
+    <div onClick={e => {
+      e.stopPropagation()
+    }}>
     {inputItem()}
-    </React.Fragment>
+    </div>
   )
 }
\ No newline at end of file

src/view/Manage/AssetResourceManage/edit-assets.jsx

@@ -7,7 +7,7 @@ import LocalStorage from 'local-storage'
 import { dispatch } from '../../../model'
 import { usePage } from '../../../util/hooks/page'
 import Table from '../../../util/Component/Table'
-import { getAssetType, getAssetTypeName, getQueryParam, isSzseEnv } from '../../../util'
+import { getAssetType, getAssetTypeName, getQueryParam, isSzseEnv, showMessage } from '../../../util'
 
 import '../Model/Component/EditModel.less'
 import { ElementItem, MultipleItem } from '../AssetManage/Component/AssetAction'
@@ -17,6 +17,7 @@ import produce from 'immer'
 const pathElement = { 
   name: '资产目录',
   supportBatchEdit: '是',
+  manualMaintain: '是',
   require: true,
 }
 
@@ -71,6 +72,14 @@ const FC = (props) => {
     try {
       await editAssetsRef.current?.save()
       const modifyData = editAssetsRef.current?.getModifyData()
+      if ((elementIds??[]).length === 0) {
+        const index = (modifyData.rowDataList??[]).findIndex(item => (item.dirIds??[]).length === 0)
+        if (index !== -1) {
+          showMessage('warn', '请选择资产目录')
+          return
+        }
+      }
+
       setWaiting(true)
       dispatch({
         type: (elementIds??[]).length===0?'assetmanage.resourceBatchAddAsAsset':'assetmanage.resourceBatchEdit',
@@ -84,8 +93,12 @@ const FC = (props) => {
           setWaiting(false)
           setAction('detail')
           LocalStorage.set('editAssetsChange', !(LocalStorage.get('editAssetsChange')??false))
+          showMessage('success', '保存成功')
+
           if ((elementIds??[]).length === 0) {
+            setTimeout(() => {
               window.close()
+            }, [300])
           }
         },
         error: () => {
@@ -255,12 +268,13 @@ export const EditAssets = React.forwardRef(function ({ action, type, ids, elemen
 
   const columns = React.useMemo(() => {
     const newColumns = []
-    let index = 0 
     let newElements = [...elements??[]]
     if ((elementIds??[]).length === 0) {
       newElements = [pathElement, ...newElements]
     }
 
+    newElements = newElements.filter(item => item.manualMaintain==='是')
+
     for (const element of newElements??[]) {
       let col = {
         title: element.name,
@@ -293,6 +307,9 @@ export const EditAssets = React.forwardRef(function ({ action, type, ids, elemen
             </Tooltip>
           );
         } 
+      } else if (element.metadataItem === '是') {
+        col.width = 200
+        col.render = (text, record) => <ElementItem type='detail' element={element} value={text} /> 
       }
 
       col.onCell = (record) => ({
@@ -311,7 +328,6 @@ export const EditAssets = React.forwardRef(function ({ action, type, ids, elemen
         }
       }
 
-      index++
       newColumns.push(col)
     }
 
@@ -356,7 +372,7 @@ export const EditAssets = React.forwardRef(function ({ action, type, ids, elemen
     if ((elementIds??[]).length === 0) {
       url = 'assetmanage.getAddAsAssetBatchEditInfo'
       payload = {
-        data: ids
+        data: (ids??'').split(',')
       }
     } else {
       url = 'assetmanage.getResourceBatchEditInfo'

src/view/Manage/AssetResourceManage/table.jsx

@@ -1672,12 +1672,12 @@ export const MetadataColumnTooltipTitle = ({ data }) => {
           dataIndex: 'typeName',
           ellipsis: true,
           render: (text, record) => {
-            let suffix = (record.size!==null&&record.size!==undefined) ? `(${record.size})` : ''
+            let suffix = (record.size) ? `(${record.size})` : ''
             if(record.size && record.decimalDigits){
               suffix = `(${record.size},${record.decimalDigits})`
             }
 
-            return `${text}${suffix}`
+            return `${text??''}${suffix}`
           }
         },
         {
@@ -1714,9 +1714,9 @@ export const MetadataColumnTooltipTitle = ({ data }) => {
       type: 'assetmanage.getMetadataColumns',
       payload: {
         params: {
-          parentId: currentMetadataId
+          parentId: currentMetadataId,
         },
-        data: ["Catalog,Database,Schema,Table,Column"]
+        data: [],
       },
       callback: (data) => {
         setLoading(false)