资产导入增加提示

src/service/dataassetmanager.js

-import { PostJSON, GetJSON, filePost2, PostJSON2, filePost } from "../util/axios"
+import { PostJSON, GetJSON, PostJSON2, filePost } from "../util/axios"
 
 export function importElement(payload) {
   return filePost("/dataassetmanager/elementApi/import", payload);
@@ -69,11 +69,11 @@ export function listAllTopics(payload) {
 }
 
 export function directoryImport(payload) {
-  return filePost2("/dataassetmanager/directoryApi/import", payload);
+  return filePost("/dataassetmanager/directoryApi/import", payload);
 }
 
 export function assetImport(payload) {
-  return filePost2("/dataassetmanager/dataAssetApi/import", payload);
+  return filePost("/dataassetmanager/dataAssetApi/import", payload);
 }
 
 export function getDirectoryById(payload) {

src/util/axios.js

@@ -149,22 +149,13 @@ export function PostJSON2(url, payload) {
 
 
 export function filePost(url, payload) {
-  const { fileList = null,} = payload||{};
+  const { fileList = null, params = null } = payload||{};
   let formData = new FormData();
   (fileList||[]).forEach(file=> {
     formData.append('file', file);
   });
 
-  return fileplain.post(url, formData,  ).then(
-    callback
-  )
-}
-
-export function filePost2(url, payload) {
-  const { fileList = null,params=null} = payload||{};
-  let formData=new FormData();// 创建form对象
-  formData.append('file',fileList);
-  return fileplain.post(url,formData, {params} ).then(
+  return fileplain.post(url, formData, { params }  ).then(
     callback
   )
 }
\ No newline at end of file

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

@@ -209,9 +209,12 @@ const AssetTable = (props) =>{
     }
   }
 
-  const onImportAssetCancel = (visible = false, refresh = false) => {
+  const onImportAssetCancel = (visible = false, refresh = false, tip = '') => {
     setImportAssetVisible(visible);
     refresh && getTable();
+    if ((tip||'') !== '') {
+      showNotifaction('导入提示', tip, 5);
+    }
   }
 
   const onImportElementCancel = (visible = false, tip = '') => {

src/view/Manage/AssetManage/components/ImportAsset.jsx

@@ -41,10 +41,10 @@ class ImportAsset extends React.Component {
         callback: data => {
           dispatch({
             type: 'assetmanage.assetImport',
-            payload: { fileList: fileList[0], params: { parentPath: data.path||'' } },
-            callback: () => {
+            payload: { fileList: fileList, params: { parentPath: data.path||'' } },
+            callback: data => {
               this.setState({ confirmLoading: false, fileList: [] }, () => {
-                onCancel && onCancel(false, true);
+                onCancel && onCancel(false, true, data||'');
               });
             },
             error: () => {

src/view/Manage/AssetManage/components/ImportDirectory.jsx

@@ -46,7 +46,7 @@ const ImportDirectory = (props) => {
       let payload;
       if (row.type === 'root') {
         payload = { 
-          fileList: fileList[0] 
+          fileList: fileList 
         };
       } else {
         payload = {