aldehyde 0.2.437 → 0.2.439

package/src/aldehyde/layout2/main.tsx

@@ -1,14 +1,16 @@
 import React from "react";
 import { Layout } from "antd";
 import TabsLayout from "./tabs/tabs-layout";
+import { MenuType } from "./type/layout-type";
 
 
 type MainPropsType = {
   style?: any;
   children?: React.ReactNode;
+  menuList?: MenuType[];
 };
 
-const Main: React.FC<MainPropsType> = ({ style, children }) => {
+const Main: React.FC<MainPropsType> = ({ style, children, menuList }) => {
   return (
     <Layout.Content style={{ background: "#fff", overflow: "auto", paddingBottom: 10, ...style }}>
       <div
@@ -19,7 +21,7 @@ const Main: React.FC<MainPropsType> = ({ style, children }) => {
           padding: 10,
         }}
       >
-        {children ? children : <TabsLayout />}
+        {children ? children : <TabsLayout menuList={menuList} />}
       </div>
     </Layout.Content>
   );

package/src/aldehyde/layout2/page.tsx

@@ -247,7 +247,7 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
             <Header themeConfig={themeConfig} logoImg={logo || systemLogo} systemName={systemName ? systemName : Units.programName_NavLeft()} menuList={menu}></Header>
             <Layout>
               <Sider themeConfig={themeConfig} menuList={menu} collapsed={getSiderCollapsed()}></Sider>
-              <Main>{props.children}</Main>
+              <Main menuList={menu}>{props.children}</Main>
             </Layout>
           </Layout>
         </ConfigProvider>

package/src/aldehyde/layout2/tabs/tabs-layout.tsx

@@ -9,10 +9,15 @@ import Units from '../../units';
 import { useLocale } from "../../locale/useLocale";
 import "../css/tabs-layout.less";
 import QueueAnim from 'rc-queue-anim';
+import { MenuType } from "../type/layout-type";
 // import {arrayMove} from "react-sortable-hoc";
 
+interface Props {
+  menuList?: MenuType[];
+}
 
-const TabsLayout: React.FC = (props) => {
+const TabsLayout = (props: Props) => {
+  const { menuList } = props;
 
   const { translate } = useLocale();
   const {
@@ -79,6 +84,9 @@ const TabsLayout: React.FC = (props) => {
   }, [menuItems]);
 
   const tabItems = useMemo(() => {
+    if (!menuList.length) { // 无菜单不显示
+      return [];
+    }
     return tabs.map(tab => {
       return {
         key: tab.routePath,
@@ -101,7 +109,7 @@ const TabsLayout: React.FC = (props) => {
         closable: tabs.length > 1, // 剩最后一个就不能删除了
       }
     })
-  }, [tabs]);
+  }, [tabs, menuList]);
   //let tabItems=tabItemsf();
 
   let navigate = useNavigate();

package/src/aldehyde/layout3/components/tabs-layout.tsx

@@ -8,13 +8,20 @@ import { useNavigate } from 'react-router-dom';
 import QueueAnim from 'rc-queue-anim';
 import Units from '../../units';
 import { useLocale } from "../../locale/useLocale";
+import { MenuType } from "../../layout2/type/layout-type";
 import "../css/tabs-layout.less";
 
 const getIcon = (icon?: string): React.ReactElement | undefined => {
   return icon && antdIcons[icon] && React.createElement(antdIcons[icon]);
 }
 
-const TabsLayout: React.FC = () => {
+interface Props {
+  menuList?: MenuType[];
+}
+
+
+const TabsLayout = (props: Props) => {
+  const { menuList } = props;
   const { translate } = useLocale();
   const navigate = useNavigate();
   const { activeTabRoutePath, tabs = [], closeTab, refreshTab, closeOtherTab } = useTabs();
@@ -59,6 +66,9 @@ const TabsLayout: React.FC = () => {
   }, [menuItems]);
 
   const tabItems = useMemo(() => {
+    if (!menuList.length) { // 无菜单不显示
+      return [];
+    }
     return tabs.map(tab => ({
       key: tab.routePath,
       label: renderTabTitle(tab),
@@ -73,7 +83,7 @@ const TabsLayout: React.FC = () => {
       ),
       closable: tabs.length > 1, // 剩最后一个就不能删除了
     }))
-  }, [tabs]);
+  }, [tabs, menuList]);
 
   const onTabsChange = useCallback((tabKey: string) => {
     const tab = tabs.find(r => r.routePath === tabKey);

package/src/aldehyde/layout3/main.tsx

@@ -1,13 +1,15 @@
 import React from "react";
 import { Layout } from "antd";
 import TabsLayout from "./components/tabs-layout";
+import { MenuType } from "../layout2/type/layout-type";
 
 type MainPropsType = {
   style?: any;
   children?: React.ReactNode;
+  menuList?: MenuType[];
 };
 
-const Main: React.FC<MainPropsType> = ({ style, children }) => {
+const Main: React.FC<MainPropsType> = ({ style, children, menuList }) => {
   return (
     <Layout.Content style={{ overflow: "auto", ...style }}>
       <div
@@ -18,7 +20,7 @@ const Main: React.FC<MainPropsType> = ({ style, children }) => {
           padding: "0 12px 12px 12px",
         }}
       >
-        {children ? children : <TabsLayout />}
+        {children ? children : <TabsLayout menuList={menuList} />}
       </div>
     </Layout.Content>
   );

package/src/aldehyde/layout3/page.tsx

@@ -75,7 +75,7 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
             <Header themeConfig={themeConfig} systemName={systemName ? systemName : Units.programName_NavLeft()} menuList={menu}></Header>
             <Layout>
               <Sider themeConfig={themeConfig} menuList={menu} collapsed={getSiderCollapsed()}></Sider>
-              <Main>{props.children}</Main>
+              <Main menuList={menu} >{props.children}</Main>
             </Layout>
           </Layout>
         </ConfigProvider>

package/src/aldehyde/layout4/components/tabs-layout.tsx

@@ -8,13 +8,19 @@ import { useNavigate } from 'react-router-dom';
 import QueueAnim from 'rc-queue-anim';
 import Units from '../../units';
 import { useLocale } from "../../locale/useLocale";
+import { MenuType } from "../../layout2/type/layout-type";
 import "../css/tabs-layout.less";
 
 const getIcon = (icon?: string): React.ReactElement | undefined => {
   return icon && antdIcons[icon] && React.createElement(antdIcons[icon]);
 }
 
-const TabsLayout: React.FC = () => {
+interface Props {
+  menuList?: MenuType[];
+}
+
+const TabsLayout = (props: Props) => {
+  const { menuList } = props;
   const { translate } = useLocale();
   const navigate = useNavigate();
   const { activeTabRoutePath, tabs = [], closeTab, refreshTab, closeOtherTab } = useTabs();
@@ -59,6 +65,9 @@ const TabsLayout: React.FC = () => {
   }, [menuItems]);
 
   const tabItems = useMemo(() => {
+    if (!menuList.length) { // 无菜单不显示
+      return [];
+    }
     return tabs.map(tab => ({
       key: tab.routePath,
       label: renderTabTitle(tab),
@@ -73,7 +82,7 @@ const TabsLayout: React.FC = () => {
       ),
       closable: tabs.length > 1, // 剩最后一个就不能删除了
     }))
-  }, [tabs]);
+  }, [tabs, menuList]);
 
   const onTabsChange = useCallback((tabKey: string) => {
     const tab = tabs.find(r => r.routePath === tabKey);

package/src/aldehyde/layout4/main.tsx

@@ -1,13 +1,15 @@
 import React from "react";
 import { Layout } from "antd";
 import TabsLayout from "./components/tabs-layout";
+import { MenuType } from "../layout2/type/layout-type";
 
 type MainPropsType = {
   style?: any;
   children?: React.ReactNode;
+  menuList?: MenuType[];
 };
 
-const Main: React.FC<MainPropsType> = ({ style, children }) => {
+const Main: React.FC<MainPropsType> = ({ style, children, menuList }) => {
   return (
     <Layout.Content style={{ overflow: "auto", ...style }}>
       <div
@@ -18,7 +20,7 @@ const Main: React.FC<MainPropsType> = ({ style, children }) => {
           padding: "0 12px 12px 12px",
         }}
       >
-        {children ? children : <TabsLayout />}
+        {children ? children : <TabsLayout menuList={menuList} />}
       </div>
     </Layout.Content>
   );

package/src/aldehyde/layout4/page.tsx

@@ -90,7 +90,7 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
             <Header themeConfig={themeConfig} logoImg={logo || systemLogo} systemName={systemName ? systemName : Units.programName_NavLeft()} menuList={menu}></Header>
             <Layout>
               <Sider themeConfig={themeConfig} menuList={menu} collapsed={getSiderCollapsed()}></Sider>
-              <Main>{props.children}</Main>
+              <Main menuList={menu}>{props.children}</Main>
             </Layout>
           </Layout>
         </ConfigProvider>

package/src/aldehyde/layout5/page.tsx

@@ -71,7 +71,7 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
             <Sider themeConfig={themeConfig} logoImg={logo || systemLogo} menuList={menu} collapsed={getSiderCollapsed()} systemName={systemName ? systemName : Units.programName_NavLeft()} />
             <Layout>
               <Header themeConfig={themeConfig} menuList={menu} />
-              <Main>{props.children}</Main>
+              <Main menuList={menu}>{props.children}</Main>
             </Layout>
           </Layout>
         </ConfigProvider>

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

@@ -3,6 +3,7 @@ import React, { ForwardedRef, forwardRef, useEffect, useImperativeHandle, useSta
 import { ConfigProvider } from "antd";
 import { LtmplConfig } from "../../tmpl/interface";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
+import { useLocale } from "../../locale/useLocale";
 import ActTable from "../../table/act-table";
 import { DataConfigProps } from "../data";
 import './index.less';
@@ -22,6 +23,7 @@ export interface ComponentStyle {
     body?: {
         background?: string;
         color?: string;
+        showEmpty?: boolean;
     };
     border?: {
         show?: boolean;
@@ -46,6 +48,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     const [ltmplConfig, setLtmplConfig] = useState<LtmplConfig>();
     const [pageInfo, setPageInfo] = useState({ pageNo: 1, pageSize: style?.table?.pageSize || 10 });
     const [initSearchParams, setInitSearchParams] = useState<{ [key: string]: any }>();
+    const { translate } = useLocale();
 
     useImperativeHandle(ref, () => ({
         updateConfig: (newConfig) => {
@@ -125,9 +128,10 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
                         pageSize={pageInfo.pageSize}
                         onChangePage={(pageNo, pageSize) => setPageInfo({ pageNo, pageSize })}
                         criteriaData={initSearchParams || {}}
+                        showEmpty={config?.body?.showEmpty}
                     />
                 </ConfigProvider> :
-                <div className='empty' style={{ color: config?.body?.color }}>暂无数据</div>
+                <div className='empty' style={{ color: config?.body?.color }}>{translate("${暂无数据}")}</div>
             }
         </div>
     );

package/src/aldehyde/lowcode-components/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";
 
@@ -13,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 },
     yAxis: {
         type: 'category',
         boundaryGap: true,
@@ -52,7 +53,7 @@ const handleData = (data: { config: { [key: string]: string }, value: { [key: st
     const temData = data.map((r) => {
         const { config, value } = r;
         const isD = Object.keys(config).some(r => r.includes("d"));
-        const vNames = Object.keys(config).filter((r) => r.startsWith("v")).sort((a, b) => parseInt(a.substring(1)) - parseInt(b.substring(1)));
+        const vNames = Object.keys(config).filter((r) => r.startsWith("v") && !r.includes("-")).sort((a, b) => parseInt(a.substring(1)) - parseInt(b.substring(1)));
         return isD ? {
             name: config.d1,
             data: vNames.map((r) => ({
@@ -69,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 };
@@ -104,6 +105,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);
@@ -222,6 +224,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, orient: "vertical" }] : [];
+        option.title.text = translate("${暂无数据}");
         option.title.show = !temData?.length;
         option.series = temData.map((r, index) => ({
             type: "bar",

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

@@ -1,6 +1,7 @@
 
 import React, { ForwardedRef, forwardRef, useImperativeHandle, useState, useMemo, useEffect } from 'react';
 import { Button } from "antd";
+import { useLocale } from "../../locale/useLocale";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import ProgramConfig from "../../units";
 import LowcodeConstant from "../assets/lowcode-constant";
@@ -112,6 +113,7 @@ const ButtonComponent = forwardRef((props: ComponentProps, ref: ForwardedRef<Com
     const { style, navigate, isDesignMode } = props;
     const [config, setConfig] = useState<ComponentStyle>(style || {});
     const [localImgDel, setLocalImgDel] = useState<boolean>(false);
+    const { translate } = useLocale();
 
     useImperativeHandle(ref, () => ({
         updateConfig: (newConfig) => { // 组件更新配置
@@ -188,7 +190,7 @@ const ButtonComponent = forwardRef((props: ComponentProps, ref: ForwardedRef<Com
             onClick={onClick}
         >
             {isDesignMode && localImgDel ? <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}
-            {config.text || ""}
+            {config.text ? translate("${" + config.text + "}") : ""}
         </Button>
     );
 });

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";
 
@@ -69,7 +70,7 @@ const handleData = (data: { config: { [key: string]: string }, value: { [key: st
     const temData = data.map((r) => {
         const { config, value } = r;
         const isD = Object.keys(config).some(r => r.includes("d"));
-        const vNames = Object.keys(config).filter((r) => r.startsWith("v")).sort((a, b) => parseInt(a.substring(1)) - parseInt(b.substring(1)));
+        const vNames = Object.keys(config).filter((r) => r.startsWith("v") && !r.includes("-")).sort((a, b) => parseInt(a.substring(1)) - parseInt(b.substring(1)));
         return isD ? {
             name: config.d1,
             data: vNames.map((r) => ({
@@ -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";
 
@@ -49,7 +50,7 @@ const handleData = (data: { config: { [key: string]: string }, value: { [key: st
     const temData = data.map((r) => {
         const { config, value } = r;
         const isD = Object.keys(config).some(r => r.includes("d"));
-        const vNames = Object.keys(config).filter((r) => r.startsWith("v")).sort((a, b) => parseInt(a.substring(1)) - parseInt(b.substring(1)));
+        const vNames = Object.keys(config).filter((r) => r.startsWith("v") && !r.includes("-")).sort((a, b) => parseInt(a.substring(1)) - parseInt(b.substring(1)));
         return isD ? {
             name: config.d1,
             data: vNames.map((r) => ({
@@ -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";
 
@@ -74,7 +75,7 @@ const handleData = (data: { config: { [key: string]: string }, value: { [key: st
     const temData = data.map((r) => {
         const { config, value } = r;
         const isD = Object.keys(config).some(r => r.includes("d"));
-        const vNames = Object.keys(config).filter((r) => r.startsWith("v")).sort((a, b) => parseInt(a.substring(1)) - parseInt(b.substring(1)));
+        const vNames = Object.keys(config).filter((r) => r.startsWith("v") && !r.includes("-")).sort((a, b) => parseInt(a.substring(1)) - parseInt(b.substring(1)));
         return isD ? {
             name: config.d1,
             data: vNames.map((r) => ({
@@ -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",