@lingxiteam/ebe-utils 0.3.6 → 0.3.10

package/lib/pcpublic/src/components/pcfactory/src/Select/selectUtils.ts

@@ -1,8 +1,5 @@
-
-
 export const CHECK_ALL_VALUE = 'LING_XI_CHECK_ALL';
 
-
 const typeFn: any = {
   string: String,
   number: Number,
@@ -35,17 +32,13 @@ export const localFilterOption = (input: string = '', option: any) => {
 // 判断data类型是不是是labelInValue格式
 export const isLabelInValue = (data: any) => {
   if (Object.prototype.toString.call(data) === '[object Object]') {
-    if (Object.keys(data).includes('label') &&
-            (Object.keys(data).includes('value') || Object.keys(data).includes('key'))) {
+    if (Object.keys(data).includes('label') && (Object.keys(data).includes('value') || Object.keys(data).includes('key'))) {
       return true;
     }
   } else if (Object.prototype.toString.call(data) === '[object Array]' && data.length) {
     let isLabelInValueCount = 0;
     data.forEach((v: any) => {
-      if (
-        Object.keys(v).includes('label') &&
-                (Object.keys(v).includes('value') || Object.keys(v).includes('key'))
-      ) {
+      if (Object.keys(v).includes('label') && (Object.keys(v).includes('value') || Object.keys(v).includes('key'))) {
         isLabelInValueCount += 1;
       }
     });
@@ -90,7 +83,6 @@ export const transformValueType = (v: any, curVal: any) => {
   return v;
 };
 
-
 export const getRules = (min?: number, max?: number, getLocale?: any) => {
   if (!min && !max) {
     return [];
@@ -120,7 +112,7 @@ export const getChangeSelectData = (dataSource: any[], val: string[] | Object, m
     return undefined;
   }
   const sltData = dataSource.find((c: any) => c.value?.toString() === v?.toString());
-  return (sltData ? [sltData] : undefined);
+  return sltData ? [sltData] : undefined;
 };
 
 export const getSelectedAllData = (checked: boolean, dataSource: any[], value: any[], max?: number) => {
@@ -165,7 +157,7 @@ export const getSelectedAllData = (checked: boolean, dataSource: any[], value: a
 
 // 获取当前列表数据下的全选状态
 export const checkIfSelectedAll = (dataSource: any[], value: any[], filterValue: string = '') => {
-  const localFilterData = dataSource.filter(d => localFilterOption(filterValue, d));
+  const localFilterData = dataSource.filter((d) => localFilterOption(filterValue, d));
   if (localFilterData?.length && Array.isArray(value)) {
     // 如果是多选，value肯定是字符串类型的数组
     const checkData = localFilterData.filter((f: any) => value.includes(f.value));
@@ -182,7 +174,7 @@ export const checkIfSelectedAll = (dataSource: any[], value: any[], filterValue:
  * @param labelKey
  * @returns
  */
-export const handleDataSource = (dataSource: any[], appendDataSoure?: any[] | Object, valueKey?: string, labelKey?: string,) => {
+export const handleDataSource = (dataSource: any[], appendDataSoure?: any[] | Object, valueKey?: string, labelKey?: string) => {
   const valueKeys: any = [];
   let newDataSoure: any[] = [];
   if (Array.isArray(dataSource)) {
@@ -190,18 +182,19 @@ export const handleDataSource = (dataSource: any[], appendDataSoure?: any[] | Ob
       const label = v?.[labelKey || 'label'];
       const value = v?.[valueKey || 'value'] || v?.key;
       if (value) {
-        valueKeys.push(value);
+        // TODO: 为什么 id 是数字就不行？？
+        valueKeys.push(value + '');
         newDataSoure.push({
           ...v,
           label,
-          value,
+          value: value + '',
         });
       }
     });
   }
   let newAppednDataSoure = [];
   if (Array.isArray(appendDataSoure) && appendDataSoure.length > 0) {
-    newAppednDataSoure = appendDataSoure.filter(item => !valueKeys?.includes(item?.[valueKey || 'value'] || item?.key));
+    newAppednDataSoure = appendDataSoure.filter((item) => !valueKeys?.includes(item?.[valueKey || 'value'] || item?.key));
   }
   if (Object.prototype.toString.call(appendDataSoure) === '[object Object]') {
     newAppednDataSoure = [appendDataSoure].filter((item: any) => !valueKeys?.includes(item?.[valueKey || 'value'] || item?.key));

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/package.json

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