导入

src/model/assetmanage.js

@@ -150,6 +150,10 @@ export function* assetImport(payload) {
   return yield call(service.assetImport, payload);
 }
 
+export function* assetImportBusinessColumn(payload) {
+  return yield call(service.assetImportBusinessColumn, payload);
+}
+
 export function* getDirectoryById(payload) {
   return yield call(service.getDirectoryById, payload);
 }
@@ -206,6 +210,10 @@ export function* importLogs(payload) {
   return yield call(service.importLogs, payload);
 }
 
+export function* importBusinessColumnLogs(payload) {
+  return yield call(service.importBusinessColumnLogs, payload);
+}
+
 export function* recoveryFromRecycleBin(payload) {
   return yield call(service.recoveryFromRecycleBin, payload);
 }

src/service/dataassetmanager.js

@@ -112,6 +112,10 @@ export function importLogs(payload) {
   return GetJSON("/dataassetmanagertest/dataAssetApi/listDataAssetImportLogsByPage", payload);
 }
 
+export function importBusinessColumnLogs(payload) {
+  return GetJSON("/dataassetmanagertest/dataAssetColumnApi/listBusinessColumnImportLogsByPage", payload);
+}
+
 export function recoveryFromRecycleBin(payload) {
   return PostJSON("/dataassetmanagertest/dataAssetApi/recoveryFromRecycleBin", payload);
 }
@@ -188,6 +192,10 @@ export function assetImport(payload) {
   return PostFile("/dataassetmanagertest/dataAssetApi/import", payload);
 }
 
+export function assetImportBusinessColumn(payload) {
+  return PostFile("/dataassetmanagertest/dataAssetColumnApi/importBusinessColumn", payload);
+}
+
 export function getDirectoryById(payload) {
   return GetJSON("/dataassetmanagertest/directoryApi/getDirectoryById", payload);
 }

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

@@ -1007,13 +1007,13 @@ const AssetTable = (props) => {
   let scrollY = null;
   if ((assets||[]).length>0) {
     if (fullScreen) {
-      scrollY = 'calc(100vh - 209px - 72px)';
+      scrollY = 'calc(100vh - 295px)';
     } else if (reference===AssetManageReference) {
-      scrollY = 'calc(100vh - 209px - 72px)';
+      scrollY = 'calc(100vh - 295px)';
     } else if (reference===AssetBrowseReference ||reference===ResourceBrowseReference) {
-      scrollY = 'calc(100vh - 209px - 72px)';
+      scrollY = 'calc(100vh - 295px)';
     } else if (reference===AssetRecycleReference) {
-      scrollY = 'calc(100vh - 209px - 72px)';
+      scrollY = 'calc(100vh - 295px)';
     }
   }
 
@@ -1214,6 +1214,7 @@ const AssetTable = (props) => {
       <ImportAssetDrawer 
         visible={importAssetVisible}
         nodeId={nodeId}
+        template={template}
         onCancel={onImportAssetCancel}
         onSuccess={onImportAssetSuccess}
       />

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

@@ -5,10 +5,9 @@ import { UploadOutlined, DownloadOutlined } from '@ant-design/icons';
 import { dispatch } from '../../../../model';
 import { showMessage, formatDate } from '../../../../util';
 import { AppContext } from '../../../../App';
-import { getTemplateType } from '../../../../util/axios';
 
 const ImportAssetDrawer = (props) => {
-  const { onCancel, onSuccess, visible, nodeId } = props;
+  const { onCancel, onSuccess, visible, nodeId, template } = props;
   const [ fileList, setFileList ] = useState([]);
   const [ confirmLoading, setConfirmLoading ] = useState(false);
 
@@ -90,16 +89,21 @@ const ImportAssetDrawer = (props) => {
   }, [visible])
 
   const downloadTemplate = () => {
-    window.open(`/api/dataassetmanagertest/dataAssetApi/getImportTemplate?templateType=${getTemplateType()}`);
+    if (template?.structured) {
+      window.open(`/api/dataassetmanagertest/dataAssetApi/getImportTemplate?templateType=${template?.type??''}`);
+    } else {
+      window.open(`/api/dataassetmanagertest/dataAssetColumnApi/getBusinessColumnImportTemplate?templateType=${template?.type??''}`);
+    }
   }
 
   const getLogs = (p = 1, s = 20) => {
     setLoading(true);
     dispatch({
-      type: 'assetmanage.importLogs',
+      type: template?.structured ? 'assetmanage.importLogs' : 'assetmanage.importBusinessColumnLogs',
       payload: {
         page: p,
-        pageSize: s
+        pageSize: s,
+        templateType: template?.type
       },
       callback: data => {
         setLoading(false);
@@ -160,7 +164,7 @@ const ImportAssetDrawer = (props) => {
         const needSaveAsDraft = (data==='true')?true:false
 
         dispatch({
-          type: 'assetmanage.assetImport',
+          type: template?.structured ? 'assetmanage.assetImport': 'assetmanage.assetImportBusinessColumn',
           payload: { fileList: fileList, params: { env: `${app?.env?.domainId}`, saveAsDraft: needSaveAsDraft } },
           callback: data => {
             setConfirmLoading(false);