新增蓝图分组功能，新增了一个选择多个节点的逻辑节点组件

src/comps/antd-common/AntdBaseDesignerController.ts

@@ -4,6 +4,7 @@ import {ComponentBaseProps} from "../common-component/CommonTypes.ts";
 import {Options, Plot} from "@antv/g2plot";
 import ObjectUtil from "../../utils/ObjectUtil";
 import BPExecutor from "../../designer/blueprint/core/BPExecutor";
+import {AntdBarProps} from "./bar/AntdCommonBarController";
 
 export abstract class AntdBaseDesignerController<I extends Plot<any> = Plot<Options>,
     C extends ComponentBaseProps = ComponentBaseProps> extends AbstractDesignerController<I, C> {
@@ -53,7 +54,8 @@ export abstract class AntdBaseDesignerController<I extends Plot<any> = Plot<Opti
     public commonUpdate(config: C, Clazz: new (...args: any[]) => I, upOp?: UpdateOptions,): void {
         this.config = ObjectUtil.merge(this.config, config);
         upOp = upOp || {reRender: true};
-        if (upOp.reRender)
+        if (upOp.reRender){
             this.instance?.update(this.config?.style!);
+        }
     }
-}
+}

src/comps/antd-common/AntdCommonDefinition.ts

@@ -1,5 +1,6 @@
 import AbstractController from "../../framework/core/AbstractController";
 import {AbstractDefinition, ActionInfo, EventInfo} from "../../framework/core/AbstractDefinition";
+import AbstractDesignerController from "../../framework/core/AbstractDesignerController";
 
 
 export abstract class AntdCommonDefinition<C extends AbstractController = AbstractController, P = any> extends AbstractDefinition<C, P> {
@@ -36,7 +37,8 @@ export abstract class AntdCommonDefinition<C extends AbstractController = Abstra
     }
 
     getActionList(): Array<ActionInfo> {
-        return super.getActionList();
+        const defaultActionList = super.getActionList();
+        return defaultActionList;
     }
 }
 

src/comps/antd-common/area/AntdCommonAreaController.ts

@@ -5,6 +5,7 @@ import {UpdateOptions} from "../../../framework/core/AbstractController";
 import {AntdBaseDesignerController} from "../AntdBaseDesignerController";
 import {ThemeItemType} from "../../../designer/DesignerType";
 import {ShapeAttrs} from "@antv/g-base";
+import {AntdBarProps} from "../bar/AntdCommonBarController";
 
 export interface AntdAreaProps extends ComponentBaseProps {
     style?: WritableAreaOptions;
@@ -31,6 +32,11 @@ export default class AntdCommonAreaController extends AntdBaseDesignerController
         super.commonUpdate(config, Area, upOp);
     }
 
+    updateAsync(config: AntdBarProps, upOp?: UpdateOptions): void {
+        this.commonUpdate(config, Area, upOp);
+        this.doApi(this.config.data.apiData);
+    }
+
     updateTheme(newTheme: ThemeItemType): void {
         const {type} = this.config?.base!;
         if (!newTheme)
@@ -92,4 +98,4 @@ export default class AntdCommonAreaController extends AntdBaseDesignerController
         //重新渲染
         this.update({style: styleConfig} as AntdAreaProps, {reRender: true});
     }
-}
+}

src/comps/antd-common/bar/AntdCommonBarController.ts

@@ -31,6 +31,11 @@ export default class AntdCommonBarController extends AntdBaseDesignerController<
         super.commonUpdate(config, Bar, upOp);
     }
 
+    updateAsync(config: AntdBarProps, upOp?: UpdateOptions): void {
+        this.commonUpdate(config, Bar, upOp);
+        this.doApi(this.config.data.apiData);
+    }
+
     updateTheme(newTheme: ThemeItemType): void {
         if (!newTheme) return;
         const styleConfig = this.config?.style!;
@@ -82,4 +87,4 @@ export default class AntdCommonBarController extends AntdBaseDesignerController<
         //重新渲染
         this.update({style: styleConfig} as AntdBarProps, {reRender: true});
     }
-}
+}

src/comps/antd-common/line/AntdCommonLineController.ts

@@ -5,6 +5,7 @@ import {UpdateOptions} from "../../../framework/core/AbstractController";
 import {AntdBaseDesignerController} from "../AntdBaseDesignerController";
 import {ThemeItemType} from "../../../designer/DesignerType";
 import {ShapeAttrs} from "@antv/g-base";
+import {AntdBarProps} from "../bar/AntdCommonBarController";
 
 export interface AntdLineProps extends ComponentBaseProps {
     style?: WritableLineOptions;
@@ -31,6 +32,11 @@ export default class AntdCommonLineController extends AntdBaseDesignerController
         super.commonUpdate(config, Line, upOp);
     }
 
+    updateAsync(config: AntdBarProps, upOp?: UpdateOptions): void {
+        this.commonUpdate(config, Line, upOp);
+        this.doApi(this.config.data.apiData);
+    }
+
     updateTheme(newTheme: ThemeItemType): void {
         if (!newTheme)
             return;
@@ -89,4 +95,4 @@ export default class AntdCommonLineController extends AntdBaseDesignerController
         //重新渲染
         this.update({style: styleConfig} as AntdLineProps, {reRender: true});
     }
-}
+}

src/comps/antd-common/rose/AntdCommonRoseController.ts

@@ -5,6 +5,7 @@ import {UpdateOptions} from "../../../framework/core/AbstractController";
 import {AntdBaseDesignerController} from "../AntdBaseDesignerController";
 import {ThemeItemType} from "../../../designer/DesignerType";
 import {ShapeAttrs} from "@antv/g-base";
+import {AntdBarProps} from "../bar/AntdCommonBarController";
 
 export interface AntdRoseProps extends ComponentBaseProps {
     style?: WritableRoseOptions;
@@ -31,6 +32,11 @@ export default class AntdCommonRoseController extends AntdBaseDesignerController
         super.commonUpdate(config, Rose, upOp);
     }
 
+    updateAsync(config: AntdBarProps, upOp?: UpdateOptions): void {
+        this.commonUpdate(config, Rose, upOp);
+        this.doApi(this.config.data.apiData);
+    }
+
     updateTheme(newTheme: ThemeItemType): void {
         if (!newTheme) return;
         const styleConfig = this.config?.style!;
@@ -51,4 +57,4 @@ export default class AntdCommonRoseController extends AntdBaseDesignerController
         //重新渲染
         this.update({style: styleConfig} as AntdRoseProps, {reRender: true});
     }
-}
+}

src/comps/antd-common/scatter/AntdCommonScatterController.ts

@@ -5,6 +5,7 @@ import {UpdateOptions} from "../../../framework/core/AbstractController";
 import {AntdBaseDesignerController} from "../AntdBaseDesignerController";
 import {ThemeItemType} from "../../../designer/DesignerType";
 import {ShapeAttrs} from "@antv/g-base";
+import {AntdBarProps} from "../bar/AntdCommonBarController";
 
 export interface AntdScatterProps extends ComponentBaseProps {
     style?: WritableScatterOptions;
@@ -31,6 +32,11 @@ export default class AntdCommonScatterController extends AntdBaseDesignerControl
         super.commonUpdate(config, Scatter, upOp);
     }
 
+    updateAsync(config: AntdBarProps, upOp?: UpdateOptions): void {
+        this.commonUpdate(config, Scatter, upOp);
+        this.doApi(this.config.data.apiData);
+    }
+
     updateTheme(newTheme: ThemeItemType): void {
         if (!newTheme) return;
         const styleConfig = this.config?.style!;
@@ -80,4 +86,4 @@ export default class AntdCommonScatterController extends AntdBaseDesignerControl
         //重新渲染
         this.update({style: styleConfig} as AntdScatterProps, {reRender: true});
     }
-}
+}

src/comps/common-component/base-info/BaseInfo.tsx

@@ -125,17 +125,23 @@ class BaseInfo extends Component<ConfigType, ILayerItem & { version?: string }>
     }
 
     buildSchema = (): Control => {
-        const {name, width, height, x, y} = this.state;
+        const {name, width, height, x, y, id} = this.state;
         return {
             type: 'grid',
             children: [
+                {
+                    id: "id",
+                    key: "id",
+                    label: "ID",
+                    type: "input",
+                    value: id,
+                },
                 {
                     id: "name",
                     key: "name",
                     label: "名称",
                     type: "input",
                     value: name,
-
                 },
                 {
                     id: "width",
@@ -238,4 +244,4 @@ class BaseInfo extends Component<ConfigType, ILayerItem & { version?: string }>
     }
 }
 
-export default BaseInfo;
+export default BaseInfo;

src/comps/common-component/data-config/DataConfig.tsx

@@ -9,6 +9,8 @@ import {DataConfigType} from "../../../designer/DesignerType.ts";
 import {StaticDataConfig} from "./static/StaticDataConfig.tsx";
 import {ApiDataConfig} from "./api/ApiDataConfig.tsx";
 import {DatabaseDataConfig} from "./database/DatabaseConfig.tsx";
+import {DynamicDataConfig} from "./dynamic/DynamicDataConfig.tsx";
+import DataSetConfig from "./dataset/DataSetConfig";
 
 type DataTypeItem = 'static' | 'api' | 'database' | 'excel';
 
@@ -48,7 +50,9 @@ const DataConfig = (props: DataConfigProps) => {
                     options: [
                         {value: 'static', label: '静态数据'},
                         {value: 'api', label: '接口(API)'},
-                        {value: 'database', label: '数据库'}
+                        {value: 'database', label: '数据库'},
+                        {value: 'dynamic', label: '动态数据'},
+                        {value: 'dataset', label: '数据集'},
                     ],
                     containerStyle: {
                         marginBottom: 10
@@ -63,6 +67,8 @@ const DataConfig = (props: DataConfigProps) => {
             {sourceType === 'static' && <StaticDataConfig controller={controller} data={dataSource.staticData}/>}
             {sourceType === 'api' && <ApiDataConfig controller={controller} data={dataSource.apiData!}/>}
             {sourceType === 'database' && <DatabaseDataConfig controller={controller} data={dataSource.database!}/>}
+            {sourceType === 'dynamic' && <DynamicDataConfig controller={controller} data={dataSource.dynamic!}/>}
+            {sourceType === 'dataset' && <DataSetConfig controller={controller} data={dataSource.dataset!}/>}
         </div>
     );
 }

src/comps/common-component/data-config/api/ApiDataConfig.tsx

@@ -140,7 +140,7 @@ export function ApiDataConfig(props: ApiDataConfigProps) {
                         type: 'code-editor',
                         config: {
                             readonly: true,
-                            height: 160,
+                            height: 60,
                         },
                         reRender: true,
                         value: apiTestResRef.current,
@@ -233,4 +233,4 @@ export function ApiDataConfig(props: ApiDataConfigProps) {
     return (
         <LCGUI schema={schema} onFieldChange={onFieldChange}/>
     );
-}
+}

src/comps/common-component/data-config/database/DatabaseConfig.tsx

@@ -23,15 +23,15 @@ export function DatabaseDataConfig(props: DatabaseDataConfigProps) {
     const [count, setCount] = useState(0);
 
     useEffect(() => {
-        FetchUtil.get(`/api/datasource/list`).then(res => {
-            if (res.code === 200) {
-                const options = (res.data as Array<IDataSource>).map(item => {
-                    return {label: item.name, value: item.id}
-                })
-                setDataSourceList(options as ISelectOption[]);
-            } else
-                globalMessage.messageApi?.error(res.msg);
-        })
+        // FetchUtil.get(`/api/datasource/list`).then(res => {
+        //     if (res.code === 200) {
+        //         const options = (res.data as Array<IDataSource>).map(item => {
+        //             return {label: item.name, value: item.id}
+        //         })
+        //         setDataSourceList(options as ISelectOption[]);
+        //     } else
+        //         globalMessage.messageApi?.error(res.msg);
+        // })
     }, []);
 
     const validate = () => {
@@ -173,7 +173,7 @@ export function DatabaseDataConfig(props: DatabaseDataConfigProps) {
                         id: 'databaseTestRes',
                         type: 'code-editor',
                         config: {
-                            height: 200,
+                            height: 60,
                             language: 'json'
                         },
                         reRender: true,
@@ -199,4 +199,4 @@ export function DatabaseDataConfig(props: DatabaseDataConfigProps) {
     return (
         <LCGUI schema={schema} onFieldChange={onFieldChange}/>
     );
-}
+}