@lingxiteam/ebe-utils 0.2.22 → 0.2.24

package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useCommon.ts

@@ -1,22 +1,25 @@
 import classNames from 'classnames';
+import { useEffect, useState, useRef } from 'react';
 import { clone } from 'lodash';
-import { useEffect, useRef, useState } from 'react';
 import { useCreation } from '../../utils/ahooks';
 
 const TABLE_ZEBRA_STRIPE_TYPE_CODE = 'zebra';
 const TABLE_BORDER_TYPE_CODE = 'border';
 
 const useCommon = (props: any) => {
-  const { rowKeyType, rowKey, bordered, boundDataSource } = props;
+  const {
+    rowKeyType,
+    rowKey,
+    bordered,
+    boundDataSource,
+  } = props;
 
   const state = props.pageState;
   const isBordered = typeof bordered === 'boolean' ? bordered : bordered === TABLE_BORDER_TYPE_CODE; // 是否为边框线类型，且兼容带borderd的存量数据
   const isZebraStripe = typeof bordered === 'boolean' ? bordered : bordered === TABLE_ZEBRA_STRIPE_TYPE_CODE; // 是否为斑马纹类型
   const [currentRowKey, setCurrentRowKey] = useState<any>(rowKey);
-
-  const innerClassName = classNames('ued-table', {
-    'ued-table-zebra-stripe': isZebraStripe,
-  });
+  
+  const innerClassName = classNames('ued-table', { 'ued-table-zebra-stripe': isZebraStripe });
 
   useEffect(() => {
     // 行主键自动生成时，替换行主键

package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useDataSource.ts

@@ -1,6 +1,6 @@
-import { message } from 'antd';
 import { useEffect, useMemo, useRef, useState } from 'react';
-import { createAutoKey, createTempRowKey, deleteTempRowProperties, EMPTY_ROW_TEMP_KEY_ATTR } from '../utils';
+import { message } from 'antd';
+import { deleteTempRowProperties, createTempRowKey, createAutoKey, EMPTY_ROW_TEMP_KEY_ATTR } from '../utils';
 import SequenceId from '../utils/SequenceId';
 
 const useDataSource = (props: any) => {
@@ -22,13 +22,9 @@ const useDataSource = (props: any) => {
   const [dataSource, setDataSource] = useState<any[]>([]);
 
   // 创建id 实例
-  const seqId = useMemo(
-    () =>
-      new SequenceId({
-        type: 'random',
-      }),
-    []
-  );
+  const seqId = useMemo(() => new SequenceId({
+    type: 'random',
+  }), []);
 
   // 表格当前页数据
   const currentPageDataSource = useMemo(() => {
@@ -36,10 +32,19 @@ const useDataSource = (props: any) => {
     const currentPageData =
       hasPageChangeEvent || !page
         ? dataSource
-        : dataSource.slice((pagination?.current - 1) * pagination?.pageSize, pagination?.current * pagination?.pageSize);
+        : dataSource.slice(
+          (pagination?.current - 1) * pagination?.pageSize,
+          pagination?.current * pagination?.pageSize,
+        );
 
     return currentPageData;
-  }, [dataSource, hasPageChangeEvent, page, pagination?.current, pagination?.pageSize]);
+  }, [
+    dataSource,
+    hasPageChangeEvent,
+    page,
+    pagination?.current,
+    pagination?.pageSize,
+  ]);
 
   // 表格自动生成主键时，记录当前使用的index值，不使用数据下标，防止重复报错
   const rowIdMapRef: any = useRef();
@@ -85,16 +90,13 @@ const useDataSource = (props: any) => {
     let fd: any[] = outerDataSource || [];
     // 处理数据
     if (!Array.isArray(fd)) {
-      message.warn(
-        getLocale('Table.data.typeError', {
-          type: Object.prototype.toString.call(fd),
-        })
-      );
+      message.warn(getLocale('Table.data.typeError', { type: Object.prototype.toString.call(fd) }));
       return;
     }
 
     const tempRows = fd.filter(r => r?.[EMPTY_ROW_TEMP_KEY_ATTR]);
-    const lastTempRow = tempRows[tempRows.length - 1];
+    // 新增空白行数据会追加到最前面
+    const lastTempRow = tempRows[0];
 
     fd = fd.map((i: any, idx) => {
       if (i) {
@@ -123,8 +125,8 @@ const useDataSource = (props: any) => {
           // }
 
           /**
-           * 移除空白行的临时属性
-           * 最后一条空白行，不允许自动移除临时属性（交由保存/取消逻辑手动移除）
+           * 移除其余空白行的临时属性
+           * 最后新一条空白行数据，不允许自动移除临时属性（交由保存/取消逻辑手动移除）
            */
           if (lastTempRow?.[EMPTY_ROW_TEMP_KEY_ATTR] !== i?.[EMPTY_ROW_TEMP_KEY_ATTR]) {
             // 移除临时属性
@@ -134,7 +136,8 @@ const useDataSource = (props: any) => {
             ...(i || {}),
           };
         }
-        return setTableRowKey({ ...(i || {}) }, idx);
+        // 自动生成的主键需要同步到源数据上
+        setTableRowKey(i, idx);
       }
 
       /**
@@ -150,7 +153,13 @@ const useDataSource = (props: any) => {
       setCurrentPage(1);
     }
     setDataSource(fd);
-  }, [outerDataSourceRef.current, currentRowKey, boundDataSource, hasPageChangeEvent, page]);
+  }, [
+    outerDataSourceRef.current,
+    currentRowKey,
+    boundDataSource,
+    hasPageChangeEvent,
+    page,
+  ]);
 
   return {
     outerDataSource,

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

@@ -1,9 +1,9 @@
-import { useEffect, useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import CommIconEG from '../../Icon';
-import { handleIsValidIconCfg } from '../../Icon/hooks';
 import CommIconED from '../../Icon/IconED';
-import { useUpdateEffect } from '../../utils/ahooks';
+import { handleIsValidIconCfg } from '../../Icon/hooks';
 import { useLocale } from '../../utils/hooks/useLocale';
+import { useUpdateEffect } from '../../utils/ahooks';
 
 const useExpandable = (expandCfg: any, isED?: boolean) => {
   const {
@@ -64,9 +64,8 @@ const useExpandable = (expandCfg: any, isED?: boolean) => {
       // 非树形表格调用时，isLeaf 为 undefined
       if (!isTree) {
         // 需要兼容表格存量树形数据判断
-        isLeaf =
-          !Array.isArray(record?.[realChildrenColumnName]) ||
-          (Array.isArray(record?.[realChildrenColumnName]) && record?.[realChildrenColumnName]?.length === 0);
+        isLeaf = !Array.isArray(record?.[realChildrenColumnName])
+        || (Array.isArray(record?.[realChildrenColumnName]) && record?.[realChildrenColumnName]?.length === 0);
       }
 
       // 若没有下级
@@ -105,7 +104,12 @@ const useExpandable = (expandCfg: any, isED?: boolean) => {
         if (handleIsValidIconCfg(expandOpenIcon)) {
           openIcon = (
             // @ts-ignore
-            <CommIcon icon={expandOpenIcon} className={customIconCls} engineApis={engineApis} onClick={handleIconClick} />
+            <CommIcon
+              icon={expandOpenIcon}
+              className={customIconCls}
+              engineApis={engineApis}
+              onClick={handleIconClick}
+            />
           );
         }
 
@@ -117,7 +121,12 @@ const useExpandable = (expandCfg: any, isED?: boolean) => {
       if (handleIsValidIconCfg(expandCloseIcon)) {
         closeIcon = (
           // @ts-ignore
-          <CommIcon icon={expandCloseIcon} className={customIconCls} engineApis={engineApis} onClick={handleIconClick} />
+          <CommIcon
+            icon={expandCloseIcon}
+            className={customIconCls}
+            engineApis={engineApis}
+            onClick={handleIconClick}
+          />
         );
       }
 
@@ -152,8 +161,8 @@ const useExpandable = (expandCfg: any, isED?: boolean) => {
               busiCompStatesKeys.forEach(k => {
                 if (typeof busiCompStates[k] === 'string') {
                   const originExp = busiCompStates[k];
-                  busiCompStates[k] = (row: any, rowId: any, index: number) =>
-                    sandBoxSafeRun(originExp, {
+                  busiCompStates[k] = (row: any, rowId: any, index: number) => sandBoxSafeRun(originExp,
+                    {
                       row,
                       rowId,
                       index,
@@ -213,8 +222,7 @@ const useExpandable = (expandCfg: any, isED?: boolean) => {
             value: record,
           },
         ]);
-      }
-      if (funcExpExecute && rowExpandable) {
+      } if (funcExpExecute && rowExpandable) {
         /**
          * 新版：配置态生成的DSL就是一个$$包含函数的表达式
          * 但会经过预处理移除 $$
@@ -237,22 +245,20 @@ const useExpandable = (expandCfg: any, isED?: boolean) => {
   }
 
   const handleAllExpandRowKeys = (rows: any[]) => {
-    const currPageRowKeys: any[] = rows
-      .map((row: any) => {
-        // 树形数据时，存在多级
-        if (row?.[realChildrenColumnName]) {
-          return [row?.[currentRowKey], ...handleAllExpandRowKeys(row[realChildrenColumnName])];
-        }
+    const currPageRowKeys: any[] = rows.map((row: any) => {
+      // 树形数据时，存在多级
+      if (row?.[realChildrenColumnName]) {
+        return [row?.[currentRowKey], ...handleAllExpandRowKeys(row[realChildrenColumnName])];
+      }
 
-        return row?.[currentRowKey];
-      })
-      .reduce((prev: any, curr: any) => {
-        // 将数组数据打平
-        if (Array.isArray(curr)) {
-          return [...prev, ...curr];
-        }
-        return [...prev, curr];
-      }, []);
+      return row?.[currentRowKey];
+    }).reduce((prev: any, curr: any) => {
+      // 将数组数据打平
+      if (Array.isArray(curr)) {
+        return [...prev, ...curr];
+      }
+      return [...prev, curr];
+    }, []);
     return currPageRowKeys || [];
   };
 

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

@@ -1,11 +1,17 @@
 /* eslint-disable react/no-danger-with-children */
-import { Button, Checkbox } from 'antd';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Checkbox, Button } from 'antd';
 import { FilterDropdownProps } from 'antd/lib/table/interface';
 import _ from 'lodash';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 const useFilter = (props: any) => {
-  const { compId, innerDataSource, currentRowKey, getLocale, outerDataSourceRef } = props;
+  const {
+    compId,
+    innerDataSource,
+    currentRowKey,
+    getLocale,
+    pagination,
+  } = props;
 
   const [filters, setFilters] = useState<any>({}); // 筛选条件
   // 筛选时不影响页码，不使用antd默认的确定方法，因为会导致触发onChange方法
@@ -39,16 +45,14 @@ const useFilter = (props: any) => {
   }, [filters]);
 
   // 判断行是否经过筛选后需要隐藏
-  const checkIfHiddenRow = useCallback(
-    (rowId: string) => {
-      let flag: boolean = false;
-      if (rowFilterSetList?.length) {
-        flag = !rowFilterSetList.every((rowSet: Set<string>) => rowSet.has(rowId));
-      }
-      return flag;
-    },
-    [rowFilterSetList]
-  );
+  const checkIfHiddenRow = useCallback((rowId: string) => {
+    let flag: boolean = false;
+    if (rowFilterSetList?.length) {
+      flag = !rowFilterSetList.every((rowSet: Set<string>) => rowSet.has(rowId));
+    }
+    return flag;
+  }, [rowFilterSetList]);
+
 
   // 筛选下拉列表显隐
   const onFilterDropdownVisibleChange = (dataIndex: string, open: boolean) => {
@@ -63,6 +67,7 @@ const useFilter = (props: any) => {
     }
   };
 
+  
   // 筛选条件下拉列表
   const collectFilterDropDownDom = (colParams: { dataIndex: string }) => {
     const { dataIndex } = colParams;
@@ -107,16 +112,21 @@ const useFilter = (props: any) => {
     };
   };
 
+  
   useEffect(() => {
-    // 源数据变化时，重置筛选条件以及重新收集筛选条件
+    // 源数据或者页码变化时，重置筛选条件以及重新收集筛选条件
     setFilters({});
     tempFilterDomList.current = {};
-  }, [outerDataSourceRef, currentRowKey]);
+  }, [
+    innerDataSource,
+    currentRowKey,
+    pagination?.current,
+  ]);
 
   // 收集所有筛选条件
   const collectAllFilters = (columns: any[], dataIndex: any) => {
     if (!Object.keys(tempFilterDomList.current)?.length || !tempFilterDomList.current?.[dataIndex]) {
-      columns.forEach(col => {
+      columns.forEach((col) => {
         if (col.filter) {
           collectFilterDropDownDom({
             ...col,
@@ -162,68 +172,65 @@ const useFilter = (props: any) => {
     const setSelectedKeys = (keys: string[] | null) => setSelectedFilterKeys((pre: any) => ({ ...pre, [dataIndex]: keys }));
     collectAllFilters(columns, dataIndex);
     const valMap = getCurrentFilterList(dataIndex);
-    return (
-      visible && (
-        <div className="ued-table-filters">
-          <div className="ued-table-filters-content">
-            {Object.keys(valMap || {}).map((val: any) => {
-              const { dom } = valMap[val];
-              return (
-                <div className="ued-table-filters-item">
-                  <Checkbox
-                    checked={selectedKeys.includes(val)}
-                    onChange={e => {
-                      let newSelected: any[] = [];
-                      if (e.target.checked) {
-                        newSelected = [...selectedKeys, val];
-                      } else {
-                        newSelected = selectedKeys.filter((k: string) => k !== val);
-                      }
-                      setSelectedKeys(newSelected?.length ? newSelected : null);
-                    }}
-                  >
-                    <div
-                      className="ued-table-filters-dom"
-                      // eslint-disable-next-line react/no-danger
-                      dangerouslySetInnerHTML={dom && val ? { __html: dom } : undefined}
-                    >
-                      {val ? null : `(${getLocale('Table.filter.empty')})`}
-                    </div>
-                  </Checkbox>
-                </div>
-              );
-            })}
-          </div>
-          <div className="ued-table-filters-bottom">
-            <Button
-              type="link"
-              disabled={selectedKeys?.length === 0}
-              size="small"
-              onClick={() => {
-                setSelectedKeys(null);
-              }}
-            >
-              {getLocale('reset')}
-            </Button>
-            <Button
-              type="primary"
-              size="small"
-              onClick={() => {
-                setFilters((pre: any) => ({
-                  ...pre,
-                  [dataIndex]: selectedKeys?.length ? selectedKeys : null,
-                }));
-                setFilterDropdownOpen(pre => ({
-                  ...pre,
-                  [dataIndex]: false,
-                }));
-              }}
-            >
-              {getLocale('confirm')}
-            </Button>
-          </div>
+    return (visible &&
+      <div className="ued-table-filters">
+        <div className="ued-table-filters-content">
+          {(Object.keys(valMap || {})).map((val: any) => {
+            const { dom } = valMap[val];
+            return (
+              <div className="ued-table-filters-item">
+                <Checkbox
+                  checked={selectedKeys.includes(val)}
+                  onChange={(e) => {
+                    let newSelected: any[] = [];
+                    if (e.target.checked) {
+                      newSelected = [...selectedKeys, val];
+                    } else {
+                      newSelected = selectedKeys.filter((k: string) => k !== val);
+                    }
+                    setSelectedKeys(newSelected?.length ? newSelected : null);
+                  }}
+                >
+                  <div
+                    className="ued-table-filters-dom"
+                    // eslint-disable-next-line react/no-danger
+                    dangerouslySetInnerHTML={dom && val ? { __html: dom } : undefined}
+                  >{val ? null : `(${getLocale('Table.filter.empty')})`}
+                  </div>
+                </Checkbox>
+              </div>
+            );
+          })}
+        </div>
+        <div className="ued-table-filters-bottom">
+          <Button
+            type="link"
+            disabled={selectedKeys?.length === 0}
+            size="small"
+            onClick={() => {
+              setSelectedKeys(null);
+            }}
+          >
+            {getLocale('reset')}
+          </Button>
+          <Button
+            type="primary"
+            size="small"
+            onClick={() => {
+              setFilters((pre: any) => ({
+                ...pre,
+                [dataIndex]: selectedKeys?.length ? selectedKeys : null,
+              }));
+              setFilterDropdownOpen(pre => ({
+                ...pre,
+                [dataIndex]: false,
+              }));
+            }}
+          >
+            {getLocale('confirm')}
+          </Button>
         </div>
-      )
+      </div>
     );
   };
 

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

@@ -1,9 +1,18 @@
+import React from 'react';
 import { message } from 'antd';
-import Qs from 'qs';
 import CustomModule from '../../utils/CustomModule';
-import type { FuncExpExeCuteType } from '../../utils/hooks/useFuncExpExecute';
-import { CUSTOM, DOWNLOAD_FILE, OPEN_MODAL, PAGE_JUMP, PREVIEW_FILE, ROUTE_PUSH, ROUTE_REPLACE } from '../constant';
+import Qs from 'qs';
+import {
+  PAGE_JUMP,
+  DOWNLOAD_FILE,
+  PREVIEW_FILE,
+  CUSTOM,
+  ROUTE_PUSH,
+  ROUTE_REPLACE,
+  OPEN_MODAL,
+} from '../constant';
 import type { ContentClick, FuncCode } from '../types/contentStyle';
+import type { FuncExpExeCuteType } from '../../utils/hooks/useFuncExpExecute';
 
 interface useFormatCellProps extends ContentClick {
   appId: string;
@@ -75,12 +84,14 @@ const useFormatCell = (props: useFormatCellProps) => {
     Object.keys(params).forEach(key => {
       if (typeof params[key] === 'string') {
         const exp = params[key];
-        params[key] = (row: any, rowId: string | number, index: number) =>
-          engineApis?.sandBoxSafeRun(exp, {
+        params[key] = (row: any, rowId: string | number, index: number) => engineApis?.sandBoxSafeRun(
+          exp,
+          {
             row,
             rowId,
             index,
-          });
+          }
+        );
       }
 
       if (typeof params[key] === 'function') {
@@ -96,7 +107,11 @@ const useFormatCell = (props: useFormatCellProps) => {
 
   const handlePageJump = async (row: any, rowId: string | number, rowIndex: number) => {
     if (page) {
-      const { pagePath, searchParams = {}, routerData = {} } = page;
+      const {
+        pagePath,
+        searchParams = {},
+        routerData = {},
+      } = page;
       const newSearchParams = getParams(searchParams, row, rowId, rowIndex);
       const newRouteData = getParams(routerData, row, rowId, rowIndex);
 
@@ -129,7 +144,10 @@ const useFormatCell = (props: useFormatCellProps) => {
 
   const handleOpenModal = async (row: any, rowId: string | number, rowIndex: number) => {
     if (modal) {
-      const { pageId, compStates = {} } = modal;
+      const {
+        pageId,
+        compStates = {},
+      } = modal;
 
       const newCompStates = getParams(compStates, row, rowId, rowIndex);
 
@@ -148,6 +166,7 @@ const useFormatCell = (props: useFormatCellProps) => {
         let realFilename = filename;
         let realFileIds = fileIds;
 
+
         if ((filename as FuncCode)?.code && funcExpExecute) {
           realFilename = funcExpExecute((filename as FuncCode).code, [
             {
@@ -225,15 +244,14 @@ const useFormatCell = (props: useFormatCellProps) => {
         appId: realAppId,
         modalWidth,
       });
-    } else if (previewType !== undefined && typeof engineApis?.previewFile === 'function') {
+    } else if (
+      previewType !== undefined &&
+      typeof engineApis?.previewFile === 'function'
+    ) {
       // 新窗口预览
       realFileIds = Array.isArray(realFileIds) ? realFileIds[0] : realFileIds;
       try {
-        engineApis.previewFile({
-          fileId: realFileIds,
-          appId: realAppId,
-          pageId: realPageId,
-        });
+        engineApis.previewFile({ fileId: realFileIds, appId: realAppId, pageId: realPageId });
       } catch (e) {
         console.error(e);
       }
@@ -271,8 +289,7 @@ const useFormatCell = (props: useFormatCellProps) => {
         }
 
         window.open(realDownloadUrl, openType);
-        break;
-      }
+        break; }
       default:
         break;
     }

package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/usePagination.ts

@@ -1,6 +1,6 @@
-import classNames from 'classnames';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useListenProps } from '../../utils';
+import classNames from 'classnames';
 import { useLocale } from '../../utils/hooks/useLocale';
 
 const usePagination = (props: any) => {
@@ -60,7 +60,7 @@ const usePagination = (props: any) => {
       try {
         const arr = JSON.parse(pageSizeOptions);
         if (Array.isArray(arr)) {
-          return arr.map(s => String(s));
+          return arr.map((s) => String(s));
         }
         return [];
       } catch (e) {
@@ -94,18 +94,28 @@ const usePagination = (props: any) => {
     // },
   };
 
+
   useEffect(() => {
     // 前端分页时，若传入的分页信息有变更且有效，需要更新内部维护的分页数据
     if (!hasPageChangeEvent) {
-      if (typeof current === 'number' || (typeof current === 'string' && !isNaN(Number(current)))) {
+      if (
+        typeof current === 'number' ||
+        (typeof current === 'string' && !isNaN(Number(current)))
+      ) {
         setCurrentPage(Number(current));
       }
 
-      if (typeof pageSize === 'number' || (typeof pageSize === 'string' && !isNaN(Number(pageSize)))) {
+      if (
+        typeof pageSize === 'number' ||
+        (typeof pageSize === 'string' && !isNaN(Number(pageSize)))
+      ) {
         setCurrentPageSize(Number(pageSize));
       }
     }
-  }, [current, pageSize]);
+  }, [
+    current,
+    pageSize,
+  ]);
 
   return {
     pagination,