aldehyde 0.2.281 → 0.2.282

package/src/aldehyde/lowcode-components/border/border9/index.tsx

@@ -0,0 +1,154 @@
+import React, { ForwardedRef, forwardRef, useImperativeHandle, useState } from "react";
+import "./index.less";
+
+interface ComponentStyle {
+    mainColor?: string;
+    subColor?: string;
+}
+
+export interface ComponentProps {
+    style?: ComponentStyle;
+    base?: { width?: number, height?: number, id: string }
+}
+
+export interface ComponentRef {
+    updateConfig: (config: ComponentProps) => void;
+}
+const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
+    const [style, setStyle] = useState<ComponentStyle>({ ...props.style });
+    const [width, setWidth] = useState<number>(320);
+    const [height, setHeight] = useState<number>(200);
+    const { mainColor = "#83BFF6", subColor = "#00CED1" } = style || {};
+
+    useImperativeHandle(ref, () => ({
+        updateConfig: (newConfig) => {
+            const { width, height } = newConfig.base;
+            setStyle({ ...newConfig.style });
+            setWidth(width);
+            setHeight(height);
+        },
+    }));
+
+    return <div className="border-box-9"  >
+        <svg className='border-svg-container' width={width} height={height}>
+            <defs>
+                <linearGradient id={`gradient${props.base.id}`} x1='0%' y1='0%' x2='100%' y2='100%'>
+                    <animate
+                        attributeName='x1'
+                        values='0%;100%;0%'
+                        dur='10s'
+                        begin='0s'
+                        repeatCount='indefinite'
+                    />
+                    <animate
+                        attributeName='x2'
+                        values='100%;0%;100%'
+                        dur='10s'
+                        begin='0s'
+                        repeatCount='indefinite'
+                    />
+                    <stop offset='0%' stopColor={mainColor}>
+                        <animate
+                            attributeName='stop-color'
+                            values={`${mainColor};${subColor};${mainColor}`}
+                            dur='10s'
+                            begin='0s'
+                            repeatCount='indefinite'
+                        />
+                    </stop>
+                    <stop offset='100%' stopColor={subColor}>
+                        <animate
+                            attributeName='stop-color'
+                            values={`${subColor};${mainColor};${subColor}`}
+                            dur='10s'
+                            begin='0s'
+                            repeatCount='indefinite'
+                        />
+                    </stop>
+                </linearGradient>
+
+                <mask id={`mask${props.base.id}`}>
+                    <polyline
+                        stroke='#fff'
+                        strokeWidth='3'
+                        fill='transparent'
+                        points={`8, ${height * 0.4} 8, 3, ${width * 0.4 + 7}, 3`}
+                    />
+                    <polyline
+                        fill='#fff'
+                        points={`8, ${height * 0.15} 8, 3, ${width * 0.1 + 7}, 3
+                ${width * 0.1}, 8 14, 8 14, ${height * 0.15 - 7}
+              `}
+                    />
+
+                    <polyline
+                        stroke='#fff'
+                        strokeWidth='3'
+                        fill='transparent'
+                        points={`${width * 0.5}, 3 ${width - 3}, 3, ${width -
+                            3}, ${height * 0.25}`}
+                    />
+                    <polyline
+                        fill='#fff'
+                        points={`
+                ${width * 0.52}, 3 ${width * 0.58}, 3
+                ${width * 0.58 - 7}, 9 ${width * 0.52 + 7}, 9
+              `}
+                    />
+                    <polyline
+                        fill='#fff'
+                        points={`
+                ${width * 0.9}, 3 ${width - 3}, 3 ${width - 3}, ${height * 0.1}
+                ${width - 9}, ${height * 0.1 - 7} ${width - 9}, 9 ${width *
+                            0.9 +
+                            7}, 9
+              `}
+                    />
+
+                    <polyline
+                        stroke='#fff'
+                        strokeWidth='3'
+                        fill='transparent'
+                        points={`8, ${height * 0.5} 8, ${height - 3} ${width * 0.3 +
+                            7}, ${height - 3}`}
+                    />
+                    <polyline
+                        fill='#fff'
+                        points={`
+                8, ${height * 0.55} 8, ${height * 0.7}
+                2, ${height * 0.7 - 7} 2, ${height * 0.55 + 7}
+              `}
+                    />
+
+                    <polyline
+                        stroke='#fff'
+                        strokeWidth='3'
+                        fill='transparent'
+                        points={`${width * 0.35}, ${height - 3} ${width - 3}, ${height -
+                            3} ${width - 3}, ${height * 0.35}`}
+                    />
+                    <polyline
+                        fill='#fff'
+                        points={`
+                ${width * 0.92}, ${height - 3} ${width - 3}, ${height -
+                            3} ${width - 3}, ${height * 0.8}
+                ${width - 9}, ${height * 0.8 + 7} ${width - 9}, ${height -
+                            9} ${width * 0.92 + 7}, ${height - 9}
+              `}
+                    />
+                </mask>
+            </defs>
+
+            <rect
+                x='0'
+                y='0'
+                width={width}
+                height={height}
+                fill={`url(#gradient${props.base.id})`}
+                mask={`url(#mask${props.base.id})`}
+            />
+        </svg>
+    </div>;
+});
+
+export default Index;

package/src/aldehyde/lowcode-components/effectScatter-map/index.tsx

@@ -0,0 +1,133 @@
+import * as echarts from 'echarts';
+import React, { useEffect, useRef, useState, ForwardedRef, forwardRef, useImperativeHandle } from 'react';
+import _ from 'lodash';
+import chinaJson from "../assets/china.json";
+
+const defOption = {
+    tooltip: {
+        trigger: 'item',
+    },
+    geo: {
+        show: true,
+        map: 'china',
+        roam: true,
+        zoom: 1,
+        label: {
+            normal: { show: false },
+            emphasis: { show: false }
+        },
+        itemStyle: {
+            normal: {
+                areaColor: '#031525',
+                borderColor: '#076ba1'
+            },
+            emphasis: {
+                areaColor: '#2B91B7'
+            }
+        },
+        select: {}
+    },
+    series: [
+        {
+            type: 'map',
+            coordinateSystem: 'geo',
+            map: 'china',
+            geoIndex: 0,
+            aspectScale: 0.75, //长宽比
+            data: []
+        },
+        {
+            type: 'effectScatter',
+            coordinateSystem: 'geo',
+            showEffectOn: 'render',
+            rippleEffect: { brushType: 'stroke' },
+            label: {
+                formatter: '{b}',
+                position: 'right',
+                show: true,
+            },
+            itemStyle: {
+                color: '#f4e925',
+            },
+            zlevel: 1,
+            encode: { value: 2 },
+            data: [{ name: '北京', value: [116.46, 39.92, 100] }]
+        }
+    ]
+};
+
+export interface ChartComponentStyle {
+    tooltip?: { show: boolean };
+    geo?: { [key: string]: any };
+    effectScatter?: { [key: string]: any };
+}
+
+export interface ChartComponentProps {
+    style?: ChartComponentStyle;
+    base: { width: number, height: number }
+}
+
+export interface BaseTextComponentRef {
+    updateConfig: (newConfig: ChartComponentProps) => void;
+}
+
+const Index = forwardRef((props: ChartComponentProps, ref: ForwardedRef<BaseTextComponentRef>) => {
+    const [config, setConfig] = useState<ChartComponentStyle>(props.style || {});
+    const [size, setSize] = useState<{ width: number, height: number }>()
+    const chartRef = useRef<HTMLDivElement>(null);
+    const chart = useRef<any>(null);
+
+    useImperativeHandle(ref, () => ({
+        updateConfig: (newConfig) => {
+            const { base, style } = newConfig;
+            setConfig({ ...(style || {}) });
+            setSize({ width: base.width, height: base.height });
+        },
+    }));
+
+    // 窗口大小变化时重新调整图表大小
+    const handleResize = () => {
+        chart.current.resize({ animation: { duration: 500 } });
+    };
+
+    useEffect(() => {
+        echarts.registerMap('china', chinaJson as any);
+        chart.current = echarts.init(chartRef.current, null, { renderer: 'svg' });
+        window.addEventListener('resize', handleResize);
+        return () => {
+            window.removeEventListener('resize', handleResize);
+            chart.current.dispose();
+        }
+    }, []);
+
+    const renderChart = () => {
+        const { tooltip, geo, effectScatter } = config
+        const option = _.cloneDeep(defOption);
+        option.tooltip = { trigger: "item", ...tooltip };
+        option.geo = { ...option.geo, ...geo, ...geo.normal };
+        option.series = option.series.map((item: any) => {
+            if (item.type === 'effectScatter') {
+                return {
+                    ...item, ...effectScatter
+                };
+            }
+            return item;
+        });
+        chart.current.setOption(option, true);
+    }
+    useEffect(() => {
+        if (config) {
+            renderChart();
+        }
+    }, [config]);
+
+    useEffect(() => {
+        if (size) {
+            handleResize();
+        }
+    }, [size]);
+
+    return <div ref={chartRef} style={{ width: '100%', height: '100%' }} />;
+});
+
+export default Index;

package/src/aldehyde/lowcode-components/index.ts

@@ -11,6 +11,20 @@ import PieChart from "./pie-chart";
 import GaugeChart from "./gauge-chart";
 import LiquidChart from "./liquid-chart";
 import DataNumber from "./data-number";
+import EffectScatterMap from "./effectScatter-map";
+import Border1 from "./border/border1";
+import Border2 from "./border/border2";
+import Border3 from "./border/border3";
+import Border4 from "./border/border4";
+import Border5 from "./border/border5";
+import Border6 from "./border/border6";
+import Border7 from "./border/border7";
+import Border8 from "./border/border8";
+import Border9 from "./border/border9";
+import Border10 from "./border/border10";
+import Border11 from "./border/border11";
+import Border12 from "./border/border12";
+import Border13 from "./border/border13";
 
 
 type CompoundedComponent = {
@@ -27,6 +41,20 @@ type CompoundedComponent = {
     GaugeChart?: typeof GaugeChart;
     LiquidChart?: typeof LiquidChart;
     DataNumber?: typeof DataNumber;
+    EffectScatterMap?: typeof EffectScatterMap;
+    Border1?: typeof Border1;
+    Border2?: typeof Border2;
+    Border3?: typeof Border3;
+    Border4?: typeof Border4;
+    Border5?: typeof Border5;
+    Border6?: typeof Border6;
+    Border7?: typeof Border7;
+    Border8?: typeof Border8;
+    Border9?: typeof Border9;
+    Border10?: typeof Border10;
+    Border11?: typeof Border11;
+    Border12?: typeof Border12;
+    Border13?: typeof Border13;
 };
 
 const LowcodeComponents: CompoundedComponent = {};
@@ -44,5 +72,19 @@ LowcodeComponents.PieChart = PieChart;
 LowcodeComponents.GaugeChart = GaugeChart;
 LowcodeComponents.LiquidChart = LiquidChart;
 LowcodeComponents.DataNumber = DataNumber;
+LowcodeComponents.EffectScatterMap = EffectScatterMap;
+LowcodeComponents.Border1 = Border1;
+LowcodeComponents.Border2 = Border2;
+LowcodeComponents.Border3 = Border3;
+LowcodeComponents.Border4 = Border4;
+LowcodeComponents.Border5 = Border5;
+LowcodeComponents.Border6 = Border6;
+LowcodeComponents.Border7 = Border7;
+LowcodeComponents.Border8 = Border8;
+LowcodeComponents.Border9 = Border9;
+LowcodeComponents.Border10 = Border10;
+LowcodeComponents.Border11 = Border11;
+LowcodeComponents.Border12 = Border12;
+LowcodeComponents.Border13 = Border13;
 
 export default LowcodeComponents;

package/src/aldehyde/lowcode-components/lowcode-view/component/assets.ts

@@ -13,6 +13,20 @@ import GaugeChart from "../../gauge-chart";
 import LiquidChart from "../../liquid-chart";
 import DataNumber from "../../data-number";
 import BaseMap from "../../base-map";
+import EffectScatterMap from "../../effectScatter-map";
+import Border1 from "../../border/border1";
+import Border2 from "../../border/border2";
+import Border3 from "../../border/border3";
+import Border4 from "../../border/border4";
+import Border5 from "../../border/border5";
+import Border6 from "../../border/border6";
+import Border7 from "../../border/border7";
+import Border8 from "../../border/border8";
+import Border9 from "../../border/border9";
+import Border10 from "../../border/border10";
+import Border11 from "../../border/border11";
+import Border12 from "../../border/border12";
+import Border13 from "../../border/border13";
 
 interface ComponentItemConfig {
     baseInfo: BaseInfoType, // 基础信息
@@ -125,5 +139,103 @@ export const compsConfig: { [key: string]: ComponentItemConfig } = {
             compName: "基础地图",
             compKey: "BaseMap"
         }
+    },
+    EffectScatterMap: {
+        componentNode: EffectScatterMap,
+        baseInfo: {
+            compName: "散点地图",
+            compKey: "EffectScatterMap"
+        }
+    },
+    Border1: {
+        componentNode: Border1,
+        baseInfo: {
+            compName: "边框1",
+            compKey: "Border1"
+        }
+    },
+    Border2: {
+        componentNode: Border2,
+        baseInfo: {
+            compName: "边框2",
+            compKey: "Border2"
+        }
+    },
+    Border3: {
+        componentNode: Border3,
+        baseInfo: {
+            compName: "边框3",
+            compKey: "Border3"
+        }
+    },
+    Border4: {
+        componentNode: Border4,
+        baseInfo: {
+            compName: "边框4",
+            compKey: "Border4"
+        }
+    },
+    Border5: {
+        componentNode: Border5,
+        baseInfo: {
+            compName: "边框5",
+            compKey: "Border5"
+        }
+    },
+    Border6: {
+        componentNode: Border6,
+        baseInfo: {
+            compName: "边框6",
+            compKey: "Border6"
+        }
+    },
+    Border7: {
+        componentNode: Border7,
+        baseInfo: {
+            compName: "边框7",
+            compKey: "Border7"
+        }
+    },
+    Border8: {
+        componentNode: Border8,
+        baseInfo: {
+            compName: "边框8",
+            compKey: "Border8"
+        }
+    },
+    Border9: {
+        componentNode: Border9,
+        baseInfo: {
+            compName: "边框9",
+            compKey: "Border9"
+        }
+    },
+    Border10: {
+        componentNode: Border10,
+        baseInfo: {
+            compName: "边框10",
+            compKey: "Border10"
+        }
+    },
+    Border11: {
+        componentNode: Border11,
+        baseInfo: {
+            compName: "边框11",
+            compKey: "Border11"
+        }
+    },
+    Border12: {
+        componentNode: Border12,
+        baseInfo: {
+            compName: "边框12",
+            compKey: "Border12"
+        }
+    },
+    Border13: {
+        componentNode: Border13,
+        baseInfo: {
+            compName: "边框13",
+            compKey: "Border13"
+        }
     }
 };

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

@@ -20,10 +20,10 @@ import Units from "../units";
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import Action from "../controls/action";
 import Scrollbars from "react-custom-scrollbars";
-import { LocaleContext } from "../locale/LocaleProvider";
 import Draggable from 'react-draggable';
 import DraggableModal from "./draggable-modal";
 import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
+import { LocaleContext } from "../locale/LocaleProvider";
 
 
 interface ModalEditorProps extends DtmplBaseProps {
@@ -55,6 +55,10 @@ export default class DtmplEditPage extends React.PureComponent<
   formRef = React.createRef<FormInstance>();
   autoSaveTimer = -1000000000000000;
   autoSaveInterval = undefined;
+
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
   onClickBody = (e) => {
     //  console.log(e);
     //console.log("点击了我" + this.autoSaveTimer);
@@ -81,8 +85,6 @@ export default class DtmplEditPage extends React.PureComponent<
     serial: 1,
     dtmplData: undefined,
   };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
 
   async componentDidMount() {
     if (this.props.open) {
@@ -320,6 +322,8 @@ export default class DtmplEditPage extends React.PureComponent<
     const { dtmplConfig, id, dtmplData } = this.state;
 
     let title1 = title ? title : dtmplConfig ? dtmplConfig.title : "";
+    const { translate } = this.context;
+    title1=translate("${" + title1 + "}");
 
     //根据 parentFormInstance 完善 dtmplConfig
     if(parentFormInstance && dtmplConfig){//

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -310,6 +310,14 @@ export default class HcserviceV3 {
     }
   }
 
+  static  isForeignLanguageMode(){
+    if(translate("${保存}")=="保存"){
+      return false;
+    }else{
+      return true;
+    }
+  }
+
   static async requestVersionList(serverKey: string, sourceId: string, code,pageNo?:number) {
     let res = await Super.super({
       url: `/v3/dtmpl/data/versions`,

package/src/aldehyde/tmpl/interface.tsx

@@ -745,6 +745,7 @@ export interface MenuConfigAPIType {
   blockId: string;
   blocks: BlockType[];
   programName: string;
+  l2MenuId: string;
   status: "success" | "error" | "";
 }