aldehyde 0.2.278 → 0.2.281

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

@@ -0,0 +1,108 @@
+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: []
+        }
+    ]
+};
+
+
+export interface ChartComponentStyle {
+    tooltip?: { show: boolean };
+    geo?: { [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 } = config
+        const option = _.cloneDeep(defOption);
+        option.tooltip = { trigger: "item", ...tooltip };
+        option.geo = { ...option.geo, ...geo, ...geo.normal };
+        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/lowcode-view/component/assets.ts

@@ -12,6 +12,7 @@ import PieChart from "../../pie-chart";
 import GaugeChart from "../../gauge-chart";
 import LiquidChart from "../../liquid-chart";
 import DataNumber from "../../data-number";
+import BaseMap from "../../base-map";
 
 interface ComponentItemConfig {
     baseInfo: BaseInfoType, // 基础信息
@@ -117,5 +118,12 @@ export const compsConfig: { [key: string]: ComponentItemConfig } = {
             compName: "数值",
             compKey: "DataNumber"
         }
+    },
+    BaseMap: {
+        componentNode: BaseMap,
+        baseInfo: {
+            compName: "基础地图",
+            compKey: "BaseMap"
+        }
     }
 };

package/src/aldehyde/module/block-menu-tree-drawer.tsx

@@ -94,7 +94,7 @@ export default class BlockMenuTreeDrawer extends React.PureComponent<BlockMenuTr
                 // onOk={()=>this.saveAuth}
                 open={open}
                 width={width}
-                extra={[<Button type={'primary'} onClick={this.saveAuth} >保存</Button>]}
+                extra={[<Button type={'primary'} onClick={this.saveAuth} >{translate("${保存}")}</Button>]}
                 style={{
                     maxWidth: '92vw',
                 }}
@@ -103,9 +103,7 @@ export default class BlockMenuTreeDrawer extends React.PureComponent<BlockMenuTr
                 // }
             >
                 <BlockMenuTree checks={this.state.selectedAuths} onChange={(auths)=>{
-
                     this.setState({
-
                         selectedAuths:auths
                     })
                 }}></BlockMenuTree>

package/src/aldehyde/module/dtmpl-view-modal.tsx

@@ -48,7 +48,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
             <Scrollbars  autoHide autoHideTimeout={1000}>
             <DtmplViewCard  codeSource={codeSource} serverKey={serverKey} sourceId={sourceId} code={code}></DtmplViewCard>
         </Scrollbars>
-                </DraggableModal>
+      </DraggableModal>
     }
 }
 

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

@@ -714,10 +714,10 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         <Tooltip title={translate("${" + title + "}")}>
           <Button
             style={{
-              marginLeft: "5px",
-            }} //为了点击到没有导出模块，使组件不致销毁，丢失导出数据
-          >
-            {type == "ltmpl-data-excel" ? <ExportOutlined /> : title}
+              // marginLeft: "5px",
+            }}
+              //为了点击到没有导出模块，使组件不致销毁，丢失导出数据
+          >{type == "ltmpl-data-excel"?<ExportOutlined />:title}
           </Button>
         </Tooltip>
       </Popover>
@@ -849,7 +849,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           )}
           {buttons.includes("importLtmplExcel") && !readOnly ? (
             <Tooltip title={translate("${导入}")}>
-              {" "}
               <Button
                 href={`#${
                   localStorage.getItem("version") === "v2" ? "/v2" : ""

package/src/aldehyde/tree/block-menu-auth-tree.tsx

@@ -3,7 +3,7 @@ import {Card, Col, Row, Tree,Space} from 'antd';
 import './index.css'
 import HCserviceV3 from "../tmpl/hcservice-v3";
 import {BlockMenu, Level2Menu, ProgramAuth} from "../tmpl/interface";
-// import type {TreeDataNode, TreeProps} from 'antd';
+import { LocaleContext } from "../locale/LocaleProvider";
 import {DeleteOutlined, KeyOutlined, LockOutlined, PlusOutlined, RedoOutlined, UnlockOutlined} from '@ant-design/icons'
 interface BlockMenuAuthTreeProps {
     checks: string[],
@@ -28,6 +28,10 @@ class BlockMenuAuthTree extends React.PureComponent<BlockMenuAuthTreeProps, Bloc
      treekeyAuthId= {};
      authIdtreekeys={};
 
+    static contextType = LocaleContext;
+    context: React.ContextType<typeof LocaleContext>;
+
+
     state = {
         treeData: undefined,
         loading: false,
@@ -139,14 +143,14 @@ class BlockMenuAuthTree extends React.PureComponent<BlockMenuAuthTreeProps, Bloc
     }
 
     renderTitle = (nodeData) => {
-        return <Card bordered={false} style={{width:'100%',minWidth:'180px',marginBottom:2}}  bodyStyle={{padding:'2px'}} >
+        const { translate } = this.context;
+        return <Card variant={"borderless"} style={{width:'100%',minWidth:'180px',marginBottom:2}}  styles={{body:{padding:'2px'}}} >
             <Row>
                 <Col span={24}>
                     <Space>
                         {nodeData["isLeaf"]?<KeyOutlined rotate={180} style={{color: '#f5222d', marginRight: '4px'}}/>:null}
-                        {nodeData.title}
+                        {translate("${" + nodeData.title + "}")}
                     </Space>
-
                 </Col>
             </Row>
         </Card>
@@ -170,14 +174,12 @@ class BlockMenuAuthTree extends React.PureComponent<BlockMenuAuthTreeProps, Bloc
             <Tree
                 checkable={true}
                 defaultExpandAll={true}
-                //defaultCheckedKeys={defaultCheckedKeys}
                 checkedKeys={checkedKeys}
-
                 showLine={{showLeafIcon: false}}
                 selectable={false}
                 onCheck={(checkedKeys)=>this.onCheck(checkedKeys)}
                 titleRender={(nodeData) => {
-                    return this.renderTitle(nodeData)
+                    return <span title={""}> {this.renderTitle(nodeData)}</span>
                 }}
                 treeData={treeData}
             />