aldehyde 0.2.119 → 0.2.121

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

@@ -1,6 +1,6 @@
 import React from "react";
 import { Card, Collapse, Descriptions, List } from "antd";
-import { Table } from "./control-table-x-axis-wrapper";
+import Table from "./control-table-x-axis-wrapper";
 import "./index.css";
 import {
   ActTableViewModel,
@@ -20,6 +20,7 @@ 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";
 const { Panel } = Collapse;
 const SortableItem = SortableElement((props) => <tr {...props} />);
 const SortableBody = SortableContainer((props) => <tbody {...props} />);
@@ -51,6 +52,7 @@ interface QueryTableProps {
   hiddenRowCodes?: string[];
   viewModel?: string;
   columnConfigs?: FieldConfig[];
+  summaryConfigs?: { id: string; aggFunc: "sum" | "avg" }[];
 }
 
 interface QueryTableStat {
@@ -306,7 +308,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     const formItemList = [];
     if (columnConfigs.length > 0) {
       columnConfigs.forEach((item, index) => {
-        if (item.id != "10000"  && item.id != "20000" &&  item.title != "操作" ) {
+        if (item.id != "10000" && item.id != "20000" && item.title != "操作") {
           const title = item.title;
           let fieldValue = data ? data[item.id] : undefined;
           if (title == "序号") {
@@ -341,9 +343,16 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     return formItemList;
   };
 
+  getTableSummaryNumberValue(value: "" | string[]) {
+    if (typeof value === "string") return Number(value);
+
+    return Number(value[0].split("@R@")[1]);
+  }
+
   render() {
-    const { pageInfo, columns, viewModels } = this.props;
+    const { pageInfo, columns, viewModels, summaryConfigs } = this.props;
     const { touchEnd, total, loading, virtualEndPageNo } = this.state;
+    const { translate } = this.context;
 
     return (
       <>
@@ -356,6 +365,115 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
             bordered
             pagination={false}
             style={{ display: columns ? "block" : "none" }}
+            summary={(pageData) => {
+              if (!summaryConfigs || summaryConfigs?.length === 0) return <></>;
+              const sumConfigs: {
+                sum: { value: string; id: string }[];
+                avg: { value: string; id: string }[];
+              } = { sum: [], avg: [] };
+
+              if (this.getRowSelection()) {
+                sumConfigs["avg"].push({
+                  value: "",
+                  id: "",
+                });
+                sumConfigs["sum"].push({
+                  value: "",
+                  id: "",
+                });
+              }
+
+              sumConfigs["sum"].push({
+                value: translate("合计"),
+                id: "title",
+              });
+              sumConfigs["avg"].push({
+                value: translate("均值"),
+                id: "title",
+              });
+
+              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: "" };
+                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();
+
+                sum.id = dataIndex;
+                if (argFun === "avg") {
+                  sumConfigs["avg"].push(sum);
+                  avgLen++;
+                } else sumConfigs["avg"].push({ value: "", id: "" });
+
+                if (argFun === "sum") {
+                  sumConfigs["sum"].push(sum);
+                  sumLen++;
+                } else sumConfigs["sum"].push({ value: "", id: "" });
+              }
+
+              return (
+                <>
+                  {sumLen === 0 ? (
+                    <></>
+                  ) : (
+                    <Table.Summary.Row>
+                      {sumConfigs["sum"].map(({ id, value }, idx) => (
+                        <Table.Summary.Cell index={idx}>
+                          {value}
+                        </Table.Summary.Cell>
+                      ))}
+                    </Table.Summary.Row>
+                  )}
+                  {avgLen === 0 ? (
+                    <></>
+                  ) : (
+                    <Table.Summary.Row>
+                      {sumConfigs["avg"].map(({ id, value }, idx) => (
+                        <Table.Summary.Cell index={idx}>
+                          {value}
+                        </Table.Summary.Cell>
+                      ))}
+                    </Table.Summary.Row>
+                  )}
+                </>
+              );
+            }}
             loading={loading}
             components={{
               body: {

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

@@ -10,7 +10,7 @@ import {
   Tooltip,
   Typography,
 } from "antd";
-import { Table } from "./control-table-x-axis-wrapper";
+import Table from "./control-table-x-axis-wrapper";
 import {
   AlignLeftOutlined,
   DeleteOutlined,
@@ -650,7 +650,7 @@ class RelationTable extends React.PureComponent<
               {fieldGroupConfig.min && (!value || value.length <= 0) ? (
                 <Text style={{ color: "red" }}>
                   {translate("${请选择或添加}")}
-                  {translate("${"+fieldGroupConfig.title +"}")}
+                  {translate("${" + fieldGroupConfig.title + "}")}
                 </Text>
               ) : null}
               <FormItem

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

@@ -719,7 +719,9 @@ export default class HcserviceV3 {
   }
 
   static getFileUrl(serverKey: string, path) {
-    const hydrocarbonToken = Units.hydrocarbonToken(Units.programCode(serverKey));
+    const hydrocarbonToken = Units.hydrocarbonToken(
+      Units.programCode(serverKey)
+    );
     let url =
       Units.joinPath(Units.api(serverKey), Units.joinPath("/v3/files", path)) +
       `?@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`;
@@ -727,7 +729,9 @@ export default class HcserviceV3 {
   }
 
   static getFileTxtUrl(serverKey: string, path) {
-    const hydrocarbonToken = Units.hydrocarbonToken(Units.programCode(serverKey));
+    const hydrocarbonToken = Units.hydrocarbonToken(
+      Units.programCode(serverKey)
+    );
     let url =
       Units.joinPath(
         Units.api(serverKey),
@@ -832,7 +836,7 @@ export default class HcserviceV3 {
     kaptchaText,
     pubkey,
     programCode?: string,
-    serverKey?:string
+    serverKey?: string
   ) {
     let datetime = dayjs(new Date())
       .tz("Europe/London")