aldehyde 0.2.122 → 0.2.124

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { Children } from "react";
 import { Card, Collapse, Descriptions, List } from "antd";
 import Table from "./control-table-x-axis-wrapper";
 import "./index.css";
@@ -53,6 +53,8 @@ interface QueryTableProps {
   viewModel?: string;
   columnConfigs?: FieldConfig[];
   summaryConfigs?: { id: string; aggFunc: "sum" | "avg" }[];
+  subtotalXColumn?: { id: string }[];
+  subtotalYColumn?: { id: string }[];
 }
 
 interface QueryTableStat {
@@ -74,6 +76,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     hiddenRowCodes: [],
     selectedRows: [],
     viewModels: ["table"],
+    summaryConfigs: [],
   };
 
   state = {
@@ -350,24 +353,505 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     return Number(value[0].split("@R@")[1]);
   }
 
+  deepClone(source, hash = new WeakMap()) {
+    if (typeof source !== "object" || source === null) {
+      return source;
+    }
+    if (hash.has(source)) {
+      return hash.get(source);
+    }
+    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 },
+        ]);
+      }
+    }
+  }
+
+  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;
+  }
+  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
+        );
+      }
+    }
+  }
+
+  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 (typeof v === "string" && (v as string)?.includes("@R@"))
+          d[k] = (v as string).split("@R@")[1];
+      }
+    }
+
+    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(JSON.parse(JSON.stringify(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)) {
+        item[colIdToNameMp[k]] = v;
+      }
+      canReadData.push(item);
+    }
+    console.log("canReadData", canReadData);
+
+    let proSummaryTableColumns = [
+        ...JSON.parse(JSON.stringify(colMp.dimension)),
+      ],
+      proSummaryTableData = [];
+
+    const cal = colMp.fact[0]?.cal;
+    const calTxt = cal === "sum" ? translate("合计") : translate("均值");
+
+    // 计算列
+    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: [
+              ...JSON.parse(JSON.stringify(i === 0 ? colMp.fact : tnodes)),
+            ],
+          };
+          _tnodes.push(tnode);
+        }
+
+        this.buildColTag(_tnodes);
+        console.log("_tnodes", JSON.parse(JSON.stringify(_tnodes)));
+
+        const sumCol = {
+          title: calTxt,
+          children: [...JSON.parse(JSON.stringify(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);
+    }
+
+    // buildData
+    this.buildColTag(proSummaryTableColumns);
+
+    // 处理行
+    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);
+    }
+
+    // 行数据处理完毕
+    console.log("rowMp", rowMp);
+
+    // 处理列
+    const colKey = [];
+    const colKeyTitle = this.flatSummaryCol(proSummaryTableColumns);
+    for (const col of proSummaryTableColumns) {
+      if (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
+    );
+
+    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 (
+      this.props.summaryConfigs &&
+      this.props.summaryConfigs?.length !== 0 &&
+      flatSummaryRowTitle.length
+    ) {
+      const calkeys = [
+        ...flatSummaryCalTitle,
+        ...flatSummaryColTitle,
+      ].map((i) => this.buildKeys(i));
+
+      const sumData = {
+        [flatSummaryRowTitle[0][0]?.dataKey]: calTxt,
+        _type: cal,
+        _calRange: "all",
+      };
+
+      for (const key of calkeys) {
+        if (cal === "sum")
+          sumData[key] = proSummaryTableData.reduce(
+            (last, d) => last.plus(BigNumber(d[key])),
+            BigNumber(0)
+          );
+        if (cal === "avg")
+          sumData[key] = proSummaryTableData.reduce(
+            (last, d) =>
+              last.plus(BigNumber(d[key]).div(proSummaryTableData.length)),
+            BigNumber(0)
+          );
+        sumData[key] = sumData[key]?.toString();
+      }
+      proSummaryTableData.push(sumData);
+    }
+
+    // 给小计和总计染色
+    this.stain(proSummaryTableColumns);
+
+    console.log("proSummaryTableColumns", proSummaryTableColumns);
+    console.log("proSummaryTableData", proSummaryTableData);
+
+    return { proSummaryTableColumns, proSummaryTableData };
+  }
+
+  flatSummaryCol(arr, res = []) {
+    for (const i of arr) {
+      if (!i.children) res.push(i.keys);
+      else this.flatSummaryCol(i.children, res);
+    }
+
+    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);
+          }
+        }
+
+        if (data[key] === undefined) 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();
+      }
+
+      for (const calCol of flatSummaryCalTitle) {
+        const key = this.buildKeys(calCol);
+        const sumDataIndex = calCol[calCol.length - 1].sumDataIndex;
+
+        if (data[key] === undefined) 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();
+      }
+      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,
+          JSON.parse(JSON.stringify(data)),
+          list
+        );
+      }
+    }
+
+    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);
+    }
+
+    for (const [k, v] of Object.entries(mp)) {
+      mp[k] = this.buildRowMp(v, sortKeys, idx + 1);
+    }
+
+    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();
+        }
+
+        res.push(...v, sumData);
+      } else {
+        this.handleRowData(v, calKeys, cal, calTxt, calTxtKey, res);
+      }
+    }
+
+    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 } = this.props;
+    const {
+      pageInfo,
+      columns,
+      viewModels,
+      summaryConfigs,
+      subtotalXColumn,
+      subtotalYColumn,
+    } = 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());
+
     return (
       <>
         {viewModels.includes("table") ? (
           <Table
             size={"middle"}
             rowSelection={this.getRowSelection()}
-            columns={columns ? columns : []}
-            dataSource={this.getUnHidenDataSource()}
+            columns={
+              isProSumarryTable
+                ? proSummaryTableColumns
+                : columns
+                ? columns
+                : []
+            }
+            dataSource={
+              isProSumarryTable
+                ? proSummaryTableData
+                : this.getUnHidenDataSource()
+            }
             bordered
             pagination={false}
             style={{ display: columns ? "block" : "none" }}
             summary={(pageData) => {
               if (!summaryConfigs || summaryConfigs?.length === 0) return <></>;
+
+              const columns = isProSumarryTable
+                ? proSummaryTableColumns
+                : this.props.columns;
+
               const sumConfigs: {
                 sum: { value: string; id: string }[];
                 avg: { value: string; id: string }[];
@@ -422,7 +906,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                         ),
                       new BigNumber(0)
                     )
-                    .toString();
+                    ?.toString();
                 if (argFun === "avg")
                   sum.value = pageData
                     .reduce(
@@ -434,7 +918,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                         ),
                       new BigNumber(0)
                     )
-                    .toString();
+                    ?.toString();
 
                 sum.id = dataIndex;
                 if (argFun === "avg") {
@@ -457,7 +941,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                   ) : (
                     <Table.Summary.Row>
                       {sumConfigs["sum"].map(({ id, value }, idx) => (
-                        <Table.Summary.Cell index={idx}>
+                        <Table.Summary.Cell index={idx} className="zongji">
                           {value}
                         </Table.Summary.Cell>
                       ))}
@@ -468,7 +952,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                   ) : (
                     <Table.Summary.Row>
                       {sumConfigs["avg"].map(({ id, value }, idx) => (
-                        <Table.Summary.Cell index={idx}>
+                        <Table.Summary.Cell index={idx} className="zongji">
                           {value}
                         </Table.Summary.Cell>
                       ))}

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -5,11 +5,17 @@ import { message } from "antd";
 import EncryptUtils from "../units/EncryptUtils";
 import "dayjs/locale/en";
 import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc";
+import timezone from "dayjs/plugin/timezone";
+
 import { CodeSource, DtmplConfig, PageInfo, SelectedRow } from "./interface";
 
 import { ProgramConfig } from "../index";
 import translate from "../locale/translate";
 
+dayjs.extend(utc);
+dayjs.extend(timezone);
+
 export default class HcserviceV3 {
   static async requestEnum(serverKey: string, mstrucIds, path: string) {
     if (!path) {

package/src/aldehyde/tmpl/interface.tsx

@@ -108,6 +108,7 @@ export interface CriteriaConfig extends FieldConfig {}
 export interface ColumnConfig extends FieldConfig {
   statColType?: StatColType;
   colWidth?: number;
+  id: string;
 }
 
 export type CodeSource = "new" | "listop" | "listop-new" | undefined;
@@ -310,6 +311,8 @@ export interface LtmplConfig extends SelectConfig {
   footer?: string;
   header?: string;
   totalColumnConfigs?: { id: string; aggFunc: "sum" | "avg"; title: string }[];
+  subtotalXColumn?: { id: string }[];
+  subtotalYColumn?: { id: string }[];
 }
 
 export interface EnumItem {