aldehyde 0.2.235 → 0.2.237

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

@@ -1,46 +1,18 @@
-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,
+  Button, Card, Checkbox, Col, Divider, Popover, Row, Space, Drawer, Modal, Tooltip,
+  message, Statistic, Layout,Table
 } from "antd";
-import Table from "./control-table-x-axis-wrapper";
 import {
-  DownloadOutlined,SettingOutlined,
-  FundOutlined,
-  LineChartOutlined,
-  PlusCircleOutlined,
-  PlusOutlined,
-  ReloadOutlined,
-  RetweetOutlined,
-  SearchOutlined,
-  TableOutlined,
-  UploadOutlined,
+  DownloadOutlined,SettingOutlined, FundOutlined, LineChartOutlined,
+  PlusCircleOutlined, PlusOutlined, ReloadOutlined, RetweetOutlined, SearchOutlined,
+  TableOutlined, UploadOutlined,
 } from "@ant-design/icons";
 import "./index.css";
 import {
-  ActTableMode,
-  ActTableViewModel,
-  ClassAddConfig,
-  ColumnConfig,
-  CustomButton,
-  DoEditParam,
-  DtmplData,
-  JumpConfig,
-  LtmplConfig,
-  QueryKey,
-  SelectedRow,
-  ShowViewParam,
-  TmplBaseProps,
+  ActTableMode, ActTableViewModel, AggregateVO, ClassAddConfig, ColumnConfig,
+  CustomButton, CustomButtonConfig, DoEditParam, DtmplData, JumpConfig, LtmplConfig, QueryKey,
+  SelectedRow, ShowViewParam, TmplBaseProps,
 } from "../tmpl/interface";
 
 import HcserviceV3 from "../tmpl/hcservice-v3";
@@ -65,7 +37,6 @@ const { Content, Sider } = Layout;
 type Level = "l1" | "l2";
 
 const defaultDisabledColIds: string[] = ["20000", "10000"];
-let refresh = true;
 
 interface ActTableProps extends TmplBaseProps {
   criteriaData: object;
@@ -90,6 +61,7 @@ interface ActTableProps extends TmplBaseProps {
   initCollapse?: boolean;
   readOnly?: boolean;
   tableType?:"common"|"report";
+  operatable?:boolean;
 }
 
 interface ActTableStat {
@@ -111,8 +83,11 @@ interface ActTableStat {
   customButton?: CustomButton;
   customButtonData?: DtmplData[];
   showRatmplSelector?: boolean;
-}
+  aggregateVO?: AggregateVO;
+  restatParams?: object;
 
+}
+let serial_number = new Date().getTime();
 class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   state = {
     //tableColumns: undefined,
@@ -135,6 +110,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     customButtonData: undefined,
     customButton: undefined,
     showRatmplSelector: false,
+    aggregateVO: undefined,
+    restatParams: undefined,
   };
 
   static contextType = LocaleContext;
@@ -146,6 +123,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     collapsible: false,
     initCollapse: false,
     readOnly: false,
+    operatable:true,
   };
 
   loadData = async (
@@ -154,14 +132,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     sortedColConfigs: ColumnConfig[]
   ) => {
     const {
-      sourceId,
-      criteriaData,
-      ltmplConfig,
-      mainCode,
-      level,
-      pageNo,
-      pageSize,
-      serverKey,
+      sourceId, criteriaData, ltmplConfig,
+      mainCode, level, pageNo, pageSize, serverKey,
     } = this.props;
 
     if (!ltmplConfig) {
@@ -230,14 +202,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
     if (!queryKey.sourceId || queryKey.sourceId == this.props.sourceId) {
       this.setState({
-        disabledColIds,
-        hiddenColIds: hiddenColIds_,
-        hiddenRowCodes,
-        sortedColConfigs,
-        queryKey,
-        showL2Chart: false,
-        selectedRows: [],
-        selectedDatas: [],
+        disabledColIds, hiddenColIds: hiddenColIds_, hiddenRowCodes,
+        sortedColConfigs, queryKey, showL2Chart: false, selectedRows: [], selectedDatas: [],
         viewModels:
           this.state.viewModels.length > 0 ? this.state.viewModels : ["table"],
       });
@@ -247,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);
     }
   };
 
@@ -294,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" ||
@@ -370,6 +370,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         ...ltmplConfig.columns,
       ];
     }
+
     this.loadData(defaultDisabledColIds, [], sortedColConfigs);
   }
 
@@ -383,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;
@@ -444,7 +445,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   onHide = (code: string) => {
-
     const { hiddenRowCodes } = this.state;
     let hiddenCodes = [...hiddenRowCodes, code];
     this.setState({
@@ -747,23 +747,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
   renderHeaderButtons = () => {
     let {
-      hiddenColIds,
-      viewModels,
-      sortedColConfigs,
-      disabledColIds,
-      showL2Chart,
-      showL2ActTable,
+      hiddenColIds, viewModels, sortedColConfigs, disabledColIds, showL2Chart,
+      showL2ActTable,restatParams,
     } = this.state;
     const {
-      ltmplConfig,
-      sourceId,
-      doCreate,
-      doSearch,
-      menuId,
-      funcMode,
-      customCreatable,
-      serverKey,
-      readOnly,
+      ltmplConfig, sourceId, doCreate, doSearch, menuId,
+      funcMode, customCreatable, serverKey, readOnly,
     } = this.props;
     const { translate } = this.context;
     let { buttons } = ltmplConfig;
@@ -778,7 +767,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
               </Button>
             </Popover>
           ) : null}
-          {buttons.includes("ratmplSelect") ? (
+          {buttons.includes("ratmplSelect") && !readOnly ? (
             <Button onClick={() => this.setState({ showRatmplSelector: true })}>
               {translate("${选择}")}
             </Button>
@@ -872,10 +861,15 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           )}
           {buttons.includes("reStat") && !readOnly ? (
             <Restat
+                value={restatParams}
               serverKey={serverKey}
               fields={ltmplConfig.reStatParams}
               sourceId={sourceId}
-              onfinish={() => doSearch(null)}
+              onfinish={(restatParams) => {
+                this.actTableDoSearch(null);
+                this.setState({ restatParams: restatParams });
+              }
+            }
             ></Restat>
           ) : (
             ""
@@ -934,7 +928,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
               className="hoverbig"
               title={translate("${刷新}")}
               onClick={() => {
-                doSearch(null);
+                this.actTableDoSearch(null);
               }}
             >
               <ReloadOutlined />
@@ -988,9 +982,37 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
   };
 
+  actTableDoSearch = (data: object) => {
+    let new_serial_number = new Date().getTime();
+    let { doSearch } = this.props;
+    if (doSearch && new_serial_number - serial_number > 3000) {
+      serial_number = new_serial_number;
+      doSearch({ ...data, serial_number });
+    }
+  }
+
+  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, doSearch, criteriaData, serverKey } = this.props;
+    let { ltmplConfig, criteriaData, serverKey } = this.props;
     return (
       <CriteriaForm
         serverKey={serverKey}
@@ -1004,10 +1026,20 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         doAction={this.doSelectedAction}
         doDelete={this.doDelete}
         doJump={this.doSelectedJump}
-        doSearch={doSearch}
+        doSearch={this.actTableDoSearch}
       />
     );
   };
+  //暂时无用
+  // queryTotal = async () => {
+  //   const { queryKey} = this.state;
+  //   const { serverKey }=this.props;
+  //   let aggregateVO:AggregateVO = await HcserviceV3.requestQueryAggregates(serverKey, queryKey.key);
+  //   this.setState({
+  //     aggregateVO,
+  //   });
+  //   return aggregateVO;
+  // };
 
   getLtreeEntitySelectCriteria=()=>{
     let {ltmplConfig}=this.props
@@ -1024,36 +1056,17 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
   renderContent = () => {
     let {
-      queryKey,
-      loading,
-      selectedRows,
-      hiddenRowCodes,
-      viewModels,
-      sortedColConfigs,
-      hiddenColIds,
-      showL2ActTable,
+      queryKey, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable,
+        aggregateVO,
     } = this.state;
     let {
-      sourceId,
-      ltmplConfig,
-      funcMode,
-      title,
-      collapsible,
-      pageSize,
-      pageNo,
-      onChangePage,
-      serverKey,
-      doSearch,
-      criteriaData,
-      showView,
-      doEdit,
-      doRAction,
-      customEditable,
-      readOnly,tableType
+      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 (
         <>
@@ -1063,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,
@@ -1149,23 +1156,13 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                             : typeof title == "string"
                                 ? translate("${" + title + "}")
                                 : title}</p>
-                        {/*{translate("${" + (title ? title : ltmplConfig.title) + "}")}*/}
-                        {/*<div style={{maxWidth:"600px",position:"relative",overflow:"auto",float: "left",marginTop:"-18px",marginLeft:"20px"}}>*/}
-                        {/*<Space size={"large"} style={{}}>*/}
-                        {/*  <Statistic title="Active Users" value={112893} />*/}
-                        {/*<Statistic title="Active Users" value={112893} /><Statistic title="Active Users" value={112893} />*/}
-                        {/*<Statistic title="Active Users" value={112893} />*/}
-                        {/*<Statistic title="Active Users" value={112893} />*/}
-                        {/*<Statistic title="Active Users" value={112893} />*/}
-                        {/*<Statistic title="Active Users" value={112893} />*/}
-                        {/*<Statistic title="Active Users" value={112893} /><Statistic title="Active Users" value={112893} />*/}
-                        {/*  <Statistic title="Active Users" value={112893} />*/}
-                        {/*  <Statistic title="Active Users" value={112893} />*/}
-                        {/*  <Statistic title="Active Users" value={112893} />*/}
-                        {/*  <Statistic title="Active Users" value={112893} />*/}
-                        {/*  <Statistic title="Active Users" value={112893} />*/}
-                        {/*  <Statistic title="Active Users" value={112893} />*/}
-                        {/*</Space></div>*/}
+                        {/*<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>
@@ -1179,19 +1176,15 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 theme={"light"}
                 style={{
                   paddingRight:'0px'
-                  // height: "90vh",
-                  // position: "fixed",
-                  // left: 0,
-                  // top: 126,
-                  // bottom: 0,
-                  // marginLeft: 210,
                 }}
             >{ltreeEntitySelect?
               <EntryControl width={300-10} value={criteriaData[ltreeEntitySelect?.id]} fieldConfig={ltreeEntitySelect}></EntryControl>:null}
             </Sider>
             <Layout style={{ backgroundColor: "#fff" }}>
               <Content style={{ overflow: "initial" }}>
+
                 {displayCriteriaCard ? this.renderCriteriaForm() : null}
+
                 { loading ? (
                     <Table loading={loading}></Table>
                 ) : (tableType =="report"?<ReportTable
@@ -1204,16 +1197,15 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                   leftFixedCols={ltmplConfig.leftFixedCols}
               />:
                 <QueryTable
+                    // queryTotal={this.queryTotal}
                     tableProps={{scrollY:ltmplConfig.scrollY,clickDisplayTotal:!ltmplConfig.directShowTotal}}
                     serverKey={serverKey}
                     onChangePage={onChangePage}
                     viewModels={viewModels}
                     primaryColumn={ltmplConfig.primaryColumn}
-                    columnConfigs={columnConfigs}
-                    summaryConfigs={ltmplConfig.totalColumnConfigs}
+                    columnConfigs={columnConfigs} summaryConfigs={ltmplConfig.totalColumnConfigs}
                     maxSelectedRows={this.checkBoxUseful() ? 10000 : -1}
-                    selectedRows={selectedRows}
-                    columns={tableColumns}
+                    selectedRows={selectedRows} columns={tableColumns}
                     hiddenRowCodes={hiddenRowCodes}
                     pageInfo={{
                       pageNo: pageNo ? pageNo : 1,
@@ -1228,7 +1220,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                           : ltmplConfig.subtotalXColumn
                     }
                     groupIColumns={ltmplConfig.groupIColumns}
-                    doSearch={doSearch}
+                    doSearch={this.actTableDoSearch}
                     sortColumnData={sortColumnData}
                 />) }
               </Content>
@@ -1267,27 +1259,17 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       mainCode,
       codes
     );
-    doSearch(null);
+    this.actTableDoSearch(null);
   };
 
 
   render() {
     let {
-      queryKey,
-      loading,
-      blockMenuTreeDrawerOpen,
-      recordCode,
-      showRatmplSelector,
+      queryKey, loading, blockMenuTreeDrawerOpen, recordCode, showRatmplSelector
     } = this.state;
     let {
-      sourceId,
-      ltmplConfig,
-      title,
-      collapsible,
-      initCollapse,
-      tip,
-      serverKey,
-      mainCode,
+      sourceId, ltmplConfig, title, collapsible, initCollapse,
+      tip, serverKey, mainCode,
     } = this.props;
     if (!ltmplConfig || !sourceId) {
       return (
@@ -1315,9 +1297,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             }
             id={queryKey + ltmplConfig.id}
             className={`hoverable`}
-            headStyle={{ background: "#f2f4f5" }}
+            styles={{header:{ background: "#f2f4f5" },body:{ padding: "6px" }}}
             loading={loading}
-            bodyStyle={{ padding: "6px" }}
             //暂时注释掉，后续要支持配置。
             extra={this.renderHeaderButtons()}
           >