aldehyde 0.2.213 → 0.2.215

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

@@ -1,4 +1,4 @@
-import React, { ReactNode, ReactDOM } from "react";
+import React, { ReactNode } from "react";
 import {
   Button,
   Card,
@@ -6,7 +6,6 @@ import {
   Col,
   Collapse,
   Divider,
-  Popconfirm,
   Popover,
   Row,
   Space,
@@ -15,24 +14,11 @@ import {
   Tooltip,
   message,
 } from "antd";
-import HCService from "../tmpl/hcservice-v3";
 import Table from "./control-table-x-axis-wrapper";
 import {
-  AlignCenterOutlined,
-  AlignLeftOutlined,
-  CaretDownOutlined,
-  CaretUpOutlined,
-  CopyOutlined,
-  DeleteOutlined,
   DownloadOutlined,
-  EditOutlined,
-  EyeInvisibleOutlined,
-  EyeOutlined,
-  FormOutlined,
   FundOutlined,
-  KeyOutlined,
   LineChartOutlined,
-  MenuOutlined,
   PlusCircleOutlined,
   PlusOutlined,
   ReloadOutlined,
@@ -45,8 +31,6 @@ import "./index.css";
 import {
   ActTableMode,
   ActTableViewModel,
-  AddOrUpdate,
-  BuiltInButtonName,
   ClassAddConfig,
   ColumnConfig,
   CustomButton,
@@ -59,36 +43,23 @@ import {
   ShowViewParam,
   TmplBaseProps,
 } from "../tmpl/interface";
-import TableUnits from "./table-util";
-import SupportInputTypes from "../tmpl/control-type-supportor";
+
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import QueryTable from "./query-table";
 import CriteriaForm from "./../form/criteria-form";
-import ViewControl from "../controls/view-control";
-import Units from "../units";
+import ProgramConfig from "../units";
 import ColumnSelector from "./column/column-selector";
 import ExportFrame, { ExportType } from "../export/export-frame";
-import { SortableHandle } from "react-sortable-hoc";
 import L2ActTable from "./l2-act-table";
 
-import Action from "../controls/action";
 import Restat from "./stat/restat";
-import ActionUtils from "../controls/action/utils";
-import CquickButton from "../controls/cquery/cquick-button";
 import CollapseCard from "../controls/collapse-card";
 import ToolTipBar from "../detail/tooltipbar";
 import { LocaleContext } from "../locale/LocaleProvider";
 import BlockMenuTreeDrawer from "../module/block-menu-tree-drawer";
-import EditButton from "../detail/button/edit-button";
-import ViewButton from "../detail/button/view-button";
-import ProgramConfig from "../units";
 import ModelSelectTable from "./../table/modal-select-table";
-import NewinFileView from "../controls/file-view/newin-file-view";
-
-const DragHandle = SortableHandle(() => (
-  <MenuOutlined style={{ cursor: "grab", color: "#999" }} />
-));
-const { Panel } = Collapse;
+import ColumnBuilder from "./column/column-builder";
+import ReportTable from "./report-table";
 
 type Level = "l1" | "l2";
 
@@ -117,10 +88,10 @@ interface ActTableProps extends TmplBaseProps {
   collapsible?: boolean;
   initCollapse?: boolean;
   readOnly?: boolean;
+  tableType?:"common"|"report";
 }
 
 interface ActTableStat {
-  //tableColumns?: object[];
   sortedColConfigs?: ColumnConfig[];
   queryKey?: QueryKey;
   loading?: boolean;
@@ -230,7 +201,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       }
     });
     /** 构建column **/
-    // let tableColumns = this.buildTableColumns(ltmplConfig, hiddenColIds_, hiddenRowCodes, sortedColConfigs);
 
     const { defaultPageSize } = ltmplConfig;
 
@@ -387,407 +357,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
   };
 
-  buildTableColumns = (
-    ltmplConfig: LtmplConfig,
-    hiddenColIds: string[],
-    hiddenRowCodes: string[],
-    sortedColConfigs: ColumnConfig[]
-  ) => {
-    const {
-      showView,
-      doEdit,
-      doRAction,
-      customEditable,
-      serverKey,
-      readOnly,
-      sourceId,
-    } = this.props;
-    const { translate } = this.context;
-    const { buttons, builtInButtons } = ltmplConfig;
-    let tableColumns = [];
-    let s = 0;
-    let colConfigs = sortedColConfigs ? sortedColConfigs : ltmplConfig.columns;
-
-    let currentDataColIndex = 0;
-
-    colConfigs.forEach((item) => {
-      let column = {};
-      if (!hiddenColIds || !hiddenColIds.includes(item.id)) {
-        tableColumns.push(column);
-      }
-      column["title"] = item.title;
-      column["dataIndex"] = item.id;
-      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);
-      if (s < 12 && item.title != "操作" && item.title != "序号") {
-        if (hiddenColIds.includes("10000")) {
-          const order = this.handleColumnOrder(column["dataIndex"]);
-
-          if(item.sortable) {
-            TableUnits.sort(column, itemType, order);
-          }
-
-        }
-      }
-      //特殊列处理
-      //序号
-      if (item.title === "序号") {
-        column["width"] = item.colWidth ? item.colWidth : 50;
-        column["title"] = translate("${序号}");
-        column["align"] = item.valueAlign ? item.valueAlign : "center";
-        //item.fixed='left';
-        column["render"] = (text, record, index) => <label>{index + 1}</label>;
-        item["sorter"] = undefined;
-      } else if (item.id == "10000") {
-        column["title"] = (
-          <Tooltip title={translate("${拖拽排序}")}>
-            {translate("${" + item.title + "}")}
-          </Tooltip>
-        );
-        column["width"] = 30;
-        column["dataIndex"] = item.id;
-        column["className"] = "drag-visible";
-        column["render"] = () => <DragHandle />;
-      } else if (item.id == "20000") {
-        //隐藏
-        column["align"] = "center";
-        column["width"] = 40;
-        column["title"] = (
-          <>
-            {hiddenRowCodes.length > 0 ? (
-              <Tooltip title={translate("${取消隐藏}")}>
-                <Button
-                  style={{ marginRight: "0px" }}
-                  size="small"
-                  shape={"circle"}
-                  icon={<EyeOutlined />}
-                  type={"text"}
-                  onClick={() => this.unHiden()}
-                ></Button>
-              </Tooltip>
-            ) : (
-              ""
-            )}
-          </>
-        );
-        column["render"] = (text, record) => (
-          <Tooltip title={translate("${隐藏}")}>
-            {" "}
-            <Button
-              style={{ marginRight: "0px" }}
-              icon={<EyeInvisibleOutlined />}
-              type="dashed"
-              size="small"
-              onClick={() => this.onHide(record.code)}
-            ></Button>
-          </Tooltip>
-        );
-      } 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) => (
-          <Space size={[0, 4]} wrap>
-            {buttons.includes("detail") &&
-            showView &&
-            ActionUtils.isShow(
-              ltmplConfig.buttonViewAction?.preposes,
-              [record],
-              undefined
-            ) ? (
-              <ViewButton
-                showView={showView}
-                data={record}
-                ltmplConfig={ltmplConfig}
-              ></ViewButton>
-            ) : (
-              ""
-            )}
-            {buttons.includes("customDetail") &&
-            showView &&
-            ActionUtils.isShow(
-              ltmplConfig.buttonViewAction?.preposes,
-              [record],
-              undefined
-            ) ? (
-              <Button
-                size="small"
-                type="primary"
-                icon={<AlignLeftOutlined />}
-                onClick={() => showView({ code: record.code })}
-              ></Button>
-            ) : (
-              ""
-            )}
-            {buttons.includes("dtmplEdit") && doEdit && !readOnly ? (
-              <EditButton
-                doEdit={doEdit}
-                data={record}
-                ltmplConfig={ltmplConfig}
-              ></EditButton>
-            ) : (
-              ""
-            )}
-            {builtInButtons?.includes("blockAuthMenuTree") && !readOnly ? (
-              <Button
-                size="small"
-                type="dashed"
-                icon={
-                  <KeyOutlined
-                    rotate={180}
-                    style={{ color: "#f5222d", marginRight: "4px" }}
-                  />
-                }
-                onClick={() =>
-                  this.setState({
-                    blockMenuTreeDrawerOpen: true,
-                    recordCode: record.code,
-                  })
-                }
-              ></Button>
-            ) : (
-              ""
-            )}
-            {(buttons.includes("dtmplCustomEdit") || customEditable) &&
-            doEdit &&
-            !readOnly &&
-            ActionUtils.isShow(
-              ltmplConfig.buttonEditAction?.preposes,
-              [record],
-              undefined
-            ) ? (
-              <Button
-                size="small"
-                type="dashed"
-                icon={<FormOutlined />}
-                onClick={() =>
-                  doEdit({
-                    code: record.code,
-                    mode: "update",
-                    toCustomPage: true,
-                  })
-                }
-              ></Button>
-            ) : (
-              ""
-            )}
-            {buttons.includes("copy") && doEdit && !readOnly ? (
-              <Tooltip title={translate("${复制}")}>
-                <Button
-                  size="small"
-                  type="dashed"
-                  icon={<CopyOutlined />}
-                  onClick={async () => {
-                    //先复制
-                    let toCustomPage = false;
-                    if (buttons.includes("dtmplCustomEdit") || customEditable) {
-                      toCustomPage = true;
-                    }
-                    let code = await HcserviceV3.doCopy(
-                      serverKey,
-                      sourceId,
-                      record.code
-                    );
-                    if (code) {
-                      doEdit({ code, mode: "update", toCustomPage });
-                    }
-                  }}
-                ></Button>
-              </Tooltip>
-            ) : (
-              ""
-            )}
-            {ltmplConfig.rowCustomButtons
-              ? ltmplConfig.rowCustomButtons.map((customButton) => {
-                  return (
-                    <Button
-                      key={customButton.id}
-                      size="small"
-                      type={
-                        customButton.buttonType
-                          ? customButton.buttonType
-                          : "dashed"
-                      }
-                      onClick={() =>
-                        this.doCustomButton(customButton, [record])
-                      }
-                    >
-                      {translate("${" + customButton.title + "}")}
-                    </Button>
-                  );
-                })
-              : ""}
-            {ltmplConfig.ractions && !readOnly
-              ? ltmplConfig.ractions.map((raction) => {
-                  return (
-                      ActionUtils.isShow(
-                          raction?.preposes,
-                          [record],
-                          undefined
-                      )?
-                    <Button
-                      key={raction.id}
-                      size="small"
-                      type="dashed"
-                      onClick={() => doRAction(raction.id, record.code)}
-                    >
-                      {translate("${" + raction.title + "}")}
-                    </Button>:""
-                  );
-                })
-              : ""}
-
-            {ltmplConfig.rowActions &&
-            !readOnly &&
-            ltmplConfig.rowActions.length > 0
-              ? ltmplConfig.rowActions.map((action) => {
-                  return (
-                    <Action
-                      serverKey={serverKey}
-                      iconType={"icon"}
-                      key={action.id}
-                      data={[record]}
-                      actionConfig={action}
-                      doAction={this.doRowAction}
-                      buttonSize={"small"}
-                      serial={1}
-                    ></Action>
-                  );
-                })
-              : ""}
-
-            {ltmplConfig.rowJumps &&
-            ltmplConfig.rowJumps.length > 0 &&
-            !readOnly
-              ? ltmplConfig.rowJumps.map((jump) => {
-                  return (
-                    <Button
-                      key={jump.id}
-                      size="small"
-                      type="dashed"
-                      onClick={() => this.doRowJump(jump, record)}
-                    >
-                      {translate("${" + jump.title + "}")}
-                    </Button>
-                  );
-                })
-              : ""}
-            {ltmplConfig.rowCQuerys &&
-            ltmplConfig.rowCQuerys.length > 0 &&
-            !readOnly
-              ? ltmplConfig.rowCQuerys.map((cquery) => {
-                  // console.log("record record", record);
-                  return (
-                    <CquickButton
-                      serverKey={serverKey}
-                      key={cquery.id}
-                      size={"small"}
-                      pageType={"drawer"}
-                      // onClick={() => doCQuery(cquery.id)}
-                      cQueryConfig={cquery}
-                      mainCode={
-                        cquery.mainCodeColId
-                          ? record[cquery.mainCodeColId]
-                          : record.code
-                      }
-                    />
-                  );
-                })
-              : ""}
-            {ltmplConfig.rowFileButtons &&
-            ltmplConfig.rowFileButtons.length > 0
-                ? ltmplConfig.rowFileButtons.map((openFileButton) => {
-                  let v= record[openFileButton.fieldId];
-                  if(v){
-                    if(v instanceof Array){
-                      v=v[0];
-                    }
-                    if(v.includes("@R@")>0){
-                      v=v.split("@R@")[1];
-                    }
-                    return (
-                        <NewinFileView
-                            title={openFileButton.title}
-                            filePath={HCService.toFilePath(v, serverKey)}
-                            serverKey={serverKey}
-                            key={openFileButton.id}
-                            //size={"small"}
-                        />
-                    );
-                  }else{
-                    return "";
-                  }
-                })
-                : ""}
-            {buttons.includes("singleDelete") &&
-            !readOnly &&
-            ActionUtils.isShow(
-              ltmplConfig.buttonDeleteAction?.preposes,
-              [record],
-              undefined
-            ) ? (
-              <Popconfirm
-                placement="rightBottom"
-                title={translate("${确定要[删除]此数据吗}?")}
-                onConfirm={() => {
-                  this.doDeleteByCode(record.code);
-                }}
-                okText={translate("${确定}")}
-                cancelText={translate("${取消}")}
-                okType={"danger"}
-              >
-                <Button size="small" type="dashed" danger>
-                  <DeleteOutlined />
-                </Button>
-              </Popconfirm>
-            ) : (
-              ""
-            )}
-          </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
-              serverKey={serverKey}
-              fieldConfig={item}
-              value={record[item.id]}
-              holderType={"table"}
-            />
-          );
-        };
-      }
-    });
-
-    console.log("columns", tableColumns);
-
-    return tableColumns;
-  };
 
   async componentDidMount() {
     const { ltmplConfig } = this.props;
@@ -818,11 +387,11 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       (sourceId && preSourceId != sourceId) ||
       (ltmplConfig &&
         (!preLtmplConfig || ltmplConfig.id != preLtmplConfig.id)) ||
-      Units.transQueryParamsToStr(criteriaData, false, [
+      ProgramConfig.transQueryParamsToStr(criteriaData, false, [
         "pageSize",
         "pageNo",
       ]) !=
-        Units.transQueryParamsToStr(preCriteriaData, false, [
+        ProgramConfig.transQueryParamsToStr(preCriteriaData, false, [
           "pageSize",
           "pageNo",
         ])
@@ -869,17 +438,15 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     const { hiddenColIds, sortedColConfigs } = this.state;
     this.setState({
       hiddenRowCodes: [],
-      // tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, [], sortedColConfigs),
     });
   };
 
   onHide = (code: string) => {
-    const { ltmplConfig } = this.props;
-    const { hiddenRowCodes, hiddenColIds, sortedColConfigs } = this.state;
+
+    const { hiddenRowCodes } = this.state;
     let hiddenCodes = [...hiddenRowCodes, code];
     this.setState({
       hiddenRowCodes: hiddenCodes,
-      // tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, hiddenCodes, sortedColConfigs),
     });
   };
 
@@ -890,12 +457,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   changeHiddenColumns = (hiddenColIds: string[]) => {
-    const {} = this.props;
-    const {} = this.state;
     this.setState({
       showL2Chart: false,
       hiddenColIds,
-      // tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, hiddenRowCodes, sortedColConfigs),
     });
   };
 
@@ -1023,9 +587,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           }
         }
       }
-      url = Units.joinPath(url, paths.join("/"));
+      url = ProgramConfig.joinPath(url, paths.join("/"));
     } else {
-      url = Units.joinPath(url, path);
+      url = ProgramConfig.joinPath(url, path);
     }
 
     //处理search 参数
@@ -1033,7 +597,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     let searchs = [];
     //放入token
     if (jump.tokenName) {
-      searchs[0] = jump.tokenName + "=" + Units.hydrocarbonToken();
+      searchs[0] = jump.tokenName + "=" + ProgramConfig.hydrocarbonToken();
     }
 
     if (searchParamConfigs) {
@@ -1064,6 +628,13 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
   };
 
+  blockMenuTreeDrawerOpen=(record)=>{
+    this.setState({
+      blockMenuTreeDrawerOpen: true,
+      recordCode: record.code,
+    })
+  }
+
   doRowJump = async (jump: JumpConfig, record: DtmplData) => {
     this.doJump(jump, record);
   };
@@ -1099,10 +670,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         <Tooltip title={translate("${" + title + "}")}>
           <Button
             style={{
-              // display:
-              //     buttons.includes("exportLtmplExcel") && !readOnly
-              //         ? "inline"
-              //         : "none",
               marginLeft: "5px",
             }} //为了点击到没有导出模块，使组件不致销毁，丢失导出数据
           >
@@ -1147,11 +714,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   onChangeColSort = (sortedColConfigs: ColumnConfig[]) => {
-    const { ltmplConfig } = this.props;
-    const { hiddenRowCodes, hiddenColIds } = this.state;
     this.setState({
       sortedColConfigs,
-      // tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, hiddenRowCodes, sortedColConfigs),
     });
   };
 
@@ -1178,7 +742,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   renderHeaderButtons = () => {
     let {
       hiddenColIds,
-      queryKey,
       viewModels,
       sortedColConfigs,
       disabledColIds,
@@ -1195,8 +758,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       customCreatable,
       serverKey,
       readOnly,
-      pageNo,
-      pageSize,
     } = this.props;
     const { translate } = this.context;
     let { buttons } = ltmplConfig;
@@ -1453,9 +1014,15 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       serverKey,
       doSearch,
       criteriaData,
+      showView,
+      doEdit,
+      doRAction,
+      customEditable,
+      readOnly,tableType
     } = this.props;
     const { translate } = this.context;
 
+
     if (!ltmplConfig || !sourceId) {
       return (
         <>
@@ -1465,11 +1032,22 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       );
     }
 
-    let tableColumns = this.buildTableColumns(
-      ltmplConfig,
+
+
+    let tableColumns = ColumnBuilder.buildTableColumns(
+        {ltmplConfig,
       hiddenColIds,
       hiddenRowCodes,
-      sortedColConfigs
+      sortedColConfigs,showView,
+        doEdit,
+        doRAction,
+        customEditable,
+        serverKey,
+        readOnly,
+        sourceId, translate,unHiden:this.unHiden,
+        onHide:this.onHide, doCustomButton:this.doCustomButton, doRowJump:this.doRowJump,
+          blockMenuTreeDrawerOpen:this.blockMenuTreeDrawerOpen,
+        doRowAction:this.doRowAction, doDeleteByCode:this.doDeleteByCode,sortColumns:criteriaData["sortColIds"]}
     );
 
     let { buttons } = ltmplConfig;
@@ -1544,7 +1122,15 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           {displayCriteriaCard ? this.renderCriteriaForm() : null}
           {loading ? (
             <Table loading={loading}></Table>
-          ) : (
+          ) : (tableType =="report"?<ReportTable
+                      tableProps={{scrollY:ltmplConfig.scrollY,clickDisplayTotal:!ltmplConfig.directShowTotal}}
+                      serverKey={serverKey}
+                      maxSelectedRows={this.checkBoxUseful() ? 1000 : -1}
+                      columns={tableColumns}
+                      selectedRows={selectedRows}  queryKey={queryKey}
+                      onChangeRowSelection={this.changeRowSelection}
+                      leftFixedCols={ltmplConfig.leftFixedCols}
+                  />:
             <QueryTable
                 tableProps={{scrollY:ltmplConfig.scrollY,clickDisplayTotal:!ltmplConfig.directShowTotal}}
               serverKey={serverKey}
@@ -1615,23 +1201,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     doSearch(null);
   };
 
-  handleColumnOrder(columnId) {
-    const sortColumns = this.props.criteriaData["sortColIds"];
-
-    if (!Array.isArray(sortColumns)) return undefined;
 
-    for (const column of sortColumns) {
-      const [key, sort] = column.split("_");
-
-      if (key === columnId) {
-        if (sort === "asc") return "ascend";
-        if (sort === "desc") return "descend";
-        continue;
-      }
-    }
-
-    return undefined;
-  }
 
 
 
@@ -1641,9 +1211,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       loading,
       blockMenuTreeDrawerOpen,
       recordCode,
-      showCustomCard,
-      customButton,
-      customButtonData,
       showRatmplSelector,
     } = this.state;
     let {
@@ -1656,8 +1223,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       serverKey,
       mainCode,
     } = this.props;
-    const { translate } = this.context;
-
     if (!ltmplConfig || !sourceId) {
       return (
         <>
@@ -1669,7 +1234,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
     return (
       <>
-        {" "}
         {this.renderAboveCustomPage()}
         {collapsible ? (
           <CollapseCard
@@ -1677,6 +1241,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             title={
               <>
                 {!title ? ltmplConfig.title : title}
+
                 <ToolTipBar
                   content={tip ? tip : ltmplConfig ? ltmplConfig.tip : null}
                 />