结构化字段

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

@@ -74,7 +74,53 @@ const AssetAction = (props) => {
   const [columnForm] = Form.useForm()
   const relationAssetsRef = useRef();
 
-  const businessCols = [
+  const columns = [
+    {
+      title: '技术ID(英文名称)',
+      dataIndex: 'name',
+      width: 160,
+      ellipsis: true,
+      render: (text, record, _) => {
+        return (
+          <Tooltip title={text||''}>
+            <a onClick={() => {
+              window.open(`/center-home/metadetail?mid=${record.metadataColumnId}&action=metadetail&type=detail&manager=true&activekey=1`)
+            }}>
+            {highlightSearchContentByTerms(text||'', terms)}
+            </a>
+          </Tooltip>
+        );
+      }
+    },
+    {
+      title: '名称',
+      dataIndex: 'cnName',
+      // width: 200,
+      ellipsis: true,
+      render: (text, _) => highlightSearchContentByTerms(text||'', terms)
+    },
+    {
+      title: '备注信息',
+      dataIndex: 'remarks',
+      ellipsis: true,
+      render: (text, _) => highlightSearchContentByTerms(text||'', terms)
+    },
+    {
+      title: '类型',
+      dataIndex: 'typeName',
+      width: 100,
+      ellipsis: true,
+      render: (text, _) => highlightSearchContentByTerms(text||'', terms)
+    },
+    {
+      title: '长度',
+      dataIndex: 'size',
+      width: 60,
+      ellipsis: true,
+    },
+  ];
+
+  const businessColumns = [
     {
       title: <span>
         <span style={{
@@ -221,13 +267,16 @@ const AssetAction = (props) => {
   }, [currentDomainGroup, currentBussinessDomain, treeDataMap])
 
   const cols = useMemo(() => {
-    let newCols = [...businessCols]
-    if (isMetadataEdit) {
+    let newCols = []
+    if (assets) {
+      newCols = assets.structured?[...columns]:[...businessColumns]
+      if (!assets.structured && isMetadataEdit) {
         newCols.push(businessActionCol)
       }
+    }
 
     return newCols
-  }, [isMetadataEdit, modifyMetadataColumnList])
+  }, [isMetadataEdit, assets, columns, businessColumns, businessActionCol])
 
   const [tableData, total] = useMemo(() => {
     let currentMetadataColumnList = isMetadataEdit ? [...modifyMetadataColumnList||[]] : [...metadataColumnList||[]]
@@ -923,41 +972,6 @@ const AssetAction = (props) => {
               },
             }} 
           /> : <React.Fragment>
-            <Form form={columnForm}>
-              <Table
-                className='mt-3'
-                loading={loadingMetadataColumnList}
-                columns={cols??[]} 
-                rowKey='_id'
-                dataSource={tableData||[]}
-                pagination={{
-                  position: ['bottomCenter'],
-                  total,
-                  showTotal: (total) => `共${total}项`,
-                  showSizeChanger: true,
-                  current: pageNum,
-                  pageSize,
-                  onChange: (_pageNum, _pageSize) => {
-                    setPagination({ pageNum: _pageNum||1, pageSize: _pageSize || 20 });
-                  },
-                  onShowSizeChange: (_pageNum, _pageSize) => {
-                    setPagination({ pageNum: _pageNum||1, pageSize: _pageSize || 20 });
-                  },
-                }} 
-              />
-            </Form>
-            <div>
-              <Divider orientation='left'>关联资产</Divider>
-              <RelationAssets 
-                ref={relationAssetsRef} 
-                reference={reference}  
-                action={currentAction} 
-                item={assets}
-              />
-            </div>
-          </React.Fragment>
-        }
-      </div>
             <Space style={{ marginLeft: 'auto' }}>
               {
                 !readonly && (reference===AssetManageReference||canEdit) && <React.Fragment>
@@ -1020,6 +1034,41 @@ const AssetAction = (props) => {
               }
             </Space>
       
+            <Form form={columnForm}>
+              <Table
+                className='mt-3'
+                loading={loadingMetadataColumnList}
+                columns={cols??[]} 
+                rowKey='_id'
+                dataSource={tableData||[]}
+                pagination={{
+                  position: ['bottomCenter'],
+                  total,
+                  showTotal: (total) => `共${total}项`,
+                  showSizeChanger: true,
+                  current: pageNum,
+                  pageSize,
+                  onChange: (_pageNum, _pageSize) => {
+                    setPagination({ pageNum: _pageNum||1, pageSize: _pageSize || 20 });
+                  },
+                  onShowSizeChange: (_pageNum, _pageSize) => {
+                    setPagination({ pageNum: _pageNum||1, pageSize: _pageSize || 20 });
+                  },
+                }} 
+              />
+            </Form>
+            <div>
+              <Divider orientation='left'>关联资产</Divider>
+              <RelationAssets 
+                ref={relationAssetsRef} 
+                reference={reference}  
+                action={currentAction} 
+                item={assets}
+              />
+            </div>
+          </React.Fragment>
+        }
+      </div>
       {contextHolder}
     </div>
   )