aldehyde 0.2.438 → 0.2.439

package/src/aldehyde/lowcode-components/base-radio/index.tsx

@@ -2,6 +2,7 @@
 import React, { ForwardedRef, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
 import { Radio, ConfigProvider } from 'antd';
 import dayjs from 'dayjs';
+import { useLocale } from "../../locale/useLocale";
 import "./index.less";
 
 const handleTimes = (type: string) => {
@@ -34,6 +35,14 @@ const handleTimes = (type: string) => {
     }
 }
 
+// 翻译
+const handleTranslate = (arr: { label: string, value: string }[], translate: any) => {
+    if (!arr) {
+        return [];
+    }
+    const temArr = arr.map(r => ({ value: r.value, label: translate("${" + r.label + "}") }));
+    return temArr;
+}
 
 export interface ComponentStyle {
     optionType?: "default" | "button",
@@ -68,8 +77,9 @@ export interface ComponentRef {
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
     const { style, setSearchParams } = props;
+    const { translate } = useLocale();
     const [config, setConfig] = useState<ComponentStyle>({ ...style });
-    const [options, setOptions] = useState<{ label: string, value: string }[]>(style?.searchConfig?.options || []);
+    const [options, setOptions] = useState<{ label: string, value: string }[]>(handleTranslate(style?.searchConfig?.options, translate));
     const [currentValue, setCurrentValue] = useState<string>(style?.searchConfig?.defaultValue || "");
 
     useImperativeHandle(ref, () => ({
@@ -77,7 +87,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             const { style: newStyle } = newConfig;
             const { searchConfig } = newStyle;
             setConfig({ ...newStyle });
-            setOptions(searchConfig?.options || []);
+            setOptions(handleTranslate(searchConfig?.options, translate));
             setCurrentValue(searchConfig?.defaultValue || "");
         },
     }));

package/src/aldehyde/lowcode-components/base-table/index.tsx

@@ -4,6 +4,7 @@ import { ConfigProvider, Empty } from "antd";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import { DataConfigProps } from "../data";
 import { ViewControl } from "../../index";
+import { useLocale } from "../../locale/useLocale";
 import './index.less';
 
 const defColumns = [
@@ -42,6 +43,7 @@ export interface ITableBodyStyle {
     fontWeight?: number;
     fontFamily?: string;
     pageSize?: number;
+    showEmpty?: boolean; // 空状态显隐
 }
 
 export interface ComponentStyle {
@@ -68,8 +70,8 @@ export interface ComponentRef {
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
     const { style, isDesignMode, data: propsData, request } = props;
-    const [headerStyle, setHeaderStyle] = useState<ITableHeaderStyle>({ ...style?.header });
-    const [bodyStyle, setBodyStyle] = useState<ITableBodyStyle>({ ...style?.body });
+    const [headerStyle, setHeaderStyle] = useState<ITableHeaderStyle>({ ...(style?.header || {}) });
+    const [bodyStyle, setBodyStyle] = useState<ITableBodyStyle>({ ...(style?.body || {}) });
     const [borderStyle, setBorderStyle] = useState<{ show?: boolean, color?: string }>({ ...(style?.border || {}) });
     const [carousel, setCarousel] = useState<{ speed: number, enable: boolean }>({ ...style?.carousel });
     const [dataConfig, setDataConfig] = useState<DataConfigProps>({ ...propsData });
@@ -81,6 +83,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const resizeObserverRef = useRef<ResizeObserver | null>(null);
     const contentHeightRef = useRef<number>(0);
     const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
+    const { translate } = useLocale();
 
     const handleDestroy = () => {
         resizeObserverRef.current && resizeObserverRef.current.disconnect();
@@ -202,7 +205,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         }
     }, [dataConfig?.sourceType, dataConfig?.sourceId, initSearchParams]);
 
-    const renderEmpty = () => <div className={'base-table-empty'} style={{ ...bodyStyle }}><Empty styles={{ description: { color: bodyStyle.color || "#000000" } }} image={Empty.PRESENTED_IMAGE_SIMPLE} description="暂无数据" /></div>;
+    const renderEmpty = () => <div className={'base-table-empty'} style={{ ...bodyStyle }}>{bodyStyle?.showEmpty !== false ? <Empty styles={{ description: { color: bodyStyle.color || "#000000" } }} image={Empty.PRESENTED_IMAGE_SIMPLE} description={translate("${暂无数据}")} /> : ""}</div>;
 
     return (
         <div className={'base-table'} ref={tableRef} style={carousel.enable ? { overflowX: "auto" } : { overflow: "auto" }}>

package/src/aldehyde/lowcode-components/base-tabs/index.tsx

@@ -4,6 +4,7 @@ import { Button, Space } from "antd";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import ProgramConfig from "../../units";
 import LowcodeConstant from "../assets/lowcode-constant";
+import { useLocale } from "../../locale/useLocale";
 import './index.less';
 
 const { serverKey, sourceId } = LowcodeConstant.fileUpload;
@@ -111,6 +112,7 @@ const ButtonComponent = forwardRef((props: ComponentProps, ref: ForwardedRef<Com
     const [defaultStyle, setDefaultStyle] = useState<ItemStyle>({ ...style.defaultStyle });
     const [activeStyle, setActiveStyle] = useState<ItemStyle>({ ...style.activeStyle });
     const [localImgDel, setLocalImgDel] = useState<{ active: boolean, default: boolean }>({ active: false, default: false });
+    const { translate } = useLocale();
 
     useImperativeHandle(ref, () => ({
         updateConfig: (newConfig) => { // 组件更新配置
@@ -173,7 +175,7 @@ const ButtonComponent = forwardRef((props: ComponentProps, ref: ForwardedRef<Com
                 onClick={() => onClick({ ...item, key: `key${index}` })}
             >
                 {isDesignMode && (activeKey === `key${index}` ? localImgDel.active : localImgDel.default) ? <div style={{ position: "absolute", width: "100%", height: "100%", backgroundColor: "rgba(0,0,0,0.5)", display: "flex", justifyContent: "center", alignItems: "center", color: "red" }}>背景图片已删除，请重新上传</div> : null}
-                {item.text || ""}
+                {item.text ? translate("${" + item.text + "}") : ""}
             </Button>)}
         </Space>
     );

package/src/aldehyde/lowcode-components/base-text/index.tsx

@@ -6,6 +6,7 @@ import React, {
     useImperativeHandle,
     useState
 } from 'react';
+import { useLocale } from "../../locale/useLocale";
 import './index.less';
 
 export interface BaseTextComponentStyle {
@@ -32,6 +33,7 @@ export interface BaseTextComponentRef {
 }
 
 const BaseTextComponent = forwardRef((props: BaseTextComponentProps, ref: ForwardedRef<BaseTextComponentRef>) => {
+    const { translate } = useLocale();
     const [config, setConfig] = useState<BaseTextComponentProps>({ ...props });
     const { style, data } = config;
 
@@ -49,7 +51,7 @@ const BaseTextComponent = forwardRef((props: BaseTextComponentProps, ref: Forwar
             className={'base-text-component'}
             style={{ ...style, ...strokeStyle }}
         >
-            {data?.staticData}
+            {data?.staticData ? translate("${" + data.staticData + "}") : ""}
         </div>
     );
 });

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

@@ -2,6 +2,7 @@ import * as echarts from 'echarts';
 import React, { useEffect, useRef, useState, ForwardedRef, forwardRef, useImperativeHandle } from 'react';
 import _ from 'lodash';
 import { Spin } from "antd";
+import { useLocale } from "../../locale/useLocale";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import { DataConfigProps } from "../data";
 
@@ -122,6 +123,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const chartRef = useRef<HTMLDivElement>(null);
     const chart = useRef<any>(null);
     const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
+    const { translate } = useLocale();
 
     const handleDestroy = () => {
         pollingIntervalRef.current && clearInterval(pollingIntervalRef.current);
@@ -240,6 +242,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         option.xAxis = { ...option.xAxis, ...xAxis, axisTick: { show: xAxis?.axisLine?.show } };
         option.yAxis = { ...option.yAxis, ...yAxis, axisTick: { show: yAxis?.axisLine?.show } };
         option.dataZoom = dataZoom ? [{ type: "inside", disabled: false, orient: "vertical" }] : [];
+        option.title.text = translate("${暂无数据}");
         option.title.show = !temData?.length;
         option.series = temData.map((r) => ({
             type: "bar",

package/src/aldehyde/lowcode-components/carousel/index.tsx

@@ -1,13 +1,13 @@
 import React, { ForwardedRef, forwardRef, useImperativeHandle, useState, useEffect, useRef } from 'react';
 import { Carousel, Image } from 'antd';
 import HydrocarbonService from "../../tmpl/hcservice-v3";
+import { useLocale } from "../../locale/useLocale";
 import ProgramConfig from "../../units";
 import { DataConfigProps, OssConfig } from "../data";
-import Units from "../../units";
 
 const defServerKey = "LowCodeOss";
 
-const renderEmpty = (height) => <div style={{
+const renderEmpty = (height, translate) => <div style={{
     color: '#9a9a9a',
     height,
     width: '100%',
@@ -15,7 +15,7 @@ const renderEmpty = (height) => <div style={{
     justifyContent: 'center',
     alignItems: 'center'
 }}>
-    <div>暂无数据</div>
+    <div>{translate("${暂无数据}")}</div>
 </div>;
 
 // 处理本地图片地址
@@ -101,9 +101,10 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
     const [size, setSize] = useState<{ width: number, height: number }>(propsBase);
     const [initSearchParams, setInitSearchParams] = useState<{ [key: string]: any }>();
+    const { translate } = useLocale();
 
     const getOssConfig = (serverKey: string) => {
-        const { accessKeyId, accessKeySecret, bucket, endpoint } = Units.getExtendServers(serverKey) || {};
+        const { accessKeyId, accessKeySecret, bucket, endpoint } = ProgramConfig.getExtendServers(serverKey) || {};
         const temObj = { accessKeyId, accessKeySecret, bucket, endpoint }
         return temObj;
     }
@@ -200,7 +201,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     return <Carousel adaptiveHeight={true} {...config} autoplaySpeed={(config.autoplaySpeed || 3) * 1000}>
         {data.length && data.map((r, index) => <div key={index}> <Image style={{ width: size.width, height: size.height }} src={r} preview={isDesignMode ? false : config.preview} /></div>)}
-        {!data.length && <div>{renderEmpty(size.height)}</div>}
+        {!data.length && <div>{renderEmpty(size.height, translate)}</div>}
     </Carousel>;
 });
 

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

@@ -2,6 +2,7 @@ import * as echarts from 'echarts';
 import React, { useEffect, useRef, useState, ForwardedRef, forwardRef, useImperativeHandle } from 'react';
 import _ from 'lodash';
 import { Spin } from "antd";
+import { useLocale } from "../../locale/useLocale";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import { DataConfigProps } from "../data";
 
@@ -158,6 +159,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const chartRef = useRef<HTMLDivElement>(null);
     const chart = useRef<any>(null);
     const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
+    const { translate } = useLocale();
 
     const handleDestroy = () => {
         pollingIntervalRef.current && clearInterval(pollingIntervalRef.current);
@@ -285,6 +287,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         option.xAxis = { ...option.xAxis, ...xAxis, axisTick: { show: xAxis?.axisLine?.show } };
         option.yAxis = { ...option.yAxis, ...yAxis };
         option.dataZoom = dataZoom ? [{ type: "inside", disabled: false }] : [];
+        option.title.text = translate("${暂无数据}");
         option.title.show = !temData?.length;
         option.series = [{
             type: 'custom',

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

@@ -2,6 +2,7 @@ import * as echarts from 'echarts';
 import React, { useEffect, useRef, useState, ForwardedRef, forwardRef, useImperativeHandle } from 'react';
 import _ from 'lodash';
 import { Spin } from "antd";
+import { useLocale } from "../../locale/useLocale";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import { DataConfigProps } from "../data";
 
@@ -126,6 +127,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const chartRef = useRef<HTMLDivElement>(null);
     const chart = useRef<any>(null);
     const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
+    const { translate } = useLocale();
 
     // 组件销毁
     const handleDestroy = () => {
@@ -244,6 +246,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         option.xAxis = { ...option.xAxis, ...xAxis, axisTick: { show: xAxis?.axisLine?.show } };
         option.yAxis = { ...option.yAxis, ...yAxis };
         option.dataZoom = dataZoom ? [{ type: "inside", disabled: false }] : [];
+        option.title.text = translate("${暂无数据}");
         option.title.show = !temData?.length;
         option.series = temData.map((r, index) => ({
             type: "bar",

package/src/aldehyde/lowcode-components/data-number/index.tsx

@@ -1,5 +1,6 @@
 
 import React, { ForwardedRef, forwardRef, useEffect, useImperativeHandle, useMemo, useState, useRef } from 'react';
+import { useLocale } from "../../locale/useLocale";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import { DataConfigProps } from "../data";
 import './index.less';
@@ -90,6 +91,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const [searchParams, setSearchParams] = useState<{ [key: string]: any }>();
     const [initSearchParams, setInitSearchParams] = useState<{ [key: string]: any }>();
     const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
+    const { translate } = useLocale();
 
     // 组件销毁
     const handleDestroy = () => {
@@ -184,9 +186,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         if (enume?.length > 0) { // 枚举
             const temEnume = enume.filter(item => item.rule && (item.num || item.num === 0));
             const item = temEnume.find((item) => eval(`${Number(data)} ${rules[item.rule]} ${item.num}`));
-            return item ? { data: processString(item.value, data), color: item.color || config?.color } : { data, color: config?.color };
+            return item ? { data: translate("${" + processString(item.value, data) + "}"), color: item.color || config?.color } : { data: translate("${" + data + "}"), color: config?.color };
         } else {
-            return { data, color: config?.color };
+            return { data: translate("${" + data + "}"), color: config?.color };
         }
     }, [data, enume]);
 

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

@@ -2,6 +2,7 @@ import * as echarts from 'echarts';
 import React, { useEffect, useRef, useState, ForwardedRef, forwardRef, useImperativeHandle } from 'react';
 import _ from 'lodash';
 import { Spin } from "antd";
+import { useLocale } from "../../locale/useLocale";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import { DataConfigProps } from "../data";
 
@@ -117,6 +118,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const chartRef = useRef<HTMLDivElement>(null);
     const chart = useRef<any>(null);
     const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
+    const { translate } = useLocale();
 
     const handleDestroy = () => {
         pollingIntervalRef.current && clearInterval(pollingIntervalRef.current);
@@ -234,6 +236,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         option.xAxis = { ...option.xAxis, ...xAxis, axisTick: { show: xAxis?.axisLine?.show } };
         option.yAxis = { ...option.yAxis, ...yAxis };
         option.dataZoom = dataZoom ? [{ type: "inside", disabled: false }] : [];
+        option.title.text = translate("${暂无数据}");
         option.title.show = !temData?.length;
         option.series = temData.map((r, index) => (index === 0 ? {
             type: "line",

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

@@ -2,6 +2,7 @@ import * as echarts from 'echarts';
 import React, { useEffect, useRef, useState, ForwardedRef, forwardRef, useImperativeHandle } from 'react';
 import _ from 'lodash';
 import { Spin } from "antd";
+import { useLocale } from "../../locale/useLocale";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import { DataConfigProps } from "../data";
 
@@ -112,6 +113,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const chartRef = useRef<HTMLDivElement>(null);
     const chart = useRef<any>(null);
     const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
+    const { translate } = useLocale();
 
     const handleDestroy = () => {
         pollingIntervalRef.current && clearInterval(pollingIntervalRef.current);
@@ -228,6 +230,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         option.xAxis = { ...option.xAxis, ...xAxis, axisTick: { show: xAxis?.axisLine?.show } };
         option.yAxis = { ...option.yAxis, ...yAxis };
         option.dataZoom = dataZoom ? [{ type: "inside", disabled: false }] : [];
+        option.title.text = translate("${暂无数据}");
         option.title.show = !temData?.length;
         option.series = temData.map((r, index) => ({
             type: "line",

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

@@ -2,6 +2,7 @@ import * as echarts from 'echarts';
 import React, { useEffect, useRef, useState, ForwardedRef, forwardRef, useImperativeHandle } from 'react';
 import _ from 'lodash';
 import { Spin } from "antd";
+import { useLocale } from "../../locale/useLocale";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import { DataConfigProps } from "../data";
 
@@ -153,6 +154,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const chartRef = useRef<HTMLDivElement>(null);
     const chart = useRef<any>(null);
     const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
+    const { translate } = useLocale();
 
     const handleDestroy = () => {
         pollingIntervalRef.current && clearInterval(pollingIntervalRef.current);
@@ -296,6 +298,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         option.legend = { ...legend, textStyle: temTextStyle, ...legends[position], formatter: (name) => legendFormatter({ name, formatter, unit }) };
         option.tooltip = { trigger: "item", ...tooltip };
         option.color = color;
+        option.title.text = translate("${暂无数据}");
         option.title.show = !temData?.length;
         option.series = temData.map(r => ({
             ...r,

package/src/aldehyde/lowcode-components/search-form/index.tsx

@@ -2,6 +2,7 @@
 import React, { ForwardedRef, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
 import CriteriaForm from "../../form/criteria-form";
 import { Button, Modal, ConfigProvider, theme as antdTheme } from 'antd';
+import { useLocale } from "../../locale/useLocale";
 import { LtmplConfigRes, LtmplConfig } from "../../tmpl/interface";
 import HCDataSource from "../../tmpl/hc-data-source";
 import "./index.less";
@@ -38,7 +39,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const [sourceId, setSourceId] = useState<string>(style?.sourceId); // 搜索表单的sourceId
     const [ltmplConfig, setLtmplConfig] = useState<LtmplConfig>();
     const [searchData, setSearchData] = useState<{ [key: string]: any }>({});
-
+    const { translate } = useLocale();
 
     useImperativeHandle(ref, () => ({
         updateConfig: (newConfig) => {
@@ -91,7 +92,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     const renderCriteriaForm = () => {
         if (!ltmplConfig) {
-            return <div className='search-form-empty'>暂无数据</div>;
+            return <div className='search-form-empty'>{translate("${暂无数据}")}</div>;
         }
         const { form } = config;
         return <ConfigProvider
@@ -113,7 +114,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     return (
         <div className="search-form-component">
             {type === "default" ? renderCriteriaForm() : renderModalBtn()}
-            {visible && <Modal width={config?.modalWidth || 520} title="搜索" open={visible} footer={null} onCancel={() => setVisible(false)}>{renderCriteriaForm()}</Modal>}
+            {visible && <Modal width={config?.modalWidth || 520} title={translate("${查询}")} open={visible} footer={null} onCancel={() => setVisible(false)}>{renderCriteriaForm()}</Modal>}
         </div>
     );
 });

package/src/aldehyde/lowcode-components/stroke-animation/index.tsx

@@ -1,5 +1,6 @@
 import * as echarts from 'echarts';
 import React, { useEffect, useRef, useState, ForwardedRef, forwardRef, useImperativeHandle } from 'react';
+import { useLocale } from "../../locale/useLocale";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import { DataConfigProps } from "../data";
 
@@ -43,6 +44,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const chartRef = useRef<HTMLDivElement>(null);
     const chart = useRef<any>(null);
     const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
+    const { translate } = useLocale();
 
     const handleDestroy = () => {
         pollingIntervalRef.current && clearInterval(pollingIntervalRef.current);
@@ -152,7 +154,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
                         left: 'center',
                         top: 'center',
                         style: {
-                            text: data,
+                            text: translate("${" + data + "}"),
                             fontSize,
                             fontWeight,
                             lineDash: [0, 200],

package/src/aldehyde/lowcode-components/text-scroller/index.tsx

@@ -1,6 +1,7 @@
 import React, { forwardRef, ForwardedRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
 import './index.less';
 import _ from "lodash";
+import { useLocale } from "../../locale/useLocale";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import { DataConfigProps } from "../data";
 
@@ -43,6 +44,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const textContainerRef = useRef<HTMLDivElement>(null);
     const resizeObserverRef = useRef<ResizeObserver | null>(null);
     const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
+    const { translate } = useLocale();
 
     const handleDestroy = () => {
         resizeObserverRef.current && resizeObserverRef.current.disconnect();
@@ -153,7 +155,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     return (
         <div className="text-scroller-container" ref={textContainerRef}>
             <div className="text-scroller" style={{ ...config }} ref={textScrollerRef}>
-                {data}
+                {translate("${" + data + "}")}
             </div>
         </div>
     );

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

@@ -81,6 +81,7 @@ interface ActTableProps extends TmplBaseProps {
   allowUserConfig?: boolean; // 是否可用户自定义配置
   deleteCallback?: (val: object) => void; // 删除回调
   onUpdatePageSizeOptions?: (val: number[]) => void; // 更新分页数数组
+  showEmpty?: boolean; // 空数据是否显示空状态，默认显示
 }
 
 interface ActTableStat {
@@ -164,6 +165,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     operatable: true,
     showPagination: true,
     showAggregates: true,
+    showEmpty: true,
   };
 
   // 获取标签选项
@@ -1496,7 +1498,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     let {
       mainCode, sourceId, ltmplConfig, funcMode, operatable,
       title, collapsible,
-      onChangePage, serverKey, criteriaData,
+      onChangePage, serverKey, criteriaData, showEmpty,
       showView, doEdit, doRAction, customEditable, readOnly, tableType, showPagination, showAggregates, userPageConfig
     } = this.props;
     const { translate } = this.context;
@@ -1563,6 +1565,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       onChangeRowSelection={this.changeRowSelection}
       leftFixedCols={ltmplConfig.leftFixedCols}
       onChangeResize={this.onChangeResize}
+      showEmpty={showEmpty}
     /> :
       <QueryTable key={"querytable" + sourceId} sourceId={sourceId}
         // queryTotal={this.queryTotal}
@@ -1594,6 +1597,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         onChangeAggregateVO={(val) => this.setState({ aggregateVO: val })}
         onChangeResize={this.onChangeResize}
         pageSizeOptions={pageSizeOptions}
+        showEmpty={showEmpty}
       />);
 
     // tab拆解条件渲染
@@ -1793,8 +1797,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 label={<div>{translate("${请手动输入}")}<span style={{ color: "#ff4d4f" }}> “ {translate("${" + strongDeleteConfirmText + "}")} ” </span>{translate("${完成验证}")}</div>}
                 name="rule"
                 rules={[
-                  { required: true, message: translate("${请输入" + strongDeleteConfirmText + "}") },
-                  { validator: (_, value) => value && value !== translate("${" + strongDeleteConfirmText + "}") ? Promise.reject(new Error(translate("${请输入" + strongDeleteConfirmText + "}"))) : Promise.resolve() }
+                  { required: true, message: translate("${请输入}" + "${" + strongDeleteConfirmText + "}") },
+                  { validator: (_, value) => value && value !== translate("${" + strongDeleteConfirmText + "}") ? Promise.reject(new Error(translate("${请输入}" + "${" + strongDeleteConfirmText + "}"))) : Promise.resolve() }
                 ]}
               >
                 <Input placeholder={translate("${" + strongDeleteConfirmText + "}")} />

package/src/aldehyde/table/page-config-button.tsx

@@ -28,6 +28,7 @@ const Index = (props: Props) => {
     const { translate } = useLocale();
     const { token } = useToken();
     const [form] = Form.useForm();
+    const menuRef = useRef(null);
 
     // 设置默认配置
     const setPageConfigDefault = async () => {
@@ -78,6 +79,7 @@ const Index = (props: Props) => {
                     okText={translate("${确定}")}
                     cancelText={translate("${取消}")}
                     okType={"danger"}
+                    getPopupContainer={() => menuRef.current}
                 >
                     <Tooltip title={translate("${更新}")}><UploadOutlined onClick={(e) => onClickOperation(e, item)} className="page-config-menu-item-icon" style={{ color: token.colorPrimary }} /></Tooltip>
                 </Popconfirm>
@@ -91,12 +93,13 @@ const Index = (props: Props) => {
                     okText={translate("${确定}")}
                     cancelText={translate("${取消}")}
                     okType={"danger"}
+                    getPopupContainer={() => menuRef.current}
                 >
                     <Tooltip title={translate("${拉取云端默认配置}")}><DownloadOutlined onClick={(e) => onClickOperation(e, item)} className="page-config-menu-item-icon" style={{ color: token.colorPrimary }} /></Tooltip>
                 </Popconfirm> : ""}
                 {key !== "default" ?
                     <>
-                        <Popover placement="bottom" open={editOpen && currentKey === item.key} destroyOnHidden={true} onOpenChange={(val) => { setEditOpen(val); form.setFieldValue("name", val ? item.name : undefined); }} zIndex={9999} content={renderAddForm} trigger="click">
+                        <Popover placement="bottom" open={editOpen && currentKey === item.key} destroyOnHidden={true} onOpenChange={(val) => { setEditOpen(val); val ? form.setFieldValue("name", item.name) : form.resetFields(); }} zIndex={9999} content={renderAddForm} trigger="click" getPopupContainer={() => menuRef.current} >
                             <Tooltip title={translate("${编辑}")}>
                                 <EditOutlined onClick={(e) => onClickOperation(e, item)} className="page-config-menu-item-icon" style={{ color: token.colorPrimary }} />
                             </Tooltip>
@@ -111,6 +114,7 @@ const Index = (props: Props) => {
                             okText={translate("${确定}")}
                             cancelText={translate("${取消}")}
                             okType={"danger"}
+                            getPopupContainer={() => menuRef.current}
                         >
                             <Tooltip title={translate("${删除}")}><DeleteOutlined onClick={(e) => onClickOperation(e, item)} className="page-config-menu-item-icon" style={{ color: token.colorError }} /></Tooltip>
                         </Popconfirm>
@@ -177,14 +181,14 @@ const Index = (props: Props) => {
     </Form>;
 
     return <Dropdown trigger={["click"]} menu={{ items: [renderMenuItem({ key: "default", name: "默认" }), ...menus.map(r => renderMenuItem({ ...r, key: r.recordCode }))].filter(Boolean) }} popupRender={(menu) => (
-        <div style={contentStyle}>
+        <div style={contentStyle} ref={menuRef}>
             {React.cloneElement(menu as any, { style: { boxShadow: 'none' } },)}
             <Divider style={{ margin: 0 }} />
             <div style={{ padding: "4px", display: "flex", justifyContent: "space-between", alignItems: "center" }}>
                 <Tooltip title={translate("${重置}")}>
                     <Button onClick={handleResetUserPageConfig} icon={<SyncOutlined />} />
                 </Tooltip>
-                <Popover placement="bottomRight" destroyOnHidden={true} open={addOpen} onOpenChange={setAddOpen} getPopupContainer={(val) => val} zIndex={9999} content={renderAddForm} trigger="click">
+                <Popover placement="bottomRight" destroyOnHidden={true} open={addOpen} onOpenChange={(val => { setCurrentKey(undefined); setAddOpen(val); })} getPopupContainer={(val) => val} zIndex={9999} content={renderAddForm} trigger="click">
                     <Tooltip title={translate("${添加我的菜单}")}><Button disabled={menus?.length > 4} icon={<PlusOutlined />} /></Tooltip>
                 </Popover>
             </div>

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

@@ -64,6 +64,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     cardListConfig: {},
     ltmplConfig: {},
     showPagination: true,
+    showEmpty: true,
   };
 
   defaultAggregateShowSize = 7;
@@ -436,7 +437,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       showPagination,
       onChangeResize,
       pageSizeOptions,
-      onChangePage
+      onChangePage,
+      showEmpty
     } = this.props;
     //debugger
     const { touchEnd, aggregateVO, loading, virtualEndPageNo, dataSource, errorText } = this.state;
@@ -596,6 +598,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
               }
             } : undefined}
             onChangeResize={onChangeResize}
+            showEmpty={showEmpty}
           />
         ) : (
           ""

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

@@ -7,6 +7,7 @@ import ColumnBuilder from "./column/column-builder";
 import ResizableTable from "./resizable-table";
 
 const ReportTable = (props: ReportTableProps) => {
+    const { showEmpty = true } = props;
     const [loading, setLoading] = useState<boolean>(false);
     const [dataSource, setDataSource] = useState<object[]>(undefined);
     const [reportData, setReportData] = useState<ReportData>(undefined);
@@ -118,6 +119,7 @@ const ReportTable = (props: ReportTableProps) => {
         pagination={false}
         style={{ display: columns ? "block" : "none", marginBottom: "12px" }}
         onChangeResize={onChangeResize}
+        showEmpty={showEmpty}
     />
 }
 

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

@@ -43,7 +43,7 @@ const ResizableTitle = props => {
 
 const ResizableTable = props => {
 
-    const { columns: columns_, components: components_, onChangeResize, ...other } = props
+    const { columns: columns_, components: components_, onChangeResize, showEmpty, ...other } = props
     // const [columns, setColumns] = useState(columns_.map((col) => {
     //         col['onHeaderCell']=(col) => ({
     //             ...col['onHeaderCell'],
@@ -90,7 +90,7 @@ const ResizableTable = props => {
         header: { cell: ResizableTitle }
     }
 
-    return <Table components={components} columns={columns}  {...other} size="small" />;
+    return <Table components={components} columns={columns}  {...other} locale={showEmpty !== false ? undefined : { emptyText: false }} size="small" />;
 }
 
 export default ResizableTable;

package/src/aldehyde/tmpl/interface.tsx

@@ -47,6 +47,7 @@ export interface ReportTableProps {
   ) => void;
   queryKey: QueryKey;
   onChangeResize?: (value: { [key: string]: number }) => void; // 表格列尺寸更新
+  showEmpty?: boolean;
 }
 
 export interface CardListConfig {
@@ -94,6 +95,7 @@ export interface QueryTableProps extends ReportTableProps {
   onChangeAggregateVO?: (aggregateVO: AggregateVO) => void;
   onChangeResize?: (value: { [key: string]: number }) => void; // 表格列尺寸更新
   pageSizeOptions?: number[]; // 分页数配置
+  showEmpty?: boolean; // 是否显示空状态
 }
 
 export interface AggregateVO {