岗位关联

src/model/assetmanage.js

@@ -386,3 +386,23 @@ export function* addSubscribe(payload) {
 export function* startProcess(payload) {
   return yield call(service.startProcess, payload);
 }
+
+export function* getRelatedAssets(payload) {
+  return yield call(service.getRelatedAssets, payload);
+}
+
+export function* getRelatedServices(payload) {
+  return yield call(service.getRelatedServices, payload);
+}
+
+export function* fillRelatedAssetsInfo(payload) {
+  return yield call(service.fillRelatedAssetsInfo, payload);
+}
+
+export function* getDraftRelatedAssets(payload) {
+  return yield call(service.getDraftRelatedAssets, payload);
+}
+
+export function* getDraftRelatedServices(payload) {
+  return yield call(service.getDraftRelatedServices, payload);
+}
\ No newline at end of file

src/service/dataassetmanager.js

@@ -368,3 +368,23 @@ export function addSubscribe(payload) {
 export function startProcess(payload) {
   return PostJSON("/dataassetmanager/flowApi/startProcess", payload)
 }
+
+export function getRelatedAssets(payload) {
+  return PostJSON("/dataassetmanager/postApi/getRelatedAssets", payload)
+}
+
+export function getRelatedServices(payload) {
+  return PostJSON("/dataassetmanager/postApi/getRelatedServices", payload)
+}
+
+export function fillRelatedAssetsInfo(payload) {
+  return PostJSON("/dataassetmanager/postApi/fillRelatedAssetsInfo", payload)
+}
+
+export function getDraftRelatedAssets(payload) {
+  return PostJSON("/dataassetmanager/postDraftApi/getRelatedAssets", payload)
+}
+
+export function getDraftRelatedServices(payload) {
+  return PostJSON("/dataassetmanager/postDraftApi/getRelatedServices", payload)
+}

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

@@ -44,10 +44,11 @@ const AddAssetModel = (props) => {
             showMessage('warn', '已存在相同的资产目录编号,请重新输入');
           } else {
             dispatch({
-              type: 'assetmanage.addOrUpdateDataAsset',
+              type: 'assetmanage.saveAsDraft',
               payload: { 
                 params: {
                   dirId: nodeId,
+                  operation: 'change',
                 },
                 data: { elements: newElements } 
               },

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

@@ -1359,7 +1359,7 @@ const AssetAction = (props) => {
       {
         action!=='add' && <React.Fragment>
           {
-            isPostAsset(assets?.templateType) ? <div className='mt-2'><PostRelation /></div> : <React.Fragment>
+            isPostAsset(assets?.templateType) ? <div className='mt-2'><PostRelation reference={reference} action={currentAction} item={assets} /></div> : <React.Fragment>
               <div>
                 <Divider orientation='left'>字段级资产目录信息</Divider>
               </div>

src/view/Manage/AssetManage/Component/post-relation.jsx

@@ -4,17 +4,21 @@ import { Tabs, Space, Button, Input, Pagination, Tooltip, Modal } from 'antd'
 import { paginate } from '../../../../util'
 import Table from '../../ResizeableTable'
 import SelectResource from './select-resource'
+import { dispatch } from '../../../../model';
+import { AssetDraftReference } from '../../../../util/constant'
 
 const FC = (props) => {
-  const { item,  } = props
+  const { item, reference, action } = props
   const [activeKey, setActiveKey] = React.useState('asset')
   const [keyword, setKeyword] = React.useState()
   const [pagination, setPagination] = React.useState({
     pageNum: 1,
     pageSize: 20,
   })
-  const [loading, setLoading] = React.useState(false)
-  const [data, setData] = React.useState()
+  const [loadingAssets, setLoadingAssets] = React.useState(false)
+  const [assets, setAssets] = React.useState()
+  const [loadingServices, setLoadingServices] = React.useState(false)
+  const [services, setServices] = React.useState()
   const [selectedRows, setSelectedRows] = React.useState()
   const [selectResourceParams, setSelectResourceParams] = React.useState({
     visible: false,
@@ -25,17 +29,18 @@ const FC = (props) => {
   const [modal, contextHolder] = Modal.useModal()
 
   React.useEffect(() => {
-    getRelations()
+    getRelatedAssets()
+    getRelatedServices()
   }, [])
 
   const [tableData, total] = React.useMemo(() => {
-    let newTableData = [...data??[]]
+    let newTableData = (activeKey==='asset')?[...assets??[]]:[...services??[]]
     if (keyword) {
       newTableData = (newTableData??[]).filter(item => (item.name??'').indexOf(keyword) !== -1)
     }
 
     return [paginate(newTableData, pagination.pageNum, pagination.pageSize), (newTableData??[]).length]
-  }, [data, keyword, pagination])
+  }, [activeKey, assets, services, keyword, pagination])
 
   const cols = [
     {
@@ -58,15 +63,42 @@ const FC = (props) => {
     },
   ]
 
-  const getRelations = () => {
-    setLoading(true)
-    setTimeout(() => {
-      setLoading(false)
-      setData(Array.from({ length: 90 }, (_, key) => ({  
-        id: `${key}`,
-        name: `test${key}`
-      })))
-    }, 3000)
+  const getRelatedAssets = () => {
+    setLoadingAssets(true)
+    dispatch({
+      type: (reference===AssetDraftReference)?'assetmanage.getDraftRelatedAssets':'assetmanage.getRelatedAssets',
+      payload: {
+        params: {
+          dataAssetId: item?.id
+        }
+      },
+      callback: (data) => {
+        setLoadingAssets(false)
+        setAssets(data)
+      },
+      error: () => {
+        setLoadingAssets(false)
+      }
+    })
+  }
+
+  const getRelatedServices = () => {
+    setLoadingServices(true)
+    dispatch({
+      type: (reference===AssetDraftReference)?'assetmanage.getDraftRelatedServices':'assetmanage.getRelatedServices',
+      payload: {
+        params: {
+          dataAssetId: item?.id
+        }
+      },
+      callback: (data) => {
+        setLoadingServices(false)
+        setServices(data)
+      },
+      error: () => {
+        setLoadingServices(false)
+      }
+    })
   }
 
   const onEditClick = () => {
@@ -89,6 +121,26 @@ const FC = (props) => {
     })
   }
 
+  const onSelectResourceCancel = (data) => {
+    setSelectResourceParams({
+      visible: false,
+      item: undefined,
+      type: undefined
+    })
+
+    if (data) {
+      if (activeKey === 'asset') {
+        setAssets(prevAssets => {
+          return [...prevAssets??[], ...data]
+        })
+      } else if (activeKey === 'service') {
+        setServices(prevServices => {
+          return [...prevServices??[], ...data]
+        })
+      }
+    }
+  }
+
   return (
     <div>
       <Tabs activeKey={activeKey} onChange={(val) => { setActiveKey(val) }}>
@@ -96,12 +148,14 @@ const FC = (props) => {
         <Tabs.TabPane tab='关联服务' key='service' />
       </Tabs>
       <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <Space>
+        {
+          action === 'edit' && <Space>
             <Button onClick={onEditClick}>编辑</Button>
             <Tooltip title={(selectedRows??[]).length===0?(activeKey==='asset'?'请先选择资产':'请先选择服务'):''}>
               <Button disabled={(selectedRows??[]).length===0} onClick={onDeleteClick}>删除</Button>
             </Tooltip>
           </Space>
+        }
         <Input size="middle"
           placeholder={activeKey==='service'?'搜索服务名称':''}
           value={keyword}
@@ -115,7 +169,7 @@ const FC = (props) => {
       <div className='mt-3'>
         <Table
           rowKey='id'
-          loading={loading}
+          loading={loadingAssets||loadingServices}
           columns={cols}
           dataSource={tableData??[]}
           pagination={false}
@@ -143,15 +197,7 @@ const FC = (props) => {
       </div>
       <SelectResource
         {...selectResourceParams}
-        onCancel={(refresh) => {
-          setSelectResourceParams({
-            visible: false,
-            item: undefined,
-            type: undefined
-          })
-
-          refresh && getRelations()
-        }}
+        onCancel={onSelectResourceCancel}
       />
       {contextHolder}
     </div>

src/view/Manage/AssetManage/Component/select-asset.jsx

@@ -14,6 +14,7 @@ import './select-asset.less'
 // const specialCol = ['数据关键用户', '业务数据owner', 'it责任人', '创建人', '更新人']
 
 const FC = (props) => {
+  const { onChange } = props
   const [args, setArgs] = React.useState(() => ({
     page: 1, 
     size: 20,
@@ -59,6 +60,10 @@ const FC = (props) => {
     }
   }, [currentTemplate, node])
 
+  React.useEffect(() => {
+    onChange?.(selectedRows)
+  }, [selectedRows])
+
   useDebounceEffect(() => {
     if (currentTemplate) {
       getAssets()

src/view/Manage/AssetManage/Component/select-data-service.jsx

@@ -63,7 +63,7 @@ const FC = (props) => {
   }, [rootNode, args], { wait: 300 })
 
   React.useEffect(() => {
-    onChange?.((selectedRows??[]).map(item => item.id))
+    onChange?.(selectedRows)
   }, [selectedRows])
 
   const treeData1 = React.useMemo(() => {

src/view/Manage/AssetManage/Component/select-resource.jsx

@@ -3,6 +3,7 @@ import { Modal, Button, Spin, message, } from 'antd'
 
 import SelectAsset from './select-asset'
 import SelectDataService from './select-data-service'
+import { dispatch } from '../../../../model';
 
 const FC = ({ visible, item, type, onCancel }) => {
   const [animated, setAnimated] = React.useState(true)
@@ -17,20 +18,46 @@ const FC = ({ visible, item, type, onCancel }) => {
     }
   }, [visible])
 
-  const close = (refresh = false) => {
+  const close = (data = null) => {
     setWaiting(false)
     setAnimated(true)
-    onCancel?.(refresh)
+    onCancel?.(data)
   }
 
   const save = async () => {
-    const selectedRowKeys = basicRef.current?.selectedRowKeys
-    if ((selectedRowKeys??[]).length === 0) {
+    const selectedRows = basicRef.current?.selectedRows
+    if ((selectedRows??[]).length === 0) {
       message.warn(type==='asset'?'请先选择资产':'请先选择服务')
       return
     }
 
+    if (type === 'asset') {
       setWaiting(true)
+      dispatch({
+        type: 'assetmanage.fillRelatedAssetsInfo',
+        payload: {
+          params: {
+            dataAssetIds: (selectedRows??[]).map(item => item.id).toString()
+          }
+        },
+        callback: (data) => {
+          setWaiting(false)
+          close(data)
+        },
+        error: () => {
+          setWaiting(false)
+        }
+      })
+    } else {
+      close((selectedRows??[]).map(item => ({
+        cnName: item.basicInfo?.cnName,
+        name: item.basicInfo?.name,
+        path: item.path,
+        relatedServiceCode: item.basicInfo?.code,
+        relatedServiceId: item.id,
+        remark: item.remark,
+      })))
+    }
   }
 
   const footer = React.useMemo(() => {
@@ -67,14 +94,14 @@ const FC = ({ visible, item, type, onCancel }) => {
 export default FC
 
 const Basic = React.forwardRef(function ({ type }, ref) {
-  const [selectedRowKeys, setSelectedRowKeys] = React.useState()
+  const [selectedRows, setSelectedRows] = React.useState()
 
   React.useImperativeHandle(ref, () => ({
-    selectedRowKeys
-  }), [selectedRowKeys])
+    selectedRows
+  }), [selectedRows])
 
   const onChange = (val) => {
-    setSelectedRowKeys(val)
+    setSelectedRows(val)
   }
 
   return (