aldehyde 0.2.213 → 0.2.215

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

@@ -3,14 +3,10 @@ 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,
+  SelectedRow,QueryTableProps
 } from "../tmpl/interface";
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import Pagination from "./pagination";
@@ -33,43 +29,6 @@ interface CacheData {
   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; title: string; sourceId: string }[]; // 组间合计key
-  doSearch?: (params: object) => void;
-  sortColumnData?: string[];
-}
 
 interface QueryTableStat {
   queryDataCache?: Map<string, CacheData>;
@@ -112,11 +71,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
   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);
     }
@@ -1028,7 +982,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
   onChange(pagination, filters, sorter, extra) {
     console.log("params", pagination, filters, sorter, extra);
-    debugger
     if (extra.action === "sort") {
       const extParams: Record<string, string> = {};
       const sortColumnData = JSON.parse(
@@ -1046,11 +999,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         sortColumnData.splice(tgt, 1);
       }
 
-      // if(!sorter.order){
-      //   Object.assign(extParams, {
-      //     sortColIds: [],
-      //   });
-      // }else
         if (sorter.order === "ascend") {
         Object.assign(extParams, {
           sortColIds: [...sortColumnData, sorter.field + "_" + "desc"],
@@ -1177,6 +1125,191 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     // current_cols[10].onCell = (_, rowIdx) =>
     //   this.mergeRowInCol(_, rowIdx, 10, mergeMp, current_cols.length);
 
+   let 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();
+
+          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();
+        }
+
+        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();
+        }
+
+        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>
+            )}
+          </>
+      );
+    }
+
     return (
       <>
         {viewModels.includes("table") ? (
@@ -1185,8 +1318,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
             rowSelection={this.getRowSelection()}
             columns={current_cols}
             dataSource={originData}
-            //tableLayout={'fixed'}
-            //sticky
             scroll={
               tableProps.scrollY == -1 || tableProps.scrollY == 0
                 ? null
@@ -1198,190 +1329,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
             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();
-
-                  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();
-                }
-
-                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();
-                }
-
-                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>
-                  )}
-                </>
-              );
-            }}
+            summary={summary}
             loading={loading}
             components={{
               body: {

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

@@ -0,0 +1,116 @@
+import React, {useEffect, useState} from 'react'
+import "./index.css"
+import { ReportData, ReportTableProps} from "../tmpl/interface";
+
+import {Table} from "antd";
+import HcserviceV3 from "../tmpl/hcservice-v3";
+import {useLocale} from "../locale/useLocale";
+import ColumnBuilder from "./column/column-builder";
+
+
+
+// interface ReportTableState {
+//     dataSource?:object[],
+//     columnConfigs?:ColumnConfig[],
+//     loading?: boolean,
+// };
+
+
+const ReportTable=(props:ReportTableProps)=> {
+
+    const [loading, setLoading] = useState<boolean>(false);
+    const [dataSource, setDataSource] = useState<object[]>(undefined);
+    const [reportData, setReportData] = useState<ReportData>(undefined);
+
+    const { getServiceLangStr, translate} = useLocale();
+    const {tableProps,columns,queryKey,serverKey,leftFixedCols}=props
+
+    useEffect( () => {
+        const queryData = async () => {
+            if (queryKey) {
+                await loadData(queryKey.key,serverKey);
+            }
+        };
+        queryData()
+    }, [queryKey?.key]);
+
+
+
+    const loadData = async (
+        queryKey: string,serverKey:string
+    ) => {
+        setLoading(true);
+        let reportData: ReportData = await HcserviceV3.requestQueryReportData(
+                serverKey,
+                queryKey,getServiceLangStr()
+            );
+            if (reportData?.key != queryKey) {
+                return;
+            } else {
+                let dataSource: object[] = [];
+                if (reportData.entities) {
+                    reportData.entities.forEach((item, index) => {
+                        let row = {
+                            key: item.code,
+                            code: item.code, //增加code,为了删除操作
+                            ...item.fieldMap,
+                            index,
+                        };
+                        dataSource.push(row);
+                    });
+                }
+
+                setDataSource(dataSource);
+                setReportData(reportData);
+                setLoading(false);
+            }
+    }
+    const addColumnOnCell=(current_cols)=>{
+
+        if(!reportData){
+            return;
+        }
+        const {rowGrids}=reportData
+        current_cols.forEach((c) => {
+            if(rowGrids){
+                c.onCell=(record,index)=>{
+
+                  let rowGrid= rowGrids[record.code] ;
+                  if(rowGrid){
+                      return {
+                          ...rowGrid.cellMap[c.dataIndex]
+                      }
+                  }
+                }
+            }
+        });
+    }
+
+    let current_cols=reportData?.columnConfigs?ColumnBuilder.buildReportTableColumns({columnConfigs:reportData.columnConfigs,translate,leftFixedCols}):columns ;
+        let table_x = 20;
+
+        current_cols.forEach((c) => {
+            table_x = table_x + (c.width ? c.width : 140);
+        });
+    addColumnOnCell(current_cols);
+
+    return <Table
+        size={tableProps.size ? tableProps.size : undefined}
+        loading={loading}
+        //rowSelection={this.getRowSelection()}
+        columns={current_cols}
+        dataSource={dataSource}
+        scroll={
+            tableProps.scrollY == -1 || tableProps.scrollY == 0
+                ? null
+                : {
+                    y: tableProps.scrollY,
+                    x: table_x,
+                }
+        }
+        bordered
+        pagination={false}
+        style={{ display: columns ? "block" : "none" }}></Table>
+}
+
+export default ReportTable;

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -322,6 +322,22 @@ HCDataSource.requestAddDtmplConfig = async function(
   return addDtmplConfigMap.get(key);
 };
 
+// HCDataSource.requestReportData = async function(
+//     serverKey: string,
+//     sourceId: string
+// ) {
+//   if (!ltmplConfigMap.has(sourceId)) {
+//     ltmplConfigMap.set(
+//         sourceId,
+//         await HcserviceV3.requestLtmplConfig(serverKey, sourceId)
+//     );
+//     //加载枚举
+//     let res: LtmplConfigRes = ltmplConfigMap.get(sourceId);
+//     await loadEnumOfLtmplConfig(serverKey, res.ltmplConfig);
+//   }
+//   return ltmplConfigMap.get(sourceId);
+// };
+
 HCDataSource.getEnums = function(mstrucId: string): EnumItem[] {
   //这里是不是后续可以考虑防止串改
   return enumMap.get(mstrucId);

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

@@ -208,6 +208,20 @@ export default class HcserviceV3 {
     );
   }
 
+  static async requestQueryReportData(
+      serverKey:string,
+      queryKey:string,language:string
+){
+    let url="/v3/ltmpl/report-data";
+    let res = await Super.super({
+      url: url,
+      serverKey,
+      method: "GET",
+      query:{queryKey,language},
+    });
+    return res;
+}
+
   static async requestTtmplRootData(
     serverKey: string,
     sourceId: string,