aldehyde 0.2.494 → 0.2.495

package/src/aldehyde/lowcode-components/lowcode-view/component/group-layer/index.tsx

@@ -1,16 +1,16 @@
-import React from "react";
-
-export interface GroupLayerStyleProps {
-    children?: React.ReactNode;
-}
-
-export default class GroupLayer extends React.PureComponent<GroupLayerStyleProps> {
-    state = {
-        load: true
-    }
-
-    render() {
-        const { load } = this.state;
-        return load ? <div style={{ position: 'absolute' }}>{this.props.children}</div> : "";
-    }
+import React from "react";
+
+export interface GroupLayerStyleProps {
+    children?: React.ReactNode;
+}
+
+export default class GroupLayer extends React.PureComponent<GroupLayerStyleProps> {
+    state = {
+        load: true
+    }
+
+    render() {
+        const { load } = this.state;
+        return load ? <div style={{ position: 'absolute' }}>{this.props.children}</div> : "";
+    }
 }

package/src/aldehyde/lowcode-components/lowcode-view/component/layer-builder.tsx

@@ -1,99 +1,99 @@
-import { createElement, ReactElement } from "react";
-import cloneDeep from "lodash/cloneDeep";
-import ComponentContainer from "./component-container";
-import { ILayerItem, LayerManagerDataType, } from "../interface";
-import GroupLayer from "./group-layer";
-
-export enum LayerOrder {
-    ASC,
-    DESC,
-}
-
-class LayerBuilder {
-
-    /**
-     * 解析函数
-     */
-    public parser = (layerManager: LayerManagerDataType, order: LayerOrder = LayerOrder.DESC): ILayerItem[] => {
-        const { layerHeader, layerConfigs } = layerManager;
-        const layerMap = cloneDeep(layerConfigs);
-        let sourceLayerArr: ILayerItem[] = [];
-
-        const iterateLayers = (currentLayer: ILayerItem, res: ILayerItem[]): void => {
-            if (currentLayer) {
-                res.push(currentLayer);
-                if (currentLayer.childHeader) {
-                    let childLayer = layerMap[currentLayer.childHeader];
-                    iterateLayers(childLayer, res);
-                }
-                let next = currentLayer.next;
-                while (next) {
-                    const nextLayer = layerMap[next!];
-                    if (nextLayer?.childHeader)
-                        iterateLayers(layerMap[nextLayer.childHeader], res);
-                    nextLayer && res.push(nextLayer);
-                    next = nextLayer?.next;
-                }
-            }
-        }
-
-        iterateLayers(layerMap[layerHeader!], sourceLayerArr);
-
-        if (order === LayerOrder.ASC)
-            sourceLayerArr = sourceLayerArr.reverse();
-
-        // 构建树结构
-        const resData: ILayerItem[] = [];
-        for (const layerItem of sourceLayerArr) {
-            if (!layerItem?.pid) {
-                // 根节点
-                resData.push(layerItem);
-            } else {
-                // 非根节点，将其加入父节点的 children 中
-                const parent = layerMap[layerItem.pid];
-                if (parent) {
-                    parent.children = parent.children || [];
-                    parent.children.push(layerItem);
-                }
-            }
-        }
-        return resData;
-    };
-
-    private order: number = 1;
-
-    /**
-     * 构建设计器主画布组件
-     * @param layerMap
-     */
-    public buildCanvasComponents = (layerManager: LayerManagerDataType): ReactElement[] => {
-        const res: ReactElement[] = [];
-        //渲染顺序，先渲染顶层容器，再逐步渲染底层的子容器
-        this.parser(layerManager, LayerOrder.ASC).forEach((item: ILayerItem) => {
-            res.push(this.buildComponents(layerManager, item));
-        });
-        //重置排序编号
-        this.order = 1;
-        return res;
-    }
-
-    private buildComponents = (layerManager: LayerManagerDataType, layer: ILayerItem): ReactElement => {
-        const { type, children } = layer;
-        const { layerConfigs } = layerManager;
-        const targetLayer = layerConfigs[layer.id!];
-        //给每个图层重新设置排序编号,用于在图层移动的过程中提供更好的体验
-        if (targetLayer)
-            targetLayer.order = this.order++;
-        if (type === 'group') {
-            //先生成子元素再包裹groupItem
-            const childDomArr: ReactElement[] = children?.map((item: ILayerItem) => this.buildComponents(layerManager, item));
-            return createElement(GroupLayer, { key: layer.id }, ...childDomArr);
-        } else {
-            return createElement(ComponentContainer, { layer, key: layer.id, layerManager });
-        }
-    }
-
-}
-
-const layerBuilder = new LayerBuilder();
+import { createElement, ReactElement } from "react";
+import cloneDeep from "lodash/cloneDeep";
+import ComponentContainer from "./component-container";
+import { ILayerItem, LayerManagerDataType, } from "../interface";
+import GroupLayer from "./group-layer";
+
+export enum LayerOrder {
+    ASC,
+    DESC,
+}
+
+class LayerBuilder {
+
+    /**
+     * 解析函数
+     */
+    public parser = (layerManager: LayerManagerDataType, order: LayerOrder = LayerOrder.DESC): ILayerItem[] => {
+        const { layerHeader, layerConfigs } = layerManager;
+        const layerMap = cloneDeep(layerConfigs);
+        let sourceLayerArr: ILayerItem[] = [];
+
+        const iterateLayers = (currentLayer: ILayerItem, res: ILayerItem[]): void => {
+            if (currentLayer) {
+                res.push(currentLayer);
+                if (currentLayer.childHeader) {
+                    let childLayer = layerMap[currentLayer.childHeader];
+                    iterateLayers(childLayer, res);
+                }
+                let next = currentLayer.next;
+                while (next) {
+                    const nextLayer = layerMap[next!];
+                    if (nextLayer?.childHeader)
+                        iterateLayers(layerMap[nextLayer.childHeader], res);
+                    nextLayer && res.push(nextLayer);
+                    next = nextLayer?.next;
+                }
+            }
+        }
+
+        iterateLayers(layerMap[layerHeader!], sourceLayerArr);
+
+        if (order === LayerOrder.ASC)
+            sourceLayerArr = sourceLayerArr.reverse();
+
+        // 构建树结构
+        const resData: ILayerItem[] = [];
+        for (const layerItem of sourceLayerArr) {
+            if (!layerItem?.pid) {
+                // 根节点
+                resData.push(layerItem);
+            } else {
+                // 非根节点，将其加入父节点的 children 中
+                const parent = layerMap[layerItem.pid];
+                if (parent) {
+                    parent.children = parent.children || [];
+                    parent.children.push(layerItem);
+                }
+            }
+        }
+        return resData;
+    };
+
+    private order: number = 1;
+
+    /**
+     * 构建设计器主画布组件
+     * @param layerMap
+     */
+    public buildCanvasComponents = (layerManager: LayerManagerDataType): ReactElement[] => {
+        const res: ReactElement[] = [];
+        //渲染顺序，先渲染顶层容器，再逐步渲染底层的子容器
+        this.parser(layerManager, LayerOrder.ASC).forEach((item: ILayerItem) => {
+            res.push(this.buildComponents(layerManager, item));
+        });
+        //重置排序编号
+        this.order = 1;
+        return res;
+    }
+
+    private buildComponents = (layerManager: LayerManagerDataType, layer: ILayerItem): ReactElement => {
+        const { type, children } = layer;
+        const { layerConfigs } = layerManager;
+        const targetLayer = layerConfigs[layer.id!];
+        //给每个图层重新设置排序编号,用于在图层移动的过程中提供更好的体验
+        if (targetLayer)
+            targetLayer.order = this.order++;
+        if (type === 'group') {
+            //先生成子元素再包裹groupItem
+            const childDomArr: ReactElement[] = children?.map((item: ILayerItem) => this.buildComponents(layerManager, item));
+            return createElement(GroupLayer, { key: layer.id }, ...childDomArr);
+        } else {
+            return createElement(ComponentContainer, { layer, key: layer.id, layerManager });
+        }
+    }
+
+}
+
+const layerBuilder = new LayerBuilder();
 export default layerBuilder;

package/src/aldehyde/lowcode-components/lowcode-view/component/screen-fit/index.less

@@ -1,14 +1,14 @@
-.react-screen-box {
-  background-size: 100% 100%;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-
-  .screen-wrapper {
-    transition-property: all;
-    transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-    transition-duration: 300ms;
-    position: relative;
-    transform-origin: left top;
-  }
+.react-screen-box {
+  background-size: 100% 100%;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+
+  .screen-wrapper {
+    transition-property: all;
+    transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+    transition-duration: 300ms;
+    position: relative;
+    transform-origin: left top;
+  }
 }

package/src/aldehyde/lowcode-components/lowcode-view/component/screen-fit/index.tsx

@@ -1,122 +1,122 @@
-/* eslint-disable no-unused-expressions */
-import React, { ReactNode, useEffect, useRef, useState } from 'react'
-import debounce from "lodash/debounce";
-import './index.less';
-import { AdaptationType } from "../../interface";
-
-interface ScreenFitProps {
-    children?: ReactNode,
-    width: number | string,
-    height: number | string,
-    bodyOverflowHidden?: boolean,
-    delay?: number,
-    mode?: AdaptationType,
-    scaleChange?: (xScale: number, yScale: number) => void,
-}
-
-
-export default function ScreenFit(props: ScreenFitProps) {
-    const { width, height, bodyOverflowHidden = true, delay = 200, scaleChange } = props
-    let bodyOverflow: string
-    const elRef = useRef<HTMLDivElement>(null);
-    const canvasRef = useRef(null);
-    const [size, setSize] = useState({ width, height, originalHeight: 0, originalWidth: 0 })
-
-    let observer: ResizeObserver;
-
-    function updateSize() {
-        if (size.width && size.height) {
-            elRef.current.style.width = `${size.width}px`
-            elRef.current.style.height = `${size.height}px`
-        } else {
-            elRef.current.style.width = `${size.originalWidth}px`
-            elRef.current.style.height = `${size.originalHeight}px`
-        }
-    }
-
-    function updateScale() {
-        // 获取真实视口尺寸
-        const currentWidth = canvasRef.current?.clientWidth || 0;
-        const currentHeight = canvasRef.current?.clientHeight || 0;
-        // 获取大屏最终的宽高
-        const realWidth = size.width || size.originalWidth;
-        const realHeight = size.height || size.originalHeight;
-        // 计算缩放比例
-        const widthScale = currentWidth / +realWidth;
-        const heightScale = currentHeight / +realHeight;
-        switch (props.mode) {
-            case 'full-screen':
-                // 若要铺满全屏，则按照各自比例缩放
-                elRef.current.style.transform = `scale(${widthScale},${heightScale})`;
-                scaleChange?.(widthScale, heightScale);
-                break;
-            case 'full-x':
-                elRef.current.style.transform = `scale(${widthScale})`;
-                canvasRef.current.style.height = `${Number(realHeight) * widthScale}px`;
-                scaleChange?.(widthScale, widthScale);
-                break;
-            case 'full-y':
-                elRef.current.style.transform = `scale(${heightScale})`;
-                canvasRef.current.style.width = `${Number(realWidth) * heightScale}px`;
-                scaleChange?.(heightScale, heightScale);
-                if (currentWidth > (+realWidth * heightScale)) {
-                    elRef.current.style.margin = `0px ${(currentWidth - +realWidth * heightScale) / 2}px`;
-                } else {
-                    elRef.current.style.margin = "0px";
-                }
-                break;
-            default:
-                // 按照宽高最小比例进行缩放
-                const scale = Math.min(widthScale, heightScale);
-                elRef.current.style.transform = `scale(${scale},${scale})`;
-                const domWidth = elRef.current.clientWidth;
-                const domHeight = elRef.current.clientHeight;
-                const mx = Math.max((currentWidth - domWidth * scale) / 2, 0);
-                const my = Math.max((currentHeight - domHeight * scale) / 2, 0);
-                elRef.current.style.margin = `${my}px ${mx}px`;
-                scaleChange?.(scale, scale);
-                break;
-        }
-    }
-
-    const onResize = debounce(() => {
-        if (!elRef.current && !canvasRef.current) return;
-        updateSize();
-        updateScale();
-    }, delay)
-
-    function initState() {
-        if (bodyOverflowHidden) {
-            bodyOverflow = document.body.style.overflow;
-            document.body.style.overflow = 'hidden';
-        }
-        observer = new ResizeObserver(() => onResize());
-        observer.observe(canvasRef.current);
-        setSize({
-            ...size,
-            originalWidth: window.screen.width,
-            originalHeight: window.screen.height
-        })
-        updateSize();
-        updateScale();
-        window.addEventListener('resize', onResize);
-    }
-
-    useEffect(() => {
-        initState();
-        return () => {
-            observer.disconnect();
-            window.removeEventListener('resize', onResize);
-            if (bodyOverflowHidden)
-                document.body.style.overflow = bodyOverflow;
-        }
-    }, [])
-
-    return (
-        <div ref={canvasRef} className={'react-screen-box'} >
-            <div className={'screen-wrapper'} ref={elRef}>
-                {props.children}
-            </div>
-        </div>
-    )
+/* eslint-disable no-unused-expressions */
+import React, { ReactNode, useEffect, useRef, useState } from 'react'
+import debounce from "lodash/debounce";
+import './index.less';
+import { AdaptationType } from "../../interface";
+
+interface ScreenFitProps {
+    children?: ReactNode,
+    width: number | string,
+    height: number | string,
+    bodyOverflowHidden?: boolean,
+    delay?: number,
+    mode?: AdaptationType,
+    scaleChange?: (xScale: number, yScale: number) => void,
+}
+
+
+export default function ScreenFit(props: ScreenFitProps) {
+    const { width, height, bodyOverflowHidden = true, delay = 200, scaleChange } = props
+    let bodyOverflow: string
+    const elRef = useRef<HTMLDivElement>(null);
+    const canvasRef = useRef(null);
+    const [size, setSize] = useState({ width, height, originalHeight: 0, originalWidth: 0 })
+
+    let observer: ResizeObserver;
+
+    function updateSize() {
+        if (size.width && size.height) {
+            elRef.current.style.width = `${size.width}px`
+            elRef.current.style.height = `${size.height}px`
+        } else {
+            elRef.current.style.width = `${size.originalWidth}px`
+            elRef.current.style.height = `${size.originalHeight}px`
+        }
+    }
+
+    function updateScale() {
+        // 获取真实视口尺寸
+        const currentWidth = canvasRef.current?.clientWidth || 0;
+        const currentHeight = canvasRef.current?.clientHeight || 0;
+        // 获取大屏最终的宽高
+        const realWidth = size.width || size.originalWidth;
+        const realHeight = size.height || size.originalHeight;
+        // 计算缩放比例
+        const widthScale = currentWidth / +realWidth;
+        const heightScale = currentHeight / +realHeight;
+        switch (props.mode) {
+            case 'full-screen':
+                // 若要铺满全屏，则按照各自比例缩放
+                elRef.current.style.transform = `scale(${widthScale},${heightScale})`;
+                scaleChange?.(widthScale, heightScale);
+                break;
+            case 'full-x':
+                elRef.current.style.transform = `scale(${widthScale})`;
+                canvasRef.current.style.height = `${Number(realHeight) * widthScale}px`;
+                scaleChange?.(widthScale, widthScale);
+                break;
+            case 'full-y':
+                elRef.current.style.transform = `scale(${heightScale})`;
+                canvasRef.current.style.width = `${Number(realWidth) * heightScale}px`;
+                scaleChange?.(heightScale, heightScale);
+                if (currentWidth > (+realWidth * heightScale)) {
+                    elRef.current.style.margin = `0px ${(currentWidth - +realWidth * heightScale) / 2}px`;
+                } else {
+                    elRef.current.style.margin = "0px";
+                }
+                break;
+            default:
+                // 按照宽高最小比例进行缩放
+                const scale = Math.min(widthScale, heightScale);
+                elRef.current.style.transform = `scale(${scale},${scale})`;
+                const domWidth = elRef.current.clientWidth;
+                const domHeight = elRef.current.clientHeight;
+                const mx = Math.max((currentWidth - domWidth * scale) / 2, 0);
+                const my = Math.max((currentHeight - domHeight * scale) / 2, 0);
+                elRef.current.style.margin = `${my}px ${mx}px`;
+                scaleChange?.(scale, scale);
+                break;
+        }
+    }
+
+    const onResize = debounce(() => {
+        if (!elRef.current && !canvasRef.current) return;
+        updateSize();
+        updateScale();
+    }, delay)
+
+    function initState() {
+        if (bodyOverflowHidden) {
+            bodyOverflow = document.body.style.overflow;
+            document.body.style.overflow = 'hidden';
+        }
+        observer = new ResizeObserver(() => onResize());
+        observer.observe(canvasRef.current);
+        setSize({
+            ...size,
+            originalWidth: window.screen.width,
+            originalHeight: window.screen.height
+        })
+        updateSize();
+        updateScale();
+        window.addEventListener('resize', onResize);
+    }
+
+    useEffect(() => {
+        initState();
+        return () => {
+            observer.disconnect();
+            window.removeEventListener('resize', onResize);
+            if (bodyOverflowHidden)
+                document.body.style.overflow = bodyOverflow;
+        }
+    }, [])
+
+    return (
+        <div ref={canvasRef} className={'react-screen-box'} >
+            <div className={'screen-wrapper'} ref={elRef}>
+                {props.children}
+            </div>
+        </div>
+    )
 }

package/src/aldehyde/lowcode-components/placeholder-component/index.tsx

@@ -1,82 +1,82 @@
-
-import React, { ForwardedRef, forwardRef, useMemo, useImperativeHandle, useState } from 'react';
-import Units from "../../units/index";
-import { useLocale } from "../../locale/useLocale";
-
-const defStyle = {
-    color: '#9a9a9a',
-    height: '100%',
-    display: 'flex',
-    justifyContent: 'center',
-    alignItems: 'center',
-    border: '1px solid #9a9a9a',
-};
-
-export interface ComponentProps {
-    style: { key: string; compsIds?: string[]; },
-    isDesignMode?: boolean; // 是否编辑模式
-    initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
-    setSearchParams: (data: any) => void;
-}
-
-export interface CompImageonentRef {
-    updateConfig: (newConfig: ComponentProps) => void;
-}
-
-const PlaceholderComponent = forwardRef((props: ComponentProps, ref: ForwardedRef<CompImageonentRef>) => {
-    const { isDesignMode, setSearchParams, style } = props;
-    const { translate } = useLocale();
-    const [key, setKey] = useState<string>(style?.key);
-    const [initSearchParams, setInitSearchParams] = useState<{ [key: string]: any }>();
-    const [compsIds, setCompsIds] = useState<string[]>(style?.compsIds || []);
-
-    useImperativeHandle(ref, () => ({
-        updateConfig: (newConfig) => {
-            setKey(newConfig.style?.key);
-            setInitSearchParams(newConfig.initSearchParams || {});
-            setCompsIds(newConfig.style?.compsIds || []);
-        },
-    }));
-
-
-    const handleParams = (params: { [key: string]: any }) => {
-        if (!compsIds?.length) {
-            return;
-        }
-        setSearchParams(val => {
-            const temObj = {};
-            for (const compId of compsIds) {
-                if (val[compId]) { // 全局搜索参数中存在当前组件的搜索参数，则合并
-                    val[compId] = { ...val[compId], ...params }
-                } else {
-                    temObj[compId] = params;
-                }
-            };
-            return { ...val, ...temObj };
-        });
-    }
-
-
-    const renderComponent = useMemo(() => {
-        const temComponent = Units.getCustomComponent(key);
-        if (temComponent) {
-            return React.createElement(temComponent, { params: initSearchParams, handleParams });
-        }
-        return <div style={defStyle}>{translate("${没有找到自定义组件}")}</div>;
-    }, [key, initSearchParams]);
-
-    return (
-        <div style={{ width: '100%', height: '100%' }}>
-            {isDesignMode || !key ?
-                <div style={defStyle}>
-                    <div>{translate("${占位组件}")}</div>
-                </div> :
-                <div style={{ width: '100%', height: '100%', overflow: "auto" }}>
-                    {renderComponent}
-                </div>
-            }
-        </div>
-    );
-});
-
+
+import React, { ForwardedRef, forwardRef, useMemo, useImperativeHandle, useState } from 'react';
+import Units from "../../units/index";
+import { useLocale } from "../../locale/useLocale";
+
+const defStyle = {
+    color: '#9a9a9a',
+    height: '100%',
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    border: '1px solid #9a9a9a',
+};
+
+export interface ComponentProps {
+    style: { key: string; compsIds?: string[]; },
+    isDesignMode?: boolean; // 是否编辑模式
+    initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
+    setSearchParams: (data: any) => void;
+}
+
+export interface CompImageonentRef {
+    updateConfig: (newConfig: ComponentProps) => void;
+}
+
+const PlaceholderComponent = forwardRef((props: ComponentProps, ref: ForwardedRef<CompImageonentRef>) => {
+    const { isDesignMode, setSearchParams, style } = props;
+    const { translate } = useLocale();
+    const [key, setKey] = useState<string>(style?.key);
+    const [initSearchParams, setInitSearchParams] = useState<{ [key: string]: any }>();
+    const [compsIds, setCompsIds] = useState<string[]>(style?.compsIds || []);
+
+    useImperativeHandle(ref, () => ({
+        updateConfig: (newConfig) => {
+            setKey(newConfig.style?.key);
+            setInitSearchParams(newConfig.initSearchParams || {});
+            setCompsIds(newConfig.style?.compsIds || []);
+        },
+    }));
+
+
+    const handleParams = (params: { [key: string]: any }) => {
+        if (!compsIds?.length) {
+            return;
+        }
+        setSearchParams(val => {
+            const temObj = {};
+            for (const compId of compsIds) {
+                if (val[compId]) { // 全局搜索参数中存在当前组件的搜索参数，则合并
+                    val[compId] = { ...val[compId], ...params }
+                } else {
+                    temObj[compId] = params;
+                }
+            };
+            return { ...val, ...temObj };
+        });
+    }
+
+
+    const renderComponent = useMemo(() => {
+        const temComponent = Units.getCustomComponent(key);
+        if (temComponent) {
+            return React.createElement(temComponent, { params: initSearchParams, handleParams });
+        }
+        return <div style={defStyle}>{translate("${没有找到自定义组件}")}</div>;
+    }, [key, initSearchParams]);
+
+    return (
+        <div style={{ width: '100%', height: '100%' }}>
+            {isDesignMode || !key ?
+                <div style={defStyle}>
+                    <div>{translate("${占位组件}")}</div>
+                </div> :
+                <div style={{ width: '100%', height: '100%', overflow: "auto" }}>
+                    {renderComponent}
+                </div>
+            }
+        </div>
+    );
+});
+
 export default PlaceholderComponent;