资产bug

src/model/assetmanage.js

@@ -29,16 +29,16 @@ 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() {
   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

@@ -24,16 +24,16 @@ 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() {
   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

@@ -135,25 +135,33 @@ const AssetAction = (props) => {
 
         let newBusinessData = [];
         data?.forEach(level1Item => {
-          level1Item.children?.forEach(level2Item => {
           const businessItem = {
+            label: level1Item.text,
+            value: level1Item.text,
+            children: []
+          }; 
+          level1Item.children?.forEach(level2Item => {
+            const tempLevel2Item = {
               label: level2Item.text,
               value: level2Item.text,
               children: []
             };
 
             level2Item.children?.forEach(level3Item => {
-              businessItem.children.push({
+              tempLevel2Item.children.push({
                 label: level3Item.text,
                 value: level3Item.text,
               })
-            })
+            });
 
-            if (businessItem.children.length !== 0) {
-              newBusinessData.push(businessItem);
+            if (tempLevel2Item.children.length !== 0) {
+              businessItem.children.push(tempLevel2Item);
             }
           });
           
+          if (businessItem.children.length !== 0) {
+            newBusinessData.push(businessItem);
+          }
         });
 
         setBusinessData(newBusinessData);
@@ -522,7 +530,7 @@ const AssetAction = (props) => {
       )
     }
 
-    if (element.name==='数据关键用户' || element.name==='业务部门负责人' || element.name?.toLowerCase()==='it责任人') {
+    if (element.name==='数据关键用户' || element.name?.toLowerCase()==='业务数据owner' || element.name?.toLowerCase()==='it责任人') {
       return <SelectUser 
         type='edit' 
         loading={loadingUsers}
@@ -614,7 +622,7 @@ const AssetAction = (props) => {
       return <IndexCode value={item.value||''} terms={terms} />;
     }
 
-    if (item.name==='数据关键用户' || item.name==='业务部门负责人' || item.name?.toLowerCase()==='it责任人') {
+    if (item.name==='数据关键用户' || item.name?.toLowerCase()==='业务数据owner' || item.name?.toLowerCase()==='it责任人') {
       return <SelectUser 
         type='detail' 
         users={users} 
@@ -920,7 +928,7 @@ const MultipleSelect = ({ value = null, element, onChange }) => {
 const CascaderItem = ({ value = null, data, onChange, ...restProps }) => {
 
   const handleChange = (values) => {
-    onChange?.(values?.join('/'))
+    onChange?.((!values||values.length===0)?'':values[values.length-1]);
   }
 
   return (

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

@@ -334,6 +334,9 @@ const AssetTable = (props) => {
     setLoading(true);
     dispatch({
       type: 'assetmanage.listFilterElementsGroupByType',
+      payload: {
+        isAdmin: (reference===AssetManageReference)
+      },
       callback: data => {
         let _columns = [];
 
@@ -1054,7 +1057,7 @@ const AssetTable = (props) => {
                   }
                 },
                 onContextMenu: event => {
-                  if (reference===AssetManageReference && (record.resourceState==='uncombed'||record.resourceState==='notRelatedAsset')) {
+                  if ((reference===AssetManageReference||(reference===AssetBrowseReference&&record.hasPermission)) && (record.resourceState==='uncombed'||record.resourceState==='notRelatedAsset')) {
                     setContextMenuItem(record);
                     displayMenu(event);
                   }
@@ -1125,6 +1128,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 { AssetManageReference } from '../../../../util/constant';
 
 //type
 //global 全局设置
@@ -11,7 +12,7 @@ import './FilterElementModal.less';
 
 const FilterElementModal = (props) => {
 
-  const { visible, onCancel, type = 'global' } = props;
+  const { visible, onCancel, type = 'global', reference = AssetManageReference } = props;
   const [ elements, setElements ] = useState([]);
   const [ typesOfElements, setTypesOfElements ] = useState([]);
   const [ selectedKeys, setSelectedKeys ] = useState([]);
@@ -28,14 +29,19 @@ const FilterElementModal = (props) => {
   const getAllFilterElementIdsThenGetAllElements = () => {
 
     let url = '';
+    let payload = null;
     if (type === 'global') {
       url = 'assetmanage.listFilterElementIdsConfig';
     } else {
       url = 'assetmanage.listFilterElementIds';
+      payload = {
+        isAdmin: (reference===AssetManageReference)
+      }
     }
 
     dispatch({
       type: url,
+      payload,
       callback: data => {
         setSelectedKeys(data||[]);
         getAllElements();
@@ -123,7 +129,10 @@ const FilterElementModal = (props) => {
     dispatch({
       type: url,
       payload: {
-        data: selectedKeys
+        data: selectedKeys,
+        params: {
+          isAdmin: (reference===AssetManageReference) 
+        }
       },
       callback: () => {
         reset();