资产增加环境

src/util/axios.js

 
 import axios from 'axios';
+import LocalStorage from 'local-storage';
 
 import { IsArr, showMessage, isSzseEnv } from './index';
 
@@ -101,8 +102,10 @@ const callback = resp => {
 
 export function Get(url, params) {
   const cancelToken = __source ? __source.token : null;
+  const env = LocalStorage.get('assetsEnv');
+
   return textplain.get(url, {
-    params, cancelToken
+    params: {...params, env}, cancelToken
   }).then(
     callback
   )
@@ -110,8 +113,10 @@ export function Get(url, params) {
 
 export function GetJSON(url, params) {
   const cancelToken = __source ? __source.token : null;
+  const env = LocalStorage.get('assetsEnv');
+
   return instance.get(url, {
-    params, cancelToken,
+    params: {...params, env}, cancelToken,
     validateStatus: false
   }).then(
     callback
@@ -120,8 +125,10 @@ export function GetJSON(url, params) {
 
 export function Delete(url, params) {
   const cancelToken = __source ? __source.token : null;
+  const env = LocalStorage.get('assetsEnv');
+
   return instance.delete(url, {
-    params, cancelToken,
+    params: {...params, env}, cancelToken,
   }).then(
     callback
   )
@@ -130,13 +137,14 @@ export function Delete(url, params) {
 export function PostJSON(url, payload) {
   const { params = null, data = null } = payload||{};
   const cancelToken = __source ? __source.token : null;
+  const env = LocalStorage.get('assetsEnv');
 
   return IsArr(data) ? instance.post(url, data, {
-    params, cancelToken
+    params: {...params, env}, cancelToken
   }).then(
     callback
   ) : instance.post(url, null, {
-    params, data, cancelToken
+    params: {...params, env}, data, cancelToken
   }).then(
     callback
   )
@@ -145,8 +153,10 @@ export function PostJSON(url, payload) {
 export function Post(url, payload) {
   const { params = null, data = null } = payload||{};
   const cancelToken = __source ? __source.token : null;
+  const env = LocalStorage.get('assetsEnv');
+
   return textplain.post(url, null, {
-    params, data, cancelToken
+    params: {...params, env}, data, cancelToken
   }).then(
     callback
   )
@@ -154,12 +164,14 @@ export function Post(url, payload) {
 
 export function PostFile(url, payload) {
   const { fileList = null, params = null } = payload||{};
+  const env = LocalStorage.get('assetsEnv');
+
   let formData = new FormData();
   (fileList||[]).forEach(file=> {
     formData.append('file', file);
   });
 
-  return fileplain.post(url, formData, { params }  ).then(
+  return fileplain.post(url, formData, { params: {...params, env} }  ).then(
     callback
   )
 }
\ No newline at end of file

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

-import React,{ useState, useEffect, useRef } from "react";
+import React,{ useState, useEffect, useRef, useContext } from "react";
 import { Button, Pagination, Space, Modal, Input, Table, Tooltip, Checkbox, Typography, Dropdown, Menu } from "antd";
 import classNames from 'classnames';
 import SmoothScroll from 'smooth-scroll';
@@ -16,6 +16,7 @@ import { dispatch, dispatchLatestHomepage } from '../../../../model';
 import { showMessage, showNotifaction, getQueryParam, inputWidth, isSzseEnv } from '../../../../util';
 import { AnchorId, AnchorTimestamp, AssetBrowseReference, AssetManageReference, AssetRecycleReference, ResourceBrowseReference } from '../../../../util/constant';
 import { FullScreenSvg, CancelFullScreenSvg } from './AssetSvg';
+import { AppContext } from "../../../../App";
 
 import "./AssetTable.less";
 import 'react-contexify/dist/ReactContexify.css';
@@ -122,6 +123,8 @@ const AssetTable = (props) => {
     id: MENU_ID,
   });
 
+  const { env } = useContext(AppContext);
+
   const [ loading, setLoading ] = useState(false);
   const [ columns, setColumns ] = useState([]);
   const [ assets, setAssets ] = useState([]);
@@ -187,6 +190,13 @@ const AssetTable = (props) => {
   }, [ keyword, pagination, elementsChanged, assetActionChanged, recursive, fullSearch ])
 
   useEffect(() => {
+    if (reference===AssetRecycleReference) {
+      getFilterElementsGroupThenGetDataAssets();
+    }
+    //eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [ env ])
+
+  useEffect(() => {
     if (shouldScrollRef.current) {
       SmoothScroll('a[href*="#"]');
 

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

-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useState, useRef, useContext } from 'react';
 import { useMount, useUnmount } from 'ahooks';
 import {Card, Spin, Tooltip, Tree, Dropdown, Menu, Modal, AutoComplete} from 'antd';
 import { PlusOutlined, ImportOutlined,ExportOutlined,ReloadOutlined, SettingOutlined } from '@ant-design/icons';
@@ -12,6 +12,7 @@ import CustomDirectoryModal from './CustomDirectoryModal';
 import { showMessage, getQueryParam } from '../../../../util';
 import { AnchorTimestamp, AnchorId, AssetManageReference, AssetBrowseReference, ResourceBrowseReference, AssetMountReference, AnchorDirId, Asset1104ManageReference } from '../../../../util/constant';
 import { highlightSearchContentByTerms } from '../../../../util';
+import { AppContext } from '../../../../App';
 
 import './AssetTree.less';
 import 'react-contexify/dist/ReactContexify.css';
@@ -26,6 +27,8 @@ const AssetTree = (props) => {
     id: MENU_ID,
   });
 
+  const { env } = useContext(AppContext);
+
   const { checkable = false, onSelect, className, onCheck, tableId, reference=AssetManageReference, onDirectoryChange, centerId } = props; 
   const [ keyword, setKeyword ] = useState('');
   const [ loading, setLoading ] = useState(false);
@@ -71,7 +74,7 @@ const AssetTree = (props) => {
       getAllDirectoryAsTree(true);
     } 
     //eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [timestamp])
+  }, [env, timestamp])
 
   useEffect(() => {
     if ((tableId||'') !== '') {