@lingxiteam/ebe-utils 0.5.11 → 0.6.2

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

@@ -2,7 +2,6 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Checkbox, Button } from 'antd';
 import { FilterDropdownProps } from 'antd/lib/table/interface';
-import _ from 'lodash';
 
 const useFilter = (props: any) => {
   const {
@@ -69,37 +68,39 @@ const useFilter = (props: any) => {
 
   
   // 筛选条件下拉列表
-  const collectFilterDropDownDom = (colParams: { dataIndex: string }) => {
-    const { dataIndex } = colParams;
+  const collectFilterDropDownDom = (colParams: { dataIndex: string; key: string }) => {
+    const { dataIndex, key } = colParams;
     const rowKey = currentRowKey;
     const tableDom = document.querySelector(`[data-compid='${compId}']`);
     const valMap: any = {};
     const originDataMap: any = {};
     let prevTdInfo: any = null;
     innerDataSource.forEach((d: any) => {
-      originDataMap[d[rowKey]] = _.get(d, dataIndex);
+      originDataMap[d[rowKey]] = [];
       // 由于表格存在单元格渲染和自定义渲染的情况，所以筛选列表从td元素获取innerText作为最终展示
-      let td: any = tableDom?.querySelector(`tr[data-row-key='${d[rowKey]}'] > td[td-dataIndex='${dataIndex}']`);
-      if (!td && prevTdInfo?.rowSpan > 1) {
+      let td: any = [...(tableDom?.querySelectorAll(`tr[data-row-key='${d[rowKey]}'] td[td-dataIndex='${dataIndex}-${key}']`) || [])];
+      if (!td?.length && prevTdInfo?.rowSpan > 1) {
         // td没有找到，但是存在tr元素，表明可能开启了行合并，采用前一个
         prevTdInfo.rowSpan -= 1;
         td = prevTdInfo?.td;
       } else {
         prevTdInfo = {
           td,
-          rowSpan: td?.rowSpan,
+          rowSpan: td[0]?.rowSpan,
         };
       }
-      if (td) {
-        const val = td.innerText;
-        const rowKeyList = valMap[val]?.rowKeyList || [];
-        // 记录筛选
-        rowKeyList.push(d[rowKey]);
-        originDataMap[d[rowKey]] = val;
-        valMap[val] = {
-          dom: td.innerHTML,
-          rowKeyList,
-        };
+      if (td?.length) {
+        td.forEach((t: HTMLElement) => {
+          const val = t.innerText;
+          const rowKeyList = valMap[val]?.rowKeyList || [];
+          // 记录筛选
+          rowKeyList.push(d[rowKey]);
+          originDataMap[d[rowKey]].push(val);
+          valMap[val] = {
+            dom: t.innerHTML,
+            rowKeyList,
+          };
+        });
       }
     });
     tempFilterDomList.current = {
@@ -148,8 +149,8 @@ const useFilter = (props: any) => {
             if (dataKey !== `${dataIndex}`) {
               const v = filters[dataKey];
               if (v?.length) {
-                const rowVal = tempFilterDomList.current[dataKey]?.originDataMap?.[rowKey];
-                return v.includes(rowVal);
+                const rows = tempFilterDomList.current[dataKey]?.originDataMap?.[rowKey];
+                return !!rows.find((rowVal: string) => v.includes(rowVal));
               }
             }
             return true;

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

@@ -47,35 +47,88 @@ const useFormatCell = (props: useFormatCellProps) => {
   const realAppId = appId;
   const realPageId = pageId;
 
-  const handleCellContent = (row: any, rowIndex: number, rowText?: any) => {
-    if ((content as FuncCode)?.jsx) {
-      return (
-        <div>
-          <CustomModule
-            code={(content as FuncCode)?.code}
-            sandBoxLoadModule={engineApis.sandBoxLoadModule}
-            compProps={{ text: rowText, item: row, index: rowIndex }}
-            errorInfo={{
-              id: $$componentItemId,
-            }}
-          />
-        </div>
-      );
+  // 处理不同输入类型的转换
+  const handleDataInput = ({ dataInput, row, rowIndex, rowText, singleObjData }: any) => {
+    if (!dataInput?.type) {
+      if ((content as FuncCode)?.jsx) {
+        return (
+          <div>
+            <CustomModule
+              code={(content as FuncCode)?.code}
+              sandBoxLoadModule={engineApis.sandBoxLoadModule}
+              compProps={{ text: rowText, item: row, index: rowIndex }}
+              errorInfo={{
+                id: $$componentItemId,
+              }}
+            />
+          </div>
+        );
+      }
+      if ((content as FuncCode)?.code && funcExpExecute) {
+        return funcExpExecute((content as FuncCode).code, [
+          {
+            key: 'row',
+            value: row,
+          },
+          {
+            key: 'index',
+            value: rowIndex,
+          },
+        ]);
+      }
+      return content;
     }
-    if ((content as FuncCode)?.code && funcExpExecute) {
-      return funcExpExecute((content as FuncCode).code, [
-        {
-          key: 'row',
-          value: row,
-        },
-        {
-          key: 'index',
-          value: rowIndex,
-        },
-      ]);
+    const { type, value, code } = dataInput;
+    let finalValue;
+    switch (type) {
+      case 'function': // 函数
+        if (code && funcExpExecute) {
+          finalValue = funcExpExecute(code, [
+            {
+              key: 'row',
+              value: row,
+            },
+            {
+              key: 'index',
+              value: rowIndex,
+            },
+          ]);
+        }
+        break;
+      case 'field': // 字段
+        finalValue = singleObjData?.[value];
+        break;
+      case 'expression': // 表达式(无$$)
+        if (value && engineApis?.sandBoxSafeRun) {
+          finalValue = engineApis?.sandBoxSafeRun(
+            value,
+            {
+              row,
+              index: rowIndex,
+            }
+          );
+        }
+        break;
+      case 'text': // 直接输入
+      default:
+        finalValue = value;
+    }
+    return finalValue;
+  };
+
+  const handleCellContent = (row: any, rowIndex: number, rowText?: any, singleObjData?: any) => {
+    if (clickType === DOWNLOAD_FILE && !singleObjData && (content as FuncCode)?.type === 'field') {
+      return null;
     }
+    const finalValue = handleDataInput({
+      dataInput: content,
+      row,
+      rowIndex,
+      rowText,
+      singleObjData,
+    });
 
-    return content;
+    return !finalValue && ((content as FuncCode)?.type === 'text' || !(content as FuncCode)?.type) ? rowText : finalValue;
   };
 
   // 获取页面-url参数/路由数据 弹窗-组件状态
@@ -163,38 +216,11 @@ const useFormatCell = (props: useFormatCellProps) => {
     }
   };
 
-  const handleDownloadFile = async (row: any, rowIndex: number) => {
+  const handleDownloadFile = async (row: any, rowIndex: number, singleObjData?: any) => {
     if (typeof engineApis?.batchDownloadFileByIds === 'function') {
       try {
-        let realFilename = filename;
-        let realFileIds = fileIds;
-
-
-        if ((filename as FuncCode)?.code && funcExpExecute) {
-          realFilename = funcExpExecute((filename as FuncCode).code, [
-            {
-              key: 'row',
-              value: row,
-            },
-            {
-              key: 'index',
-              value: rowIndex,
-            },
-          ]);
-        }
-
-        if ((fileIds as FuncCode)?.code && funcExpExecute) {
-          realFileIds = funcExpExecute((fileIds as FuncCode).code, [
-            {
-              key: 'row',
-              value: row,
-            },
-            {
-              key: 'index',
-              value: rowIndex,
-            },
-          ]);
-        }
+        const realFilename = handleDataInput({ dataInput: filename, row, rowIndex, singleObjData });
+        let realFileIds = handleDataInput({ dataInput: fileIds, row, rowIndex, singleObjData });
 
         realFileIds = Array.isArray(realFileIds) ? realFileIds[0] : realFileIds;
 
@@ -261,7 +287,7 @@ const useFormatCell = (props: useFormatCellProps) => {
     }
   };
 
-  const onCellClick = async (row: any, rowId: string | number, rowIndex: number) => {
+  const onCellClick = async (row: any, rowId: string | number, rowIndex: number, singleObjData?: any) => {
     switch (clickType) {
       case PAGE_JUMP:
         handlePageJump(row, rowId, rowIndex);
@@ -270,7 +296,7 @@ const useFormatCell = (props: useFormatCellProps) => {
         handleOpenModal(row, rowId, rowIndex);
         break;
       case DOWNLOAD_FILE:
-        handleDownloadFile(row, rowIndex);
+        handleDownloadFile(row, rowIndex, singleObjData);
         break;
       case PREVIEW_FILE:
         handlePreviewFile(row, rowIndex);
@@ -301,6 +327,7 @@ const useFormatCell = (props: useFormatCellProps) => {
   return {
     onCellClick,
     handleCellContent,
+    handleDataInput,
   };
 };
 

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

@@ -0,0 +1,71 @@
+import { useMemo } from 'react';
+import { LEVEL_COL_KEY } from './useColumns';
+
+type TableColumns = Array<{type: 'children' | 'dynamic'; dataIndex: string | string[]; key: string}>;
+export interface LevelTableProps {
+
+  /**
+   * 是否是层级表格
+   */
+  hasLevelData: boolean;
+
+  /**
+   * 显隐规则处理后的columns
+   */
+  visibleColumns: TableColumns;
+
+}
+const useLevelTable = (props: LevelTableProps) => {
+  const { visibleColumns, hasLevelData } = props;
+  const levelTableColSpanMap = useMemo(() => {
+    if (hasLevelData) {
+      // 记录从表的rowSpan，每级从表用一个单独表格渲染，要求从表字段相邻
+      const levelColSpan:Record<string, Array<{
+    colKey: string;
+    index: number;
+    colSpan: number;
+    childrenColumn: any[]
+  }>> = {};
+      visibleColumns.forEach((col, i) => {
+        if (col.type === LEVEL_COL_KEY && col.dataIndex?.length > 1) {
+          // 绑定从表字段，内部构建表格来渲染，一个从表一个表格
+          let pathLen = 1;
+          while (pathLen < col.dataIndex.length) {
+            const colDataIndex = Array.isArray(col.dataIndex) ? col.dataIndex : [col.dataIndex];
+            const parentKey = String(colDataIndex?.slice(0, pathLen));
+            const prevLevelList = levelColSpan[parentKey];
+            // eslint-disable-next-line @typescript-eslint/no-loop-func
+            const neighborCol = (prevLevelList || []).find(l => l.index === i - 1);
+            if (neighborCol) {
+              // 当前从表字段相邻
+              neighborCol.colSpan += 1;
+              neighborCol.index = i;
+              neighborCol.childrenColumn.push(col);
+            } else {
+              const newCol = {
+                // 避免dataIndex重复
+                colKey: `${String(colDataIndex)}_${col.key}`,
+                index: i,
+                colSpan: 1,
+                childrenColumn: [col],
+              };
+              if (!prevLevelList) {
+                levelColSpan[parentKey] = [];
+              }
+              levelColSpan[parentKey].push(newCol);
+            }
+            pathLen += 1;
+          }
+        }
+      });
+      return levelColSpan;
+    }
+    return undefined;
+  }, [visibleColumns, hasLevelData]);
+
+  return {
+    levelTableColSpanMap,
+  };
+};
+
+export default useLevelTable;

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

@@ -193,7 +193,7 @@ const useRowEdit = (props: any) => {
 
     // 当处于编辑状态时，需要过滤来自编辑控件内部触发的 click
     while (target?.className !== curentTarget?.className) {
-      if (!target) break;
+            if (!target) break;
       // 非当前行内元素，不再遍历
       if (!curentTarget.contains(target)) {
         return false;
@@ -223,7 +223,7 @@ const useRowEdit = (props: any) => {
       // 当处于编辑状态时，需要过滤来自编辑控件内部触发的 doubleclick
       let stopDoubleClick = false;
       while (target?.className !== curentTarget?.className) {
-        if (!target) break;
+            if (!target) break;
         // 非当前行内元素，不再遍历，不触发点击事件
         if (!curentTarget.contains(target)) {
           stopDoubleClick = true;

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

@@ -1,8 +1,9 @@
 import { useEventListener } from 'ahooks';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { usePersistFn } from '../../utils/ahooks';
 
 const DYNAMIC_PAGE_ROOT_CLASS = 'lcdp-renderer';
+export const SCROLL_TABLE_CLASSNAME = 'ued-table-scroll-y-auto';
 const useScroll = (props: any) => {
   const {
     initLoadColWidth,
@@ -10,6 +11,8 @@ const useScroll = (props: any) => {
     columnWidth,
     adjustModel,
     scroll: tableScroll,
+    sortDataSource,
+    pageNum,
   } = props;
 
   const tableWrapRef = useRef<any>();
@@ -40,7 +43,8 @@ const useScroll = (props: any) => {
 
       return tableScroll;
     }
-    return {};
+    return {
+    };
   }, [finalcolumns, tableScroll]);
 
   const getTableWrapWidth = () => {
@@ -105,6 +109,35 @@ const useScroll = (props: any) => {
     }
   };
 
+  // 内容自适应时滚动
+  const computedScrollHeight = () => {
+    if (tableWrapRef?.current?.classList?.contains(SCROLL_TABLE_CLASSNAME)) {
+      const bodyWrap = tableWrapRef.current.querySelector('.pcfactory-table');
+      const bodyTable = tableWrapRef.current.querySelector('.pcfactory-table > .pcfactory-table-container');
+      if (bodyWrap && bodyWrap.style.height) {
+        bodyWrap.style.height = '';
+        bodyWrap.style.flex = '';
+      }
+      if (bodyWrap && bodyTable) {
+        const { height: wrapHeight } = bodyWrap.getBoundingClientRect() || {};
+        let { height: tableHeight } = bodyTable.getBoundingClientRect() || {};
+        const { borderTopWidth, borderBottomWidth } = getComputedStyle(bodyWrap) || {};
+        tableHeight += parseInt(borderTopWidth, 10) + parseInt(borderBottomWidth, 10) + 1;
+        if (tableHeight < wrapHeight) {
+          if (bodyWrap) {
+            // 为避免内容较少时表格高度撑满页面出现的边框线分离，当内容高度小于height为100%时的高度时，将高度设置为内容对应高度
+            bodyWrap.style.height = `${(tableHeight || 0)}px`;
+            bodyWrap.style.flex = 'none';
+          }
+        }
+      }
+    }
+  };
+
+  useLayoutEffect(() => {
+    computedScrollHeight();
+  }, [pageNum, sortDataSource]);
+
   // 高度适配计算逻辑
   const computedTablePosition = usePersistFn(() => {
     let newScroll: typeof tableScrollY = 0;
@@ -145,6 +178,7 @@ const useScroll = (props: any) => {
         newScroll = 'auto';
       }
     }
+    computedScrollHeight();
     setTableScrollY(newScroll);
   });
 
@@ -170,6 +204,8 @@ const useScroll = (props: any) => {
     tableWrapRef,
     initTableWrapWidthRef,
     getTableWrapWidth,
+    // 由于antd的overflowY值为scroll，为实现自适应滚动，当scroll.y为auto时，强制让滚动表格的overflowY设置为auto
+    scrollClassName: scroll?.y === undefined && adjustModel === 'auto' ? SCROLL_TABLE_CLASSNAME : undefined,
   };
 };
 

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

@@ -12,6 +12,7 @@ type selectionProps<T> = {
   checkIfHiddenRow?: Function,
   hasPageChangeEvent?: boolean,
   funcExpExecute: Function,
+  getRealIndexById: (id: string) => number
 }
 const useSelection = <T extends {[key: string]: unknown}, >(props: MyTableProps & selectionProps<T>) => {
   const {
@@ -27,6 +28,7 @@ const useSelection = <T extends {[key: string]: unknown}, >(props: MyTableProps
     funcExpExecute,
     checkLoosed,
     expandable,
+    getRealIndexById,
   } = props;
 
   const { childrenColumnName = 'children' } = expandable || {};
@@ -232,9 +234,23 @@ const useSelection = <T extends {[key: string]: unknown}, >(props: MyTableProps
     }
   };
 
+  /**
+       * 决定可选表格某行是否可选
+       * 由于此接口不支持索引 index 操作，所以 index 定位行逻辑放在 currentPageDisabledRows，以此兼容
+       */
+  const checkIsDisabled = (record: any, index?: number) => {
+    let disabled = relatedDisabledMap[record[currentRowKey]];
+    const flag = handleIsRowSelectDisabled(record, index) ||
+          !!currentPageDisabledRows.find(row => row[currentRowKey] === record[currentRowKey]);
+    if (flag) {
+      disabled = true;
+    }
+    return disabled;
+  };
+
   const onRowSelectClick = (record: any, index?: number) => {
     // 行禁用，不允许界面选中
-    if (rowSelection && !handleIsRowSelectDisabled(record, index)) {
+    if (rowSelection && !checkIsDisabled(record, index)) {
       // 下面if else代码一样？？
       // if (selectedRowKeys.includes(record[currentRowKey])) {
       //   // eslint-disable-next-line @typescript-eslint/no-unused-expressions
@@ -385,18 +401,12 @@ const useSelection = <T extends {[key: string]: unknown}, >(props: MyTableProps
       checkStrictly,
       onChange: (_: any, sltrows: any[]) => handleSelect(sltrows),
       getCheckboxProps: (record: T) => {
+        const index = getRealIndexById(record[currentRowKey] as string);
         const props: ReturnType<Required<TableRowSelection<unknown>>['getCheckboxProps']> = {
-          disabled: relatedDisabledMap[record[currentRowKey] as string],
+          disabled: checkIsDisabled(record, index),
         };
 
-        /**
-         * 决定可选表格某行是否可选
-         * 由于此接口不支持索引 index 操作，所以 index 定位行逻辑放在 currentPageDisabledRows，以此兼容
-         */
-        const isRowSelectDisabled = handleIsRowSelectDisabled(record) ||
-          !!currentPageDisabledRows.find(row => row[currentRowKey] === record[currentRowKey]);
-
-        if (isRowSelectDisabled || checkIfHiddenRow?.(record[currentRowKey])) {
+        if (checkIfHiddenRow?.(record[currentRowKey])) {
           props.disabled = true;
         }
 

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

@@ -170,6 +170,13 @@ const useSummaryCol = <T, >(props: SummaryProps<T>) => {
         if (typeof val === 'object' && !Array.isArray(val)) {
           // 存在层级对象，继续收集下层的值列表
           recursiveCollectValueByDataIndex(val, dataIndex);
+        } else if (Array.isArray(val)) {
+          // 数组，继续遍历下一层的对象
+          val.forEach((item: any) => {
+            if (typeof item === 'object' && !Array.isArray(item)) {
+              recursiveCollectValueByDataIndex(item, dataIndex);
+            }
+          });
         }
         dataMap[`${dataIndex}`].push(val);
       });

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

@@ -0,0 +1,37 @@
+import React, { createContext, useContext, useMemo } from 'react';
+
+export type TableContextProps = {
+  loading: boolean;
+  levelTableColSpanMap?: Record<string, Array<{
+    colSpan: number;
+    colKey: string;
+    childrenColumn?: any[];
+  }>>;
+}
+
+const TableContext = createContext<TableContextProps>({
+  loading: false,
+  levelTableColSpanMap: undefined,
+});
+
+const TableContextProvider = (props: React.PropsWithChildren<TableContextProps>) => {
+  const { loading = false, children, levelTableColSpanMap } = props;
+  const context = useMemo(() => ({
+    loading,
+    levelTableColSpanMap,
+  }), [loading, levelTableColSpanMap]);
+  return (
+    <TableContext.Provider value={context}>
+      {children}
+    </TableContext.Provider>);
+};
+
+const useTableContext = () => {
+  const context = useContext(TableContext);
+  return context;
+};
+
+export {
+  TableContextProvider,
+  useTableContext,
+};

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

@@ -17,6 +17,7 @@ import {
 } from './hooks';
 import TableLoader from './loader';
 import IdleContainer from '../utils/IdleContainer';
+import { useCreation } from '../utils/ahooks';
 
 const Table = LingxiForwardRef<unknown, any>((props, ref) => {
   const { dataSource: boundDataSource, $$componentItem, getEngineApis } = props;
@@ -100,6 +101,24 @@ const Table = LingxiForwardRef<unknown, any>((props, ref) => {
   });
   const { expandable: realExpandable, expandTableData } = expandProps;
 
+  // 根据id获取真实的下标，避免过滤和排序后影响下标
+  const { getRealIndexById } = useCreation(() => {
+    const indexMap = new Map<string | number, number>();
+    return {
+      getRealIndexById: (id: string | number) => {
+        if (indexMap.has(id)) {
+          return indexMap.get(id);
+        }
+        const index = (innerDataSource || []).findIndex((c: any) => c[currentRowKey] === id);
+        if (index !== -1) {
+          indexMap.set(id, index);
+        }
+        return index;
+      },
+    };
+  }, [innerDataSource, currentRowKey]);
+  
+
   const selectionProps = useSelection({
     ...props,
     innerDataSource,
@@ -110,6 +129,7 @@ const Table = LingxiForwardRef<unknown, any>((props, ref) => {
     hasPageChangeEvent,
     funcExpExecute,
     expandable: realExpandable,
+    getRealIndexById,
   });
   const {
     selectedRows,
@@ -191,6 +211,7 @@ const Table = LingxiForwardRef<unknown, any>((props, ref) => {
     ...editProps,
     ...cmdProps,
     form,
+    getRealIndexById,
   };
   return (
     <IdleContainer>

package/lib/pcpublic/src/components/pcfactory/src/Table/types/bodyCell.d.ts

@@ -17,4 +17,16 @@ export interface MyBodyCellProps {
   onTableCellClick?: (row: Record<string, any>, cell: any, cellId: string | number, rowIndex: number) => void;
   width?: number;
   index: number;
+  type?: 'dynamicCol' | 'children';
+  parentKey?: string;
+  // 记录列初始化时的默认宽度
+  defaultColWidthMap?: Record<string, number>;
+  originRow?: any;
+  originDataIndex?: string | string[];
+  originIndex?: number;
+  createCellPropsFn: (record: any, col: any, rowIndex: number, childInfo?: {record: any; dataIndex: string | string[]}) => any;
+  size?: 'default' | 'small' | 'middle';
+  isBordered?: boolean;
+  colKey?: string;
+  rowText?: string;
 }

package/lib/pcpublic/src/components/pcfactory/src/Table/types/contentStyle.d.ts

@@ -16,6 +16,8 @@ export interface FuncCode {
   code: string;
   originCode: string;
   jsx?: any;
+  type?: 'text' | 'expression' | 'function' | 'field';
+  value?: any;
 }
 
 type DataBindType = FuncCode | string | undefined;

package/lib/pcpublic/src/components/pcfactory/src/Table/utils/index.ts

@@ -18,7 +18,7 @@ export const handleMultiLevelHeader = (
   leftTree: any,
   column: any,
 ) => {
-  const { fixed = '' } = column;
+  const { fixed = undefined } = column;
   let { group } = column;
 
   // 兼容旧版的分组数据
@@ -135,7 +135,7 @@ export const handleMultiLevelHeader = (
         current.className = hiddenHeaderCellClass;
       }
       if (current) {
-        current.colSpan = 1;
+        current.colSpan = current?.className?.includes(hiddenHeaderCellClass) ? 0 : 1;
       }
     }
   }
@@ -457,3 +457,21 @@ export const getFullCheckedKeySet = <
 export const getFormItemFieldName = ({ compId, currentRowKey, rowData, rowId, dataIndex }:
   {compId: string, currentRowKey: string; rowData: any; rowId?: string | number; dataIndex: string | string[]}) =>
   `${compId}_${currentRowKey}_${rowData[currentRowKey] || rowId}_${dataIndex}`;
+
+// 将表格层级结构的字段如$["a","b"]$, 转为以.连接的正常字段
+export const parseLevelStrToKey = (k: string, joinStr = '/') => {
+  const reg = /^\$\[["'](\w+)["'],["'](\w+)["']\]\$$/;
+  if (reg.test(k)) {
+    const res = k.match(reg);
+    const path = res?.slice?.(1, res.length);
+    return path?.join(joinStr);
+  }
+  return k;
+};
+
+// 获取子从表的dataIndex
+export const generateChildDataIndex = (keyList: string|string[], prefix = '') => {
+  const list = Array.isArray(keyList) ? keyList : [keyList];
+  const parentLen = prefix ? prefix.split(',')?.length : 0;
+  return list.slice(parentLen, list.length);
+};