aldehyde 0.2.126 → 0.2.127

package/src/aldehyde/form/form-Item-group.tsx

@@ -163,7 +163,7 @@ export default class FormItemGroup extends React.PureComponent<
             </FormItem>
           );
         } else {
-          debugger;
+         // debugger;
           // console.log("getFieldValue ---", Form.useFormInstance());
           formItem = item.shouldUpdate ? (
             <FormItem noStyle shouldUpdate={item.shouldUpdate}>

package/src/aldehyde/layout/MainPage.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Layout } from "antd";
+import { Layout ,Affix} from "antd";
 import Footer from "./footer/index";
 import { BlockMenu } from "../tmpl/interface";
 import Header from "./header";
@@ -296,7 +296,7 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
                     }
               }
             >
-              <Header toggle={this.toggle} {...this.state} />
+              <Header   toggle={this.toggle} {...this.state} />
               <Content
                 style={{
                   margin: "24px 16px 0",

package/src/aldehyde/layout/header/index.tsx

@@ -25,7 +25,11 @@ const Header: React.FC<HeaderProps> = (props) => {
     "--antd-color-primary": token.colorPrimary,
   } as CSSProperties;
   return (
-    <AntdHeader style={{ padding: 0, height: "auto", minWidth: "760px" }}>
+    <AntdHeader  style={{position: 'sticky',
+        top: 0,
+        zIndex: 100,
+        width: '100%',
+         padding: 0, height: "auto", minWidth: "760px" }}>
       {/*<Row  justify="space-around" align="middle" style={{'background':'#0f4da1',height:'100px'}}>*/}
       {/*      <Col span={12}>*/}
       {/*          <img style={{height:'80px'}} src={Logo}></img>*/}

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)) {
@@ -283,6 +285,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       //特殊列处理
       //序号
       if (item.title === "序号") {
+        column["width"] = item.colWidth?item.colWidth:40;
         //item.fixed='left';
         column["render"] = (text, record, index) => <label>{index + 1}</label>;
         item["sorter"] = undefined;
@@ -299,7 +302,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 +336,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 +521,16 @@ 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}
+        if(ltmplConfig.leftFixedCols && ltmplConfig.leftFixedCols>=currentDataColIndex){
+          column["fixed"]="left";
+        }else{
+          column["fixed"]= item.fixed ? item.fixed =='right'?"right":"left":false;
+        }
         column["render"] = (text, record) => {
           return (
             <ViewControl

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

@@ -37,6 +37,11 @@ interface QueryTableProps {
     pageNo: number;
     pageSize: number;
   };
+  tableProps?:{
+    size?:"small"|"middle"|"large",
+    clickDisplayTotal?:boolean,
+    scrollY?:number,
+  };
   primaryColumn?: ColumnConfig;
   columns: any[];
   serverKey?: string;
@@ -73,6 +78,11 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       pageSize: 10,
       virtualEndPageNo: undefined,
     },
+    tableProps:{
+      size:"small",
+      clickDisplayTotal:false,
+      scrollY:500,
+    },
     hiddenRowCodes: [],
     selectedRows: [],
     viewModels: ["table"],
@@ -100,6 +110,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     // }
     if (queryKey) {
       await this.loadData(queryKey.key, pageInfo);
+
     }
   }
 
@@ -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();
+      }
+      // }
     }
   };
 
@@ -347,9 +363,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
   };
 
   getTableSummaryNumberValue(value: "" | string[]) {
-    if (value === undefined || value === null) return 0;
+    if (value === undefined || value === null ) return 0;
     if (typeof value === "string") return Number(value);
-
     return Number(value[0].split("@R@")[1]);
   }
 
@@ -442,8 +457,12 @@ 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];
+        }
       }
     }
 
@@ -700,7 +719,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 +733,14 @@ 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 +754,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)) {
@@ -827,6 +849,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 +861,32 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       proSummaryTableData,
     } = this.handleProSummaryTable(this.getUnHidenDataSource());
 
-    return (
+    let current_cols = isProSumarryTable
+        ? proSummaryTableColumns
+        : columns
+            ? columns
+            : [];
+    console.log(current_cols);
+    let table_x=200;
+    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:"middle"}
             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 ? 500:tableProps.scrollY, x:table_x}}
             bordered
             pagination={false}
             style={{ display: columns ? "block" : "none" }}

package/src/aldehyde/tmpl/interface.tsx

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

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);
         }