aldehyde 0.2.160 → 0.2.163

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

@@ -41,13 +41,13 @@ import {
   ActTableViewModel,
   AddOrUpdate,
   BuiltInButtonName,
-  ClassifiedAddConfig,
-  ColumnConfig,
+  ClassAddConfig,
+  ColumnConfig, DoEditParam,
   DtmplData,
   JumpConfig,
   LtmplConfig,
   QueryKey,
-  SelectedRow,
+  SelectedRow, ShowViewParam,
   TmplBaseProps,
 } from "../tmpl/interface";
 import TableUnits from "./table-util";
@@ -58,7 +58,7 @@ import CriteriaForm from "./../form/criteria-form";
 import ViewControl from "../controls/view-control";
 import Units from "../units";
 import ColumnSelector from "./column/column-selector";
-import ExportFrame from "../exportor/export-frame";
+import ExportFrame, {ExportType} from "../export/export-frame";
 import { SortableHandle } from "react-sortable-hoc";
 import L2ActTable from "./l2-act-table";
 
@@ -70,6 +70,8 @@ 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";
 
 const DragHandle = SortableHandle(() => (
   <MenuOutlined style={{ cursor: "grab", color: "#999" }} />
@@ -87,10 +89,10 @@ interface ActTableProps extends TmplBaseProps {
   onChangePage: (pageNo: number, pageSize: number) => void;
   ltmplConfig: LtmplConfig;
   menuId?: string;
-  showView?: (code: string, toCustomPage?: boolean) => void;
+  showView?: (showVievParam:ShowViewParam) => void;
   doCreate?: (addtmplId: string, toCustomPage: boolean) => void;
   customCreatable?: boolean;
-  doEdit?: (code: string, mode: AddOrUpdate, toCustomPage?: boolean) => void;
+  doEdit?: (doEditParam:DoEditParam) => void;
   customEditable?: boolean;
   doDelete?: (code: string) => void;
   doSearch?: (params: object) => void;
@@ -357,7 +359,11 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         column["title"] = <>{translate("${操作}")}</>;
         column["render"] = (text, record) => (
           <Space size={[0, 4]} wrap>
-            {buttons.includes("detail") && showView ? (
+            {buttons.includes("detail") && showView && (ActionUtils.isShow(
+                ltmplConfig.buttonViewAction?.preposes,
+                [record],
+                undefined
+            ))  ? (
               <Button
                 size="small"
                 type="primary"
@@ -367,34 +373,19 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             ) : (
               ""
             )}
-            {buttons.includes("customDetail") && showView ? (
-              <Button
-                size="small"
-                type="primary"
-                icon={<AlignCenterOutlined />}
-                onClick={() => showView(record.code, true)}
-              ></Button>
-            ) : (
-              ""
-            )}
+            {buttons.includes("customDetail") && showView &&
+                (ActionUtils.isShow(
+                    ltmplConfig.buttonViewAction?.preposes,
+                    [record],
+                    undefined
+                )) ?
+                (<ViewButton showView={showView} data={record} ltmplConfig={ltmplConfig} ></ViewButton>) : (
+                "")}
             {buttons.includes("dtmplEdit") &&
             doEdit &&
-            !readOnly &&
-            (!ltmplConfig.buttonEditAction ||
-              ActionUtils.isShow(
-                ltmplConfig.buttonEditAction,
-                [record],
-                undefined
-              )) ? (
-              <Button
-                size="small"
-                type="dashed"
-                icon={<EditOutlined />}
-                onClick={() => doEdit(record.code, "update")}
-              ></Button>
-            ) : (
-              ""
-            )}
+            !readOnly ?
+                (<EditButton doEdit={doEdit} data={record} ltmplConfig={ltmplConfig} ></EditButton>) : (
+              "")}
             {builtInButtons?.includes("blockAuthMenuTree") && !readOnly ? (
               <Button
                 size="small"
@@ -418,9 +409,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             {(buttons.includes("dtmplCustomEdit") || customEditable) &&
             doEdit &&
             !readOnly &&
-            (!ltmplConfig.buttonEditAction ||
-              ActionUtils.isShow(
-                ltmplConfig.buttonEditAction,
+            (ActionUtils.isShow(
+                ltmplConfig.buttonEditAction?.preposes,
                 [record],
                 undefined
               )) ? (
@@ -428,7 +418,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 size="small"
                 type="dashed"
                 icon={<FormOutlined />}
-                onClick={() => doEdit(record.code, "update", true)}
+                onClick={() => doEdit({code:record.code, mode:"update",toCustomPage:true})}
               ></Button>
             ) : (
               ""
@@ -451,7 +441,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                       record.code
                     );
                     if (code) {
-                      doEdit(code, "update", toCustomPage);
+                      doEdit({code, mode:"update", toCustomPage});
                     }
                   }}
                 ></Button>
@@ -531,9 +521,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
               : ""}
             {buttons.includes("singleDelete") &&
             !readOnly &&
-            (!ltmplConfig.buttonDeleteAction ||
-              ActionUtils.isShow(
-                ltmplConfig.buttonDeleteAction,
+            (ActionUtils.isShow(
+                ltmplConfig.buttonDeleteAction?.preposes,
                 [record],
                 undefined
               )) ? (
@@ -868,6 +857,61 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     this.doJump(jump, record);
   };
 
+
+  renderExportButton=(title,type:ExportType,sourceId?:string)=>{
+    const {pageNo,pageSize,serverKey,ltmplConfig,readOnly}=this.props;
+
+    let buttons=ltmplConfig?.buttons;
+
+    const {queryKey,}=this.state;
+    const { translate } = this.context;
+    return <Popover
+        content={
+          <ExportFrame //导出组件
+              currentPage={{
+                pageNo: pageNo ? pageNo : 1,
+                pageSize: pageSize ? pageSize : ltmplConfig.defaultPageSize,
+              }}
+              type={type}
+              serverKey={serverKey}
+              queryKey={queryKey}
+              sourceId={sourceId}
+              title={translate("${" + ltmplConfig.title + "}" +"-"+ "${" +title + "}")}
+          />
+        }
+        title={translate("${"+title+"}")}
+        placement="bottomRight"
+        trigger="click"
+    >
+      <Tooltip title={translate("${"+title+"}")}>
+        <Button
+            style={{
+              // display:
+              //     buttons.includes("exportLtmplExcel") && !readOnly
+              //         ? "inline"
+              //         : "none",
+              marginLeft: "5px",
+            }} //为了点击到没有导出模块，使组件不致销毁，丢失导出数据
+        >
+          {type=="ltmpl-data-excel"? <DownloadOutlined />:title}
+        </Button>
+      </Tooltip>
+    </Popover>
+  }
+
+  renderFileExportButton=()=>{
+    const {ltmplConfig}=this.props;
+    let fileExports=ltmplConfig?.topFileExports;
+    if(fileExports){
+      return fileExports.map((fileExport) => {
+        return this.renderExportButton(fileExport.title,"ltmpl-data-filedata",fileExport.id);
+      });
+    }else{
+      return <></>
+    }
+
+  }
+
   doSelectedJump = async (jump: JumpConfig) => {
     const { selectedDatas } = this.state;
     if (selectedDatas.length == 1) {
@@ -894,12 +938,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     });
   };
 
-  getAddTmplButton = (classifiedAddConfigs: ClassifiedAddConfig[]) => {
+  getAddTmplButton = (classAddConfigs: ClassAddConfig[]) => {
     const { translate } = this.context;
-    if (classifiedAddConfigs && classifiedAddConfigs.length < 1) {
+    if (classAddConfigs && classAddConfigs.length < 1) {
       return translate("${没有分类添加按钮}");
     }
-    return classifiedAddConfigs.map((config) => {
+    return classAddConfigs.map((config) => {
       return (
         <p>
           <Button
@@ -951,12 +995,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             </Popover>
           ) : null}
           {buttons.includes("dtmplAdd") && doCreate && !readOnly ? (
-            ltmplConfig.classifiedAddConfigs &&
-            ltmplConfig.classifiedAddConfigs.length > 0 ? (
+            ltmplConfig.classAddConfigs &&
+            ltmplConfig.classAddConfigs.length > 0 ? (
               <Popover
                 arrow={false}
                 content={this.getAddTmplButton(
-                  ltmplConfig.classifiedAddConfigs
+                  ltmplConfig.classAddConfigs
                 )}
                 placement="bottomRight"
               >
@@ -1001,39 +1045,11 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             ""
           )}
           {buttons.includes("exportLtmplExcel") && !readOnly ? (
-            <Popover
-              content={
-                <ExportFrame //导出组件
-                  currentPage={{
-                    pageNo: pageNo ? pageNo : 1,
-                    pageSize: pageSize ? pageSize : ltmplConfig.defaultPageSize,
-                  }}
-                  serverKey={serverKey}
-                  queryKey={queryKey}
-                  title={translate("${" + ltmplConfig.title + "}")}
-                />
-              }
-              title={translate("${导出}")}
-              placement="bottomRight"
-              trigger="click"
-            >
-              <Tooltip title={translate("${导出}")}>
-                <Button
-                  style={{
-                    display:
-                      buttons.includes("exportLtmplExcel") && !readOnly
-                        ? "inline"
-                        : "none",
-                    marginLeft: "5px",
-                  }} //为了点击到没有导出模块，使组件不致销毁，丢失导出数据
-                >
-                  <DownloadOutlined />
-                </Button>
-              </Tooltip>
-            </Popover>
+              this.renderExportButton("导出","ltmpl-data-excel")
           ) : (
             ""
           )}
+          { this.renderFileExportButton()}
           {buttons.includes("showChart") ? (
             <Tooltip
               title={

package/src/aldehyde/table/index.css

@@ -51,17 +51,17 @@
 /*}*/
 
 .ant-table-cell:has(.xiaoji) {
-  background-color: rgb(225, 250, 235);
+  background-color: var(--ant-control-item-bg-active-hover) !important;
 }
 
 .ant-table-cell:has(.zongji) {
-  background-color: #00b96b;
+  background-color: var(--color-4) !important;
 }
 
 .xiaoji {
-  background-color: rgb(225, 250, 235);
+  background-color: var(--ant-control-item-bg-active-hover) !important;
 }
 
 .zongji {
-  background-color: #00b96b;
+  background-color: var(--color-4) !important;
 }

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

@@ -1,4 +1,4 @@
-import React, { Children } from "react";
+import React from "react";
 import { Card, Collapse, Descriptions, List } from "antd";
 import Table from "./control-table-x-axis-wrapper";
 import "./index.css";
@@ -18,11 +18,8 @@ import { TableRowSelection } from "antd/lib/table/interface";
 import { SortableContainer, SortableElement } from "react-sortable-hoc";
 import { arrayMoveImmutable } from "array-move";
 import ViewControl from "../controls/view-control";
-import Scrollbars from "react-custom-scrollbars";
 import { LocaleContext } from "../locale/LocaleProvider";
 import { BigNumber } from "bignumber.js";
-import Column from "antd/es/table/Column";
-import { ColumnsType } from "antd/es/table";
 import { init, merge, statistic } from "../utils/dsu";
 
 const { Panel } = Collapse;

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

@@ -21,7 +21,7 @@ import {
 } from "@ant-design/icons";
 import "./index.css";
 import {
-  ClassifiedAddConfig,
+  ClassAddConfig,
   DtmplData,
   FieldGroupConfig,
   SelectedRow,
@@ -553,13 +553,13 @@ class RelationTable extends React.PureComponent<
     });
   };
 
-  getAddTmplButton = (classifiedAddConfigs: ClassifiedAddConfig[]) => {
+  getAddTmplButton = (classAddConfigs: ClassAddConfig[]) => {
     const { translate } = this.context;
 
-    if (classifiedAddConfigs && classifiedAddConfigs.length < 1) {
+    if (classAddConfigs && classAddConfigs.length < 1) {
       return translate("${没有分类添加按钮}");
     }
-    return classifiedAddConfigs.map((config) => {
+    return classAddConfigs.map((config) => {
       return (
         <p>
           <Button
@@ -604,12 +604,12 @@ class RelationTable extends React.PureComponent<
                 ""
               )}
               {buttons.includes("dtmplAdd") ? (
-                fieldGroupConfig.classifiedAddConfigs &&
-                fieldGroupConfig.classifiedAddConfigs.length > 0 ? (
+                fieldGroupConfig.classAddConfigs &&
+                fieldGroupConfig.classAddConfigs.length > 0 ? (
                   <Popover
                     arrow={false}
                     content={this.getAddTmplButton(
-                      fieldGroupConfig.classifiedAddConfigs
+                      fieldGroupConfig.classAddConfigs
                     )}
                     placement="bottomRight"
                   >

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

@@ -238,10 +238,10 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
             return <>
             </>
         }
-        let {buttons, criterias, jumps, actions} = selectConfig
+        let {buttons, criterias, jumps, actions,fileExports} = selectConfig
         let displayCriteriaCard: boolean = false;
         if (buttons.includes('batchDelete') || (buttons.includes('query') && criterias && criterias.length > 0) ||
-            (actions && actions.length > 0) || (jumps && jumps.length > 0)) {
+            (actions && actions.length > 0) || (jumps && jumps.length > 0) || (fileExports && fileExports.length>0)) {
             displayCriteriaCard = true;
         }
         return (