结构化字段

src/model/assetmanage.js

@@ -418,6 +418,10 @@ export function* fillRelationDisplayInfo(payload) {
   return yield call(service.fillRelationDisplayInfo, payload);
 }
 
+export function* getColumns(payload) {
+  return yield call(service.getColumns, payload)
+}
+
 export function* getBusinessColumns(payload) {
   return yield call(service.getBusinessColumns, payload);
 }

src/service/dataassetmanager.js

@@ -425,6 +425,10 @@ export function fillRelationDisplayInfo(payload) {
   return GetJSON("/dataassetmanagertest/dataAssetRelatedApi/fillRelationDisplayInfo", payload)
 }
 
+export function getColumns(payload) {
+  return GetJSON("/dataassetmanagertest/dataAssetColumnApi/listColumnsByDataAssetId", payload)
+}
+
 export function getBusinessColumns(payload) {
   return GetJSON("/dataassetmanagertest/dataAssetColumnApi/listBusinessColumnsByDataAssetId", payload)
 }

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

@@ -188,7 +188,9 @@ const AssetAction = (props) => {
   }, [assets])
 
   useEffect(() => {
-    getMetadataAttributes()
+    if (assets) {
+      getMetadataAttributes()
+    }
   }, [assets])
 
   useEffect(() => {
@@ -483,7 +485,7 @@ const AssetAction = (props) => {
     if (assets?.id) {
       setLoadingMetadataColumnList(true);
       dispatch({
-        type: 'assetmanage.getBusinessColumns',
+        type: (assets?.structured)?'assetmanage.getColumns':'assetmanage.getBusinessColumns',
         payload: {
           dataAssetId: assets?.id
         },
@@ -899,6 +901,62 @@ const AssetAction = (props) => {
 
       <div>
         <Divider orientation='left'>字段级资产目录信息</Divider>
+        {
+          assets?.structured ? <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 });
+              },
+            }} 
+          /> : <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' }}>
         {
@@ -962,39 +1020,6 @@ 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>
       {contextHolder}
     </div>
   )

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

@@ -263,7 +263,6 @@ const AssetTagModal = (props) => {
                  label={element.name}
                  name={element.name}
                  key={index}
-                 
                >
                { (element.name==='资产项') ? <MetadataInfo /> : <Input disabled={element.manualMaintain==='否'}  /> }
                </Form.Item>