增加资源类型

src/model/assetmanage.js

@@ -21,8 +21,8 @@ export function* listCustomElements() {
   return yield call(service.listCustomElements);
 }
 
-export function* listFilterElementIds() {
-  return yield call(service.listFilterElementIds);
+export function* listFilterElementIds(payload) {
+  return yield call(service.listFilterElementIds, payload);
 }
 
 export function* listFilterElements() {
@@ -37,8 +37,8 @@ export function* setupFilterElementIds(payload) {
   return yield call(service.setupFilterElementIds, payload);
 }
 
-export function* listFilterElementIdsConfig() {
-  return yield call(service.listFilterElementIdsConfig);
+export function* listFilterElementIdsConfig(payload) {
+  return yield call(service.listFilterElementIdsConfig, payload);
 }
 
 export function* setupFilterElementIdsConfig(payload) {

src/service/dataassetmanager.js

@@ -20,8 +20,8 @@ export function listCustomElements() {
   return GetJSON("/dataassetmanager/elementApi/listCustomElements");
 }
 
-export function listFilterElementIds() {
-  return GetJSON("/dataassetmanager/elementApi/listFilterElementIds");
+export function listFilterElementIds(payload) {
+  return GetJSON("/dataassetmanager/elementApi/listFilterElementIds", payload);
 }
 
 export function listFilterElements() {
@@ -36,8 +36,8 @@ export function setupFilterElementIds(payload) {
   return PostJSON("/dataassetmanager/elementApi/setupFilterElementIds", payload);
 }
 
-export function listFilterElementIdsConfig() {
-  return PostJSON("/dataassetmanager/configApi/listFilterElementIds");
+export function listFilterElementIdsConfig(payload) {
+  return PostJSON("/dataassetmanager/configApi/listFilterElementIds", payload);
 }
 
 export function setupFilterElementIdsConfig(payload) {

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

@@ -4,7 +4,7 @@ import { DownOutlined, UpOutlined } from '@ant-design/icons';
 
 import MetadataInfo from './MetadataInfo';
 import { dispatch } from '../../../../model';
-import { highlightSearchContentByTerms, showMessage, getAssetRange, checkMenuAdmit } from '../../../../util';
+import { highlightSearchContentByTerms, showMessage, getAssetRange, checkMenuAdmit, getAssetType } from '../../../../util';
 import { AppContext } from '../../../../App';
 import Separate from './Separate';
 import { AnchorId, AnchorDirId, AssetManageReference } from '../../../../util/constant';
@@ -81,7 +81,8 @@ const AssetAction = (props) => {
       type: 'assetmanage.listElements',
       payload: {
         params: {
-          range: getAssetRange(reference)
+          range: getAssetRange(reference),
+          dataAsset: getAssetType(reference),
         }
       },
       callback: data => {

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

@@ -333,6 +333,7 @@ const AssetDirectory = (props) => {
       />
 
       <AttributeRelationModal
+        type={reference}
         visible={ attributeRelationModalVisible }
         onCancel={ onAttributeRelationModalCancel }
       />

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

@@ -3,7 +3,7 @@ import { Row, Col, Checkbox, Typography, Button, Switch, Modal } from 'antd';
 
 import { dispatch } from '../../../../model';
 import './FilterElementModal.less';
-import { getAssetRange } from '../../../../util';
+import { getAssetRange, getAssetType } from '../../../../util';
 
 //type
 //global 全局设置
@@ -27,22 +27,32 @@ const FilterElementModal = (props) => {
   }, [visible]);
 
   const getAllFilterElementIdsThenGetAllElements = () => {
-
-    let url = '';
     if (type === 'global') {
-      url = 'assetmanage.listFilterElementIdsConfig';
-    } else {
-      url = 'assetmanage.listFilterElementIds';
+      dispatch({
+        type: 'assetmanage.listFilterElementIdsConfig',
+        payload: {
+          params: {
+            dataAssetType: getAssetType(reference)
           }
-
+        },
+        callback: data => {
+          setSelectedKeys(data||[]);
+          getAllElements();
+        }
+      })
+    } else {
       dispatch({
-      type: url,
+        type: 'assetmanage.listFilterElementIds',
+        payload: {
+          dataAssetType: getAssetType(reference)
+        },
         callback: data => {
           setSelectedKeys(data||[]);
           getAllElements();
         }
       })
     }
+  }
 
   const getAllElements = () => {
 
@@ -57,7 +67,8 @@ const FilterElementModal = (props) => {
       type: url,
       payload: {
         params: {
-          range: getAssetRange(reference)
+          range: getAssetRange(reference),
+          dataAssetType: getAssetType(reference)
         }
       },
       callback: data => {
@@ -129,7 +140,10 @@ const FilterElementModal = (props) => {
     dispatch({
       type: url,
       payload: {
-        data: selectedKeys
+        data: selectedKeys,
+        params: {
+          dataAssetType: getAssetType(reference)
+        }
       },
       callback: () => {
         reset();