选择资产

src/model/assetmanage.js

@@ -107,8 +107,8 @@ export function* deletePersonalCustomDirectory(payload) {
 export function* existDataAsset(payload) {
   return yield call(service.existDataAsset, payload);
 }
-export function* queryAllDirectoryAsTree() {
-  return yield call(service.queryAllDirectoryAsTree);
+export function* queryAllDirectoryAsTree(payload) {
+  return yield call(service.queryAllDirectoryAsTree, payload);
 }
 export function* queryDirectoryTreeByMetadataId(payload) {
   return yield call(service.queryDirectoryTreeByMetadataId, payload);

src/service/dataassetmanager.js

@@ -136,8 +136,8 @@ export function existDataAsset(payload) {
   return GetJSON("/dataassetmanager/directoryApi/existDataAsset", payload);
 }
 
-export function queryAllDirectoryAsTree() {
-  return GetJSON("/dataassetmanager/directoryApi/queryAllDirectoryAsTree");
+export function queryAllDirectoryAsTree(payload) {
+  return GetJSON("/dataassetmanager/directoryApi/queryAllDirectoryAsTree", payload);
 }
 
 export function queryDirectoryTreeByMetadataId(payload) {

src/util/axios.js

@@ -122,7 +122,7 @@ export function GetJSON(url, params) {
   const env = LocalStorage.get('assetsEnv')??debugEnv;
 
   return instance.get(url, {
-    params: {...params, env, templateType: getTemplateType()}, cancelToken,
+    params: {env, templateType: getTemplateType(), ...params}, cancelToken,
     validateStatus: false
   }).then(
     callback
@@ -134,7 +134,7 @@ export function Delete(url, params) {
   const env = LocalStorage.get('assetsEnv')??debugEnv;
 
   return instance.delete(url, {
-    params: {...params, env, templateType: getTemplateType()}, cancelToken,
+    params: {env, templateType: getTemplateType(), ...params}, cancelToken,
   }).then(
     callback
   )
@@ -146,11 +146,11 @@ export function PostJSON(url, payload) {
   const env = LocalStorage.get('assetsEnv')??debugEnv;
 
   return IsArr(data) ? instance.post(url, data, {
-    params: {...params, env, templateType: getTemplateType()}, cancelToken
+    params: {env, templateType: getTemplateType(), ...params}, cancelToken
   }).then(
     callback
   ) : instance.post(url, null, {
-    params: {...params, env, templateType: getTemplateType()}, data, cancelToken
+    params: {env, templateType: getTemplateType(), ...params}, data, cancelToken
   }).then(
     callback
   )
@@ -162,7 +162,7 @@ export function Post(url, payload) {
   const env = LocalStorage.get('assetsEnv')??debugEnv;
 
   return textplain.post(url, null, {
-    params: {...params, env, templateType: getTemplateType()}, data, cancelToken
+    params: {env, templateType: getTemplateType(), ...params}, data, cancelToken
   }).then(
     callback
   )
@@ -177,7 +177,7 @@ export function PostFile(url, payload, fileName='file') {
     formData.append(fileName, file);
   });
 
-  return fileplain.post(url, formData, { params: {...params, env, templateType: getTemplateType()} }  ).then(
+  return fileplain.post(url, formData, { params: {env, templateType: getTemplateType(), ...params} }  ).then(
     callback
   )
 }

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

@@ -29,7 +29,7 @@ const { Search } = Input;
 const { Column } = Table;
 
 //资产项
-const AssetItem = (props) => {
+export const AssetItem = (props) => {
   const { metadata } = props;
   const app = useContext(AppContext);
 

src/view/Manage/Model/Component/ImportModal.jsx

@@ -5,6 +5,7 @@ import ImportWord from './ImportWord';
 import ImportExcel from './ImportExcel';
 import ImportExcelCopy from './ImportExcelCopy';
 import ImportDDL from './ImportDDL';
+import SelectAsset from './select-asset';
 
 import { dispatchLatest } from '../../../../model'; 
 import { isSzseEnv } from '../../../../util';
@@ -12,6 +13,7 @@ import { isSzseEnv } from '../../../../util';
 const importModes = [
   { name: '快速创建', key: 'excel-copy' },
   { name: '空白创建', key: 'no-condition' },
+  { name: '资产导入', key: 'asset-import' },
   // { name: 'Word导入', key: 'word' },
   // { name: 'Excel导入', key: 'excel' },
   // { name: 'DDL导入', key: 'ddl' },
@@ -24,6 +26,9 @@ const ImportModal = (props) => {
   const [ hints, setHints ] = useState([]);
   const [ ddl, setDDL ] = useState('');
   const [ confirmLoading, setConfirmLoading ] = useState(false);
+  const [selectAssetParams, setSelectAssetParams] = useState({
+    visible: false
+  })
 
   const [ form ] = Form.useForm();
 
@@ -84,6 +89,8 @@ const ImportModal = (props) => {
       } else if (modeKey==='ddl') {
         reset();
         onCancelByDDL && onCancelByDDL(true, ddl);
+      } else if (modeKey === 'asset-import') {
+        setSelectAssetParams({ visible: true })
       }
 
     } catch (errInfo) {
@@ -132,6 +139,7 @@ const ImportModal = (props) => {
   ];
 
   return (
+    <>
     <Modal 
       forceRender
       visible={visible}
@@ -200,6 +208,13 @@ const ImportModal = (props) => {
         }
       </Form>
     </Modal>
+    <SelectAsset 
+      {...selectAssetParams}
+      onCancel={() => {
+        setSelectAssetParams({ visible: false })
+      }}
+    />
+    </>
   )
 }