aldehyde 0.2.236 → 0.2.237

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

@@ -1,4 +1,4 @@
-import React, { ReactNode } from "react";
+import React, {ReactDOM, ReactNode} from "react";
 import {
   Button, Card, Checkbox, Col, Divider, Popover, Row, Space, Drawer, Modal, Tooltip,
   message, Statistic, Layout,Table
@@ -11,7 +11,7 @@ import {
 import "./index.css";
 import {
   ActTableMode, ActTableViewModel, AggregateVO, ClassAddConfig, ColumnConfig,
-  CustomButton, DoEditParam, DtmplData, JumpConfig, LtmplConfig, QueryKey,
+  CustomButton, CustomButtonConfig, DoEditParam, DtmplData, JumpConfig, LtmplConfig, QueryKey,
   SelectedRow, ShowViewParam, TmplBaseProps,
 } from "../tmpl/interface";
 
@@ -61,6 +61,7 @@ interface ActTableProps extends TmplBaseProps {
   initCollapse?: boolean;
   readOnly?: boolean;
   tableType?:"common"|"report";
+  operatable?:boolean;
 }
 
 interface ActTableStat {
@@ -84,6 +85,7 @@ interface ActTableStat {
   showRatmplSelector?: boolean;
   aggregateVO?: AggregateVO;
   restatParams?: object;
+
 }
 let serial_number = new Date().getTime();
 class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
@@ -121,6 +123,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     collapsible: false,
     initCollapse: false,
     readOnly: false,
+    operatable:true,
   };
 
   loadData = async (
@@ -210,18 +213,34 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     });
   };
 
-  doCustomButton = (customButton: CustomButton, records: DtmplData[]) => {
-    let page = ProgramConfig.getCustomPage(customButton.id);
-    if (!page) {
-      message.error("Not Found Custom Page");
-    } else {
-      //if(customButton.){
-      this.setState({
-        showCustomCard: true,
-        customButton,
-        customButtonData: records,
-      });
-      // }
+  doCustomButton =async (customButton: CustomButton, records: DtmplData[]) => {
+    if(!this.buttonClickable()){
+      return;
+    }
+    const {serverKey, sourceId} = this.props;
+    let doType=customButton.doType;
+    let config:CustomButtonConfig = ProgramConfig.getCustomButtonConfig(customButton.id);
+    if("request_refresh" == doType){
+      if(config && config.doAction){
+       await config.doAction(customButton,records);
+      }else if(config && config.getRequestUrl){
+        let url=await  config.getRequestUrl(customButton,records);
+        await HcserviceV3.doPostRequest(serverKey,url);
+      }else if(customButton.path){
+        await HcserviceV3.doPostRequest(serverKey,customButton.path);
+      }else{
+        message.error("Button Config Error");
+        return;
+      }
+      this.doSearchDirect(null);
+    }else if("show_window"==doType){
+        this.setState({
+          showCustomCard: true,
+          customButton,
+          customButtonData: records,
+        });
+    }else {
+      message.error("Unsuport Button dotype " + doType);
     }
   };
 
@@ -257,8 +276,26 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     if (windowPosition && windowPosition != customButton.windowPosition) {
       return "";
     }
+
     let customProps = { customButton: customButton, data: customButtonData };
-    let page = ProgramConfig.getCustomPage(customButton.id);
+
+   let config:CustomButtonConfig= ProgramConfig.getCustomButtonConfig(customButton.id);
+   let page;
+   if(config && config.getCurrentPage){
+     page=config.getCurrentPage(customButton,customButtonData);
+   }
+   if(!page){
+      page = ProgramConfig.getCustomPage(customButton.id);
+   }
+
+   if(!page){
+     message.error("Not found CustomButton Page");
+     this.setState({
+       customButton:undefined
+     })
+     return;
+   }
+
     let customElement = React.createElement(page, customProps);
     if (
       customButton.windowPosition == "under-table" ||
@@ -333,6 +370,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         ...ltmplConfig.columns,
       ];
     }
+
     this.loadData(defaultDisabledColIds, [], sortedColConfigs);
   }
 
@@ -346,19 +384,19 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     } = prevProps;
 
     let { hiddenColIds, sortedColConfigs } = this.state;
-
+   let currentQueryParams= ProgramConfig.transQueryParamsToStr(criteriaData, false, [
+      "pageSize",
+      "pageNo",
+    ]);
+   let preCurrentQueryParams=ProgramConfig.transQueryParamsToStr(preCriteriaData, false, [
+     "pageSize",
+     "pageNo",
+   ]);
     if (
       (sourceId && preSourceId != sourceId) ||
       (ltmplConfig &&
         (!preLtmplConfig || ltmplConfig.id != preLtmplConfig.id)) ||
-      ProgramConfig.transQueryParamsToStr(criteriaData, false, [
-        "pageSize",
-        "pageNo",
-      ]) !=
-        ProgramConfig.transQueryParamsToStr(preCriteriaData, false, [
-          "pageSize",
-          "pageNo",
-        ])
+        (currentQueryParams != preCurrentQueryParams &&  (!criteriaData['menuId'] || preCriteriaData.menuId==criteriaData['menuId']))
     ) {
       //5秒后允许再次请求数据
       //refresh=false;
@@ -407,7 +445,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   onHide = (code: string) => {
-
     const { hiddenRowCodes } = this.state;
     let hiddenCodes = [...hiddenRowCodes, code];
     this.setState({
@@ -954,6 +991,25 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
   }
 
+  doSearchDirect = (data: object) => {
+
+    let { doSearch } = this.props;
+    if (doSearch ) {
+      doSearch({ ...data, serial_number });
+    }
+  }
+
+
+  buttonClickable = () => {
+    let new_serial_number = new Date().getTime();
+    if (new_serial_number - serial_number > 1500) {
+      serial_number = new_serial_number;
+      return true;
+    }else{
+      return false;
+    }
+  }
+
   renderCriteriaForm = () => {
     let { loading, selectedRows, selectedDatas } = this.state;
     let { ltmplConfig, criteriaData, serverKey } = this.props;
@@ -1004,14 +1060,13 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         aggregateVO,
     } = this.state;
     let {
-      sourceId, ltmplConfig, funcMode,
+      sourceId, ltmplConfig, funcMode,operatable,
       title, collapsible, pageSize,
       pageNo, onChangePage, serverKey, criteriaData,
       showView, doEdit, doRAction, customEditable, readOnly,tableType
     } = this.props;
     const { translate } = this.context;
 
-
     if (!ltmplConfig || !sourceId) {
       return (
         <>
@@ -1021,18 +1076,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       );
     }
 
-
-
     let tableColumns = ColumnBuilder.buildTableColumns(
-        {ltmplConfig,
-      hiddenColIds,
-      hiddenRowCodes,
-      sortedColConfigs,showView,
+        {ltmplConfig,operatable,
+      hiddenColIds, hiddenRowCodes, sortedColConfigs,showView,
         doEdit,
-        doRAction,
-        customEditable,
-        serverKey,
-        readOnly,
+        doRAction, customEditable,
+        serverKey, readOnly,
         sourceId, translate,unHiden:this.unHiden,
         onHide:this.onHide, doCustomButton:this.doCustomButton, doRowJump:this.doRowJump,
           blockMenuTreeDrawerOpen:this.blockMenuTreeDrawerOpen,
@@ -1107,13 +1156,13 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                             : typeof title == "string"
                                 ? translate("${" + title + "}")
                                 : title}</p>
-                        <Space size={"large"} style={{marginLeft:50}}>
-                        {aggregateVO && aggregateVO.aggregates?
-                            aggregateVO.aggregates.map(av=>{
-                              return <Statistic title={av.fieldTitle} value={av.value} />
-                            }):null
-                        }
-                        </Space>
+                        {/*<Space size={"large"} style={{marginLeft:50}}>*/}
+                        {/*{aggregateVO && aggregateVO.aggregates?*/}
+                        {/*    aggregateVO.aggregates.map(av=>{*/}
+                        {/*      return <Statistic title={av.fieldTitle} value={av.value} />*/}
+                        {/*    }):null*/}
+                        {/*}*/}
+                        {/*</Space>*/}
                         <p className="fr" style={{marginBottom:"4px"}}>{this.renderHeaderButtons()}</p>
                 </h3>
               </span>
@@ -1133,7 +1182,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             </Sider>
             <Layout style={{ backgroundColor: "#fff" }}>
               <Content style={{ overflow: "initial" }}>
+
                 {displayCriteriaCard ? this.renderCriteriaForm() : null}
+
                 { loading ? (
                     <Table loading={loading}></Table>
                 ) : (tableType =="report"?<ReportTable
@@ -1214,7 +1265,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
   render() {
     let {
-      queryKey, loading, blockMenuTreeDrawerOpen, recordCode, showRatmplSelector,
+      queryKey, loading, blockMenuTreeDrawerOpen, recordCode, showRatmplSelector
     } = this.state;
     let {
       sourceId, ltmplConfig, title, collapsible, initCollapse,

package/src/aldehyde/table/column/column-builder.tsx

@@ -34,14 +34,15 @@ interface ColumnBuilderProps extends ActionRenderProps{
   hiddenRowCodes?: string[],
   sortedColConfigs?: ColumnConfig[],
   unHiden?:()=>any,
-  onHide?:(code: string)=>any,
+    onHide?:(code: string)=>any,
+    operatable?:boolean,
 }
 
 interface ReportColumnBuilderProps {
-  columnConfigs: ColumnConfig[],
+    columnConfigs: ColumnConfig[],
     hiddenColIds?: string[],
-  translate:(...strs: string[]) => string;
-  leftFixedCols: number,
+    translate:(...strs: string[]) => string;
+    leftFixedCols: number,
     hiddenRowCodes?: string[],
     unHiden?:()=>any,
     onHide?:(code: string)=>any,
@@ -57,7 +58,7 @@ export default {
       hiddenRowCodes,
       sortedColConfigs, unHiden,
         onHide,translate,
-       sortColumns,serverKey
+       sortColumns,serverKey,
     } = props;
 
 
@@ -104,7 +105,7 @@ export default {
           this.setSortProps(column,item,translate);
       } else if (item.id == "20000") {
           this.setHiddenRecordOpt(column,hiddenRowCodes,unHiden,onHide,translate);
-      } else if (item.title === "操作") {
+      } else if (item.title === "操作" && props.operatable) {
           column["操作"] = "1";
         column["fixed"] = "right";
         column["align"] = "left";

package/src/aldehyde/table/modal-select-table.tsx

@@ -254,7 +254,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
         return (
             <Modal
                 open={open}
-                title={<SelectedRowsCard value={selectedRows} onChange={this.changeRowSelection}></SelectedRowsCard>}
+                title={<SelectedRowsCard value={selectedRows} onChange={this.changeRowSelection} ></SelectedRowsCard>}
                 width={1150}
                 destroyOnClose={true}
                 centered
@@ -265,7 +265,8 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
                 <div className="actTable">
                     <CriteriaForm serverKey={serverKey} selectedRows={selectedRows} ltmplConfig={selectConfig} data={criteriaData}
                                   doSearch={this.doSearch} loading={loading} />
-                    <QueryTable serverKey={serverKey}  pageInfo={{pageNo:pageNo?pageNo:1,pageSize:pageSize?pageSize:selectConfig.defaultPageSize}} onChangePage={this.onChangePage} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows}
+                    <QueryTable serverKey={serverKey}  pageInfo={{pageNo:pageNo?pageNo:1,pageSize:pageSize?pageSize:selectConfig.defaultPageSize}} onChangePage={this.onChangePage}
+                                maxSelectedRows={maxSelectedRows?maxSelectedRows:selectConfig.maxSelectedRows} selectedRows={selectedRows}
                                 primaryColumn={selectConfig.primaryColumn}
                                 columns={columns}
                                 queryKey={queryKey}

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

@@ -15,7 +15,7 @@ import { LocaleContext } from "../locale/LocaleProvider";
 import { init, merge, statistic } from "../utils/dsu";
 import VerticalList from "../list/vertical-list";
 import SummaryBuilder from "./column/summary-builder";
-import {Card, Descriptions, Space, Statistic, Table} from "antd";
+import {Card, Descriptions, message, Space, Statistic, Table} from "antd";
 
 const SortableItem = SortableElement((props) => (
   <tr className="sortable-item-hover" {...props} />
@@ -35,6 +35,7 @@ interface QueryTableStat {
   loading?: boolean;
   touchEnd?: boolean;
   aggregateVO?: AggregateVO;
+  beforeSelectedRows?:number;
 }
 
 class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
@@ -62,6 +63,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     loading: true,
     touchEnd: undefined,
     aggregateVO: undefined,
+    beforeSelectedRows:undefined,
   };
 
   static contextType = LocaleContext;
@@ -82,6 +84,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     const { queryKey: preQueryKey, pageInfo: prePageInfo } = prevProps;
     const { queryKey, pageInfo } = this.props;
    // const { aggregateVO } = this.state;
+    //debugger
     if (queryKey) {
       if (preQueryKey?.key != queryKey.key) {
         await this.loadData(queryKey.key, pageInfo, true);
@@ -186,6 +189,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           pageInfo,
         });
         this.setState({
+          beforeSelectedRows:queryData.beforeSelectedRows,
           dataSource,
           virtualEndPageNo: pageInfo.virtualEndPageNo,
           queryDataCache: queryCache,
@@ -236,7 +240,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       maxSelectedRows,
       primaryColumn,
     } = this.props;
-    let { dataSource } = this.state;
+    let { dataSource,beforeSelectedRows } = this.state;
     let selectedRowKeys = [];
 
     for (let row of selectedRows) {
@@ -248,14 +252,50 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         allRowKeys.push(d.code);
       }
     }
-    if (maxSelectedRows == -1) {
+
+    let tmplMax=maxSelectedRows?maxSelectedRows:0;
+    if(beforeSelectedRows>0){
+      tmplMax=tmplMax-beforeSelectedRows;
+    }
+    const { translate } = this.context;
+
+    if (tmplMax <= -1) {
+      return null;
+    }
+
+    if (beforeSelectedRows>0 && tmplMax<=0) {
+      message.warning(translate("${已选超}") );
       return null;
     }
+
     const rowSelection: TableRowSelection<any> = {
+
       fixed: true,
       type: maxSelectedRows == 1 ? "radio" : "checkbox",
       selectedRowKeys,
       onChange: (selectedRowKeys, selectedRows) => {
+
+        if(tmplMax > 0 && selectedRowKeys.length > tmplMax){
+
+          message.error(translate("${最多只能选择}") + " : "+ tmplMax);
+          // message.error({
+          //     //type: 'error',
+          //     content: translate("${最多只能选择}") + " : "+ tmplMax,
+          //     style: {
+          //       zIndex: 12000,
+          //     },
+          //   duration:5
+          //   });
+
+          // messageApi.open({
+          //   type: 'error',
+          //   content: translate("${最多只能选择}") + " : "+ tmplMax,
+          //   style: {
+          //     zIndex: 2000,
+          //   },
+          // });
+          return;
+        }
         let selectedRows_: SelectedRow[] = [];
         let selectedDatas: DtmplData[] = [];
         let titleColId = primaryColumn?.id;
@@ -448,7 +488,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       }
     }
     const mergeMp = statistic();
-    console.log("统计结果", mergeMp);
+    //console.log("统计结果", mergeMp);
 
     // 给 col 添加 mergeRowInCol
     current_cols.forEach(

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

@@ -755,9 +755,8 @@ class RelationTable extends React.PureComponent<
           tip={fieldGroupConfig.tip}
           id={parentId + fieldGroupConfig.id}
           className={`hoverable`}
-          headStyle={{ background: "#f2f4f5" }}
+          styles={{header:{ background: "#f2f4f5" },body:{ padding: "6px" }}}
           loading={loading}
-          bodyStyle={{ padding: "6px" }}
           //暂时注释掉，后续要支持配置。
           //extra={<Input.Search onSearch={this.searchValue} allowClear placeholder=""/>}
         >

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

@@ -246,6 +246,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
             (actions && actions.length > 0) || (jumps && jumps.length > 0) || (fileExports && fileExports.length>0)) {
             displayCriteriaCard = true;
         }
+       // debugger
         return (
             // <Card
             //     // title={<SelectedRowsCard value={selectedRows} onChange={this.changeRowSelection}></SelectedRowsCard>}
@@ -258,7 +259,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
                 <CriteriaForm serverKey={serverKey} selectedRows={selectedRows} selectedDatas={selectedDatas} ltmplConfig={selectConfig}
                               data={criteriaData}
                               doSearch={this.doSearch} loading={loading}/>
-                <QueryTable serverKey={serverKey} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows}
+                <QueryTable serverKey={serverKey} maxSelectedRows={maxSelectedRows?maxSelectedRows:selectConfig.maxSelectedRows} selectedRows={selectedRows}
                             primaryColumn={selectConfig.primaryColumn}
                             columns={columns}
                             pageInfo={{pageNo,

package/src/aldehyde/table/selected-rows-card.tsx

@@ -7,6 +7,7 @@ import { LocaleContext } from "../locale/LocaleProvider";
 interface SelectedRowsCardProps {
   value: SelectedRow[];
   onChange?: (value: SelectedRow[]) => void;
+  message?: string;
 }
 
 interface SelectedRowsCardStat {}
@@ -66,6 +67,8 @@ class SelectedRowsCard extends React.PureComponent<
         <h3>
           {translate("${查询点选}:")}
           {this.renderTag()}
+          {this.props.message}
+          {}
         </h3>
       </div>
     );

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

@@ -685,6 +685,26 @@ export default class HcserviceV3 {
     return res;
   }
 
+  static async doPostRequest(serverKey: string, url:string,params?:object) {
+    let res = await Super.super({
+      url,
+      serverKey,
+      method: "POST",
+      data: { ...params },
+    });
+    return res;
+  }
+
+  static async doGetRequest(serverKey: string, url:string,params?:object) {
+    let res = await Super.super({
+      url,
+      serverKey,
+      method: "GET",
+      query: { ...params },
+    });
+    return res;
+  }
+
 
   static async postActions(
     serverKey: string,

package/src/aldehyde/tmpl/interface.tsx

@@ -1,6 +1,6 @@
 import { MenuProps } from "antd/lib/menu";
 import { FormInstance } from "antd";
-import React, { HTMLAttributeAnchorTarget, RefObject } from "react";
+import React, {HTMLAttributeAnchorTarget, ReactDOM, RefObject} from "react";
 import { ButtonShape, ButtonType } from "antd/lib/button";
 
 export type ViewOrEdit = "view" | "edit";
@@ -16,8 +16,18 @@ export type StatColType = "fact" | "dimension";
 export type ActTableViewModel = "table" | "verticalList" | "horizontalList";
 
 export type ControlHolderType = "table" | "descriptions";
+
 export type PageType = "modal" | "drawer" |"card"| "routing" |"blank";
 
+export type CustomButtonType = "request_refresh" | "show_window" |"do_event";
+
+export interface CustomButtonConfig{
+  getRequestUrl?:(customButton: CustomButton, records?: DtmplData[])=>string;
+  doAction?:(customButton: CustomButton, records: DtmplData[])=>void;
+  getCurrentPage?:(customButton: CustomButton, records: DtmplData[])=>any;
+}
+
+
 export interface ReportTableProps {
   tableProps?: {
     size?: "small" | "middle" | "large";
@@ -39,7 +49,6 @@ export interface ReportTableProps {
 }
 export interface QueryTableProps extends ReportTableProps{
   viewModels?: ActTableViewModel[];
-  // defaultPageSize?: number;
   pageInfo: {
     pageNo: number;
     pageSize: number;
@@ -57,7 +66,7 @@ export interface QueryTableProps extends ReportTableProps{
   groupIColumns?: { id: string; title: string; sourceId: string }[]; // 组间合计key
   doSearch?: (params: object) => void;
   sortColumnData?: string[];
-  queryTotal?:()=> any; //暂时无用
+  queryTotal?:()=> any;//暂时无用
 }
 
 export interface AggregateVO {
@@ -131,7 +140,7 @@ export interface CustomButton extends ButtonConfig {
    path:string;
    params:string;
    requestMethod:string;
-   doType:string;
+   doType:CustomButtonType;
    windowPosition:'under-table'|'above-table'|'modal-window'|'left-drawer'|'right-drawer';
    windowHeight:string;
    windowWidth:string;
@@ -418,6 +427,8 @@ export interface SelectConfig extends TmplBase {
   scrollY?:number;
   directShowTotal?: boolean;
   leftFixedCols?: number;
+  minSelectRows?: number;
+  maxSelectRows?: number;
   onCriteriaValuesChange?: (
     changedValues,
     allValues: DtmplData,
@@ -567,6 +578,7 @@ export interface QueryData {
   touchEnd: boolean;
   key: string;
   pageInfo: PageInfo;
+  beforeSelectedRows:number;
 }
 
 export interface ReportData {
@@ -612,6 +624,7 @@ export interface RouterCompProps {
   navigate?: any;
   params: any;
   searchParams: any;
+  // routeMode?:'multiple'|'single';
 }
 
 export interface TmplBaseProps {

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

@@ -12,6 +12,7 @@ const { Text, Title } = Typography;
 
 interface ActTreeProps {
   ttmplConfig: TtmplConfig;
+  top:number,
 }
 
 interface ActTreeState {
@@ -29,7 +30,7 @@ export default class ActTree extends React.PureComponent<
   ActTreeProps,
   ActTreeState
 > {
-  static defaultProps = {};
+  static defaultProps = {top:66};
   state = {
     ttmplNodeConfig: undefined,
     recordCode: undefined,
@@ -137,8 +138,9 @@ export default class ActTree extends React.PureComponent<
   };
 
   render() {
-    const {} = this.props;
-    const { translate } = this.context;
+    const {top} = this.props;
+    const { translate,siderCollapsed } = this.context;
+
 
     const {
       ttmplNodeConfig,
@@ -162,9 +164,9 @@ export default class ActTree extends React.PureComponent<
             height: "90vh",
             position: "fixed",
             left: 0,
-            top: 66,
+            top: top,
             bottom: 0,
-            marginLeft: 210,
+            marginLeft: siderCollapsed?10:210,
           }}
         >
           <TmplTree