@lingxiteam/ebe-utils 0.0.27 → 0.0.30

package/lib/public/src/utils/Context/context.tsx

@@ -4,6 +4,7 @@ import React from 'react';
 export const Context = React.createContext<{
   ModalManagerRef: React.MutableRefObject<any>;
   refs: any;
+  forceUpdate: any;
   appId: string;
   attrDataMap: Record<string, any>;
 }>({} as any);

package/lib/public/src/utils/historytool.ts

@@ -144,6 +144,9 @@ const historytool = (
           menuUrl: createUrl(true, historyParmas),
           params: historyParmas.search,
         });
+      } else {
+        console.error('未找到门户，使用push跳转');
+        historyPush(historyParmas);
       }
       break;
     default:

package/lib/public/src/utils/lcdpBaseApi.ts

@@ -2,8 +2,8 @@
 import { ModalManagerHooks } from '@lingxiteam/types';
 import copy from 'copy-to-clipboard';
 import React from 'react';
+import PopoverUtils from './popoverUtils';
 import api from './service/commonFetch';
-// import PopoverUtils from '@/utils/popoverUtils';
 // import { Interceptor } from "../request";
 // import type { InterceptorType } from "../request";
 // import browserCompatible from './browserCompatible';
@@ -50,7 +50,7 @@ class LcdpBaseApi {
       /**
        * 收集页面popover引用
        */
-      //   PopoverManager: PopoverUtils.getInstance(),
+      PopoverManager: PopoverUtils.getInstance(),
     };
 
     // 调用接口合集

package/lib/public/src/utils/platform/utils/fileUtils.ts

@@ -4,9 +4,11 @@ import {
   openProgressMsg,
   showProgressNotification,
 } from '@/components/ProgressComp';
+import { APPID } from '@/constants';
 import engineServices from '@/services/api/engine';
 import fileServices from '@/services/api/file';
 import { getAppFileUrlByFileCode } from '@/services/api/getAppFileUrlByFileCode';
+import security from '@/utils/Security';
 import {
   BatchDownloadFileByIdsParamsType,
   DownloadByFileCodeType,
@@ -18,8 +20,6 @@ import {
 import { isErrorStatus } from '../../service/defaultResponseInterceptor';
 import { HTTPMehodFn } from '../type';
 
-import security from '@/utils/Security';
-
 type ExportPathMapType = Record<'sql' | 'object' | 'multiExport', string>;
 type ExportApiMapType = Record<'sql' | 'object' | 'multiExport', HTTPMehodFn>;
 
@@ -126,6 +126,7 @@ const downloadByXMLHttpRequest = (params: {
     xhr.responseType = 'blob'; // 设置接受类型
     const headers: any = {
       'Content-Type': 'application/json',
+      appId: APPID,
     };
     Object.keys(headers).forEach((header) => {
       xhr.setRequestHeader(header, headers[header]); // 设置请求头参数
@@ -144,8 +145,8 @@ const downloadByXMLHttpRequest = (params: {
       // 展示下载进度条
       if (evt.lengthComputable && messageApi?.loading) {
         const percentComplete = Math.round((evt.loaded * 100) / evt.total);
-        if (typeof messageApi?.openProgressMsg === 'function') {
-          messageApi.openProgressMsg(
+        if (typeof openProgressMsg === 'function') {
+          openProgressMsg(
             downloadIndex,
             newFileName,
             percentComplete,
@@ -293,8 +294,8 @@ const exportFileShowProgressAsync: OmitAppIdAndPageId<
       } else {
         percent = +((+currentCount / +total) * 100).toFixed(2);
       }
-      if (messageApi?.showProgressNotification) {
-        messageApi.showProgressNotification({
+      if (showProgressNotification) {
+        showProgressNotification({
           ...messageConfig,
           message: showLoading
             ? undefined
@@ -326,8 +327,8 @@ const exportFileShowProgressAsync: OmitAppIdAndPageId<
         polledRequest();
       } else if (statusCd === 10) {
         onSuccess?.();
-        if (messageApi?.showProgressNotification) {
-          messageApi.showProgressNotification({
+        if (showProgressNotification) {
+          showProgressNotification({
             ...messageConfig,
             percent: 100,
             btn: () => null,
@@ -348,7 +349,7 @@ const exportFileShowProgressAsync: OmitAppIdAndPageId<
           });
         }
       } else if (statusCd === -1) {
-        messageApi.showProgressNotification({
+        showProgressNotification({
           ...messageConfig,
           type: 'error',
           percent,
@@ -439,7 +440,7 @@ const exportFileShowProgress: OmitAppIdAndPageId<
       'Content-Type': 'application/json',
       // 'X-B-TARGET-ID': pageId,
       'X-B-AUTH': '1',
-      // 'APP-ID': appId,
+      // 'APP-ID': APPID,
     };
     Object.keys(headers).forEach((header) => {
       xhr.setRequestHeader(header, headers[header]); // 设置请求头参数
@@ -506,7 +507,7 @@ const exportFileShowProgress: OmitAppIdAndPageId<
       }
       xhr.abort(); // 取消请求
     };
-    xhr.send(JSON.stringify(params));
+    xhr.send(JSON.stringify({ ...params, appId: APPID }));
   }
 };
 

package/lib/public/src/utils/polyfills.ts

@@ -0,0 +1,4 @@
+// 兼容属性调用Object.keys/ Object.values时 参数为非对象报错
+const { keys, values } = Object;
+Object.keys = (o = {}) => keys(o);
+Object.values = (o = {}) => values(o);

package/lib/public/src/utils/popoverUtils.ts

@@ -0,0 +1,56 @@
+export type popoverRef = {
+  close: () => void;
+};
+
+class PopoverUtils {
+  static instance: PopoverUtils;
+
+  // 根据renderId记录popover引用
+  private readonly renderPopoverRef = new Map<string, Set<popoverRef>>();
+
+  setPopover(ref: popoverRef, renderId: string) {
+    if (!this.renderPopoverRef.has(renderId)) {
+      this.renderPopoverRef.set(renderId, new Set());
+    }
+    this.renderPopoverRef.get(renderId)?.add(ref);
+  }
+
+  private close(pagePopoverRef?: Set<popoverRef>) {
+    if (pagePopoverRef && pagePopoverRef.size > 0) {
+      pagePopoverRef.forEach((ref) => {
+        if (ref && typeof ref.close === 'function') {
+          ref.close();
+        }
+      });
+    }
+  }
+
+  closePopover(renderId?: string) {
+    if (renderId) {
+      const pagePopoverRef = this.renderPopoverRef.get(renderId);
+      this.close(pagePopoverRef);
+    } else {
+      this.renderPopoverRef.forEach((val) => {
+        this.close(val);
+      });
+    }
+  }
+
+  removePopover(ref: popoverRef, renderId?: string) {
+    if (ref && renderId) {
+      const pagePopoverRef = this.renderPopoverRef.get(renderId);
+      pagePopoverRef?.delete(ref);
+    } else {
+      this.renderPopoverRef.clear();
+    }
+  }
+
+  static getInstance() {
+    if (!this.instance) {
+      this.instance = new PopoverUtils();
+    }
+    return this.instance;
+  }
+}
+
+export default PopoverUtils;

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

@@ -1,7 +1,7 @@
 import { request as baseRequest, RequestOptionsInit } from 'alita';
 import merge from 'lodash/merge';
 export interface AppCtxType {
-  appId: string;
+  appId?: string;
   pageId?: string;
   language?: string;
 }
@@ -77,7 +77,7 @@ export const request = (
 const http = {
   get: (
     url: string,
-    appCtx: AppCtxType,
+    appCtx?: AppCtxType,
     data?: DataType,
     options?: RequestOptions,
   ) => {
@@ -85,24 +85,24 @@ const http = {
   },
   post: (
     url: string,
-    appCtx: AppCtxType,
-    data: DataType,
+    appCtx?: AppCtxType,
+    data?: DataType,
     options?: RequestOptions,
   ) => {
     return request('post', url, appCtx, data, options);
   },
   put: (
     url: string,
-    appCtx: AppCtxType,
-    data: DataType,
+    appCtx?: AppCtxType,
+    data?: DataType,
     options?: RequestOptions,
   ) => {
     return request('put', url, appCtx, data, options);
   },
   delete: (
     url: string,
-    appCtx: AppCtxType,
-    data: DataType,
+    appCtx?: AppCtxType,
+    data?: DataType,
     options?: RequestOptions,
   ) => {
     return request('delete', url, appCtx, data, options);

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

@@ -1,3 +1,4 @@
+import { APPID } from '@/constants';
 import { isPlainObject } from 'lodash';
 import http, { AppCtxType } from './baseRequest';
 
@@ -38,6 +39,7 @@ const urlHelper = {
     return `${url}?${urlHelper.stringify({
       ...params,
       ...appCtx,
+      appId: APPID,
     })}`;
   },
   get: (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.0.27",
+  "version": "0.0.30",
   "description": "",
   "keywords": [],
   "author": "",
@@ -17,7 +17,7 @@
     "@babel/parser": "^7.12.12",
     "@babel/traverse": "^7.12.12",
     "@babel/types": "^7.12.12",
-    "@lingxiteam/ebe": "0.0.27",
+    "@lingxiteam/ebe": "0.0.30",
     "cac": "^6.7.14",
     "fs-extra": "9.x"
   },