aldehyde 0.2.126 → 0.2.128

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

@@ -262,6 +262,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     let s = 0;
     let colConfigs = sortedColConfigs ? sortedColConfigs : ltmplConfig.columns;
 
+    let currentDataColIndex = 0;
+
     colConfigs.forEach((item) => {
       let column = {};
       if (!hiddenColIds || !hiddenColIds.includes(item.id)) {
@@ -272,6 +274,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       if (item["colWidth"]) column["width"] = item["colWidth"];
       if (item["statColType"]) column["statColType"] = item["statColType"];
       if (item["aggFunc"]) column["cal"] = item["aggFunc"];
+      if (item["order"]) column["order"] = Number(item["order"]);
       // column['ellipsis']= true;
       s++;
       let itemType = SupportInputTypes.getSupportControlType(item);
@@ -283,6 +286,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       //特殊列处理
       //序号
       if (item.title === "序号") {
+        column["width"] = item.colWidth ? item.colWidth : 50;
+        column["title"] = translate("${序号}");
         //item.fixed='left';
         column["render"] = (text, record, index) => <label>{index + 1}</label>;
         item["sorter"] = undefined;
@@ -299,7 +304,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       } else if (item.id == "20000") {
         //隐藏
         column["align"] = "center";
-        column["width"] = 14;
+        column["width"] = 40;
         column["title"] = (
           <>
             {hiddenRowCodes.length > 0 ? (
@@ -333,6 +338,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       } else if (item.title === "操作") {
         column["fixed"] = "right";
         column["align"] = "center";
+        column["width"] = item.colWidth ? item.colWidth : 160;
         column["className"] = "opsColumn";
         column["title"] = <>{translate("${操作}")}</>;
         column["render"] = (text, record) => (
@@ -517,8 +523,24 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           </Space>
         );
       } else {
+        currentDataColIndex++;
         column["className"] = "opsColumn";
         column["title"] = translate("${" + item.title + "}");
+        column["width"] = item.colWidth ? item.colWidth : 160;
+        column["ellipsis"] = { showTitle: true };
+        column["align"]=item.valueAlign?item.valueAlign:"left";
+        if (
+          ltmplConfig.leftFixedCols &&
+          ltmplConfig.leftFixedCols >= currentDataColIndex
+        ) {
+          column["fixed"] = "left";
+        } else {
+          column["fixed"] = item.colFixed
+            ? item.colFixed == "right"
+              ? "right"
+              : "left"
+            : false;
+        }
         column["render"] = (text, record) => {
           return (
             <ViewControl
@@ -1081,9 +1103,10 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
   criteriaFormUseful = () => {
     const { ltmplConfig } = this.props;
-    let { buttons, criterias,updrillButtonConfigs } = ltmplConfig;
+    let { buttons, criterias, updrillButtonConfigs } = ltmplConfig;
     if (
-      ((buttons.includes("query") || updrillButtonConfigs && updrillButtonConfigs.length>0) &&
+      ((buttons.includes("query") ||
+        (updrillButtonConfigs && updrillButtonConfigs.length > 0)) &&
         ((criterias && criterias.length > 0) ||
           buttons.includes("drilling"))) ||
       this.checkBoxUseful()

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

@@ -21,6 +21,7 @@ import ViewControl from "../controls/view-control";
 import Scrollbars from "react-custom-scrollbars";
 import { LocaleContext } from "../locale/LocaleProvider";
 import { BigNumber } from "bignumber.js";
+import Column from "antd/es/table/Column";
 const { Panel } = Collapse;
 const SortableItem = SortableElement((props) => <tr {...props} />);
 const SortableBody = SortableContainer((props) => <tbody {...props} />);
@@ -37,6 +38,11 @@ interface QueryTableProps {
     pageNo: number;
     pageSize: number;
   };
+  tableProps?: {
+    size?: "small" | "middle" | "large";
+    clickDisplayTotal?: boolean;
+    scrollY?: number;
+  };
   primaryColumn?: ColumnConfig;
   columns: any[];
   serverKey?: string;
@@ -73,6 +79,11 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       pageSize: 10,
       virtualEndPageNo: undefined,
     },
+    tableProps: {
+      size: "small",
+      clickDisplayTotal: false,
+      scrollY: 500,
+    },
     hiddenRowCodes: [],
     selectedRows: [],
     viewModels: ["table"],
@@ -168,7 +179,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     });
     let { queryDataCache } = this.state;
 
-    let { serverKey } = this.props;
+    let { serverKey, tableProps } = this.props;
     let queryCache: Map<string, CacheData>;
     if (cleanCache || !queryDataCache) {
       queryCache = new Map<string, CacheData>();
@@ -213,6 +224,11 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         touchEnd,
         loading: false,
       });
+
+      if (!tableProps.clickDisplayTotal) {
+        await this.queryTotal();
+      }
+      // }
     }
   };
 
@@ -349,7 +365,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
   getTableSummaryNumberValue(value: "" | string[]) {
     if (value === undefined || value === null) return 0;
     if (typeof value === "string") return Number(value);
-
     return Number(value[0].split("@R@")[1]);
   }
 
@@ -442,8 +457,11 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     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@"))
+        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];
+        }
       }
     }
 
@@ -457,7 +475,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       colIdToNameMp[col["dataIndex"]] = col["title"];
       colNameToIdMp[col["title"]] = col["dataIndex"];
       if (col.statColType !== undefined)
-        colMp[col.statColType].push(JSON.parse(JSON.stringify(col)));
+        colMp[col.statColType].push(this.deepClone(col));
     }
     console.log("colIdToNameMp", colIdToNameMp);
     console.log("colNameToIdMp", colNameToIdMp);
@@ -480,9 +498,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     }
     console.log("canReadData", canReadData);
 
-    let proSummaryTableColumns = [
-        ...JSON.parse(JSON.stringify(colMp.dimension)),
-      ],
+    let proSummaryTableColumns = [...this.deepClone(colMp.dimension)],
       proSummaryTableData = [],
       excludeGroupSumData = [];
 
@@ -508,9 +524,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           const tnode = {
             title: k,
             _type: v,
-            children: [
-              ...JSON.parse(JSON.stringify(i === 0 ? colMp.fact : tnodes)),
-            ],
+            children: [...this.deepClone(i === 0 ? colMp.fact : tnodes)],
           };
           _tnodes.push(tnode);
         }
@@ -520,7 +534,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
         const sumCol = {
           title: calTxt,
-          children: [...JSON.parse(JSON.stringify(colMp.fact))],
+          children: [...this.deepClone(colMp.fact)],
           TYPE: cal,
         };
         this.buildColTag([sumCol]);
@@ -595,7 +609,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       cal
     );
 
-    excludeGroupSumData = JSON.parse(JSON.stringify(proSummaryTableData));
+    excludeGroupSumData = this.deepClone(proSummaryTableData);
     console.log("excludeGroupSumData", excludeGroupSumData);
 
     if (
@@ -623,6 +637,18 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       );
     }
 
+    // 序号
+    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;
+      });
+    }
+
     // 做总计
     if (
       this.props.summaryConfigs &&
@@ -635,8 +661,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       ].map((i) => this.buildKeys(i));
 
       const sumData = {
-        [flatSummaryRowTitle[0][0]?.dataKey]:
-          cal === "sum" ? translate("合计") : translate("均值"),
+        [proSummaryTableColumns[0]?.dataIndex]:
+          cal === "sum" ? translate("${合计}") : translate("${均值}"),
         _type: cal,
         _calRange: "all",
       };
@@ -661,6 +687,11 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     // 给小计和总计染色
     this.stain(proSummaryTableColumns);
 
+    // 排序
+    proSummaryTableColumns = proSummaryTableColumns.sort((a, b) => {
+      return a.order < b.order ? -1 : 1;
+    });
+
     console.log("proSummaryTableColumns", proSummaryTableColumns);
     console.log("proSummaryTableData", proSummaryTableData);
 
@@ -700,7 +731,9 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           }
         }
 
-        if (data[key] === undefined) data[key] = BigNumber(0);
+        if (data[key] === undefined || data[key] == "") {
+          data[key] = BigNumber(0);
+        }
         if (cal === "sum")
           data[key] = colTarget.reduce(
             (last, d) => last.plus(BigNumber(d[targetKey])),
@@ -712,14 +745,16 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
               last.plus(BigNumber(d[targetKey]).div(colTarget.length)),
             BigNumber(0)
           );
-        data[key] = data[key]?.toString();
+        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] = BigNumber(0);
+        if (data[key] === undefined || data[key] == "")
+          data[key] = BigNumber(0);
         if (cal === "sum")
           data[key] = sumDataIndex.reduce(
             (last, dataKey) => last.plus(BigNumber(data[dataKey])),
@@ -733,6 +768,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           );
         data[key] = data[key]?.toString();
       }
+      // debugger
       list.push(data);
     } else {
       for (const [k, v] of Object.entries(rowMp)) {
@@ -745,7 +781,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           flatSummaryCalTitle,
           cal,
           idx + 1,
-          JSON.parse(JSON.stringify(data)),
+          this.deepClone(data),
           list
         );
       }
@@ -827,6 +863,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       summaryConfigs,
       subtotalXColumn,
       subtotalYColumn,
+      tableProps,
     } = this.props;
     const { touchEnd, total, loading, virtualEndPageNo } = this.state;
     const { translate } = this.context;
@@ -838,24 +875,39 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       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={"middle"}
+            size={tableProps.size ? tableProps.size : undefined}
             rowSelection={this.getRowSelection()}
-            columns={
-              isProSumarryTable
-                ? proSummaryTableColumns
-                : columns
-                ? columns
-                : []
-            }
+            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" }}
@@ -883,11 +935,11 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
               }
 
               sumConfigs["sum"].push({
-                value: translate("合计"),
+                value: translate("${合计}"),
                 id: "title",
               });
               sumConfigs["avg"].push({
-                value: translate("均值"),
+                value: translate("${均值}"),
                 id: "title",
               });
 

package/src/aldehyde/tmpl/control-type-supportor.tsx

@@ -52,6 +52,7 @@ SupportInputTypes.add('float');
 SupportInputTypes.add('double');
 SupportInputTypes.add('int');
 SupportInputTypes.add('relselect');
+SupportInputTypes.add('relselectvalue');
 SupportInputTypes.add('refselect');
 
 

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

@@ -208,7 +208,7 @@ export default class HcserviceV3 {
     url
   ) {
     if (!sourceId) {
-      message.error("SourceId is undefined!");
+      message.error("SourceId is undefined!",5);
     } else {
       let res = await Super.super({
         url: url,
@@ -236,7 +236,7 @@ export default class HcserviceV3 {
     if (res.status === "success") {
       return res.entities;
     } else {
-      message.error(translate("${没有找到实体}!"));
+      message.error(translate("${没有找到实体}!"),5);
       return null;
     }
   }
@@ -279,7 +279,7 @@ export default class HcserviceV3 {
     if (res.status === "success") {
       return res.entity;
     } else {
-      message.error(translate("${实体不存在}!"));
+      message.error(translate("${实体不存在}!"),5);
       return null;
     }
   }
@@ -409,7 +409,7 @@ export default class HcserviceV3 {
       // }
     } else {
       if (message) {
-        message.error(translate("${保存失败}!"));
+        message.error(translate("${保存失败}!"),5);
       }
     }
     return { code, status: res ? res.status : "error" };
@@ -541,12 +541,12 @@ export default class HcserviceV3 {
       if (item.code) {
         codes.push(item.code);
       } else {
-        message.error(translate("${没找到所选数据的Code}!!"));
+        message.error(translate("${没找到所选数据的Code}!!"),5);
       }
     }
 
     if (codes.length < 1) {
-      message.error(translate("${没找到所选数据的Code}!!"));
+      message.error(translate("${没找到所选数据的Code}!!"),5);
     }
 
     return codes;
@@ -575,7 +575,7 @@ export default class HcserviceV3 {
       message.success(translate("${删除成功}"), 1);
       return true;
     } else {
-      message.error(translate("${删除成功}"));
+      message.error(translate("${删除成功}"),5);
       //console.log("删除失败消息",res.message);
       return false;
     }

package/src/aldehyde/tmpl/interface.tsx

@@ -117,6 +117,8 @@ export interface CriteriaConfig extends FieldConfig {}
 export interface ColumnConfig extends FieldConfig {
   statColType?: StatColType;
   colWidth?: number;
+  colFixed?:"left"|'right'|boolean,
+  valueAlign?:"left"|'right'|'center',
   id: string;
 }
 
@@ -268,6 +270,8 @@ export interface SelectConfig extends TmplBase {
   orderColumn: ColumnConfig;
   totalColummConfigs?: ColumnConfig[];
   showDim?: boolean;
+  clickDisplayTotal?:boolean;
+  leftFixedCols?:number;
 }
 
 export interface TtmplConfigRes {

package/src/aldehyde/tmpl/model-struc-v3.tsx

@@ -33,7 +33,7 @@ export default class ModelStrucV3 {
       }
     } else {
       if (message) {
-        message.error(translate("${保存失败}!"));
+        message.error(translate("${保存失败}!"),5);
       }
     }
     return { code, status: res ? res.status : "error" };
@@ -61,12 +61,12 @@ export default class ModelStrucV3 {
         code = res.entityCode ? res.entityCode : res.code;
       } else {
         if (res.message) {
-          message.error(translate("${查询失败}!") + res.message, 6);
+          message.error(translate("${查询失败}!") + res.message, 5);
         }
       }
     } else {
       if (message) {
-        message.error(translate("${查询失败}!"));
+        message.error(translate("${查询失败}!"),5);
       }
     }
     return res ? res : { status: "error" };
@@ -94,12 +94,12 @@ export default class ModelStrucV3 {
         code = res.entityCode ? res.entityCode : res.code;
       } else {
         if (res.message) {
-          message.error(translate("${删除失败}!") + res.message, 6);
+          message.error(translate("${删除失败}!") + res.message, 5);
         }
       }
     } else {
       if (message) {
-        message.error(translate("${删除失败}!"));
+        message.error(translate("${删除失败}!"),5);
       }
     }
     return res;

package/src/aldehyde/tmpl/superagent.js

@@ -61,7 +61,7 @@ export default class Superagent {
               let result = res.body;
               if (result) {
                 if (result.status === "error") {
-                  message.error(translate("${错误消息}: ") + result.message, 6);
+                  message.error(translate("${错误消息}: ") + result.message, 5);
                 }
                 // else if(result.message){
                 //     message.warn(result.message,4)
@@ -74,7 +74,7 @@ export default class Superagent {
             } else if (res.status === 403) {
               Units.toLogin();
             } else if (res.status === 405 || res.status === 406) {
-              message.error(translate("${权限不足}"));
+              message.error(translate("${权限不足}"),5);
               resolve(res);
             } else if (res.status === 404 || res.status === 504) {
               //因为hydrogen v2 首次跳转时会报此错误，影响用户感受

package/src/aldehyde/units/index.tsx

@@ -528,6 +528,7 @@ export default {
         return defaultValue.startsWith("$$current");
     },
     configParamTrans(value: string) {
+
         if (value && value.startsWith && value.startsWith("$$current")) {
             return TmplConfigAnalysis.current(value);
         }