aldehyde 0.2.487 → 0.2.488

package/src/aldehyde/draw-canvas-edit/components/render/tools/copy-tool.ts

@@ -235,10 +235,10 @@ export class CopyTool {
       this.render.updateHistory();
       // 重绘
       this.render.redraw([
-        GraphDraw.name,
-        LinkDraw.name,
-        RulerDraw.name,
-        PreviewDraw.name
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
       ]);
     }
   }

package/src/aldehyde/draw-canvas-edit/components/render/tools/import-export-tool.ts

@@ -46,7 +46,7 @@ export class ImportExportTool {
 
       if (withLink) {
         // 从 Link group 中提取 连接线
-        const linkDraw = cover.children.find((o) => o.attrs.name === LinkDraw.name) as Konva.Group;
+        const linkDraw = cover.children.find((o) => o.attrs.name === LinkDraw.NAME) as Konva.Group;
         if (linkDraw) {
           nodes = nodes.concat(linkDraw.children.filter((o) => o.attrs.name === 'link-line'));
         }
@@ -157,7 +157,7 @@ export class ImportExportTool {
             // 防止进入调整点，重复处理
             if (!node.attrs.hoverAnchor) {
               node.setAttr('hover', true);
-              this.render.redraw([GraphDraw.name]);
+              this.render.redraw([GraphDraw.NAME]);
             }
             setTimeout(() => {
               // 调整产生 redraw，导致离开调整点不触发其 mouseleave（进入其他元素区域除外）
@@ -177,7 +177,7 @@ export class ImportExportTool {
               if (!node.attrs.hoverAnchor) {
                 node.setAttr('hover', false);
                 node.setAttr('hoverAnchor', false);
-                this.render.redraw([GraphDraw.name]);
+                this.render.redraw([GraphDraw.NAME]);
               }
             });
             // 隐藏 连接点
@@ -238,10 +238,10 @@ export class ImportExportTool {
       this.render.linkTool.pointsVisible(false);
       // 重绘
       this.render.redraw([
-        GraphDraw.name,
-        LinkDraw.name,
-        RulerDraw.name,
-        PreviewDraw.name
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
       ]);
       stage.destroy();
     } catch (e) {

package/src/aldehyde/draw-canvas-edit/components/render/tools/link-tool.ts

@@ -26,9 +26,9 @@ export class LinkTool {
         });
       }
       // 拐点操作中，此处不重绘
-      if (!(this.render.draws[LinkDraw.name] as LinkDraw)?.state.linkManualing) {
+      if (!(this.render.draws[LinkDraw.NAME] as LinkDraw)?.state.linkManualing) {
         // 重绘
-        this.render.redraw([LinkDraw.name, RulerDraw.name, PreviewDraw.name]);
+        this.render.redraw([LinkDraw.NAME, RulerDraw.NAME, PreviewDraw.NAME]);
       }
     }
   }
@@ -57,9 +57,9 @@ export class LinkTool {
 
               // 重绘
               this.render.redraw([
-                LinkDraw.name,
-                RulerDraw.name,
-                PreviewDraw.name
+                LinkDraw.NAME,
+                RulerDraw.NAME,
+                PreviewDraw.NAME
               ]);
             }
           }
@@ -205,8 +205,8 @@ export class LinkTool {
     this.render.emit('link-selection-change', this.linkCurrent);
     // 重绘
     this.render.redraw([
-      LinkDraw.name, // 更新连线
-      RulerDraw.name // 更新比例尺
+      LinkDraw.NAME, // 更新连线
+      RulerDraw.NAME // 更新比例尺
     ]);
   }
 
@@ -216,8 +216,8 @@ export class LinkTool {
     this.render.emit('link-selection-change', undefined);
     // 重绘
     this.render.redraw([
-      LinkDraw.name, // 更新连线
-      RulerDraw.name
+      LinkDraw.NAME, // 更新连线
+      RulerDraw.NAME
     ]);
   }
 }

package/src/aldehyde/draw-canvas-edit/components/render/tools/position-tool.ts

@@ -110,12 +110,12 @@ export class PositionTool {
 
     // 重绘
     this.render.redraw([
-      BgDraw.name,
-      GraphDraw.name,
-      LinkDraw.name,
-      RulerDraw.name,
-      RefLineDraw.name,
-      PreviewDraw.name
+      BgDraw.NAME,
+      GraphDraw.NAME,
+      LinkDraw.NAME,
+      RulerDraw.NAME,
+      RefLineDraw.NAME,
+      PreviewDraw.NAME
     ]);
   }
 
@@ -136,12 +136,12 @@ export class PositionTool {
     });
     // 重绘
     this.render.redraw([
-      BgDraw.name,
-      GraphDraw.name,
-      LinkDraw.name,
-      RulerDraw.name,
-      RefLineDraw.name,
-      PreviewDraw.name
+      BgDraw.NAME,
+      GraphDraw.NAME,
+      LinkDraw.NAME,
+      RulerDraw.NAME,
+      RefLineDraw.NAME,
+      PreviewDraw.NAME
     ]);
   }
 
@@ -181,12 +181,12 @@ export class PositionTool {
     });
     // 重绘
     this.render.redraw([
-      BgDraw.name,
-      GraphDraw.name,
-      LinkDraw.name,
-      RulerDraw.name,
-      RefLineDraw.name,
-      PreviewDraw.name
+      BgDraw.NAME,
+      GraphDraw.NAME,
+      LinkDraw.NAME,
+      RulerDraw.NAME,
+      RefLineDraw.NAME,
+      PreviewDraw.NAME
     ]);
   }
 }

package/src/aldehyde/draw-canvas-edit/components/render/tools/selection-tool.ts

@@ -44,7 +44,7 @@ export class SelectionTool {
     // 隐藏 连接点
     this.render.linkTool.pointsVisible(false);
     // 重绘
-    this.render.redraw([GraphDraw.name, LinkDraw.name]);
+    this.render.redraw([GraphDraw.NAME, LinkDraw.NAME]);
   }
 
   // 选择节点
@@ -121,7 +121,7 @@ export class SelectionTool {
     }
 
     // 重绘
-    this.render.redraw([GraphDraw.name, LinkDraw.name]);
+    this.render.redraw([GraphDraw.NAME, LinkDraw.NAME]);
   }
 
   // 更新节点位置

package/src/aldehyde/draw-canvas-edit/components/render/tools/z-index-tool.ts

@@ -106,10 +106,10 @@ export class ZIndexTool {
       this.render.updateHistory();
       // 重绘
       this.render.redraw([
-        GraphDraw.name,
-        LinkDraw.name,
-        RulerDraw.name,
-        PreviewDraw.name
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
       ]);
     }
   }
@@ -151,10 +151,10 @@ export class ZIndexTool {
       this.render.updateHistory();
       // 重绘
       this.render.redraw([
-        GraphDraw.name,
-        LinkDraw.name,
-        RulerDraw.name,
-        PreviewDraw.name
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
       ]);
     }
   }
@@ -182,10 +182,10 @@ export class ZIndexTool {
       this.render.updateHistory();
       // 重绘
       this.render.redraw([
-        GraphDraw.name,
-        LinkDraw.name,
-        RulerDraw.name,
-        PreviewDraw.name
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
       ]);
     }
   }
@@ -215,10 +215,10 @@ export class ZIndexTool {
       this.render.updateHistory();
       // 重绘
       this.render.redraw([
-        GraphDraw.name,
-        LinkDraw.name,
-        RulerDraw.name,
-        PreviewDraw.name
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
       ]);
     }
   }

package/src/aldehyde/lowcode-components/bar-chart/index.tsx

@@ -81,7 +81,7 @@ export interface ComponentStyle {
 
 export interface ComponentProps {
     style?: ComponentStyle;
-    base: { width: number, height: number };
+    base?: { width: number, height: number };
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
     initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
@@ -90,6 +90,7 @@ export interface ComponentProps {
 export interface ComponentRef {
     updateConfig: (newConfig: ComponentProps) => void;
     destroy: () => void;
+    updateSearchParams: (params: { [key: string]: any }) => void;
 }
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
@@ -147,6 +148,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             handleWSData(newDataConfig);
         },
         destroy: handleDestroy,
+        updateSearchParams: (params) => {
+            setInitSearchParams(params);
+        },
     }));
 
     // 窗口大小变化时重新调整图表大小

package/src/aldehyde/lowcode-components/column-3d-chart/index.tsx

@@ -136,7 +136,7 @@ export interface ComponentStyle {
 
 export interface ComponentProps {
     style?: ComponentStyle;
-    base: { width: number, height: number, type: string };
+    base?: { width: number, height: number, type: string };
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
     initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
@@ -145,6 +145,7 @@ export interface ComponentProps {
 export interface ComponentRef {
     updateConfig: (newConfig: ComponentProps) => void;
     destroy: () => void;
+    updateSearchParams: (params: { [key: string]: any }) => void;
 }
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
@@ -202,6 +203,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             handleWSData(newDataConfig);
         },
         destroy: handleDestroy,
+        updateSearchParams: (params) => {
+            setInitSearchParams(params);
+        },
     }));
 
     // 窗口大小变化时重新调整图表大小

package/src/aldehyde/lowcode-components/column-chart/index.tsx

@@ -41,7 +41,7 @@ const defOption = {
         show: false, // 无数据时显示
     },
     tooltip: { trigger: "axis" },
-    grid: { top: 30, let: 30, right: 20, bottom: 30 },
+    grid: { top: 30, left: 30, right: 20, bottom: 30 },
     xAxis: {
         type: 'category',
         boundaryGap: true,
@@ -92,7 +92,7 @@ const handleData = (data: { config: { [key: string]: string }, value: { [key: st
 export interface ComponentStyle {
     tooltip?: { show: boolean };
     color?: string[];
-    grid?: { top: number, let: number, right: number, bottom: number };
+    grid?: { top: number, left: number, right: number, bottom: number };
     xAxis?: { [key: string]: any };
     yAxis?: { [key: string]: any };
     legend?: { [key: string]: any };
@@ -104,7 +104,7 @@ export interface ComponentStyle {
 
 export interface ComponentProps {
     style?: ComponentStyle;
-    base: { width: number, height: number, type: string };
+    base: { width?: number, height?: number, type: string };
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
     initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
@@ -113,6 +113,7 @@ export interface ComponentProps {
 export interface ComponentRef {
     updateConfig: (newConfig: ComponentProps) => void;
     destroy: () => void;
+    updateSearchParams: (params: { [key: string]: any }) => void;
 }
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
@@ -171,6 +172,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             setInitSearchParams(newISParams);
             handleWSData(newDataConfig);
         },
+        updateSearchParams: (params) => {
+            setInitSearchParams(params);
+        },
         destroy: handleDestroy,
     }));
 

package/src/aldehyde/lowcode-components/line-bar-chart/index.tsx

@@ -97,7 +97,7 @@ export interface ComponentStyle {
 
 export interface ComponentProps {
     style?: ComponentStyle;
-    base: { width: number, height: number };
+    base?: { width: number, height: number };
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
     initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
@@ -106,6 +106,7 @@ export interface ComponentProps {
 export interface ComponentRef {
     updateConfig: (newConfig: ComponentProps) => void;
     destroy: () => void;
+    updateSearchParams: (params: { [key: string]: any }) => void;
 }
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
@@ -164,6 +165,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             setInitSearchParams(newISParams);
             handleWSData(newDataConfig);
         },
+        updateSearchParams: (params) => {
+            setInitSearchParams(params);
+        },
         destroy: handleDestroy,
     }));
 

package/src/aldehyde/lowcode-components/line-chart/index.tsx

@@ -6,7 +6,6 @@ import { useLocale } from "../../locale/useLocale";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import { DataConfigProps } from "../data";
 
-
 const defOption = {
     title: {
         text: '暂无数据',
@@ -15,7 +14,7 @@ const defOption = {
         show: false, // 无数据时显示
     },
     tooltip: { trigger: "axis" },
-    grid: { top: 30, let: 30, right: 20, bottom: 30 },
+    grid: { top: 30, left: 30, right: 20, bottom: 30 },
     xAxis: {
         type: 'category',
         boundaryGap: true,
@@ -71,7 +70,7 @@ const handleData = (data: { config: { [key: string]: string }, value: { [key: st
 export interface ComponentStyle {
     tooltip?: { show: boolean };
     color?: string[];
-    grid?: { top: number, let: number, right: number, bottom: number };
+    grid?: { top: number, left: number, right: number, bottom: number };
     xAxis?: { [key: string]: any };
     yAxis?: { [key: string]: any };
     legend?: { [key: string]: any };
@@ -92,7 +91,7 @@ export interface ComponentStyle {
 
 export interface ComponentProps {
     style?: ComponentStyle;
-    base: { width: number, height: number };
+    base?: { width: number, height: number };
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
     initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
@@ -101,6 +100,7 @@ export interface ComponentProps {
 export interface ComponentRef {
     updateConfig: (newConfig: ComponentProps) => void;
     destroy: () => void;
+    updateSearchParams: (params: { [key: string]: any }) => void;
 }
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
@@ -159,6 +159,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             setInitSearchParams(newISParams);
             handleWSData(newDataConfig);
         },
+        updateSearchParams: (params) => {
+            setInitSearchParams(params);
+        },
         destroy: handleDestroy,
     }));
 
@@ -235,7 +238,8 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
-        const { grid, legend, tooltip, color, xAxis, yAxis, smooth, connectNulls, lineStyle, step, isArea, isGradient, areaStyle, dataZoom, slider, symbol: { itemStyle, ...symbol } } = config;
+        const { grid, legend, tooltip, color, xAxis, yAxis, smooth, connectNulls, lineStyle, step, isArea, isGradient, areaStyle, dataZoom, slider, symbol: configSymbol } = config;
+        const { itemStyle, ...symbol } = configSymbol || {};
         const option = _.cloneDeep(defOption);
         // 编辑态无数据显示默认数据
         const temData = isDesignMode && !data?.length ? option.series : data;

package/src/aldehyde/lowcode-components/pie-chart/index.tsx

@@ -130,7 +130,7 @@ export interface ComponentStyle {
 
 export interface ComponentProps {
     style?: ComponentStyle;
-    base: { width: number, height: number };
+    base?: { width: number, height: number };
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
     initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
@@ -139,6 +139,7 @@ export interface ComponentProps {
 export interface ComponentRef {
     updateConfig: (newConfig: ComponentProps) => void;
     destroy: () => void;
+    updateSearchParams: (params: { [key: string]: any }) => void;
 }
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
@@ -196,6 +197,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             handleWSData(newDataConfig);
         },
         destroy: handleDestroy,
+        updateSearchParams: (params) => {
+            setInitSearchParams(params);
+        },
     }));
 
     // 窗口大小变化时重新调整图表大小

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

@@ -14,6 +14,9 @@ import { LocaleContext } from "../locale/LocaleProvider";
 import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
 import { relValueFieldExtControlType } from "../controls/entry-control";
 
+// 缓存 getSubDtmplData 的请求结果（防止多次请求）
+const subDtmplDataCache: Map<string, any> = new Map();
+
 interface DtmplEditCardProps extends DtmplBaseProps {
     onOk?: (code: string) => void;
     style?: {};
@@ -228,11 +231,18 @@ export default class DtmplEditCard extends React.PureComponent<
     getSubDtmplData = async (valueField, code) => {
         const { serverKey } = this.props;
         let dtmplData = null;
-        if (valueField.extRefPageId) { // 存在extRefPageId(扩展关联页面)，则优先使用extRefPageId(例如：枚举值无指向页面，使用扩展关联页面)
-            const { entities } = await HcserviceV3.requestLtmplQueryTop(null, valueField.extRefPageId, { top: 1, secondCriterion: code.split("@R@")[0] }) || {};
-            dtmplData = entities?.[0];
-        } else { // 查询字段指向页面的数据
-            dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
+        const cacheKey = `${valueField.extRefPageId || valueField.id}_${code.split("@R@")[0]}`; //缓存Key
+        const cacheData = subDtmplDataCache.get(cacheKey);
+        if (cacheData !== undefined) { // 存在缓存使用缓存，减少请求次数
+            dtmplData = cacheData;
+        } else {
+            if (valueField.extRefPageId) { // 存在extRefPageId(扩展关联页面)，则优先使用extRefPageId(例如：枚举值无指向页面，使用扩展关联页面)
+                const { entities } = await HcserviceV3.requestLtmplQueryTop(null, valueField.extRefPageId, { top: 1, secondCriterion: code.split("@R@")[0] }) || {};
+                dtmplData = entities?.[0];
+            } else { // 查询字段指向页面的数据
+                dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
+            }
+            subDtmplDataCache.set(cacheKey, dtmplData || false);
         }
         if (!dtmplData) return null;
         const subField = valueField.subRelValueField;

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

@@ -26,6 +26,8 @@ import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
 import { LocaleContext } from "../locale/LocaleProvider";
 import { relValueFieldExtControlType } from "../controls/entry-control";
 
+// 缓存 getSubDtmplData 的请求结果（防止多次请求）
+const subDtmplDataCache: Map<string, any> = new Map();
 
 interface ModalEditorProps extends DtmplBaseProps {
   height?: any;
@@ -171,11 +173,18 @@ export default class DtmplEditPage extends React.PureComponent<
   getSubDtmplData = async (valueField, code) => {
     const { serverKey } = this.props;
     let dtmplData = null;
-    if (valueField.extRefPageId) { // 存在extRefPageId(扩展关联页面)，则优先使用extRefPageId(例如：枚举值无指向页面，使用扩展关联页面)
-      const { entities } = await HcserviceV3.requestLtmplQueryTop(null, valueField.extRefPageId, { top: 1, secondCriterion: code.split("@R@")[0] }) || {};
-      dtmplData = entities?.[0];
-    } else { // 查询字段指向页面的数据
-      dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
+    const cacheKey = `${valueField.extRefPageId || valueField.id}_${code.split("@R@")[0]}`; //缓存Key
+    const cacheData = subDtmplDataCache.get(cacheKey);
+    if (cacheData !== undefined) { // 存在缓存使用缓存，减少请求次数
+      dtmplData = cacheData;
+    } else {
+      if (valueField.extRefPageId) { // 存在extRefPageId(扩展关联页面)，则优先使用extRefPageId(例如：枚举值无指向页面，使用扩展关联页面)
+        const { entities } = await HcserviceV3.requestLtmplQueryTop(null, valueField.extRefPageId, { top: 1, secondCriterion: code.split("@R@")[0] }) || {};
+        dtmplData = entities?.[0];
+      } else { // 查询字段指向页面的数据
+        dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
+      }
+      subDtmplDataCache.set(cacheKey, dtmplData || false);
     }
     if (!dtmplData) return null;
     const subField = valueField.subRelValueField;

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

@@ -6,7 +6,7 @@ import {
 import {
   ExportOutlined, FundOutlined, LineChartOutlined,
   PlusCircleOutlined, PlusOutlined, ReloadOutlined, RetweetOutlined, SearchOutlined,
-  TableOutlined, ImportOutlined
+  TableOutlined, ImportOutlined, AppstoreAddOutlined
 } from "@ant-design/icons";
 import _ from "lodash";
 import "./index.css";
@@ -36,6 +36,8 @@ import DraggableModal from "../module/draggable-modal";
 import Icon from "../icon/aliIcon";
 import PageConfigButton from "./page-config-button";
 import { defPageSizeOptions } from "./pagination"; // 默认分页数
+import PageChart from "./page-chart"; // 展示图表
+import RowTable from "./row-table";
 
 const { Content, Sider } = Layout;
 const { Text } = Typography;
@@ -118,6 +120,7 @@ interface ActTableStat {
   tabActiveKey?: string; // Tabs选中项
   pageSizeOptions?: number[]; // 设备分页数
   customDrawerSize?: number | string; // 自定义页面抽屉宽度
+  tableNumber?: number; // 添加多表格-显示表格数量
 }
 let serial_number = new Date().getTime();
 let busyReminderTime = 0;
@@ -154,7 +157,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     tabsOptions: [],
     tabActiveKey: "all",
     pageSizeOptions: defPageSizeOptions,
-    customDrawerSize: undefined
+    customDrawerSize: undefined,
+    tableNumber: undefined,
   };
 
   static contextType = LocaleContext;
@@ -1028,6 +1032,10 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       <>
         <Space>
           {userPageConfig && allowUserConfig ? <PageConfigButton menuCode={menuId} handleResetUserPageConfig={this.handleResetUserPageConfig} handleUpdateUserPageConfig={this.handleUpdateUserPageConfig} userCriteriaData={userCriteriaData} /> : ""}
+          {buttons.includes("showTableAdd") ?
+            <Tooltip title={translate("${添加列表}")}>
+              <Button onClick={() => { }}><AppstoreAddOutlined /></Button>
+            </Tooltip> : ""}
           {funcMode == "common" && this.criteriaFormUseful() ? (
             <Popover trigger="click" content={this.renderCriteriaForm()}>
               <Button>
@@ -1516,7 +1524,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   renderContent = () => {
     let {
       queryKey, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable,
-      pageInfo, editings, userCriteriaData, tabsOptions, tabActiveKey, pageSizeOptions
+      pageInfo, editings, userCriteriaData, tabsOptions, tabActiveKey, pageSizeOptions, tableNumber
     } = this.state;
     let {
       mainCode, sourceId, ltmplConfig, funcMode, operatable,
@@ -1633,6 +1641,25 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       {splitTabShowType === "radio" ? <div className="split-tab" ><div className="split-tab-left"><Radio.Group onChange={(e) => this.doTabSearch(e.target.value)} value={tabActiveKey} options={tabsOptions} /></div><div className="split-tab-right">{this.renderHeaderButtons()}</div></div> : ""}
     </>;
 
+    const renderTable = <Layout hasSider style={{ backgroundColor: "#fff" }}>
+      <Sider
+        width={ltreeEntitySelect ? 260 : 0}
+        theme={"light"}
+        style={{ paddingRight: ltreeEntitySelect ? '10px' : "0px" }}
+      >
+        {ltreeEntitySelect ?
+          <EntryControl style={{ width: "300px" }} onChange={this.ltreeValueChange} fieldConfig={ltreeEntitySelect}></EntryControl> : null}
+      </Sider>
+      <Layout style={{ backgroundColor: "#fff" }}>
+        <Content style={{ overflow: "initial" }}>
+          {showAggregates ? this.renderAggregates() : ""}
+          {displayCriteriaCard ? this.renderCriteriaForm() : null}
+          {buttons.includes("rowEdit") ? <AntdForm ref={this.formRef} component={false} onValuesChange={this.doRowEditFormChange}>{renderActTable}</AntdForm> : renderActTable}
+          <PageChart ltmplConfig={ltmplConfig} criteriaData={userCriteriaData} />
+        </Content>
+      </Layout>
+    </Layout>;
+
     return (
       <>
         {buttons.includes("analysis") && showL2ActTable ? (
@@ -1678,28 +1705,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 )}
               </Col>
             </Row> : null}
-          {(<Row><Col span={24}><Layout hasSider style={{ backgroundColor: "#fff" }}>
-            <Sider
-              width={ltreeEntitySelect ? 260 : 0}
-              theme={"light"}
-              style={{
-                paddingRight: ltreeEntitySelect ? '10px' : "0px"
-              }}
-            >
-              {ltreeEntitySelect ?
-                <EntryControl style={{ width: "300px" }} onChange={this.ltreeValueChange} fieldConfig={ltreeEntitySelect}></EntryControl>
-                //     <NavigationTree fieldConfig={ltreeEntitySelect} />
-                : null}
-            </Sider>
-            <Layout style={{ backgroundColor: "#fff" }}>
-              <Content style={{ overflow: "initial" }}>
-                {showAggregates ? this.renderAggregates() : ""}
-                {displayCriteriaCard ? this.renderCriteriaForm() : null}
-                {buttons.includes("rowEdit") ? <AntdForm ref={this.formRef} component={false} onValuesChange={this.doRowEditFormChange}>{renderActTable}</AntdForm> : renderActTable}
-              </Content>
-            </Layout>
-          </Layout></Col></Row>
-          )}
+          {buttons.includes("showTableAdd") ? <RowTable mainTable={renderTable} ltmplConfig={ltmplConfig} tableNumber={tableNumber} sourceId={sourceId} /> : renderTable}
           {/*此处放页脚*/}
           {ltmplConfig.footer ? (
             <div

package/src/aldehyde/table/page-chart.less

@@ -0,0 +1,10 @@
+.page-chart {
+    width: 100%;
+    height: 240px;
+
+    .ant-spin,
+    .ant-spin-container {
+        width: 100%;
+        height: 100%;
+    }
+}