@lingxiteam/ebe-utils 0.3.9 → 0.3.11

package/lib/pcpublic/src/utils/exportCustomData/index.tsx

@@ -1,6 +1,7 @@
 import engineServices from '@/services/api/engine';
 import { messageApi } from '@/utils/messageApi';
 import { exportFileShowProgress } from './tool';
+import { APPID } from '@/constants';
 
 const SERVICE_SOURCE = {
   // 服务来源
@@ -567,101 +568,106 @@ const exportPathMap: ExportPathMapType = {
   multiExport: engineServices.exportMultiServiceResultPath(),
 };
 const exportCustomData = (exportSheet: any = [], custFileName: any, selectedKeyMap: { [x: string]: any }, async: string) => {
-  // 获取到的服务出参列表
-  const selectedRowMap: any = {};
-  messageApi.loading('正在导出中，请稍候...', 0);
-  try {
-    const columnsReq = Object.keys(selectedKeyMap).map(type => {
-      if (!selectedKeyMap[type] || !selectedKeyMap[type]?.length) {
-        return undefined;
-      }
-      // 获取不同类型服务的出参列表
-      let req;
-      if (type === SERVICE_SOURCE.QUERY) {
-        // SQL类型
-        req = engineServices
-          .getSqlQueryColumnsList({
-            serviceCodes: selectedKeyMap[type].join(','),
-          })
-          .then((res: any) => {
-            const m: any = {};
-            (res || []).forEach((c: any) => (m[c.serviceCode] = c.rowColumns));
-            return m;
-          });
-      }
-      if (type === SERVICE_SOURCE.OBJECT) {
-        // 对象类型
-        req = engineServices
-          .queryBusiObjectRowColumnsList({
-            busiObjectIds: selectedKeyMap[type].join(','),
-          })
-          .then((res: any) => {
-            const m: any = {};
-            (res || []).forEach((c: any) => (m[c.busiObjectId] = c.rowColumns));
-            return m;
-          });
-      }
-      if (type === SERVICE_SOURCE.STD) {
-        // 编排类服务
-        // @ts-ignore
-        req = engineServices
-          .queryServiceResponseColumnsList({
-            serviceVersionIds: (selectedKeyMap[type] || []).join(','),
-            appId: APPID,
-          })
-          .then((res: any) => {
-            const m: any = {};
-            (res || []).forEach((c: any) => (m[c.serviceVersionId] = getResponseAttr(c.response)));
-            return m;
-          });
-      }
-      if (req) {
-        req?.then((r: any) => {
-          selectedRowMap[type] = r;
+ return new Promise((resolve,reject)=>{
+// 获取到的服务出参列表
+const selectedRowMap: any = {};
+messageApi.loading('正在导出中，请稍候...', 0);
+try {
+  const columnsReq = Object.keys(selectedKeyMap).map(type => {
+    if (!selectedKeyMap[type] || !selectedKeyMap[type]?.length) {
+      return undefined;
+    }
+    // 获取不同类型服务的出参列表
+    let req;
+    if (type === SERVICE_SOURCE.QUERY) {
+      // SQL类型
+      req = engineServices
+        .getSqlQueryColumnsList({
+          serviceCodes: selectedKeyMap[type].join(','),
+          appId: APPID,
+        })
+        .then((res: any) => {
+          const m: any = {};
+          (res || []).forEach((c: any) => (m[c.serviceCode] = c.rowColumns));
+          return m;
         });
-      }
-      return req;
-    });
-    Promise.all(columnsReq).then(async () => {
-      const sheetItemList = exportSheet;
-      const serviceExecuteParams = sheetItemList.map((sheet: ExportItem) => {
-        const { parameters, objValue, objType, custSheetName, source } = sheet;
-        const resultList = (selectedRowMap[source] || {})[objValue] || [];
-        const columns = getExportColumns(sheet, resultList);
-        return {
-          objValue,
-          objType,
-          parameters,
-          sheetName: custSheetName,
-          ...columns,
-        };
+    }
+    if (type === SERVICE_SOURCE.OBJECT) {
+      // 对象类型
+      req = engineServices
+        .queryBusiObjectRowColumnsList({
+          busiObjectIds: selectedKeyMap[type].join(','),
+        })
+        .then((res: any) => {
+          const m: any = {};
+          (res || []).forEach((c: any) => (m[c.busiObjectId] = c.rowColumns));
+          return m;
+        });
+    }
+    if (type === SERVICE_SOURCE.STD) {
+      // 编排类服务
+      // @ts-ignore
+      req = engineServices
+        .queryServiceResponseColumnsList({
+          serviceVersionIds: (selectedKeyMap[type] || []).join(','),
+        })
+        .then((res: any) => {
+          const m: any = {};
+          (res || []).forEach((c: any) => (m[c.serviceVersionId] = getResponseAttr(c.response)));
+          return m;
+        });
+    }
+    if (req) {
+      req?.then((r: any) => {
+        selectedRowMap[type] = r;
       });
-      const exportFileName = custFileName;
-      const fileName = `${exportFileName}.xlsx`;
-      const downloadIndex = `${fileName}_${Math.random()}`;
-      await exportFileShowProgress?.({
-        downloadIndex,
+    }
+    return req;
+  });
+  Promise.all(columnsReq).then(async () => {
+    const sheetItemList = exportSheet;
+    const serviceExecuteParams = sheetItemList.map((sheet: ExportItem) => {
+      const { parameters, objValue, objType, custSheetName, source } = sheet;
+      const resultList = (selectedRowMap[source] || {})[objValue] || [];
+      const columns = getExportColumns(sheet, resultList);
+      return {
+        objValue,
+        objType,
+        parameters,
+        sheetName: custSheetName,
+        ...columns,
+      };
+    });
+    const exportFileName = custFileName;
+    const fileName = `${exportFileName}.xlsx`;
+    const downloadIndex = `${fileName}_${Math.random()}`;
+    await exportFileShowProgress?.({
+      downloadIndex,
+      fileName,
+      methodType: 'POST',
+      fileOrigin: 'multiExport',
+      async,
+      params: {
+        serviceExecuteParams,
         fileName,
-        methodType: 'POST',
-        fileOrigin: 'multiExport',
-        async,
-        params: {
-          serviceExecuteParams,
-          fileName,
-        },
-        onSuccess: () => {
-          messageApi.destroy();
-        },
-        onFail: () => {
-          messageApi.destroy();
-          messageApi.error('导出失败');
-        },
-      });
+      },
+      onSuccess: () => {
+        messageApi.destroy();
+      },
+      onFail: () => {
+        messageApi.destroy();
+        messageApi.error('导出失败');
+      },
     });
-  } catch {
-    messageApi.destroy();
-    messageApi.error('导出失败');
-  }
+  });
+  resolve(true);
+} catch {
+  messageApi.destroy();
+  messageApi.error('导出失败');
+  reject()
+}
+ })
+  
 };
 
 export default exportCustomData;

package/lib/public/src/components/ImportBusiObjModal/index.tsx

@@ -921,14 +921,9 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
         <Button
           onClick={() => {
             const { fileCode } = params.custTpl || {};
-            // @ts-ignore
-            const downloadUrl = params.custTplUrl || (fileCode ? getAppFileUrlByFileCode(fileCode) : null);
-            if (!downloadUrl) {
-              return;
-            }
-            // 下载导入模板自定义名称无效处理
             const xhr = new XMLHttpRequest();
-            xhr.open('GET', downloadUrl, true);
+            // 文件放到本地
+            xhr.open('GET', `${process.env.PUBLIC_PATH}appFile/${fileCode}.xlsx`, true);
             xhr.responseType = 'blob'; // 通过文件下载url拿到对应的blob对象
             xhr.onload = () => {
               if (xhr.status === 200) {
@@ -943,6 +938,8 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
                 link.click();
                 link.remove();
                 window.URL?.revokeObjectURL(link.href);
+              }else{
+                console.log('文件不存在',fileCode)
               }
             };
             xhr.send();

package/lib/public/src/utils/service/defaultResponseInterceptor.ts

@@ -57,7 +57,7 @@ export const defaultResponense: ResponseInterceptor = async (
   }
 
   // 如果内容为非json类型并没有配置指定响应内容类型时，根据content-type进行二次处理
-  if (contentType !== 'application/json' && !options.responseType) {
+  if (contentType !== 'application/json') {
     // Blob解析
     if (url.indexOf('/app/file/download') !== -1 || [
       /^application\/octet-stream/,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "description": "",
   "keywords": [],
   "author": "",
@@ -19,7 +19,7 @@
     "@babel/types": "^7.12.12",
     "cac": "^6.7.14",
     "fs-extra": "9.x",
-    "@lingxiteam/ebe": "0.3.9"
+    "@lingxiteam/ebe": "0.3.11"
   },
   "publishConfig": {
     "access": "public"