@lingxiteam/ebe-utils 0.4.3 → 0.4.5

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

@@ -1,4 +1,9 @@
 import LcdpBaseApi from './lcdpBaseApi';
+import { historytool, HISTORYTYPES } from '@/utils/historytool';
+import { history } from 'alita';
+import message from 'antd/es/message';
+import DrawerMap from '@/components/drawer';
+import ModalMap from '@/components/modal';
 
 export declare type LocaleFunction = (key: string, placeholder?: string, kv?: Record<string, string>) => string;
 // 对应用全局数据和全局方法访问的接口对象,为自定义代码提供更多可能性
@@ -15,26 +20,6 @@ class LcdpApi extends LcdpBaseApi {
   /*  @__HOT_UPDATE__ @alias LcdpApi */
   constructor(mountObj?: any, singletonLcdpApi?: any) {
     super(mountObj, singletonLcdpApi);
-    // 废弃
-    // this.mount(mountObj);
-    if (singletonLcdpApi) {
-      // router 只应该由singletonLcdpApi访问
-      ['router'].forEach(k => {
-        (() => {
-          // eslint-disable-next-line
-          let val = null;
-          Object.defineProperty(this, k, {
-            get() {
-              return (url: string, lcdpParentRenderId: string, state?: Record<string, any>) =>
-                singletonLcdpApi[k](url, this.data.pages, this.data.appConfig.appId, lcdpParentRenderId, state);
-            },
-            set(value) {
-              val = value;
-            },
-          });
-        })();
-      });
-    }
   }
 
   /**
@@ -46,89 +31,39 @@ class LcdpApi extends LcdpBaseApi {
    * @param state 组件状态数据
    */
   router(url: string, currentAppPages: Array<any>, appId: string, lcdpParentRenderId: string, state?: Record<string, any>) {
-    const { message } = this.antd;
     if (!url) {
       message?.warning(this.getLocale('lcdpApi.router.urlEmpty', '页面跳转地址缺失，请检查'));
     }
-    if (/^((http|https):)?\/\/[^\s]+/.test(url) || !this.refs.history || !this.data.pages) {
+    if (/^((http|https):)?\/\/[^\s]+/.test(url)) {
       window.location.href = url;
     } else {
-      const isPageId = /^\d+$/.test(url);
-      let pageData: any = null;
-      // 优先跳转当前应用页面
-      if (currentAppPages?.length) {
-        pageData = isPageId
-          ? currentAppPages.find((n: any) => n.pageId === url)
-          : currentAppPages.find((n: any) => url.split('?').includes(n.pagePath));
-      }
-      // this.data.pages 包含所有应用页面
-      if (!pageData) {
-        pageData = isPageId
-          ? this.data.pages.find((n: any) => n.pageId === url)
-          : this.data.pages.find((n: any) => url.split('?').includes(n.pagePath));
-      }
-      if (pageData) {
-        const [pathname, search] = url.split('?');
-        const searchPamams = search
-          ? search.split('&').reduce((pre: any, cur: any) => {
-            const [k, v] = cur.split('=');
-            if (v) {
-              pre[decodeURIComponent(k)] = decodeURIComponent(v);
-            }
-            return pre;
-          }, {})
-          : {};
-        switch (pageData.pageContainerType) {
-          case 'Page': {
-            let realSearch = search;
-            if (!searchPamams?.appId) {
-              realSearch = `${search === undefined ? '?' : `${search}&`}appId=${pageData.appId || appId}`;
-            }
-            this.refs.history.push({
-              pathname,
-              search: realSearch,
-            });
-            break;
-          }
-          case 'Drawer': {
-            try {
-              this.refs.ModalManager.current.openDrawer({
-                pageId: pageData.pageId,
-                params: {
-                  ...searchPamams,
-                  ...state,
-                },
-                lcdpParentRenderId,
-              });
-            } catch (e) {
-              console.error(e);
-              message?.warning(this.getLocale('lcdpApi.router.openFail', '打开新页面失败，缺失Drawer', { type: 'Drawer' }));
-            }
-            break;
-          }
-          case 'Modal':
-          case 'MobileModal': {
-            try {
-              this.refs.ModalManager.current.openModal({
-                pageId: pageData.pageId,
-                params: searchPamams,
-                lcdpParentRenderId,
-              });
-            } catch (e) {
-              console.error(e);
-              message?.warning(this.getLocale('lcdpApi.router.openFail', '打开新页面失败，缺失Modal', { type: 'Modal' }));
-            }
-            break;
-          }
-          default: {
-            message?.warning(
-              this.getLocale('lcdpApi.router.notSupport', `不支持的页面类型: ${pageData.pageContainerType}`, { type: pageData.pageContainerType })
-            );
-            break;
+      const [pathname, search] = url.split('?');
+      const searchPamams = search
+        ? search.split('&').reduce((pre: any, cur: any) => {
+          const [k, v] = cur.split('=');
+          if (v) {
+            pre[decodeURIComponent(k)] = decodeURIComponent(v);
           }
-        }
+          return pre;
+        }, {})
+        : {};
+      if (ModalMap[pathname]) {
+        this.refs.ModalManager.current.openModal({
+          pathname,
+          params: searchPamams,
+        });
+      } else if (DrawerMap[pathname]) {
+        this.refs.ModalManager.current.openDrawer({
+          pathname,
+          params: searchPamams,
+        });
       } else {
-        message?.warning(this.getLocale('lcdpApi.router.notFound', '找不到跳转页面的数据'));
+        historytool(HISTORYTYPES.replace, {
+          pathname,
+          search,
+          state: {},
+          history,
+        });
       }
     }
   }

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

@@ -120,7 +120,16 @@ class LcdpBaseApi {
     /**
      * @name 发送请求
      */
-    this.fetch = api.commonFetch;
+    this.fetch = {
+      post: (url: string, data?: any) => {
+        return api.commonFetch('post', url, data)
+        // return compatHttp.post(url, data, { appId: this.data.appId, ...(appCtx || {})}, options)
+      },
+      get: (url: string, data?: any) => {
+        return api.commonFetch('get', url, data)
+        // return compatHttp.get(url, data, { appId: this.data.appId, ...(appCtx || {})}, options)
+      }
+    }
 
     // 重构 屏蔽
     // this.isSupport = browserCompatible(),

package/package.json

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