@lingxiteam/ebe-utils 0.2.22 → 0.2.24

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

@@ -1,18 +1,19 @@
-import { TableRowSelection } from 'antd/lib/table/interface';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { MyTableProps } from '../types/prop';
-import { recursionDataSource } from '../utils';
 import useCheckStrict from './useCheckStrict';
+import { TableRowSelection } from 'antd/lib/table/interface';
+import { recursionDataSource } from '../utils';
+
 
 type selectionProps<T> = {
-  innerDataSource: T[];
-  currentRowKey: string;
-  currentPageDataSource: T[];
-  checkIfHiddenRow?: Function;
-  hasPageChangeEvent?: boolean;
-  funcExpExecute: Function;
-};
-const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps & selectionProps<T>) => {
+  innerDataSource: T[],
+  currentRowKey: string,
+  currentPageDataSource: T[],
+  checkIfHiddenRow?: Function,
+  hasPageChangeEvent?: boolean,
+  funcExpExecute: Function,
+}
+const useSelection = <T extends {[key: string]: unknown}, >(props: MyTableProps & selectionProps<T>) => {
   const {
     innerDataSource,
     currentRowKey,
@@ -30,6 +31,7 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
 
   const { childrenColumnName = 'children' } = expandable || {};
 
+
   const [selectedRows, setSelectedRows] = useState<any[]>([]);
   const [selectedRowKeys, setSelectedRowKeys] = useState<any[]>([]);
   const [currentPageSelectedRows, setCurrentPageSelectedRows] = useState<any[]>([]);
@@ -42,6 +44,7 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
     childrenKey: childrenColumnName,
   });
 
+
   // 记录动作+操作选中的keys，包括跨页和非法的key
   const combineSelectedRowKeysRef = useRef<any[]>([]);
   const hiddenKeysRef = useRef<any[]>([]);
@@ -54,11 +57,8 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
     } else {
       // 当更新当前selectedKeys时，从hiddenKeys中过滤掉页面上已展示过的
       // 配置时兼容key为数字or字符串的情况
-      const currentMap: Record<string | number, boolean> = keys.reduce((p, n) => {
-        p[n] = true;
-        return p;
-      }, {} as any);
-      hiddenKeysRef.current = hiddenKeysRef.current.filter(k => !currentMap[k]);
+      const currentMap: Record<string | number, boolean> = keys.reduce((p, n) => { p[n] = true; return p; }, {} as any);
+      hiddenKeysRef.current = hiddenKeysRef.current.filter((k) => !currentMap[k]);
     }
     // 更新表格所有的选中key
     combineSelectedRowKeysRef.current = [...new Set([...curKeys, ...hiddenKeysRef.current])];
@@ -86,8 +86,7 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
           value: index,
         },
       ]);
-    }
-    if (rowSelectionDisabled) {
+    } if (rowSelectionDisabled) {
       /**
        * 新版：配置态生成的DSL就是一个$$包含函数的表达式
        * 但会经过预处理移除 $$
@@ -108,10 +107,10 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
   };
 
   /**
-   * 获取所有页选中行数据
-   * @param _selectedRows 当前选中的行数据
-   * @returns
-   */
+ * 获取所有页选中行数据
+ * @param _selectedRows 当前选中的行数据
+ * @returns
+ */
   const handleAllPageSelectedRows = (_selectedRows: any[] = []) => {
     // 当 未配置页面回调事件 时，认为是前端分页，此时，_selectedRows 就代表所有页选中行数据
     if (!hasPageChangeEvent) {
@@ -120,9 +119,14 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
 
     // 当 配置页面回调事件 时，认为是后端分页，此时，_selectedRows 代表当前页选中数据，需要特殊处理
     if (currentRowKey) {
+      const currentPageKey = new Set<string>();
+      // 记录当前页数据（包括层级数据）的主键集合
+      recursionDataSource(innerDataSource, (n) => {
+        currentPageKey.add(n[currentRowKey] as string);
+      }, childrenColumnName);
       // 移除当前所有页行选中中，当前页对应的选中
-      const otherPageSelectedRows = selectedRows.filter(selectedRow => {
-        return !innerDataSource.some((row: any) => row[currentRowKey] === selectedRow[currentRowKey]);
+      const otherPageSelectedRows = selectedRows.filter((selectedRow) => {
+        return !currentPageKey.has(selectedRow[currentRowKey]);
       });
 
       // 重新补回最新的当前页的选中数据，返回所有页选中行数据
@@ -143,15 +147,11 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
     if (currentRowKey) {
       const currentPageKey = new Set<string>();
       // 记录当前页数据（包括层级数据）的主键集合
-      recursionDataSource(
-        currentPageDataSource,
-        n => {
-          currentPageKey.add(n[currentRowKey] as string);
-        },
-        childrenColumnName
-      );
+      recursionDataSource(currentPageDataSource, (n) => {
+        currentPageKey.add(n[currentRowKey] as string);
+      }, childrenColumnName);
       // 在当前最新的选中的行数据中，找到属于当前页的、且可选中数据
-      currentPageSeletedRows = selectedRows.filter(selectedRow => {
+      currentPageSeletedRows = selectedRows.filter((selectedRow) => {
         return currentPageKey.has(selectedRow[currentRowKey]);
       });
     }
@@ -167,7 +167,11 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
   const handleSelect = (_selectedRows: any[]) => {
     // 单选
     if (rowSelection?.type === 'radio') {
-      onRowSelected(_selectedRows, true, _selectedRows);
+      onRowSelected(
+        _selectedRows,
+        true,
+        _selectedRows,
+      );
     } else {
       // 多选
       const allPageSelectedRows = handleAllPageSelectedRows(_selectedRows);
@@ -182,11 +186,19 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
         currentPageSelectedRows = _selectedRows;
       }
 
-      onRowSelected(allPageSelectedRows, true, currentPageSelectedRows);
+      onRowSelected(
+        allPageSelectedRows,
+        true,
+        currentPageSelectedRows,
+      );
     }
   };
 
-  const onRowSelected = (_sltrows: any[], doOnSelectChange: boolean, _currentPageSelectedRows?: any[]) => {
+  const onRowSelected = (
+    _sltrows: any[],
+    doOnSelectChange: boolean,
+    _currentPageSelectedRows?: any[],
+  ) => {
     const sltrows: any = currentRowKey ? _sltrows : [];
 
     const sltkeys: any = sltrows.map((row: any) => row[currentRowKey]);
@@ -242,7 +254,12 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
       //     );
       // }
 
-      rowSelection.type === 'radio' ? onRowSelected([record], true) : onRowSelected(triggerSingleSelection(selectedRows, record), true);
+      rowSelection.type === 'radio'
+        ? onRowSelected([record], true)
+        : onRowSelected(
+          triggerSingleSelection(selectedRows, record),
+          true,
+        );
     }
   };
 
@@ -253,7 +270,7 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
     const rowsObject = new Map();
     if (selectedRowsRule) {
       if (!['string', 'object'].includes(typeof selectedRowsRule)) {
-        // TODO: (2022.7.27 与国永沟通)，废弃旧版本在表格内部对 $$ 表达式的解析
+      // TODO: (2022.7.27 与国永沟通)，废弃旧版本在表格内部对 $$ 表达式的解析
         console.warn('请检查配置数据，现有版本只支持(行id字符串或数组、行对象)');
         updateSelectRowsObject(rowsObject);
         return;
@@ -261,28 +278,26 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
 
       // '1' / '1,2,3' / 1,2,3 代表选中行的行id
       if (typeof selectedRowsRule === 'string') {
-        actionSetSelectedKeys = selectedRowsRule?.split(',').map(k => k.trim()) || [];
+        actionSetSelectedKeys = selectedRowsRule?.split(',').map((k) => k.trim()) || [];
       }
 
       // 处理 [{ [rowId]: '1'} ...] 或 ['1', '2'] 或 [1, 2]
       if (Array.isArray(selectedRowsRule)) {
-        actionSetSelectedKeys = selectedRowsRule
-          .map(one => {
-            if (['string', 'number'].includes(typeof one)) {
-              return one;
-            }
+        actionSetSelectedKeys = selectedRowsRule.map((one) => {
+          if (['string', 'number'].includes(typeof one)) {
+            return one;
+          }
 
-            if (typeof one === 'object' && !Array.isArray(one) && one) {
-              const rowKey = one[currentRowKey];
-              if (rowKey) {
-                rowsObject.set(rowKey, one);
-              }
-              return rowKey;
+          if (typeof one === 'object' && !Array.isArray(one) && one) {
+            const rowKey = one[currentRowKey];
+            if (rowKey) {
+              rowsObject.set(rowKey, one);
             }
+            return rowKey;
+          }
 
-            return undefined;
-          })
-          .filter(one => !!one);
+          return undefined;
+        }).filter(one => !!one);
       }
 
       // 代表行数据对象
@@ -306,19 +321,15 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
 
   useEffect(() => {
     if (currentRowKey) {
-      const keySet: Record<string | number, unknown> = {};
+      const keySet: Record<string|number, unknown> = {};
       const map: any = {};
       // 数据源变更需要更新当前选中行的数据，保证获取时能获取到当前最新的数据详情
-      recursionDataSource<{ [k: string]: any; children?: any[] }>(
-        innerDataSource as [],
-        n => {
-          map[n[currentRowKey]] = n;
-        },
-        childrenColumnName
-      );
-
+      recursionDataSource<{[k: string]: any, children?: any[]}>(innerDataSource as [], (n) => {
+        map[n[currentRowKey]] = n;
+      }, childrenColumnName);
+      
       const rows = [];
-      selectedRows.forEach(selectedRow => {
+      selectedRows.forEach((selectedRow) => {
         const key = selectedRow[currentRowKey];
         if (!map[key]) {
           map[key] = selectedRow;
@@ -328,7 +339,7 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
       const actionRows: any[] = [];
       const collectSelectedRow = (key: string | number, childFlag = false) => {
         if (!keySet[key]) {
-          const row = map[key] || actionSetSelectRowsObject.get(key);
+          const row = map[key] || actionSetSelectRowsObject?.get?.(key);
           const canSelected = childFlag ? !relatedDisabledMap[row[currentRowKey]] : true;
           // 通过动作设置选中的禁用节点，允许选中
           // 通过动作设置选中父节点时，非禁用的子级数据也需要选中
@@ -336,15 +347,11 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
             keySet[key] = row;
             actionRows.push(row);
             if (row?.[childrenColumnName]?.length && !checkStrictly) {
-              recursionDataSource<{ [k: string]: any }>(
-                row[childrenColumnName],
-                n => {
-                  if (n[currentRowKey]) {
-                    collectSelectedRow(n[currentRowKey], true);
-                  }
-                },
-                childrenColumnName
-              );
+              recursionDataSource<{[k: string]: any}>(row[childrenColumnName], (n) => {
+                if (n[currentRowKey]) {
+                  collectSelectedRow(n[currentRowKey], true);
+                }
+              }, childrenColumnName);
             }
           }
         }
@@ -365,38 +372,40 @@ const useSelection = <T extends { [key: string]: unknown }>(props: MyTableProps
     const newCurrentPageSelectedRowKeys = newCurrentPageSelectedRows.map((r: any) => r[currentRowKey]);
     setCurrentPageSelectedRows(newCurrentPageSelectedRows);
     setCurrentPageSelectedRowKeys(newCurrentPageSelectedRowKeys);
-  }, [selectedRows, currentRowKey, currentPageDataSource]);
+  }, [
+    selectedRows,
+    currentRowKey,
+    currentPageDataSource,
+  ]);
 
   return {
-    rowSelection: rowSelection
-      ? {
-        type: rowSelection.type,
-        selectedRowKeys,
-        checkStrictly,
-        onChange: (_: any, sltrows: any[]) => handleSelect(sltrows),
-        getCheckboxProps: (record: T) => {
-          const props: ReturnType<Required<TableRowSelection<unknown>>['getCheckboxProps']> = {
-            disabled: relatedDisabledMap[record[currentRowKey] as string],
-          };
-
-          /**
-             * 决定可选表格某行是否可选
-             * 由于此接口不支持索引 index 操作，所以 index 定位行逻辑放在 currentPageDisabledRows，以此兼容
-             */
-          const isRowSelectDisabled =
-              handleIsRowSelectDisabled(record) || !!currentPageDisabledRows.find(row => row[currentRowKey] === record[currentRowKey]);
-
-          if (isRowSelectDisabled || checkIfHiddenRow?.(record[currentRowKey])) {
-            props.disabled = true;
-          }
+    rowSelection: rowSelection ? {
+      type: rowSelection.type,
+      selectedRowKeys,
+      checkStrictly,
+      onChange: (_: any, sltrows: any[]) => handleSelect(sltrows),
+      getCheckboxProps: (record: T) => {
+        const props: ReturnType<Required<TableRowSelection<unknown>>['getCheckboxProps']> = {
+          disabled: relatedDisabledMap[record[currentRowKey] as string],
+        };
+
+        /**
+         * 决定可选表格某行是否可选
+         * 由于此接口不支持索引 index 操作，所以 index 定位行逻辑放在 currentPageDisabledRows，以此兼容
+         */
+        const isRowSelectDisabled = handleIsRowSelectDisabled(record) ||
+          !!currentPageDisabledRows.find(row => row[currentRowKey] === record[currentRowKey]);
+
+        if (isRowSelectDisabled || checkIfHiddenRow?.(record[currentRowKey])) {
+          props.disabled = true;
+        }
 
-          // 开启checkLoosed模式时，父禁用子也禁用
-          markDisable(record, props.disabled || false);
+        // 开启checkLoosed模式时，父禁用子也禁用
+        markDisable(record, props.disabled || false);
 
-          return props;
-        },
-      }
-      : undefined,
+        return props;
+      },
+    } : undefined,
     selectedRows,
     selectedRowKeys,
     currentPageSelectedRows,

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

@@ -1,18 +1,21 @@
-import _ from 'lodash';
 import { useMemo, useState } from 'react';
 import { compareFn } from '../utils';
+import _ from 'lodash';
 
 const useSort = (props: any) => {
-  const { innerDataSource, onSortChange } = props;
+  const {
+    innerDataSource,
+    onSortChange,
+  } = props;
 
   const hasSortEvent = typeof onSortChange === 'function'; // 是否配置表格排序事件
 
   // 开启了行合并后由前端进行排序
   const [sortOrder, setSortOrder] = useState<
     | {
-        field: string;
-        order?: string;
-      }
+      field: string;
+      order?: string;
+    }
     | undefined
   >();
 

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

@@ -1,44 +1,36 @@
-import { TableColumnProps } from 'antd';
 import { useMemo } from 'react';
 import { SummaryConfig } from '../types/prop';
+import { TableColumnProps } from 'antd';
 
 export type ColItem = {
 
   /**
    * 总结行类型 sub 合计
    */
-  operateType: 'sub';
+  'operateType': 'sub',
 
   /**
    * 总结行涉及列key集合
    */
-  group: string[];
-};
+  'group': string[]
+}
 
-export type Column = {
-  key?: string;
-  dataIndex: string | string[];
-  type?: 'orderCol' | 'dynamicCol';
+export type Column = {key?: string; dataIndex: string | string[]; type?: 'orderCol' | 'dynamicCol';
 
   /**
    * 动态列原始key
    */
   dynamicOriginKey?: string;
   fixed?: TableColumnProps<any>['fixed'];
-  align?: TableColumnProps<any>['align'];
-  children?: Array<Column>;
-};
+  align?: TableColumnProps<any>['align'], children?: Array<Column>}
 export interface SummaryProps<T> {
-  summaryConfig?: SummaryConfig;
+  summaryConfig?: SummaryConfig,
   readonly dataSource?: Array<T>;
   columns?: Array<Column>;
 }
-const useSummaryCol = <T>(props: SummaryProps<T>) => {
+const useSummaryCol = <T, >(props: SummaryProps<T>) => {
   const { summaryConfig, dataSource, columns } = props;
-  const { summaryType, summaryGroup } = useMemo<{
-    summaryType: SummaryConfig['type'];
-    summaryGroup: SummaryConfig['group'];
-  }>(() => {
+  const { summaryType, summaryGroup } = useMemo<{summaryType: SummaryConfig['type'], summaryGroup:SummaryConfig['group']}>(() => {
     if (!summaryConfig) {
       return {
         summaryType: 'none',
@@ -57,7 +49,7 @@ const useSummaryCol = <T>(props: SummaryProps<T>) => {
     const colList: typeof columns = [];
     const recursive = (arr: typeof columns) => {
       if (Array.isArray(arr)) {
-        arr.forEach(c => {
+        arr.forEach((c) => {
           if (c?.children?.length) {
             recursive(c.children);
           } else {
@@ -71,13 +63,10 @@ const useSummaryCol = <T>(props: SummaryProps<T>) => {
   }, [columns]);
 
   const summaryColIndexMap = useMemo(() => {
-    const map = new Map<
-      string,
-      {
-        index: number;
-        operateType: ColItem['operateType'];
-      }
-    >();
+    const map = new Map<string, {
+      index: number,
+      operateType: ColItem['operateType']
+    }>();
     if (summaryType === 'none') {
       return map;
     }
@@ -102,18 +91,18 @@ const useSummaryCol = <T>(props: SummaryProps<T>) => {
   const summaryColList = useMemo(() => {
     if (summaryColIndexMap.size === 0) return [];
     const col: Array<{
-      title: string | number;
-      colSpan?: number;
-      dataIndexList?: string[];
-      operateType?: ColItem['operateType'];
-      type?: Column['type'];
+      title: string | number,
+      colSpan?: number,
+      dataIndexList?: string[],
+      operateType?: ColItem['operateType'],
+      type?: Column['type']
       prev?: {
         index: number;
         fixed?: TableColumnProps<T>['fixed'];
       };
-      align?: TableColumnProps<T>['align'];
+      align?: TableColumnProps<T>['align']
     }> = [];
-    // 标记当前已经记录的总结列
+      // 标记当前已经记录的总结列
     const currentSummaryColMap: Record<number, (typeof col)[number]> = {};
     fieldColumns?.forEach((c, i) => {
       const { key, dataIndex, dynamicOriginKey, type } = c;
@@ -139,11 +128,8 @@ const useSummaryCol = <T>(props: SummaryProps<T>) => {
           const { index, operateType } = summaryCol;
           if (currentSummaryColMap[index]) {
             const prevItem = currentSummaryColMap[index];
-            if (
-              prevItem?.prev &&
-              i === prevItem?.prev?.index + 1 &&
-              prevItem?.prev?.fixed === c?.fixed &&
-              !(summaryType === 'single' && type === 'dynamicCol' && type === prevItem?.type)
+            if (prevItem?.prev && i === prevItem?.prev?.index + 1 && prevItem?.prev?.fixed === c?.fixed
+              && !(summaryType === 'single' && type === 'dynamicCol' && type === prevItem?.type)
             ) {
               // 勾选列是相邻的，则允许合并
               // 单列合计时，需排除动态列情况
@@ -173,7 +159,7 @@ const useSummaryCol = <T>(props: SummaryProps<T>) => {
         col.push(item);
       }
     });
-    const dataMap: Record<string, any[]> = {};
+    const dataMap:Record<string, any[]> = {};
     const recursiveCollectValueByDataIndex = (row: Record<string, any>, keyPath: string[] = []) => {
       Object.keys(row || {}).forEach((key: string) => {
         const dataIndex = [...keyPath, key];
@@ -189,10 +175,10 @@ const useSummaryCol = <T>(props: SummaryProps<T>) => {
       });
     };
     // 收集每个dataIndex
-    dataSource?.forEach(v => {
+    dataSource?.forEach((v) => {
       recursiveCollectValueByDataIndex(v as Record<string, any>);
     });
-    return col.map(c => {
+    return col.map((c) => {
       const { operateType, dataIndexList = [] } = c;
       const item = {
         ...c,
@@ -207,9 +193,7 @@ const useSummaryCol = <T>(props: SummaryProps<T>) => {
               // 转换失败不合计
               return NaN;
             }
-            data.forEach(v => {
-              val += Number(v);
-            });
+            data.forEach((v) => { val += Number(v); });
             return val;
           }, 0);
           item.title = isNaN(sub) ? '' : sub.toFixed(summaryConfig?.decimal || 0);