aldehyde 0.2.234 → 0.2.236

package/src/aldehyde/form/criteria-form.tsx

@@ -23,7 +23,7 @@ import EntryControl from "../controls/entry-control";
 import Action from "../controls/action";
 import CquickButton from "../controls/cquery/cquick-button";
 import { useLocale } from "../locale/useLocale";
-import { SearchOutlined } from "@ant-design/icons";
+import {DownOutlined, LeftOutlined, RightOutlined, SearchOutlined, UpOutlined} from "@ant-design/icons";
 import { ProgramConfig } from "../index";
 import SelectCodeExport from "../controls/file-export/select-code-export";
 
@@ -80,7 +80,8 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
     drillingParams,
     columns,
     updrillButtonConfigs,
-      innerParams
+      innerParams,
+      defShowCriteriaCount,
   } = ltmplConfig;
   const initialValues = {};
   const searchSubmit = (data) => {
@@ -96,9 +97,18 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
   // let currentDrillButton=null;
   const [currentDrillButton, setCurrentDrillButton] = useState(null);
   const [drillLoadings, setDrillLoadings] = useState<string>(null);
+  const [collapsible, setCollapsible] = useState<boolean>(false);
+  const [expanded, setExpanded] = useState<boolean>(false);
+
+  let collapseCriteria:CriteriaConfig[] =defShowCriteriaCount<=0?criterias:criterias.slice(0,defShowCriteriaCount);
+
+
 
   useEffect(() => {
     form.resetFields();
+    if(collapseCriteria.length<criterias.length){
+      setCollapsible(true);
+    }
   });
 
   let showQueryButton = buttons.includes("query") && doSearch;
@@ -431,10 +441,20 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
                       {renderDrillDimension()}</>
                     : null}
                 {showQueryButton || (updrillButtonConfigs && updrillButtonConfigs.length > 0)
-                    ? renderCriteria(criterias)
+                    ? renderCriteria(expanded?criterias:collapseCriteria)
                     : null}
 
                 <Space className="btns">
+                  {collapsible ? (
+                      expanded?<Button icon={<LeftOutlined />} type={"link"}  onClick={()=>setExpanded(false)}>
+                            {translate("${收起}")}
+                          </Button>:
+                      <Button icon={<RightOutlined />} type={"link"}   onClick={()=>setExpanded(true)}>
+                        {translate("${更多条件}")}
+                      </Button>
+                  ) : (
+                      ""
+                  )}
                   {showQueryButton ? (
                       <Button type="primary" htmlType="submit">
                         {translate("${查询}")}

package/src/aldehyde/module/dtmpl-edit-card.tsx

@@ -66,7 +66,6 @@ export default class DtmplEditCard extends React.PureComponent<
         await this.loadConfigData();
       } else if(prevProps.sourceId != this.props.sourceId || queryingCode!=code || !dtmplData ){
         //防止反复请求 code
-        debugger
         if(code){
           await this.loadCodeData(dtmplConfig,code);
         }else{

package/src/aldehyde/routable/dtmpl-route.tsx

@@ -5,6 +5,7 @@ import DtmplEdit from "../detail/edit/dtmpl-edit";
 import ActDtmplView from "../detail/view/act-dtmpl-view";
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import withRouter from "./withroute";
+import TabActDtmplView from "../detail/view/tab-act-dtmpl-view";
 
 export interface DtmplRouteProps extends RouterCompProps {
   layoutRootPath?: string;
@@ -136,7 +137,7 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
     let versionId = params["versionId"];
     if (location.pathname.endsWith("detail-view")) {
       return (
-        <ActDtmplView
+        <TabActDtmplView
           serverKey={null}
           goBackToLtmpl={codeSource ? undefined : this.goBackToLtmpl}
           goDtmpl={this.goDtmpl}

package/src/aldehyde/routable/ltmpl-route.tsx

@@ -271,7 +271,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
             ),
             ...params_,
         };
-        //params['sourceId'] = sourceId;
+
         const newfliter = Units.transQueryParamsToStr({...params});
         this.props.navigate(
             `${basePath}${this.computedLayoutPath}/${sourceId}/${this.pathMark()}?${newfliter}`,
@@ -290,9 +290,6 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         }
         const {pageSize, pageNo} = this.state;
         params["pageNo"] = 1;
-        // if (pageNo) {
-        //     params["pageNo"] = 1;
-        // }
         if (pageSize) {
             params["pageSize"] = pageSize;
         }

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

@@ -1,46 +1,18 @@
 import React, { 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, 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;
@@ -111,8 +82,10 @@ 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 +108,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     customButtonData: undefined,
     customButton: undefined,
     showRatmplSelector: false,
+    aggregateVO: undefined,
+    restatParams: undefined,
   };
 
   static contextType = LocaleContext;
@@ -154,14 +129,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 +199,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"],
       });
@@ -747,23 +710,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 +730,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 +824,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 +891,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
               className="hoverbig"
               title={translate("${刷新}")}
               onClick={() => {
-                doSearch(null);
+                this.actTableDoSearch(null);
               }}
             >
               <ReloadOutlined />
@@ -988,9 +945,18 @@ 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 });
+    }
+  }
+
   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 +970,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,32 +1000,14 @@ 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,
+      title, collapsible, pageSize,
+      pageNo, onChangePage, serverKey, criteriaData,
+      showView, doEdit, doRAction, customEditable, readOnly,tableType
     } = this.props;
     const { translate } = this.context;
 
@@ -1149,23 +1107,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,12 +1127,6 @@ 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}
@@ -1204,16 +1146,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 +1169,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                           : ltmplConfig.subtotalXColumn
                     }
                     groupIColumns={ltmplConfig.groupIColumns}
-                    doSearch={doSearch}
+                    doSearch={this.actTableDoSearch}
                     sortColumnData={sortColumnData}
                 />) }
               </Content>
@@ -1267,27 +1208,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 +1246,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()}
           >