新增为资产

src/view/Manage/AssetResourceManage/add-to-asset.jsx

@@ -13,6 +13,7 @@ import Table from '../../../util/Component/Table'
 import AssetItem from '../AssetManage/asset-item'
 
 import './add-to-asset.less'
+import { MetadataColumn } from './table'
 
 const FC = (props) => {
   const { visible, items, onCancel } = props
@@ -246,9 +247,17 @@ export const Basic = React.forwardRef(function ({ items, defaultValue }, ref) {
             name='assetId'
             label='选择资产'
             rules={[{ required: true, message: '请选择资产!' }]}
-          >
-            <SelectAssetItem />
-          </Form.Item>
+          />
+  
+          <SelectAssetItem 
+            onChange={(rows) => {
+              if ((rows??[]).length > 0) {
+                form?.setFieldsValue({ assetId: rows[0].id })
+              } else {
+                form?.setFieldsValue({ assetId: undefined })
+              }
+            }}
+          />
         </React.Fragment>
       }
     </Form>
@@ -422,37 +431,51 @@ const SelectAssetItem = ({ onChange }) => {
   const columns = React.useMemo(() => {
     const newColumns = []
     let index = 0 
-    for (const attrItem of (elements??[])) {
-      for (const name of attrItem.names??[]) {
-        const col = {
-          title: name,
-          dataIndex: `element${++index}`,
-          ellipsis: true,
-          width: 120,
-          render: (text, record) => {
-            return (
-              <Tooltip title={text}>
-                <Typography.Text ellipsis={true}>
-                {text}
-                </Typography.Text>
-              </Tooltip>
-            );
-          }
+    for (const element of elements??[]) {
+      const col = {
+        title: element.name,
+        dataIndex: `element${++index}`,
+        ellipsis: true,
+        width: 120,
+        render: (text, record) => {
+          return (
+            <Tooltip title={text}>
+              <Typography.Text ellipsis={true}>
+              {text}
+              </Typography.Text>
+            </Tooltip>
+          );
         }
-        if (name === '编号') {
-          col.width = 60
-        } else if (name === '中文名称') {
-          col.width = isSzseEnv ? 230 : 160
-        } else if (name === '英文名称') {
-          col.width = isSzseEnv ? 224 : 160
-        } else if (name === '资产项') {
-          col.width = isSzseEnv ? 250 : 120
-        } else if (name === '资产路径') {
-          
+      }
+      if (element.name === '编号') {
+        col.width = 60
+      } else if (element.name === '中文名称') {
+        col.width = isSzseEnv ? 230 : 160
+      } else if (element.name === '英文名称') {
+        col.width = isSzseEnv ? 224 : 160
+      } else if (element.name === '资产路径') {
+        col.render = (text, record) => {
+          return (
+            <Tooltip title={text}>
+              <Typography.Text ellipsis={true}>
+                <a onClick={()=>{
+                  let event = new Event('storage')
+                  event.key = 'assetDirChangeEvent'
+                  event.dirId = record.dirId
+                  window?.dispatchEvent(event)
+                }}>
+                {text}
+                </a>
+              </Typography.Text>
+            </Tooltip>
+          )
         }
-
-        newColumns.push(col)
+      } else if (element.metadataItem === '是') {
+        col.width = isSzseEnv ? 250 : 120
+        col.render = (text, record) => <MetadataColumn data={text} />
       }
+
+      newColumns.push(col)
     }
     
     return newColumns
@@ -464,9 +487,7 @@ const SelectAssetItem = ({ onChange }) => {
       const newAsset = {...item}
       let index = 0
       for (const elementValue of (item.elementValues??[])) {
-        for (const value of (elementValue.values??[])) {
-          newAsset[`element${++index}`] = value
-        }
+        newAsset[`element${++index}`] = elementValue
       }
       newTableData.push(newAsset)
     }
@@ -517,7 +538,7 @@ const SelectAssetItem = ({ onChange }) => {
   const getTreeData = () => {
     setLoadingTreeData(true)
     dispatch({
-      type: 'assetmanage.queryAssetDirectoryAsTree',
+      type: 'assetmanage.queryDataAssetManageTree',
       callback: data => {
         setLoadingTreeData(false)
         setTreeData(data)
@@ -537,7 +558,7 @@ const SelectAssetItem = ({ onChange }) => {
   const getElements = () => {
     setLoadingElements(true)
     dispatch({
-      type: 'assetmanage.listFilterElementsGroupByType',
+      type: 'assetmanage.listFilterElements',
       payload: {
         range: getAssetRange(AssetManageReference),
         dataAssetType: getAssetType(AssetManageReference)
@@ -557,11 +578,14 @@ const SelectAssetItem = ({ onChange }) => {
     dispatch({
       type: 'assetmanage.listDataAssetsByPage',
       payload: {
-        dirId: node?.nodeId,
-        pageNum: args.params.page,
-        pageSize: args.params.size,
-        keyword: args.params.keyword,
-        range: getAssetRange(AssetManageReference),
+        data: [],
+        params: {
+          dirId: node?.nodeId,
+          pageNum: args.params.page,
+          pageSize: args.params.size,
+          keyword: args.params.keyword,
+          range: getAssetRange(AssetManageReference),
+        }
       },
       callback: data => {
         setLoading(false)
@@ -638,6 +662,7 @@ const SelectAssetItem = ({ onChange }) => {
             selectedRowKeys: (selectedRows??[]).map(item => item.id),
             onChange: (selectedRowKeys, selectedRows) => {
               setSelectedRows(selectedRows)
+              onChange?.(selectedRows)
             },
           }}
         />