aldehyde 0.2.151 → 0.2.152

package/src/aldehyde/table/query-table.tsx

@@ -1,1150 +1,1159 @@
-import React, {Children} from "react";
-import {Card, Collapse, Descriptions, List} from "antd";
+import React, { Children } from "react";
+import { Card, Collapse, Descriptions, List } from "antd";
 import Table from "./control-table-x-axis-wrapper";
 import "./index.css";
 import {
-    ActTableViewModel,
-    ColumnConfig,
-    DtmplData,
-    FieldConfig,
-    PageInfo,
-    QueryData,
-    QueryKey,
-    SelectedRow,
+  ActTableViewModel,
+  ColumnConfig,
+  DtmplData,
+  FieldConfig,
+  PageInfo,
+  QueryData,
+  QueryKey,
+  SelectedRow,
 } from "../tmpl/interface";
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import Pagination from "./pagination";
-import {TableRowSelection} from "antd/lib/table/interface";
-import {SortableContainer, SortableElement} from "react-sortable-hoc";
-import {arrayMoveImmutable} from "array-move";
+import { TableRowSelection } from "antd/lib/table/interface";
+import { SortableContainer, SortableElement } from "react-sortable-hoc";
+import { arrayMoveImmutable } from "array-move";
 import ViewControl from "../controls/view-control";
 import Scrollbars from "react-custom-scrollbars";
-import {LocaleContext} from "../locale/LocaleProvider";
-import {BigNumber} from "bignumber.js";
+import { LocaleContext } from "../locale/LocaleProvider";
+import { BigNumber } from "bignumber.js";
 import Column from "antd/es/table/Column";
-import {ColumnsType} from "antd/es/table";
+import { ColumnsType } from "antd/es/table";
 
-const {Panel} = Collapse;
+const { Panel } = Collapse;
 const SortableItem = SortableElement((props) => <tr {...props} />);
 const SortableBody = SortableContainer((props) => <tbody {...props} />);
 
 interface CacheData {
-    dataSource: object[];
-    pageInfo: PageInfo;
+  dataSource: object[];
+  pageInfo: PageInfo;
 }
 
 interface QueryTableProps {
-    viewModels?: ActTableViewModel[];
-    // defaultPageSize?: number;
-    pageInfo: {
-        pageNo: number;
-        pageSize: number;
-    };
-    tableProps?: {
-        size?: "small" | "middle" | "large";
-        clickDisplayTotal?: boolean;
-        scrollY?: number;
-    };
-    primaryColumn?: ColumnConfig;
-    columns: any[];
-    serverKey?: string;
-    queryKey: QueryKey;
-    onChangePage: (pageNo: number, pageSize: number) => void;
-    onChangeRowSelection?: (
-        selectedRows: SelectedRow[],
-        selectedDatas: DtmplData[],
-        allRowKeys: string[]
-    ) => void;
-    maxSelectedRows?: number;
-    selectedRows?: SelectedRow[];
-    hiddenRowCodes?: string[];
-    viewModel?: string;
-    columnConfigs?: FieldConfig[];
-    summaryConfigs?: {
-        id: string;
-        aggFunc: "sum" | "avg" | "groupIsum" | "groupIavg";
-    }[];
-    subtotalXColumn?: { id: string }[];
-    subtotalYColumn?: { id: string }[];
-    groupIColumns?: { id: string }[]; // 组间合计key
+  viewModels?: ActTableViewModel[];
+  // defaultPageSize?: number;
+  pageInfo: {
+    pageNo: number;
+    pageSize: number;
+  };
+  tableProps?: {
+    size?: "small" | "middle" | "large";
+    clickDisplayTotal?: boolean;
+    scrollY?: number;
+  };
+  primaryColumn?: ColumnConfig;
+  columns: any[];
+  serverKey?: string;
+  queryKey: QueryKey;
+  onChangePage: (pageNo: number, pageSize: number) => void;
+  onChangeRowSelection?: (
+    selectedRows: SelectedRow[],
+    selectedDatas: DtmplData[],
+    allRowKeys: string[]
+  ) => void;
+  maxSelectedRows?: number;
+  selectedRows?: SelectedRow[];
+  hiddenRowCodes?: string[];
+  viewModel?: string;
+  columnConfigs?: FieldConfig[];
+  summaryConfigs?: {
+    id: string;
+    aggFunc: "sum" | "avg" | "groupIsum" | "groupIavg";
+  }[];
+  subtotalXColumn?: { id: string }[];
+  subtotalYColumn?: { id: string }[];
+  groupIColumns?: { id: string }[]; // 组间合计key
 }
 
 interface QueryTableStat {
-    queryDataCache?: Map<string, CacheData>;
-    virtualEndPageNo?: number;
-    dataSource?: object[];
-    loading?: boolean;
-    touchEnd?: boolean;
-    total?: number;
+  queryDataCache?: Map<string, CacheData>;
+  virtualEndPageNo?: number;
+  dataSource?: object[];
+  loading?: boolean;
+  touchEnd?: boolean;
+  total?: number;
 }
 
 class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
-    static defaultProps = {
-        pageInfo: {
-            pageNo: 1,
-            pageSize: 10,
-            virtualEndPageNo: undefined,
-        },
-        tableProps: {
-            size: "small",
-            clickDisplayTotal: false,
-            scrollY: 500,
-        },
-        hiddenRowCodes: [],
-        selectedRows: [],
-        viewModels: ["table"],
-        summaryConfigs: [],
-    };
-
-    state = {
-        queryDataCache: undefined,
-        virtualEndPageNo: undefined,
-        dataSource: undefined,
-        loading: true,
-        touchEnd: undefined,
-        total: undefined,
-    };
-
-    static contextType = LocaleContext;
-    context: React.ContextType<typeof LocaleContext>;
-
-    async componentDidMount() {
-        const {queryKey, pageInfo} = this.props;
-        // let pageInfo = {
-        //     pageNo: 1,
-        //     pageSize: defaultPageSize ? defaultPageSize : 10,
-        //     virtualEndPageNo: undefined,
-        // }
-        if (queryKey) {
-            await this.loadData(queryKey.key, pageInfo);
-        }
+  static defaultProps = {
+    pageInfo: {
+      pageNo: 1,
+      pageSize: 10,
+      virtualEndPageNo: undefined,
+    },
+    tableProps: {
+      size: "small",
+      clickDisplayTotal: false,
+      scrollY: 500,
+    },
+    hiddenRowCodes: [],
+    selectedRows: [],
+    viewModels: ["table"],
+    summaryConfigs: [],
+  };
+
+  state = {
+    queryDataCache: undefined,
+    virtualEndPageNo: undefined,
+    dataSource: undefined,
+    loading: true,
+    touchEnd: undefined,
+    total: undefined,
+  };
+
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  async componentDidMount() {
+    const { queryKey, pageInfo } = this.props;
+    // let pageInfo = {
+    //     pageNo: 1,
+    //     pageSize: defaultPageSize ? defaultPageSize : 10,
+    //     virtualEndPageNo: undefined,
+    // }
+    if (queryKey) {
+      await this.loadData(queryKey.key, pageInfo);
     }
-
-    componentWillUnmount() {
-        this.setState = () => false;
+  }
+
+  componentWillUnmount() {
+    this.setState = () => false;
+  }
+
+  async componentDidUpdate(prevProps) {
+    const { queryKey: preQueryKey, pageInfo: prePageInfo } = prevProps;
+    const { queryKey, pageInfo } = this.props;
+    const { total } = this.state;
+    if (queryKey) {
+      if (preQueryKey?.key != queryKey.key) {
+        await this.loadData(queryKey.key, pageInfo, true);
+      } else if (
+        prePageInfo?.pageNo != pageInfo.pageNo ||
+        prePageInfo?.pageSize != pageInfo.pageSize
+      ) {
+        await this.loadData(queryKey.key, pageInfo, false);
+      }
     }
-
-    async componentDidUpdate(prevProps) {
-        const {queryKey: preQueryKey, pageInfo: prePageInfo} = prevProps;
-        const {queryKey, pageInfo} = this.props;
-        const {total} = this.state;
-        if (queryKey) {
-            if (preQueryKey?.key != queryKey.key) {
-                await this.loadData(queryKey.key, pageInfo, true);
-            } else if (
-                prePageInfo?.pageNo != pageInfo.pageNo ||
-                prePageInfo?.pageSize != pageInfo.pageSize
-            ) {
-                await this.loadData(queryKey.key, pageInfo, false);
-            }
-        }
+  }
+
+  DraggableContainer = (props) => (
+    <SortableBody
+      useDragHandle
+      disableAutoscroll
+      helperClass="row-dragging"
+      onSortEnd={this.onSortEnd}
+      {...props}
+    />
+  );
+
+  DraggableBodyRow = ({ className, style, ...restProps }) => {
+    const { dataSource } = this.state;
+    if (dataSource) {
+      const index = dataSource.findIndex(
+        (x) => x.key === restProps["data-row-key"]
+      );
+      return <SortableItem key={index} index={index} {...restProps} />;
+    } else {
+      return <></>;
     }
-
-    DraggableContainer = (props) => (
-        <SortableBody
-            useDragHandle
-            disableAutoscroll
-            helperClass="row-dragging"
-            onSortEnd={this.onSortEnd}
-            {...props}
-        />
-    );
-
-    DraggableBodyRow = ({className, style, ...restProps}) => {
-        const {dataSource} = this.state;
-        if (dataSource) {
-            const index = dataSource.findIndex(
-                (x) => x.key === restProps["data-row-key"]
-            );
-            return <SortableItem key={index} index={index} {...restProps} />;
-        } else {
-            return <></>;
-        }
-    };
-
-    onSortEnd = ({oldIndex, newIndex}) => {
-        const {dataSource} = this.state;
-        if (oldIndex !== newIndex) {
-            const newData = arrayMoveImmutable(
-                [].concat(dataSource),
-                oldIndex,
-                newIndex
-            ).filter((el) => !!el);
-            //console.log('Sorted items: ', newData);
-            this.setState({dataSource: newData});
+  };
+
+  onSortEnd = ({ oldIndex, newIndex }) => {
+    const { dataSource } = this.state;
+    if (oldIndex !== newIndex) {
+      const newData = arrayMoveImmutable(
+        [].concat(dataSource),
+        oldIndex,
+        newIndex
+      ).filter((el) => !!el);
+      //console.log('Sorted items: ', newData);
+      this.setState({ dataSource: newData });
+    }
+  };
+
+  loadData = async (
+    queryKey: string,
+    pageInfo: PageInfo,
+    cleanCache?: boolean
+  ) => {
+    this.setState({
+      loading: true,
+    });
+    let { queryDataCache } = this.state;
+
+    let { serverKey, tableProps } = this.props;
+    let queryCache: Map<string, CacheData>;
+    if (cleanCache || !queryDataCache) {
+      queryCache = new Map<string, CacheData>();
+      this.setState({ total: undefined });
+    } else {
+      queryCache = queryDataCache;
+    }
+    if (queryCache.has(pageInfo?.pageNo + "_" + pageInfo?.pageSize)) {
+      let cacheData = queryCache.get(
+        pageInfo?.pageNo + "_" + pageInfo?.pageSize
+      );
+      this.setState({
+        dataSource: cacheData.dataSource,
+        virtualEndPageNo: cacheData.pageInfo.virtualEndPageNo,
+        loading: false,
+      });
+    } else {
+      let queryData: QueryData = await HcserviceV3.requestQueryData(
+        serverKey,
+        queryKey,
+        pageInfo
+      );
+      if (queryData.key != this.props.queryKey.key) {
+        return;
+      } else {
+        let dataSource: object[] = [];
+        pageInfo = queryData.pageInfo;
+        if (queryData.entities) {
+          queryData.entities.forEach((item, index) => {
+            let row = {
+              key: item.code,
+              code: item.code, //增加code,为了删除操作
+              ...item.fieldMap,
+              index,
+            };
+            dataSource.push(row);
+          });
         }
-    };
 
-    loadData = async (
-        queryKey: string,
-        pageInfo: PageInfo,
-        cleanCache?: boolean
-    ) => {
-        this.setState({
-            loading: true,
+        let touchEnd = queryData.touchEnd;
+        //缓存数据
+        queryCache.set(pageInfo?.pageNo + "_" + pageInfo?.pageSize, {
+          dataSource,
+          pageInfo,
         });
-        let {queryDataCache} = this.state;
-
-        let {serverKey, tableProps} = this.props;
-        let queryCache: Map<string, CacheData>;
-        if (cleanCache || !queryDataCache) {
-            queryCache = new Map<string, CacheData>();
-            this.setState({total: undefined});
-        } else {
-            queryCache = queryDataCache;
-        }
-        if (queryCache.has(pageInfo?.pageNo + "_" + pageInfo?.pageSize)) {
-            let cacheData = queryCache.get(
-                pageInfo?.pageNo + "_" + pageInfo?.pageSize
-            );
-            this.setState({
-                dataSource: cacheData.dataSource,
-                virtualEndPageNo: cacheData.pageInfo.virtualEndPageNo,
-                loading: false,
-            });
-        } else {
-            let queryData: QueryData = await HcserviceV3.requestQueryData(
-                serverKey,
-                queryKey,
-                pageInfo
-            );
-            if (queryData.key != this.props.queryKey.key) {
-                return;
-            } else {
-                let dataSource: object[] = [];
-                pageInfo = queryData.pageInfo;
-                if (queryData.entities) {
-                    queryData.entities.forEach((item, index) => {
-                        let row = {
-                            key: item.code,
-                            code: item.code, //增加code,为了删除操作
-                            ...item.fieldMap,
-                            index,
-                        };
-                        dataSource.push(row);
-                    });
-                }
-
-                let touchEnd = queryData.touchEnd;
-                //缓存数据
-                queryCache.set(pageInfo?.pageNo + "_" + pageInfo?.pageSize, {
-                    dataSource,
-                    pageInfo,
-                });
-                this.setState({
-                    dataSource,
-                    virtualEndPageNo: pageInfo.virtualEndPageNo,
-                    queryDataCache: queryCache,
-                    touchEnd,
-                    loading: false,
-                });
-
-                if (!tableProps.clickDisplayTotal) {
-                    await this.queryTotal();
-                }
-            }
-            // }
-        }
-    };
-
-    pageTo = async (pageNo: number, pageSize: number) => {
-        const {onChangePage} = this.props;
-        const {virtualEndPageNo} = this.state;
-        let pageInfo = {
-            pageNo,
-            pageSize: pageSize ? pageSize : 10,
-            virtualEndPageNo,
-        };
-        const {queryKey} = this.props;
-        await this.loadData(queryKey.key, pageInfo);
-        onChangePage(pageNo, pageSize);
-    };
-
-    queryTotal = async () => {
-        const {queryKey, serverKey} = this.props;
-        let total = await HcserviceV3.requestQueryCount(serverKey, queryKey.key);
         this.setState({
-            total,
+          dataSource,
+          virtualEndPageNo: pageInfo.virtualEndPageNo,
+          queryDataCache: queryCache,
+          touchEnd,
+          loading: false,
         });
-    };
 
-    getRowSelection = () => {
-        const {
-            columns,
-            onChangeRowSelection,
-            selectedRows,
-            maxSelectedRows,
-            primaryColumn,
-        } = this.props;
-        let {dataSource} = this.state;
-        let selectedRowKeys = [];
-
-        for (let row of selectedRows) {
-            selectedRowKeys.push(row.code);
-        }
-        const allRowKeys: string[] = [];
-        if (dataSource) {
-            for (let d of dataSource) {
-                allRowKeys.push(d.code);
-            }
+        if (!tableProps.clickDisplayTotal) {
+          await this.queryTotal();
         }
-        if (maxSelectedRows == -1) {
-            return null;
-        }
-        const rowSelection: TableRowSelection<any> = {
-            fixed: true,
-            type: maxSelectedRows == 1 ? "radio" : "checkbox",
-            selectedRowKeys,
-            onChange: (selectedRowKeys, selectedRows) => {
-                //console.log('selectedRowKeys:', selectedRowKeys);
-                // console.log('selectedRows:', selectedRows);
-                let selectedRows_: SelectedRow[] = [];
-                let selectedDatas: DtmplData[] = [];
-                let titleColId = primaryColumn?.id;
-                if (!titleColId) {
-                    columns.forEach((col) => {
-                        if (col.title != "序号" && titleColId == null) {
-                            titleColId = col.dataIndex;
-                            return;
-                        }
-                    });
-                }
-                selectedRows.forEach((item) => {
-                    selectedRows_.push({code: item["code"], title: item[titleColId]});
-                    selectedDatas.push(item);
-                });
-                if (onChangeRowSelection) {
-                    onChangeRowSelection(selectedRows_, selectedDatas, allRowKeys);
-                }
-            },
-        };
-        return rowSelection;
+      }
+      // }
+    }
+  };
+
+  pageTo = async (pageNo: number, pageSize: number) => {
+    const { onChangePage } = this.props;
+    const { virtualEndPageNo } = this.state;
+    let pageInfo = {
+      pageNo,
+      pageSize: pageSize ? pageSize : 10,
+      virtualEndPageNo,
     };
-
-    getUnHidenDataSource = () => {
-        const {dataSource} = this.state;
-        const {hiddenRowCodes} = this.props;
-        let ds: object[] = [];
-        if (dataSource) {
-            for (let d of dataSource) {
-                if (!hiddenRowCodes.includes(d.code)) {
-                    ds.push(d);
-                }
+    const { queryKey } = this.props;
+    await this.loadData(queryKey.key, pageInfo);
+    onChangePage(pageNo, pageSize);
+  };
+
+  queryTotal = async () => {
+    const { queryKey, serverKey } = this.props;
+    let total = await HcserviceV3.requestQueryCount(serverKey, queryKey.key);
+    this.setState({
+      total,
+    });
+  };
+
+  getRowSelection = () => {
+    const {
+      columns,
+      onChangeRowSelection,
+      selectedRows,
+      maxSelectedRows,
+      primaryColumn,
+    } = this.props;
+    let { dataSource } = this.state;
+    let selectedRowKeys = [];
+
+    for (let row of selectedRows) {
+      selectedRowKeys.push(row.code);
+    }
+    const allRowKeys: string[] = [];
+    if (dataSource) {
+      for (let d of dataSource) {
+        allRowKeys.push(d.code);
+      }
+    }
+    if (maxSelectedRows == -1) {
+      return null;
+    }
+    const rowSelection: TableRowSelection<any> = {
+      fixed: true,
+      type: maxSelectedRows == 1 ? "radio" : "checkbox",
+      selectedRowKeys,
+      onChange: (selectedRowKeys, selectedRows) => {
+        //console.log('selectedRowKeys:', selectedRowKeys);
+        // console.log('selectedRows:', selectedRows);
+        let selectedRows_: SelectedRow[] = [];
+        let selectedDatas: DtmplData[] = [];
+        let titleColId = primaryColumn?.id;
+        if (!titleColId) {
+          columns.forEach((col) => {
+            if (col.title != "序号" && titleColId == null) {
+              titleColId = col.dataIndex;
+              return;
             }
+          });
         }
-        return ds;
-    };
-
-    initViewList = (data) => {
-        //console.log("data:",data);
-        const {translate} = this.context;
-        const {columns, columnConfigs, serverKey} = this.props;
-        const formItemList = [];
-        if (columnConfigs.length > 0) {
-            columnConfigs.forEach((item, index) => {
-                if (item.id != "10000" && item.id != "20000" && item.title != "操作") {
-                    const title = item.title;
-                    let fieldValue = data ? data[item.id] : undefined;
-                    if (title == "序号") {
-                        fieldValue = data.index;
-                    }
-                    //fieldValue 没有值时不能为null 要为 undefined。antd input所限制
-                    fieldValue = fieldValue
-                        ? fieldValue
-                        : item.defaultValue
-                            ? item.defaultValue
-                            : undefined;
-                    const fieldKey = item.id + Math.random() * 100;
-
-                    const formItem = (
-                        <Descriptions.Item
-                            label={translate("${" + item.title + "}")}
-                            key={index}
-                            className="labelcss"
-                        >
-                            <ViewControl
-                                serverKey={serverKey}
-                                holderType={"table"}
-                                value={fieldValue}
-                                fieldConfig={item}
-                            />
-                        </Descriptions.Item>
-                    );
-                    formItemList.push(formItem);
-                }
-            });
+        selectedRows.forEach((item) => {
+          selectedRows_.push({ code: item["code"], title: item[titleColId] });
+          selectedDatas.push(item);
+        });
+        if (onChangeRowSelection) {
+          onChangeRowSelection(selectedRows_, selectedDatas, allRowKeys);
         }
-        return formItemList;
+      },
     };
-
-    getTableSummaryNumberValue(value: "" | string[]) {
-        if (value === undefined || value === null) return 0;
-        if (typeof value === "string") return Number(value);
-        return Number(value[0].split("@R@")[1]);
-    }
-
-    deepClone(source, hash = new WeakMap()) {
-        if (typeof source !== "object" || source === null) {
-            return source;
+    return rowSelection;
+  };
+
+  getUnHidenDataSource = () => {
+    const { dataSource } = this.state;
+    const { hiddenRowCodes } = this.props;
+    let ds: object[] = [];
+    if (dataSource) {
+      for (let d of dataSource) {
+        if (!hiddenRowCodes.includes(d.code)) {
+          ds.push(d);
         }
-        if (hash.has(source)) {
-            return hash.get(source);
+      }
+    }
+    return ds;
+  };
+
+  initViewList = (data) => {
+    //console.log("data:",data);
+    const { translate } = this.context;
+    const { columns, columnConfigs, serverKey } = this.props;
+    const formItemList = [];
+    if (columnConfigs.length > 0) {
+      columnConfigs.forEach((item, index) => {
+        if (item.id != "10000" && item.id != "20000" && item.title != "操作") {
+          const title = item.title;
+          let fieldValue = data ? data[item.id] : undefined;
+          if (title == "序号") {
+            fieldValue = data.index;
+          }
+          //fieldValue 没有值时不能为null 要为 undefined。antd input所限制
+          fieldValue = fieldValue
+            ? fieldValue
+            : item.defaultValue
+            ? item.defaultValue
+            : undefined;
+          const fieldKey = item.id + Math.random() * 100;
+
+          const formItem = (
+            <Descriptions.Item
+              label={translate("${" + item.title + "}")}
+              key={index}
+              className="labelcss"
+            >
+              <ViewControl
+                serverKey={serverKey}
+                holderType={"table"}
+                value={fieldValue}
+                fieldConfig={item}
+              />
+            </Descriptions.Item>
+          );
+          formItemList.push(formItem);
         }
-        const target = Array.isArray(source) ? [] : {};
-        Reflect.ownKeys(source).forEach((key) => {
-            const val = source[key];
-            if (typeof val === "object" && val != null) {
-                target[key] = this.deepClone(val, hash);
-            } else {
-                target[key] = val;
-            }
-        });
-        return target;
+      });
     }
-
-    buildKeys(keys: { title: string; dataKey: string }[]) {
-        return keys.map((i) => i.title).join("-");
+    return formItemList;
+  };
+
+  getTableSummaryNumberValue(value: "" | string[]) {
+    if (value === undefined || value === null) return 0;
+    if (typeof value === "string") return Number(value);
+    return Number(value[0].split("@R@")[1]);
+  }
+
+  deepClone(source, hash = new WeakMap()) {
+    if (typeof source !== "object" || source === null) {
+      return source;
     }
-
-    buildColTag(cols, keys = []) {
-        for (const col of cols) {
-            if (!col.children) {
-                // if (col.dataIndex === undefined)
-                col.dataIndex = this.buildKeys([
-                    ...keys,
-                    {dataKey: col._type ? col._type : col.title, title: col.title},
-                ]);
-                if (col.keys === undefined)
-                    col.keys = [
-                        ...keys,
-                        {dataKey: col._type ? col._type : col.title, title: col.title},
-                    ];
-            } else {
-                this.buildColTag(col.children, [
-                    ...keys,
-                    {dataKey: col._type ? col._type : col.title, title: col.title},
-                ]);
-            }
-        }
+    if (hash.has(source)) {
+      return hash.get(source);
     }
-
-    getCurCalKeys(cols, keys = []) {
-        for (const col of cols) {
-            if (Array.isArray(col.children)) {
-                this.getCurCalKeys(col.children, keys);
-            } else {
-                keys.push({
-                    factIndex: col.keys[col.keys.length - 1],
-                    dataIndex: col.dataIndex,
-                });
-            }
-        }
-
-        return keys;
+    const target = Array.isArray(source) ? [] : {};
+    Reflect.ownKeys(source).forEach((key) => {
+      const val = source[key];
+      if (typeof val === "object" && val != null) {
+        target[key] = this.deepClone(val, hash);
+      } else {
+        target[key] = val;
+      }
+    });
+    return target;
+  }
+
+  buildKeys(keys: { title: string; dataKey: string }[]) {
+    return keys.map((i) => i.title).join("-");
+  }
+
+  buildColTag(cols, keys = []) {
+    for (const col of cols) {
+      if (!col.children) {
+        // if (col.dataIndex === undefined)
+        col.dataIndex = this.buildKeys([
+          ...keys,
+          { dataKey: col._type ? col._type : col.title, title: col.title },
+        ]);
+        if (col.keys === undefined)
+          col.keys = [
+            ...keys,
+            { dataKey: col._type ? col._type : col.title, title: col.title },
+          ];
+      } else {
+        this.buildColTag(col.children, [
+          ...keys,
+          { dataKey: col._type ? col._type : col.title, title: col.title },
+        ]);
+      }
     }
-
-    setSumColKeys(sumCol, sumKeys) {
-        if (sumKeys.length === 0) return;
-        if (Array.isArray(sumCol.children)) {
-            this.setSumColKeys(sumCol.children, sumKeys);
-        } else {
-            for (const col of sumCol) {
-                const factKey = col.keys[col.keys.length - 1].dataKey;
-                col.sumDataIndex = sumKeys.filter(
-                    ({factIndex: {dataKey}}) => dataKey === factKey
-                );
-                col.keys[col.keys.length - 1].sumDataIndex = col.sumDataIndex.map(
-                    ({dataIndex}) => dataIndex
-                );
-            }
-        }
+  }
+
+  getCurCalKeys(cols, keys = []) {
+    for (const col of cols) {
+      if (Array.isArray(col.children)) {
+        this.getCurCalKeys(col.children, keys);
+      } else {
+        keys.push({
+          factIndex: col.keys[col.keys.length - 1],
+          dataIndex: col.dataIndex,
+        });
+      }
     }
 
-    handleProSummaryTable(data: any[]) {
-        const isProSumarryTable = Boolean(
-            this.props.subtotalXColumn || this.props.subtotalYColumn
+    return keys;
+  }
+
+  setSumColKeys(sumCol, sumKeys) {
+    if (sumKeys.length === 0) return;
+    if (Array.isArray(sumCol.children)) {
+      this.setSumColKeys(sumCol.children, sumKeys);
+    } else {
+      for (const col of sumCol) {
+        const factKey = col.keys[col.keys.length - 1].dataKey;
+        col.sumDataIndex = sumKeys.filter(
+          ({ factIndex: { dataKey } }) => dataKey === factKey
         );
-        if (!isProSumarryTable)
-            return {proSummaryTableColumns: [], proSummaryTableData: []};
-
-        const {translate} = this.context;
-
-        const {subtotalXColumn, subtotalYColumn, columns: _columns} = this.props;
-        const columns = _columns;
-        for (const d of data) {
-            for (const [k, v] of Object.entries(d)) {
-                if (v == null || v == "null") {
-                    d[k] = "";
-                } else if (typeof v === "string" && (v as string)?.includes("@R@")) {
-                    d[k] = (v as string).split("@R@")[1];
-                }
-            }
-        }
+        col.keys[col.keys.length - 1].sumDataIndex = col.sumDataIndex.map(
+          ({ dataIndex }) => dataIndex
+        );
+      }
+    }
+  }
 
-        console.log("data", data);
-        console.log("columns", columns);
-
-        const colMp = {dimension: [], fact: []};
-        const colIdToNameMp = {};
-        const colNameToIdMp = {};
-        for (const col of columns) {
-            colIdToNameMp[col["dataIndex"]] = col["title"];
-            colNameToIdMp[col["title"]] = col["dataIndex"];
-            if (col.statColType !== undefined)
-                colMp[col.statColType].push(this.deepClone(col));
-        }
-        console.log("colIdToNameMp", colIdToNameMp);
-        console.log("colNameToIdMp", colNameToIdMp);
-        console.log("colMp", colMp);
-
-        // canReadData
-        const canReadData = [];
-        for (const d of data) {
-            const item = {};
-            for (const [k, v] of Object.entries(d)) {
-                let _v = v;
-                if (
-                    colMp.fact.findIndex(({dataIndex}) => dataIndex === k) > -1 &&
-                    v === null
-                )
-                    _v = 0;
-                item[colIdToNameMp[k]] = _v;
-            }
-            canReadData.push(item);
+  handleProSummaryTable(data: any[]) {
+    const isProSumarryTable = Boolean(
+      this.props.subtotalXColumn || this.props.subtotalYColumn
+    );
+    if (!isProSumarryTable)
+      return { proSummaryTableColumns: [], proSummaryTableData: [] };
+
+    const { translate } = this.context;
+
+    const { subtotalXColumn, subtotalYColumn, columns: _columns } = this.props;
+    const columns = _columns;
+    for (const d of data) {
+      for (const [k, v] of Object.entries(d)) {
+        if (v == null || v == "null") {
+          d[k] = "";
+        } else if (typeof v === "string" && (v as string)?.includes("@R@")) {
+          d[k] = (v as string).split("@R@")[1];
         }
-        console.log("canReadData", canReadData);
-
-        let proSummaryTableColumns = [...this.deepClone(colMp.dimension)],
-            proSummaryTableData = [],
-            excludeGroupSumData = [];
-
-        const cal = colMp.fact[0]?.cal;
-        const calTxt = cal === "sum" ? translate("小计") : translate("均值");
+      }
+    }
 
-        // 计算列
+    console.log("data", data);
+    console.log("columns", columns);
+
+    const colMp = { dimension: [], fact: [] };
+    const colIdToNameMp = {};
+    const colNameToIdMp = {};
+    for (const col of columns) {
+      colIdToNameMp[col["dataIndex"]] = col["title"];
+      colNameToIdMp[col["title"]] = col["dataIndex"];
+      if (col.statColType !== undefined)
+        colMp[col.statColType].push(this.deepClone(col));
+    }
+    console.log("colIdToNameMp", colIdToNameMp);
+    console.log("colNameToIdMp", colNameToIdMp);
+    console.log("colMp", colMp);
+
+    // canReadData
+    const canReadData = [];
+    for (const d of data) {
+      const item = {};
+      for (const [k, v] of Object.entries(d)) {
+        let _v = v;
         if (
-            subtotalYColumn &&
-            Array.isArray(subtotalYColumn) &&
-            subtotalYColumn.length
-        ) {
-            // col
-            let tnodes = [];
-
-            for (let i = 0; i < subtotalYColumn.length; i++) {
-                const y = subtotalYColumn[i];
-                const id = y.id;
-                const mp = {};
-                let _tnodes = [];
-                for (const d of data) mp[d[id]] = colIdToNameMp[id];
-                for (const [k, v] of Object.entries(mp)) {
-                    const tnode = {
-                        title: k,
-                        _type: v,
-                        children: [...this.deepClone(i === 0 ? colMp.fact : tnodes)],
-                    };
-                    _tnodes.push(tnode);
-                }
+          colMp.fact.findIndex(({ dataIndex }) => dataIndex === k) > -1 &&
+          v === null
+        )
+          _v = 0;
+        item[colIdToNameMp[k]] = _v;
+      }
+      canReadData.push(item);
+    }
+    console.log("canReadData", canReadData);
 
-                this.buildColTag(_tnodes);
-                console.log("_tnodes", JSON.parse(JSON.stringify(_tnodes)));
-
-                const sumCol = {
-                    title: calTxt,
-                    children: [...this.deepClone(colMp.fact)],
-                    TYPE: cal,
-                };
-                this.buildColTag([sumCol]);
-                this.setSumColKeys(sumCol, this.getCurCalKeys(_tnodes));
-                _tnodes.unshift(sumCol);
-
-                tnodes = _tnodes;
-                proSummaryTableColumns.splice(
-                    proSummaryTableColumns.findIndex((item) => item.dataIndex === id),
-                    1
-                );
-            }
-            proSummaryTableColumns.push(...tnodes);
-        } else {
-            proSummaryTableColumns.push(...colMp.fact);
-        }
+    let proSummaryTableColumns = [...this.deepClone(colMp.dimension)],
+      proSummaryTableData = [],
+      excludeGroupSumData = [];
 
-        // buildData
-        this.buildColTag(proSummaryTableColumns);
+    const cal = colMp.fact[0]?.cal;
+    const calTxt = cal === "sum" ? translate("小计") : translate("均值");
 
-        // 处理行
-        const rowMp = {};
-        const rowKey = [];
-        for (const col of proSummaryTableColumns) {
-            if (Array.isArray(col.keys) && col.keys.length === 1) rowKey.push(col);
-        }
-        console.log("rowKey", rowKey);
-
-        for (const d of canReadData) {
-            let t: any = rowMp;
-            for (let i = 0; i < rowKey.length; i++) {
-                const key = rowKey[i].title;
-                if (t[d[key]] === undefined) {
-                    if (i !== rowKey.length - 1) t[d[key]] = {};
-                    else t[d[key]] = [];
-                }
-                t = t[d[key]];
-            }
-            if (Array.isArray(t)) t.push(d);
+    // 计算列
+    if (
+      subtotalYColumn &&
+      Array.isArray(subtotalYColumn) &&
+      subtotalYColumn.length
+    ) {
+      // col
+      let tnodes = [];
+
+      for (let i = 0; i < subtotalYColumn.length; i++) {
+        const y = subtotalYColumn[i];
+        const id = y.id;
+        const mp = {};
+        let _tnodes = [];
+        for (const d of data) mp[d[id]] = colIdToNameMp[id];
+        for (const [k, v] of Object.entries(mp)) {
+          const tnode = {
+            title: k,
+            _type: v,
+            children: [...this.deepClone(i === 0 ? colMp.fact : tnodes)],
+          };
+          _tnodes.push(tnode);
         }
 
-        // 行数据处理完毕
-        console.log("rowMp", rowMp);
-
-        // 处理列
-        const colKey = [];
-        const colKeyTitle = this.flatSummaryCol(proSummaryTableColumns);
-        for (const col of proSummaryTableColumns) {
-            if (
-                (col.statColType === "fact" || Array.isArray(col.children)) &&
-                col.TYPE === undefined
-            ) {
-                colKey.push(col);
-            }
-        }
-        const flatSummaryColTitle = this.flatSummaryCol(colKey);
-        const flatSummaryRowTitle = this.flatSummaryCol(rowKey);
-        const flatSummaryCalTitle = this.flatSummaryCol(
-            proSummaryTableColumns.filter(({TYPE}) => TYPE !== undefined)
-        );
-        console.log("colKey", colKey);
-        console.log("colKeyTitle", colKeyTitle);
-        console.log("flatSummaryColTitle", flatSummaryColTitle);
-        console.log("flatSummaryRowTitle", flatSummaryRowTitle);
-        console.log("flatSummaryCalTitle", flatSummaryCalTitle);
-
-        proSummaryTableData = this.handleColData(
-            rowMp,
-            flatSummaryRowTitle,
-            flatSummaryColTitle,
-            flatSummaryCalTitle,
-            cal
+        this.buildColTag(_tnodes);
+        console.log("_tnodes", JSON.parse(JSON.stringify(_tnodes)));
+
+        const sumCol = {
+          title: calTxt,
+          children: [...this.deepClone(colMp.fact)],
+          TYPE: cal,
+        };
+        this.buildColTag([sumCol]);
+        this.setSumColKeys(sumCol, this.getCurCalKeys(_tnodes));
+        _tnodes.unshift(sumCol);
+
+        tnodes = _tnodes;
+        proSummaryTableColumns.splice(
+          proSummaryTableColumns.findIndex((item) => item.dataIndex === id),
+          1
         );
+      }
+      proSummaryTableColumns.push(...tnodes);
+    } else {
+      proSummaryTableColumns.push(...colMp.fact);
+    }
 
-        excludeGroupSumData = this.deepClone(proSummaryTableData);
-        console.log("excludeGroupSumData", excludeGroupSumData);
+    // buildData
+    this.buildColTag(proSummaryTableColumns);
 
-        if (
-            subtotalXColumn &&
-            Array.isArray(subtotalXColumn) &&
-            subtotalXColumn.length
-        ) {
-            const sortKeys = subtotalXColumn.map(({id}) => colIdToNameMp[id]);
-
-            const rowSumMp = this.buildRowMp(proSummaryTableData, sortKeys);
-            console.log("rowSumMp", rowSumMp);
-
-            const calRowKeys = [
-                ...flatSummaryCalTitle,
-                ...flatSummaryColTitle,
-            ].map((i) => this.buildKeys(i));
-            console.log("calRowKeys", calRowKeys);
-
-            proSummaryTableData = this.handleRowData(
-                rowSumMp,
-                calRowKeys,
-                cal,
-                calTxt,
-                sortKeys[0]
-            );
-        }
-
-        // 序号
-        if (columns[0].title === "序号") {
-            const col: any = {dataIndex: "序号", title: "序号", width: 160};
-            if (columns[0].colWidth) {
-                col.width = columns[0].colWidth;
-            }
-            proSummaryTableColumns.unshift(col);
-            proSummaryTableData.forEach((_, idx) => {
-                _["序号"] = idx + 1;
-            });
+    // 处理行
+    const rowMp = {};
+    const rowKey = [];
+    for (const col of proSummaryTableColumns) {
+      if (Array.isArray(col.keys) && col.keys.length === 1) rowKey.push(col);
+    }
+    console.log("rowKey", rowKey);
+
+    for (const d of canReadData) {
+      let t: any = rowMp;
+      for (let i = 0; i < rowKey.length; i++) {
+        const key = rowKey[i].title;
+        if (t[d[key]] === undefined) {
+          if (i !== rowKey.length - 1) t[d[key]] = {};
+          else t[d[key]] = [];
         }
+        t = t[d[key]];
+      }
+      if (Array.isArray(t)) t.push(d);
+    }
 
-        // 做总计
-        if (
-            this.props.summaryConfigs &&
-            this.props.summaryConfigs?.length !== 0 &&
-            flatSummaryRowTitle.length &&
-            proSummaryTableData.length
-        ) {
-            const calkeys = [
-                ...flatSummaryCalTitle,
-                ...flatSummaryColTitle,
-            ].map((i) => this.buildKeys(i));
-
-            const sumData = {
-                [proSummaryTableColumns[0]?.dataIndex]:
-                    cal === "sum" ? translate("${合计}") : translate("${均值}"),
-                _type: cal,
-                _calRange: "all",
-            };
+    // 行数据处理完毕
+    console.log("rowMp", rowMp);
+
+    // 处理列
+    const colKey = [];
+    const colKeyTitle = this.flatSummaryCol(proSummaryTableColumns);
+    for (const col of proSummaryTableColumns) {
+      if (
+        (col.statColType === "fact" || Array.isArray(col.children)) &&
+        col.TYPE === undefined
+      ) {
+        colKey.push(col);
+      }
+    }
+    const flatSummaryColTitle = this.flatSummaryCol(colKey);
+    const flatSummaryRowTitle = this.flatSummaryCol(rowKey);
+    const flatSummaryCalTitle = this.flatSummaryCol(
+      proSummaryTableColumns.filter(({ TYPE }) => TYPE !== undefined)
+    );
+    console.log("colKey", colKey);
+    console.log("colKeyTitle", colKeyTitle);
+    console.log("flatSummaryColTitle", flatSummaryColTitle);
+    console.log("flatSummaryRowTitle", flatSummaryRowTitle);
+    console.log("flatSummaryCalTitle", flatSummaryCalTitle);
+
+    proSummaryTableData = this.handleColData(
+      rowMp,
+      flatSummaryRowTitle,
+      flatSummaryColTitle,
+      flatSummaryCalTitle,
+      cal
+    );
 
-            for (const key of calkeys) {
-                if (cal === "sum")
-                    sumData[key] = excludeGroupSumData.reduce(
-                        (last, d) => last.plus(BigNumber(d[key])),
-                        BigNumber(0)
-                    );
-                if (cal === "avg")
-                    sumData[key] = excludeGroupSumData.reduce(
-                        (last, d) =>
-                            last.plus(BigNumber(d[key]).div(excludeGroupSumData.length)),
-                        BigNumber(0)
-                    );
-                sumData[key] = sumData[key]?.toString();
-            }
-            proSummaryTableData.push(sumData);
-        }
+    excludeGroupSumData = this.deepClone(proSummaryTableData);
+    console.log("excludeGroupSumData", excludeGroupSumData);
 
-        // 给小计和总计染色
-        this.stain(proSummaryTableColumns);
+    if (
+      subtotalXColumn &&
+      Array.isArray(subtotalXColumn) &&
+      subtotalXColumn.length
+    ) {
+      const sortKeys = subtotalXColumn.map(({ id }) => colIdToNameMp[id]);
 
-        // 排序
-        proSummaryTableColumns = proSummaryTableColumns.sort((a, b) => {
-            return a.order < b.order ? -1 : 1;
-        });
+      const rowSumMp = this.buildRowMp(proSummaryTableData, sortKeys);
+      console.log("rowSumMp", rowSumMp);
 
-        console.log("proSummaryTableColumns", proSummaryTableColumns);
-        console.log("proSummaryTableData", proSummaryTableData);
+      const calRowKeys = [
+        ...flatSummaryCalTitle,
+        ...flatSummaryColTitle,
+      ].map((i) => this.buildKeys(i));
+      console.log("calRowKeys", calRowKeys);
 
-        return {proSummaryTableColumns, proSummaryTableData};
+      proSummaryTableData = this.handleRowData(
+        rowSumMp,
+        calRowKeys,
+        cal,
+        calTxt,
+        sortKeys[0]
+      );
     }
 
-    flatSummaryCol(arr, res = []) {
-        for (const i of arr) {
-            if (!i.children) res.push(i.keys);
-            else this.flatSummaryCol(i.children, res);
-        }
-
-        return res;
+    // 序号
+    if (columns[0].title === "序号") {
+      const col: any = { dataIndex: "序号", title: "序号", width: 160 };
+      if (columns[0].colWidth) {
+        col.width = columns[0].colWidth;
+      }
+      proSummaryTableColumns.unshift(col);
+      proSummaryTableData.forEach((_, idx) => {
+        _["序号"] = idx + 1;
+      });
     }
 
-    handleColData(
-        rowMp,
-        flatSummaryRowTitle,
-        flatSummaryColTitle,
-        flatSummaryCalTitle,
-        cal,
-        idx = 0,
-        data = {},
-        list = []
+    // 做总计
+    if (
+      this.props.summaryConfigs &&
+      this.props.summaryConfigs?.length !== 0 &&
+      flatSummaryRowTitle.length &&
+      proSummaryTableData.length
     ) {
-        if (Array.isArray(rowMp)) {
-            for (const col of flatSummaryColTitle) {
-                const key = this.buildKeys(col);
-                const colTarget = [];
-                const preConditions = col.slice(0, col.length - 1);
-                const targetKey = col.slice(col.length - 1)[0].title;
-                for (const d of rowMp) {
-                    if (
-                        preConditions.every(({dataKey, title}) => d[dataKey] === title)
-                    ) {
-                        colTarget.push(d);
-                    }
-                }
+      const calkeys = [
+        ...flatSummaryCalTitle,
+        ...flatSummaryColTitle,
+      ].map((i) => this.buildKeys(i));
+
+      const sumData = {
+        [proSummaryTableColumns[0]?.dataIndex]:
+          cal === "sum" ? translate("${合计}") : translate("${均值}"),
+        _type: cal,
+        _calRange: "all",
+      };
+
+      for (const key of calkeys) {
+        if (cal === "sum")
+          sumData[key] = excludeGroupSumData.reduce(
+            (last, d) => last.plus(BigNumber(d[key])),
+            BigNumber(0)
+          );
+        if (cal === "avg")
+          sumData[key] = excludeGroupSumData.reduce(
+            (last, d) =>
+              last.plus(BigNumber(d[key]).div(excludeGroupSumData.length)),
+            BigNumber(0)
+          );
+        sumData[key] = sumData[key]?.toString();
+      }
+      proSummaryTableData.push(sumData);
+    }
 
-                if (data[key] === undefined || data[key] == "") {
-                    data[key] = BigNumber(0);
-                }
-                if (cal === "sum")
-                    data[key] = colTarget.reduce(
-                        (last, d) => last.plus(BigNumber(d[targetKey])),
-                        BigNumber(0)
-                    );
-                if (cal === "avg")
-                    data[key] = colTarget.reduce(
-                        (last, d) =>
-                            last.plus(BigNumber(d[targetKey]).div(colTarget.length)),
-                        BigNumber(0)
-                    );
-                data[key] =
-                    data[key]?.toString() == "NaN" ? "0" : data[key]?.toString();
-            }
+    // 给小计和总计染色
+    this.stain(proSummaryTableColumns);
 
-            for (const calCol of flatSummaryCalTitle) {
-                const key = this.buildKeys(calCol);
-                const sumDataIndex = calCol[calCol.length - 1].sumDataIndex;
-
-                if (data[key] === undefined || data[key] == "")
-                    data[key] = BigNumber(0);
-                if (cal === "sum")
-                    data[key] = sumDataIndex.reduce(
-                        (last, dataKey) => last.plus(BigNumber(data[dataKey])),
-                        BigNumber(0)
-                    );
-                if (cal === "avg")
-                    data[key] = sumDataIndex.reduce(
-                        (last, dataKey) =>
-                            last.plus(BigNumber(data[dataKey]).div(sumDataIndex.length)),
-                        BigNumber(0)
-                    );
-                data[key] = data[key]?.toString();
-            }
-            // debugger
-            list.push(data);
-        } else {
-            for (const [k, v] of Object.entries(rowMp)) {
-                const dataKey = flatSummaryRowTitle[idx][0].dataKey;
-                data[dataKey] = k;
-                this.handleColData(
-                    v,
-                    flatSummaryRowTitle,
-                    flatSummaryColTitle,
-                    flatSummaryCalTitle,
-                    cal,
-                    idx + 1,
-                    this.deepClone(data),
-                    list
-                );
-            }
-        }
+    // 排序
+    proSummaryTableColumns = proSummaryTableColumns.sort((a, b) => {
+      return a.order < b.order ? -1 : 1;
+    });
 
-        return list;
-    }
+    console.log("proSummaryTableColumns", proSummaryTableColumns);
+    console.log("proSummaryTableData", proSummaryTableData);
 
-    buildRowMp(data, sortKeys, idx = 0, mp = {}) {
-        if (idx >= sortKeys.length) return data;
+    return { proSummaryTableColumns, proSummaryTableData };
+  }
 
-        const dataKey = sortKeys[idx];
+  flatSummaryCol(arr, res = []) {
+    for (const i of arr) {
+      if (!i.children) res.push(i.keys);
+      else this.flatSummaryCol(i.children, res);
+    }
 
-        for (const d of data) {
-            if (mp[d[dataKey]] === undefined) mp[d[dataKey]] = [];
-            mp[d[dataKey]].push(d);
+    return res;
+  }
+
+  handleColData(
+    rowMp,
+    flatSummaryRowTitle,
+    flatSummaryColTitle,
+    flatSummaryCalTitle,
+    cal,
+    idx = 0,
+    data = {},
+    list = []
+  ) {
+    if (Array.isArray(rowMp)) {
+      for (const col of flatSummaryColTitle) {
+        const key = this.buildKeys(col);
+        const colTarget = [];
+        const preConditions = col.slice(0, col.length - 1);
+        const targetKey = col.slice(col.length - 1)[0].title;
+        for (const d of rowMp) {
+          if (
+            preConditions.every(({ dataKey, title }) => d[dataKey] === title)
+          ) {
+            colTarget.push(d);
+          }
         }
 
-        for (const [k, v] of Object.entries(mp)) {
-            mp[k] = this.buildRowMp(v, sortKeys, idx + 1);
+        if (data[key] === undefined || data[key] == "") {
+          data[key] = BigNumber(0);
         }
+        if (cal === "sum")
+          data[key] = colTarget.reduce(
+            (last, d) => last.plus(BigNumber(d[targetKey])),
+            BigNumber(0)
+          );
+        if (cal === "avg")
+          data[key] = colTarget.reduce(
+            (last, d) =>
+              last.plus(BigNumber(d[targetKey]).div(colTarget.length)),
+            BigNumber(0)
+          );
+        data[key] =
+          data[key]?.toString() == "NaN" ? "0" : data[key]?.toString();
+      }
+
+      for (const calCol of flatSummaryCalTitle) {
+        const key = this.buildKeys(calCol);
+        const sumDataIndex = calCol[calCol.length - 1].sumDataIndex;
+
+        if (data[key] === undefined || data[key] == "")
+          data[key] = BigNumber(0);
+        if (cal === "sum")
+          data[key] = sumDataIndex.reduce(
+            (last, dataKey) => last.plus(BigNumber(data[dataKey])),
+            BigNumber(0)
+          );
+        if (cal === "avg")
+          data[key] = sumDataIndex.reduce(
+            (last, dataKey) =>
+              last.plus(BigNumber(data[dataKey]).div(sumDataIndex.length)),
+            BigNumber(0)
+          );
+        data[key] = data[key]?.toString();
+      }
+      // debugger
+      list.push(data);
+    } else {
+      for (const [k, v] of Object.entries(rowMp)) {
+        const dataKey = flatSummaryRowTitle[idx][0].dataKey;
+        data[dataKey] = k;
+        this.handleColData(
+          v,
+          flatSummaryRowTitle,
+          flatSummaryColTitle,
+          flatSummaryCalTitle,
+          cal,
+          idx + 1,
+          this.deepClone(data),
+          list
+        );
+      }
+    }
 
-        return mp;
+    return list;
+  }
+
+  buildRowMp(data, sortKeys, idx = 0, mp = {}) {
+    if (idx >= sortKeys.length) return data;
+
+    const dataKey = sortKeys[idx];
+
+    for (const d of data) {
+      if (mp[d[dataKey]] === undefined) mp[d[dataKey]] = [];
+      mp[d[dataKey]].push(d);
     }
 
-    handleRowData(data, calKeys, cal, calTxt, calTxtKey, res = []) {
-        for (const [k, v] of Object.entries(data)) {
-            if (Array.isArray(v)) {
-                const sumData = {
-                    [calTxtKey]: calTxt,
-                    _type: cal,
-                    _calRange: "small",
-                };
-                for (const calKey of calKeys) {
-                    if (cal === "sum")
-                        sumData[calKey] = v.reduce(
-                            (last, d) => last.plus(BigNumber(d[calKey])),
-                            BigNumber(0)
-                        );
-                    if (cal === "avg")
-                        sumData[calKey] = v.reduce(
-                            (last, d) => last.plus(BigNumber(d[calKey]).div(v.length)),
-                            BigNumber(0)
-                        );
-                    sumData[calKey] = sumData[calKey]?.toString();
-                }
+    for (const [k, v] of Object.entries(mp)) {
+      mp[k] = this.buildRowMp(v, sortKeys, idx + 1);
+    }
 
-                res.push(...v, sumData);
-            } else {
-                this.handleRowData(v, calKeys, cal, calTxt, calTxtKey, res);
-            }
+    return mp;
+  }
+
+  handleRowData(data, calKeys, cal, calTxt, calTxtKey, res = []) {
+    for (const [k, v] of Object.entries(data)) {
+      if (Array.isArray(v)) {
+        const sumData = {
+          [calTxtKey]: calTxt,
+          _type: cal,
+          _calRange: "small",
+        };
+        for (const calKey of calKeys) {
+          if (cal === "sum")
+            sumData[calKey] = v.reduce(
+              (last, d) => last.plus(BigNumber(d[calKey])),
+              BigNumber(0)
+            );
+          if (cal === "avg")
+            sumData[calKey] = v.reduce(
+              (last, d) => last.plus(BigNumber(d[calKey]).div(v.length)),
+              BigNumber(0)
+            );
+          sumData[calKey] = sumData[calKey]?.toString();
         }
 
-        return res;
+        res.push(...v, sumData);
+      } else {
+        this.handleRowData(v, calKeys, cal, calTxt, calTxtKey, res);
+      }
     }
 
-    stain(cols) {
-        for (const col of cols) {
-            if (Array.isArray(col.children)) {
-                this.stain(col.children);
-            } else {
-                col.render = function (text, record, index) {
-                    let className = "";
-                    if (record._type !== undefined) {
-                        if (record._calRange === "small") className = "xiaoji";
-                        else className = "zongji";
-                    }
-                    return <div className={className}>{text}</div>;
-                };
-            }
-        }
+    return res;
+  }
+
+  stain(cols) {
+    for (const col of cols) {
+      if (Array.isArray(col.children)) {
+        this.stain(col.children);
+      } else {
+        col.render = function(text, record, index) {
+          let className = "";
+          if (record._type !== undefined) {
+            if (record._calRange === "small") className = "xiaoji";
+            else className = "zongji";
+          }
+          return <div className={className}>{text}</div>;
+        };
+      }
     }
+  }
+
+  render() {
+    const {
+      pageInfo,
+      columns,
+      viewModels,
+      summaryConfigs,
+      subtotalXColumn,
+      subtotalYColumn,
+      tableProps,
+      groupIColumns,
+    } = this.props;
+    const { touchEnd, total, loading, virtualEndPageNo } = this.state;
+    const { translate } = this.context;
+
+    const isProSumarryTable = Boolean(subtotalXColumn || subtotalYColumn);
+
+    const {
+      proSummaryTableColumns,
+      proSummaryTableData,
+    } = this.handleProSummaryTable(this.getUnHidenDataSource());
+
+    let current_cols = isProSumarryTable
+      ? proSummaryTableColumns
+      : columns
+      ? columns
+      : [];
+    console.log(current_cols);
+    let table_x = 20;
+    current_cols.forEach((c) => {
+      table_x = table_x + (c.width ? c.width : 140);
+    });
+
+    return (
+      <>
+        {viewModels.includes("table") ? (
+          <Table
+            size={tableProps.size ? tableProps.size : undefined}
+            rowSelection={this.getRowSelection()}
+            columns={current_cols}
+            dataSource={
+              isProSumarryTable
+                ? proSummaryTableData
+                : this.getUnHidenDataSource()
+            }
+            //tableLayout={'fixed'}
+            //sticky
+            scroll={
+              tableProps.scrollY == -1
+                ? null
+                : {
+                    y: tableProps.scrollY == 0 ? 420 : tableProps.scrollY,
+                    x: table_x,
+                  }
+            }
+            bordered
+            pagination={false}
+            style={{ display: columns ? "block" : "none" }}
+            summary={(pageData) => {
+              if (
+                !summaryConfigs ||
+                summaryConfigs?.length === 0 ||
+                pageData.length === 0
+              )
+                return <></>;
+
+              const columns = isProSumarryTable
+                ? proSummaryTableColumns
+                : this.props.columns;
+
+              const sumConfigs: {
+                sum: { value: string; id: string; columnConfig?: any }[];
+                avg: { value: string; id: string; columnConfig?: any }[];
+              } = { sum: [], avg: [] };
+
+              if (this.getRowSelection()) {
+                sumConfigs["avg"].push({
+                  value: "",
+                  id: "",
+                  columnConfig: { align: "center" },
+                });
+                sumConfigs["sum"].push({
+                  value: "",
+                  id: "",
+                  columnConfig: { align: "center" },
+                });
+              }
+
+              sumConfigs["sum"].push({
+                value: translate("${合计}"),
+                id: "title",
+                columnConfig: { align: "center" },
+              });
+              sumConfigs["avg"].push({
+                value: translate("${均值}"),
+                id: "title",
+                columnConfig: { align: "center" },
+              });
+
+              let sumLen = 0,
+                avgLen = 0;
+
+              for (let i = 0; i < columns.length; i++) {
+                const idx = i,
+                  dataIndex = columns[i].dataIndex;
+                if (idx === 0) continue;
+                const sum = { value: "", id: "", columnConfig: columns[i] };
+                const sumConfigIdx = summaryConfigs.findIndex(
+                  ({ id }) => id === dataIndex
+                );
+                if (sumConfigIdx === -1) {
+                  sumConfigs["sum"].push(sum);
+                  sumConfigs["avg"].push(sum);
+                  continue;
+                }
+                const argFun = summaryConfigs[sumConfigIdx].aggFunc;
+                if (argFun === "sum")
+                  sum.value = pageData
+                    .reduce(
+                      (lastNum, item) =>
+                        lastNum.plus(
+                          new BigNumber(
+                            this.getTableSummaryNumberValue(item[dataIndex])
+                          )
+                        ),
+                      new BigNumber(0)
+                    )
+                    ?.toString();
+                if (argFun === "avg")
+                  sum.value = pageData
+                    .reduce(
+                      (lastNum, item) =>
+                        lastNum.plus(
+                          new BigNumber(
+                            this.getTableSummaryNumberValue(item[dataIndex])
+                          ).div(pageData.length)
+                        ),
+                      new BigNumber(0)
+                    )
+                    ?.toString();
+
+                const hash = (...args) => args.join("-");
+                const hashKey = (data, keys) =>
+                  hash(...keys.map((key) => data[key]));
+
+                if (argFun === "groupIsum") {
+                  const allKeys = groupIColumns?.map(({ id }) => id);
+                  const set = new Set();
+
+                  console.log(columns + "组件加和: ", [...set]);
+
+                  sum.value = pageData
+                    .reduce((lastNum, item) => {
+                      if (set.has(hashKey(item, allKeys))) return lastNum;
+                      set.add(hashKey(item, allKeys));
+                      return lastNum.plus(
+                        new BigNumber(
+                          this.getTableSummaryNumberValue(item[dataIndex])
+                        )
+                      );
+                    }, new BigNumber(0))
+                    ?.toString();
+                }
 
-    render() {
-        const {
-            pageInfo,
-            columns,
-            viewModels,
-            summaryConfigs,
-            subtotalXColumn,
-            subtotalYColumn,
-            tableProps,
-            groupIColumns,
-        } = this.props;
-        const {touchEnd, total, loading, virtualEndPageNo} = this.state;
-        const {translate} = this.context;
-
-        const isProSumarryTable = Boolean(subtotalXColumn || subtotalYColumn);
-
-        const {
-            proSummaryTableColumns,
-            proSummaryTableData,
-        } = this.handleProSummaryTable(this.getUnHidenDataSource());
-
-        let current_cols = isProSumarryTable
-            ? proSummaryTableColumns
-            : columns
-                ? columns
-                : [];
-        console.log(current_cols);
-        let table_x = 20;
-        current_cols.forEach((c) => {
-            table_x = table_x + (c.width ? c.width : 140);
-        });
+                if (argFun === "groupIavg") {
+                  const set = new Set();
+                  let nums = 0;
+                  const allKeys = groupIColumns?.map(({ id }) => id);
+
+                  pageData.forEach((item) => {
+                    if (set.has(hashKey(item, allKeys))) return;
+                    set.add(hashKey(item, allKeys));
+
+                    nums++;
+                  });
+
+                  set.clear();
+
+                  sum.value = pageData
+                    .reduce((lastNum, item) => {
+                      if (set.has(hashKey(item, allKeys))) return lastNum;
+                      set.add(hashKey(item, allKeys));
+                      return lastNum.plus(
+                        new BigNumber(
+                          this.getTableSummaryNumberValue(item[dataIndex])
+                        ).div(nums)
+                      );
+                    }, new BigNumber(0))
+                    ?.toString();
+                }
 
-        return (
-            <>
-                {viewModels.includes("table") ? (
-                    <Table
-                        size={tableProps.size ? tableProps.size : undefined}
-                        rowSelection={this.getRowSelection()}
-                        columns={current_cols}
-                        dataSource={
-                            isProSumarryTable
-                                ? proSummaryTableData
-                                : this.getUnHidenDataSource()
-                        }
-                        //tableLayout={'fixed'}
-                        //sticky
-                        scroll={
-                            tableProps.scrollY == -1
-                                ? null
-                                : {
-                                    y: tableProps.scrollY == 0 ? 420 : tableProps.scrollY,
-                                    x: table_x,
-                                }
-                        }
-                        bordered
-                        pagination={false}
-                        style={{display: columns ? "block" : "none"}}
-                        summary={(pageData) => {
-                            if (
-                                !summaryConfigs ||
-                                summaryConfigs?.length === 0 ||
-                                pageData.length === 0
-                            )
-                                return <></>;
-
-                            const columns = isProSumarryTable
-                                ? proSummaryTableColumns
-                                : this.props.columns;
-
-                            const sumConfigs: {
-                                sum: { value: string; id: string; columnConfig?: any }[];
-                                avg: { value: string; id: string; columnConfig?: any }[];
-                            } = {sum: [], avg: []};
-
-                            if (this.getRowSelection()) {
-                                sumConfigs["avg"].push({
-                                    value: "",
-                                    id: "",
-                                    columnConfig: {align: "center"},
-                                });
-                                sumConfigs["sum"].push({
-                                    value: "",
-                                    id: "",
-                                    columnConfig: {align: "center"},
-                                });
-                            }
-
-                            sumConfigs["sum"].push({
-                                value: translate("${合计}"),
-                                id: "title",
-                                columnConfig: {align: "center"},
-                            });
-                            sumConfigs["avg"].push({
-                                value: translate("${均值}"),
-                                id: "title",
-                                columnConfig: {align: "center"},
-                            });
-
-                            let sumLen = 0,
-                                avgLen = 0;
-
-                            for (let i = 0; i < columns.length; i++) {
-                                const idx = i,
-                                    dataIndex = columns[i].dataIndex;
-                                if (idx === 0) continue;
-                                const sum = {value: "", id: "", columnConfig: columns[i]};
-                                const sumConfigIdx = summaryConfigs.findIndex(
-                                    ({id}) => id === dataIndex
-                                );
-                                if (sumConfigIdx === -1) {
-                                    sumConfigs["sum"].push(sum);
-                                    sumConfigs["avg"].push(sum);
-                                    continue;
-                                }
-                                const argFun = summaryConfigs[sumConfigIdx].aggFunc;
-                                if (argFun === "sum")
-                                    sum.value = pageData
-                                        .reduce(
-                                            (lastNum, item) =>
-                                                lastNum.plus(
-                                                    new BigNumber(
-                                                        this.getTableSummaryNumberValue(item[dataIndex])
-                                                    )
-                                                ),
-                                            new BigNumber(0)
-                                        )
-                                        ?.toString();
-                                if (argFun === "avg")
-                                    sum.value = pageData
-                                        .reduce(
-                                            (lastNum, item) =>
-                                                lastNum.plus(
-                                                    new BigNumber(
-                                                        this.getTableSummaryNumberValue(item[dataIndex])
-                                                    ).div(pageData.length)
-                                                ),
-                                            new BigNumber(0)
-                                        )
-                                        ?.toString();
-                                if (argFun === "groupIsum") {
-                                    const key = groupIColumns[0].id;
-                                    const set = new Set();
-                                    sum.value = pageData
-                                        .reduce((lastNum, item) => {
-                                            if (set.has(item[key])) return lastNum;
-                                            set.add(item[key]);
-                                            return lastNum.plus(
-                                                new BigNumber(
-                                                    this.getTableSummaryNumberValue(item[dataIndex])
-                                                )
-                                            );
-                                        }, new BigNumber(0))
-                                        ?.toString();
-                                }
-                                if (argFun === "groupIavg") {
-                                    const key = groupIColumns[0].id;
-                                    const set = new Set();
-                                    let nums = 0;
-
-                                    pageData.forEach((item) => {
-                                        if (set.has(item[key])) return;
-                                        set.add(item[key]);
-
-                                        nums++;
-                                    });
-
-                                    set.clear();
-
-                                    sum.value = pageData
-                                        .reduce((lastNum, item) => {
-                                            if (set.has(item[key])) return lastNum;
-                                            set.add(item[key]);
-                                            return lastNum.plus(
-                                                new BigNumber(
-                                                    this.getTableSummaryNumberValue(item[dataIndex])
-                                                ).div(nums)
-                                            );
-                                        }, new BigNumber(0))
-                                        ?.toString();
-                                }
-
-                                sum.id = dataIndex;
-                                if (argFun === "avg" || argFun === "groupIavg") {
-                                    sumConfigs["avg"].push(sum);
-                                    avgLen++;
-                                } else sumConfigs["avg"].push({value: "", id: ""});
-
-                                if (argFun === "sum" || argFun === "groupIsum") {
-                                    sumConfigs["sum"].push(sum);
-                                    sumLen++;
-                                } else sumConfigs["sum"].push({value: "", id: ""});
-                            }
-
-                            console.log("sumConfigs", sumConfigs, sumLen, avgLen);
-
-                            return (
-                                <>
-                                    {sumLen === 0 ? (
-                                        <></>
-                                    ) : (
-                                        <Table.Summary.Row>
-                                            {sumConfigs["sum"].map(
-                                                ({id, value, columnConfig}, idx) => (
-                                                    <Table.Summary.Cell
-                                                        align={columnConfig?.align}
-                                                        index={idx}
-                                                        className="zongji"
-                                                    >
-                                                        {value}
-                                                    </Table.Summary.Cell>
-                                                )
-                                            )}
-                                        </Table.Summary.Row>
-                                    )}
-                                    {avgLen === 0 ? (
-                                        <></>
-                                    ) : (
-                                        <Table.Summary.Row>
-                                            {sumConfigs["avg"].map(
-                                                ({id, value, columnConfig}, idx) => (
-                                                    <Table.Summary.Cell
-                                                        align={columnConfig?.align}
-                                                        index={idx}
-                                                        className="zongji"
-                                                    >
-                                                        {value}
-                                                    </Table.Summary.Cell>
-                                                )
-                                            )}
-                                        </Table.Summary.Row>
-                                    )}
-                                </>
-                            );
-                        }}
-                        loading={loading}
-                        components={{
-                            body: {
-                                wrapper: this.DraggableContainer,
-                                row: this.DraggableBodyRow,
-                            },
-                        }}
-                    ></Table>
-                ) : (
-                    ""
-                )}
-                <Pagination
-                    touchEnd={touchEnd}
-                    pageInfo={{...pageInfo, virtualEndPageNo}}
-                    pageTo={this.pageTo}
-                    queryTotal={this.queryTotal}
-                    total={total}
-                />
-                {viewModels.includes("verticalList") ? (
-                    <Card style={{marginTop: "10px"}}>
-                        <List
-                            dataSource={this.getUnHidenDataSource()}
-                            renderItem={(item) => (
-                                <List.Item key={item["id"]}>
-                                    <Card size={"small"} bodyStyle={{padding: "4px"}}>
-                                        <Descriptions column={4}>
-                                            {this.initViewList(item)}
-                                        </Descriptions>
-                                    </Card>
-                                </List.Item>
-                            )}
-                        />
-                    </Card>
-                ) : (
-                    ""
-                )}
-            </>
-        );
-    }
+                sum.id = dataIndex;
+                if (argFun === "avg" || argFun === "groupIavg") {
+                  sumConfigs["avg"].push(sum);
+                  avgLen++;
+                } else sumConfigs["avg"].push({ value: "", id: "" });
+
+                if (argFun === "sum" || argFun === "groupIsum") {
+                  sumConfigs["sum"].push(sum);
+                  sumLen++;
+                } else sumConfigs["sum"].push({ value: "", id: "" });
+              }
+
+              console.log("sumConfigs", sumConfigs, sumLen, avgLen);
+
+              return (
+                <>
+                  {sumLen === 0 ? (
+                    <></>
+                  ) : (
+                    <Table.Summary.Row>
+                      {sumConfigs["sum"].map(
+                        ({ id, value, columnConfig }, idx) => (
+                          <Table.Summary.Cell
+                            align={columnConfig?.align}
+                            index={idx}
+                            className="zongji"
+                          >
+                            {value}
+                          </Table.Summary.Cell>
+                        )
+                      )}
+                    </Table.Summary.Row>
+                  )}
+                  {avgLen === 0 ? (
+                    <></>
+                  ) : (
+                    <Table.Summary.Row>
+                      {sumConfigs["avg"].map(
+                        ({ id, value, columnConfig }, idx) => (
+                          <Table.Summary.Cell
+                            align={columnConfig?.align}
+                            index={idx}
+                            className="zongji"
+                          >
+                            {value}
+                          </Table.Summary.Cell>
+                        )
+                      )}
+                    </Table.Summary.Row>
+                  )}
+                </>
+              );
+            }}
+            loading={loading}
+            components={{
+              body: {
+                wrapper: this.DraggableContainer,
+                row: this.DraggableBodyRow,
+              },
+            }}
+          ></Table>
+        ) : (
+          ""
+        )}
+        <Pagination
+          touchEnd={touchEnd}
+          pageInfo={{ ...pageInfo, virtualEndPageNo }}
+          pageTo={this.pageTo}
+          queryTotal={this.queryTotal}
+          total={total}
+        />
+        {viewModels.includes("verticalList") ? (
+          <Card style={{ marginTop: "10px" }}>
+            <List
+              dataSource={this.getUnHidenDataSource()}
+              renderItem={(item) => (
+                <List.Item key={item["id"]}>
+                  <Card size={"small"} bodyStyle={{ padding: "4px" }}>
+                    <Descriptions column={4}>
+                      {this.initViewList(item)}
+                    </Descriptions>
+                  </Card>
+                </List.Item>
+              )}
+            />
+          </Card>
+        ) : (
+          ""
+        )}
+      </>
+    );
+  }
 }
 
 export default QueryTable;