资产增加range

src/model/assetmanage.js

@@ -9,12 +9,12 @@ export function* getLogs(payload) {
   return yield call(service.getLogs, payload);
 }
 
-export function* listElements() {
-  return yield call(service.listElements);
+export function* listElements(payload) {
+  return yield call(service.listElements, payload);
 }
 
-export function* listUserElements() {
-  return yield call(service.listUserElements);
+export function* listUserElements(payload) {
+  return yield call(service.listUserElements, payload);
 }
 
 export function* listCustomElements() {
@@ -29,8 +29,8 @@ export function* listFilterElements() {
   return yield call(service.listFilterElements);
 }
 
-export function* listFilterElementsGroupByType() {
-  return yield call(service.listFilterElementsGroupByType);
+export function* listFilterElementsGroupByType(payload) {
+  return yield call(service.listFilterElementsGroupByType, payload);
 }
 
 export function* setupFilterElementIds(payload) {

src/service/dataassetmanager.js

@@ -8,12 +8,12 @@ export function getLogs(payload) {
   return GetJSON("/dataassetmanager/elementApi/listOperationLogsByPage", payload);
 }
 
-export function listElements() {
-  return PostJSON("/dataassetmanager/elementApi/listElements");
+export function listElements(payload) {
+  return PostJSON("/dataassetmanager/elementApi/listElements", payload);
 }
 
-export function listUserElements() {
-  return PostJSON("/dataassetmanager/elementApi/listSelectedRangeElements");
+export function listUserElements(payload) {
+  return PostJSON("/dataassetmanager/elementApi/listSelectedRangeElements", payload);
 }
 
 export function listCustomElements() {
@@ -28,8 +28,8 @@ export function listFilterElements() {
   return GetJSON("/dataassetmanager/elementApi/listFilterElements");
 }
 
-export function listFilterElementsGroupByType() {
-  return GetJSON("/dataassetmanager/elementApi/listFilterElementsGroupByType");
+export function listFilterElementsGroupByType(payload) {
+  return GetJSON("/dataassetmanager/elementApi/listFilterElementsGroupByType", payload);
 }
 
 export function setupFilterElementIds(payload) {

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

@@ -9,13 +9,13 @@ import { AppContext } from '../../../../App';
 import Tag from '../../Tag';  
 import Separate from './Separate';
 import AssetTagModal from './AssetTagModal';
-import { AnchorId, AnchorDirId } from '../../../../util/constant';
+import { AnchorId, AnchorDirId, AssetManageReference } from '../../../../util/constant';
 import PermissionButton from '../../../../util/Component/PermissionButton';
 
 import { CancelSvg, EditSvg, SaveSvg, FullScreenSvg, CancelFullScreenSvg } from './AssetSvg';
 
 const AssetAction = (props) => {
-  const { id, dirId, action, terms, onChange, readOnly = false, form, onMetadataChange, onElementsChange, reference } = props;
+  const { id, dirId, action, terms, onChange, readOnly = false, form, onMetadataChange, onElementsChange, reference = AssetManageReference } = props;
 
   const [ currentAction, setCurrentAction ] = useState(action);
   const [ assetParams, setAssetParams ] = useState({ assets: {}, attributes: [], attributesFoldMap: {} });
@@ -82,6 +82,11 @@ const AssetAction = (props) => {
     setLoading(true);
     dispatch({
       type: 'assetmanage.listElements',
+      payload: {
+        params: {
+          range: getAssetRange(reference)
+        }
+      },
       callback: data => {
         setLoading(false);
         setElements(data||[]);
@@ -116,6 +121,11 @@ const AssetAction = (props) => {
     setLoading(true);
     dispatch({
       type: 'assetmanage.listUserElements',
+      payload: {
+        params: {
+          range: getAssetRange(reference)
+        }
+      },
       callback: data => {
         setLoading(false);
         getAsset(data||[]);

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

@@ -2,7 +2,7 @@ import React, { useEffect, useMemo, useState } from "react";
 import { Spin, Descriptions, Divider } from "antd";
 
 import MetadataInfo from './MetadataInfo';
-import { highlightSearchContentByTerms } from '../../../../util';
+import { getAssetRange, highlightSearchContentByTerms } from '../../../../util';
 import { dispatch } from '../../../../model';
 
 const AssetDetail = (props)=>{
@@ -69,6 +69,11 @@ const AssetDetail = (props)=>{
     setLoading(true);
     dispatch({
       type: 'assetmanage.listUserElements',
+      payload: {
+        params: {
+          range: getAssetRange(reference)
+        }
+      },
       callback: data => {
         setLoading(false);
         setUserElements(data||[]);

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

@@ -327,6 +327,7 @@ const AssetDirectory = (props) => {
 
       <FilterElementModal
         visible={ filterElementVisible }
+        reference={reference}
         onCancel={ onFilterElementModalCancel}
       />
 

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

@@ -383,6 +383,9 @@ const AssetTable = (props) => {
     setLoading(true);
     dispatch({
       type: 'assetmanage.listFilterElementsGroupByType',
+      payload: {
+        range: getAssetRange(reference)
+      },
       callback: data => {
         let _columns = [];
 
@@ -1158,6 +1161,7 @@ const AssetTable = (props) => {
       />
       <FilterElementModal
         type={(reference===AssetManageReference)?'admin': 'user'}
+        reference={reference}
         visible={ filterElementVisible }
         onCancel={ onFilterElementModalCancel}
       />

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

@@ -3,6 +3,7 @@ import { Row, Col, Checkbox, Typography, Button, Switch, Modal } from 'antd';
 
 import { dispatch } from '../../../../model';
 import './FilterElementModal.less';
+import { getAssetRange } from '../../../../util';
 
 //type
 //global 全局设置
@@ -11,7 +12,7 @@ import './FilterElementModal.less';
 
 const FilterElementModal = (props) => {
 
-  const { visible, onCancel, type = 'global' } = props;
+  const { visible, onCancel, type = 'global', reference } = props;
   const [ elements, setElements ] = useState([]);
   const [ typesOfElements, setTypesOfElements ] = useState([]);
   const [ selectedKeys, setSelectedKeys ] = useState([]);
@@ -54,6 +55,11 @@ const FilterElementModal = (props) => {
 
     dispatch({
       type: url,
+      payload: {
+        params: {
+          range: getAssetRange(reference)
+        }
+      },
       callback: data => {
         setElements(data||[]);
         convertElements(data||[]);