@lingxiteam/ebe-utils 0.4.4 → 0.4.6

package/lib/pcpublic/src/components/pcfactory/src/Table/Table.tsx

@@ -10,11 +10,7 @@ import BodyCell from './BodyCell';
 import HeaderCell from './HeaderCell';
 import TableHead from './TableHead';
 import { useFuncExpExecute } from '../utils/hooks/useFuncExpExecute';
-import {
-  useColumns,
-  useRowMerge,
-  useScroll,
-} from './hooks';
+import { useColumns, useRowMerge, useScroll } from './hooks';
 import type { MyTableProps, WrapperTablePropsTypes } from './types/prop';
 import EmptyComp from '../utils/Empty';
 import { usePrintMode, PrintContainer } from '../utils';
@@ -74,7 +70,6 @@ const MyTable = LingxiForwardRef<any, Omit<MyTableProps, keyof WrapperTableProps
     form,
     ...restProps
   } = props;
-  
 
   const { uid: compId } = $$componentItem;
   const { size, sortDirections, sticky, summary, tableLayout, title, rowClassName, showHeader = true } = restProps || {};
@@ -91,11 +86,7 @@ const MyTable = LingxiForwardRef<any, Omit<MyTableProps, keyof WrapperTableProps
   const engineApis = getEngineApis?.();
   const { backgroundStyle } = useBackgroundStyle({ backgroundType, engineApis, appId: $$componentItem?.appId, mode: 'engine' });
 
-  const {
-    sandBoxSafeRun,
-    dataState,
-  } = engineApis || {};
-
+  const { sandBoxSafeRun, dataState } = engineApis || {};
 
   const { getLocale } = useLocale(engineApis || {});
 
@@ -104,11 +95,7 @@ const MyTable = LingxiForwardRef<any, Omit<MyTableProps, keyof WrapperTableProps
   const appId = props?.appId || $$componentItem?.appId;
   const pageId = props?.pageId || $$componentItem?.pageId;
 
-  const {
-    rowSpanColMap,
-    rowSpanMap,
-    rowClassMap,
-  } = useRowMerge({
+  const { rowSpanColMap, rowSpanMap, rowClassMap } = useRowMerge({
     ...props,
     currentPageDataSource,
     nowInlineEditKey,
@@ -211,12 +198,7 @@ const MyTable = LingxiForwardRef<any, Omit<MyTableProps, keyof WrapperTableProps
     innerTableStyle.overflowY = styles.overflowY;
   }
 
-  const handleTableChange = (
-    newPagination: any,
-    newFilters: any,
-    newSorter: any,
-    newExtra: any,
-  ) => {
+  const handleTableChange = (newPagination: any, newFilters: any, newSorter: any, newExtra: any) => {
     if (typeof onChange === 'function') {
       onChange(newPagination, newFilters, newSorter, newExtra);
     }
@@ -227,7 +209,7 @@ const MyTable = LingxiForwardRef<any, Omit<MyTableProps, keyof WrapperTableProps
           newPagination?.current,
           newPagination?.pageSize,
           newSorter?.order === 'ascend' ? newSorter?.field : undefined,
-          newSorter?.order === 'descend' ? newSorter?.field : undefined,
+          newSorter?.order === 'descend' ? newSorter?.field : undefined
         );
         return;
       }
@@ -266,13 +248,15 @@ const MyTable = LingxiForwardRef<any, Omit<MyTableProps, keyof WrapperTableProps
   // }, [columnWidth]);
 
   const InnerHeaderCell = useMemo(() => {
-    return (info: any) => <HeaderCell
-      {...info}
-      key={info.columnIndex}
-      tableData={sortDataSource}
-      hasExpandContent={hasExpandContent}
-      childrenColumnName={realExpandable.childrenColumnName}
-    />;
+    return (info: any) => (
+      <HeaderCell
+        {...info}
+        key={info.columnIndex}
+        tableData={sortDataSource}
+        hasExpandContent={hasExpandContent}
+        childrenColumnName={realExpandable.childrenColumnName}
+      />
+    );
   }, [sortDataSource, hasExpandContent, realExpandable.childrenColumnName]);
   const eleProps = {
     appId,
@@ -284,15 +268,7 @@ const MyTable = LingxiForwardRef<any, Omit<MyTableProps, keyof WrapperTableProps
 
   return visible ? (
     <>
-      <div
-        {...eleProps}
-        style={{ ...backgroundStyle, ...styles }}
-        className={classnames(
-          'ued-table-wrap',
-          className,
-        )}
-        ref={tableWrapRef}
-      >
+      <div {...eleProps} style={{ ...backgroundStyle, ...styles }} className={classnames('ued-table-wrap', className)} ref={tableWrapRef}>
         <TableHead
           {...restProps}
           source="engine"
@@ -305,14 +281,14 @@ const MyTable = LingxiForwardRef<any, Omit<MyTableProps, keyof WrapperTableProps
         />
         <Form form={form}>
           <Table
-          // {...restProps} // TODO: 不要这么透传，需要什么传什么，先注释，之后缺什么再补
+            // {...restProps} // TODO: 不要这么透传，需要什么传什么，先注释，之后缺什么再补
             {...tableProps}
             showHeader={showHeader}
             locale={{
               emptyText: <EmptyComp dataState={dataState} getLocale={getLocale} />,
             }}
             ref={tableRef}
-          // loading={loading}
+            // loading={loading}
             bordered={isBordered}
             className={innerClassName}
             style={innerTableStyle}
@@ -336,7 +312,7 @@ const MyTable = LingxiForwardRef<any, Omit<MyTableProps, keyof WrapperTableProps
             scroll={scroll}
             onChange={handleTableChange}
             onRow={(record) => {
-              return ({
+              return {
                 onClick: (event) => {
                   const hasOnRowClick = onRowClick(event, record, getRealIndexById(record[currentRowKey]));
                   !hasOnRowClick && onRowSelectClick(record, getRealIndexById(record[currentRowKey]));
@@ -344,13 +320,13 @@ const MyTable = LingxiForwardRef<any, Omit<MyTableProps, keyof WrapperTableProps
                 onDoubleClick: (event) => {
                   onRowDoubleClick(event, record, getRealIndexById(record[currentRowKey]));
                 },
-                onContextMenu: (event) => { },
-                onMouseEnter: (event) => { }, // 鼠标移入行
-                onMouseLeave: (event) => { },
-              });
+                onContextMenu: (event) => {},
+                onMouseEnter: (event) => {}, // 鼠标移入行
+                onMouseLeave: (event) => {},
+              };
             }}
-            rowSelection={rowSelection}
-          // loading没有数据的时候模拟3个数据,当数据为空时依然展示骨架屏
+            rowSelection={rowSelection && rowSelection?.type ? rowSelection : false}
+            // loading没有数据的时候模拟3个数据,当数据为空时依然展示骨架屏
             dataSource={isEmptyLoading ? [{}, {}, {}] : sortDataSource}
             expandable={realExpandable}
             pagination={isEmptyLoading ? false : page && pagination}
@@ -401,12 +377,14 @@ const MyTable = LingxiForwardRef<any, Omit<MyTableProps, keyof WrapperTableProps
                   cell: BodyCell,
                 },
                 header: {
-                  cell: (info: any) => <HeaderCell
-                    {...info}
-                    tableData={printData?.dataSource?.length > 0 ? printData.dataSource : sortDataSource}
-                    childrenColumnName={realExpandable.childrenColumnName}
-                    hasExpandContent={hasExpandContent}
-                  />,
+                  cell: (info: any) => (
+                    <HeaderCell
+                      {...info}
+                      tableData={printData?.dataSource?.length > 0 ? printData.dataSource : sortDataSource}
+                      childrenColumnName={realExpandable.childrenColumnName}
+                      hasExpandContent={hasExpandContent}
+                    />
+                  ),
                 },
               }}
               columns={printColumns.map((item, index) => {

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

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