aldehyde 0.2.480 → 0.2.481

package/src/aldehyde/lowcode-components/data-number/index.tsx

@@ -1,220 +1,220 @@
-
-import React, { ForwardedRef, forwardRef, useEffect, useImperativeHandle, useMemo, useState, useRef } from 'react';
-import { useLocale } from "../../locale/useLocale";
-import HydrocarbonService from "../../tmpl/hcservice-v3";
-import { DataConfigProps } from "../data";
-import './index.less';
-
-const rules = {
-    eq: '==',
-    ne: '!=',
-    gt: '>',
-    gte: '>=',
-    lt: '<',
-    lte: '<=',
-};
-
-/**
- * 格式化枚举内容
- *  text: 原始文本,例："同比上升{value}%"
- *  value: 当前数值,例：{value：12}
- *  返回值：格式化后的文本,例: "同比上升12%"
- */
-const processString = (text, value) => {
-    // 定义匹配大括号内内容的正则
-    const regex = /\{(.*?)\}/g;
-    // 使用replace方法，并传入一个替换函数
-    const output = text.replace(regex, (match, expression) => {
-        if (!expression.includes('value')) {
-            return match;
-        }
-        try {
-            // eslint-disable-next-line no-new-func
-            const func = new Function("value", `return (${expression})`);
-            const result = func(value);
-            return result;
-        } catch (error) {
-            console.error(`执行表达式 "${expression}" 时出错:`, error);
-            return match; // 执行失败则返回原匹配内容
-        }
-    });
-    return output;
-};
-
-// 处理数据格式
-const handleData = (data: { config: { [key: string]: string }, value: { [key: string]: any }[] }[], defaultValue: number) => {
-    const temVal = data?.[0]?.value?.[0]?.v1;
-    const temData = (temVal || temVal === 0) ? temVal : (defaultValue || 0);
-    return temData;
-}
-
-interface EnumeProps {
-    rule: string;
-    num: number;
-    value: string;
-    color?: string
-}
-
-export interface ComponentStyle {
-    color?: string;
-    fontSize?: number;
-    fontWeight?: number;
-    fontFamily?: string;
-    alignItems?: string;
-    justifyContent?: string;
-    strokeWidth?: number;
-    strokeColor?: string;
-    letterSpacing?: number;
-    lineHeight?: number;
-    defaultValue?: number;
-    enume?: EnumeProps[];
-}
-
-export interface ComponentProps {
-    style?: ComponentStyle;
-    data?: DataConfigProps;
-    isDesignMode?: boolean; // 是否编辑模式
-    initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
-}
-
-export interface ComponentRef {
-    updateConfig: (newConfig: ComponentProps) => void;
-    destroy: () => void;
-}
-
-const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
-    const { style, data: propsData, isDesignMode } = props;
-    const [config, setConfig] = useState<ComponentStyle>(style || {});
-    const [enume, setEnume] = useState<EnumeProps[]>(style?.enume || []);
-    const [dataConfig, setDataConfig] = useState<DataConfigProps>({ ...propsData }); // 数据源配置
-    const [data, setData] = useState<number>(style?.defaultValue);
-    const [searchParams, setSearchParams] = useState<{ [key: string]: any }>();
-    const [initSearchParams, setInitSearchParams] = useState<{ [key: string]: any }>();
-    const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
-    const { translate } = useLocale();
-
-    // 组件销毁
-    const handleDestroy = () => {
-        pollingIntervalRef.current && clearInterval(pollingIntervalRef.current);
-    };
-
-    // 全局初始化请求数据处理
-    const handleInitData = (val: DataConfigProps) => {
-        if (val.sourceType === "sourceId" && val.isInit && val.initData) {
-            const { config, value } = val.initData;
-            const temData = handleData(value, config?.defaultValue);
-            setData(temData);
-            if (config?.requestMode === "polling") {
-                pollingIntervalRef.current = setInterval(() => { getData() }, config?.pollingInterval || 60000);
-            }
-        }
-    }
-
-    // ws订阅数据更新
-    const handleWSData = (val: DataConfigProps) => {
-        if (val.sourceType === "sourceId" && val.wsData) {
-            const { config, value } = val.wsData;
-            const temData = handleData(value, config?.defaultValue);
-            setData(temData);
-        }
-    }
-
-    useImperativeHandle(ref, () => ({ // 暴露到外部func
-        updateConfig: (newConfig) => { // 组件更新配置
-            const { style: { defaultValue, enume: newEnume, ...style }, data: newDataConfig, initSearchParams: newISParams } = newConfig;
-            setConfig({ ...(style || {}) });
-            setEnume([...(newEnume || [])]);
-            setDataConfig(newDataConfig);
-            newDataConfig?.sourceType !== 'staticData' && setData(defaultValue || 0); // 静态数据不更新
-            handleInitData(newDataConfig);
-            setSearchParams(newDataConfig.searchParams);
-            setInitSearchParams(newISParams);
-            handleWSData(newDataConfig);
-        },
-        destroy: handleDestroy
-    }));
-
-    // 请求数据
-    const getData = async (params?: object) => {
-        const { data } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId, params) || {};
-        const { config, value } = data || {};
-        const temData = handleData(value, config?.defaultValue);
-        setData(temData);
-        return config;
-    }
-
-    // 初始化请求数据
-    const getInitData = async (params?: object) => {
-        pollingIntervalRef.current && clearInterval(pollingIntervalRef.current);
-        const config = await getData(params);
-        if (config?.requestMode === "polling") {
-            pollingIntervalRef.current = setInterval(() => getData(params), config?.pollingInterval || 60000);
-        }
-    }
-
-    useEffect(() => {
-        return () => {
-            handleDestroy();
-        }
-    }, []);
-
-    // 静态数据处理
-    useEffect(() => {
-        if (dataConfig?.sourceType === 'staticData') {
-            const { value } = dataConfig.staticData || {};
-            setData(value);
-        }
-    }, [dataConfig?.sourceType, dataConfig?.staticData]);
-
-    /**
-     * 数据源数据请求
-     * 1、编辑态不请求数据
-     */
-    useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
-            if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
-                initSearchParams && getInitData(initSearchParams);
-            } else {
-                getInitData();
-            }
-        }
-    }, [dataConfig?.sourceType, dataConfig?.sourceId, initSearchParams]);
-
-    // 搜索参数变化时重新请求数据
-    useEffect(() => {
-        if (searchParams) {
-            const params = { ...(initSearchParams || {}), ...searchParams };
-            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
-                initSearchParams && getInitData(params);
-            } else {
-                getInitData(params);
-            }
-        }
-    }, [searchParams, initSearchParams]);
-
-    const value = useMemo(() => {
-        if (enume?.length > 0) { // 枚举
-            const temEnume = enume.filter(item => item.rule && (item.num || item.num === 0));
-            const item = temEnume.find((item) => eval(`${Number(data)} ${rules[item.rule]} ${item.num}`));
-            return item ? { data: translate("${" + processString(item.value, data) + "}"), color: item.color || config?.color } : { data: translate("${" + data + "}"), color: config?.color };
-        } else {
-            return { data: translate("${" + data + "}"), color: config?.color };
-        }
-    }, [data, enume]);
-
-    return (
-        <div
-            className={'data-number-component'}
-            style={{
-                ...config,
-                WebkitTextStrokeWidth: config?.strokeWidth,
-                WebkitTextStrokeColor: config?.strokeColor,
-                color: value?.color,
-            }}
-        >
-            {value?.data}
-        </div>
-    );
-});
-
+
+import React, { ForwardedRef, forwardRef, useEffect, useImperativeHandle, useMemo, useState, useRef } from 'react';
+import { useLocale } from "../../locale/useLocale";
+import HydrocarbonService from "../../tmpl/hcservice-v3";
+import { DataConfigProps } from "../data";
+import './index.less';
+
+const rules = {
+    eq: '==',
+    ne: '!=',
+    gt: '>',
+    gte: '>=',
+    lt: '<',
+    lte: '<=',
+};
+
+/**
+ * 格式化枚举内容
+ *  text: 原始文本,例："同比上升{value}%"
+ *  value: 当前数值,例：{value：12}
+ *  返回值：格式化后的文本,例: "同比上升12%"
+ */
+const processString = (text, value) => {
+    // 定义匹配大括号内内容的正则
+    const regex = /\{(.*?)\}/g;
+    // 使用replace方法，并传入一个替换函数
+    const output = text.replace(regex, (match, expression) => {
+        if (!expression.includes('value')) {
+            return match;
+        }
+        try {
+            // eslint-disable-next-line no-new-func
+            const func = new Function("value", `return (${expression})`);
+            const result = func(value);
+            return result;
+        } catch (error) {
+            console.error(`执行表达式 "${expression}" 时出错:`, error);
+            return match; // 执行失败则返回原匹配内容
+        }
+    });
+    return output;
+};
+
+// 处理数据格式
+const handleData = (data: { config: { [key: string]: string }, value: { [key: string]: any }[] }[], defaultValue: number) => {
+    const temVal = data?.[0]?.value?.[0]?.v1;
+    const temData = (temVal || temVal === 0) ? temVal : (defaultValue || 0);
+    return temData;
+}
+
+interface EnumeProps {
+    rule: string;
+    num: number;
+    value: string;
+    color?: string
+}
+
+export interface ComponentStyle {
+    color?: string;
+    fontSize?: number;
+    fontWeight?: number;
+    fontFamily?: string;
+    alignItems?: string;
+    justifyContent?: string;
+    strokeWidth?: number;
+    strokeColor?: string;
+    letterSpacing?: number;
+    lineHeight?: number;
+    defaultValue?: number;
+    enume?: EnumeProps[];
+}
+
+export interface ComponentProps {
+    style?: ComponentStyle;
+    data?: DataConfigProps;
+    isDesignMode?: boolean; // 是否编辑模式
+    initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
+}
+
+export interface ComponentRef {
+    updateConfig: (newConfig: ComponentProps) => void;
+    destroy: () => void;
+}
+
+const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
+    const { style, data: propsData, isDesignMode } = props;
+    const [config, setConfig] = useState<ComponentStyle>(style || {});
+    const [enume, setEnume] = useState<EnumeProps[]>(style?.enume || []);
+    const [dataConfig, setDataConfig] = useState<DataConfigProps>({ ...propsData }); // 数据源配置
+    const [data, setData] = useState<number>(style?.defaultValue);
+    const [searchParams, setSearchParams] = useState<{ [key: string]: any }>();
+    const [initSearchParams, setInitSearchParams] = useState<{ [key: string]: any }>();
+    const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
+    const { translate } = useLocale();
+
+    // 组件销毁
+    const handleDestroy = () => {
+        pollingIntervalRef.current && clearInterval(pollingIntervalRef.current);
+    };
+
+    // 全局初始化请求数据处理
+    const handleInitData = (val: DataConfigProps) => {
+        if (val.sourceType === "sourceId" && val.isInit && val.initData) {
+            const { config, value } = val.initData;
+            const temData = handleData(value, config?.defaultValue);
+            setData(temData);
+            if (config?.requestMode === "polling") {
+                pollingIntervalRef.current = setInterval(() => { getData() }, config?.pollingInterval || 60000);
+            }
+        }
+    }
+
+    // ws订阅数据更新
+    const handleWSData = (val: DataConfigProps) => {
+        if (val.sourceType === "sourceId" && val.wsData) {
+            const { config, value } = val.wsData;
+            const temData = handleData(value, config?.defaultValue);
+            setData(temData);
+        }
+    }
+
+    useImperativeHandle(ref, () => ({ // 暴露到外部func
+        updateConfig: (newConfig) => { // 组件更新配置
+            const { style: { defaultValue, enume: newEnume, ...style }, data: newDataConfig, initSearchParams: newISParams } = newConfig;
+            setConfig({ ...(style || {}) });
+            setEnume([...(newEnume || [])]);
+            setDataConfig(newDataConfig);
+            newDataConfig?.sourceType !== 'staticData' && setData(defaultValue || 0); // 静态数据不更新
+            handleInitData(newDataConfig);
+            setSearchParams(newDataConfig.searchParams);
+            setInitSearchParams(newISParams);
+            handleWSData(newDataConfig);
+        },
+        destroy: handleDestroy
+    }));
+
+    // 请求数据
+    const getData = async (params?: object) => {
+        const { data } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId, params) || {};
+        const { config, value } = data || {};
+        const temData = handleData(value, config?.defaultValue);
+        setData(temData);
+        return config;
+    }
+
+    // 初始化请求数据
+    const getInitData = async (params?: object) => {
+        pollingIntervalRef.current && clearInterval(pollingIntervalRef.current);
+        const config = await getData(params);
+        if (config?.requestMode === "polling") {
+            pollingIntervalRef.current = setInterval(() => getData(params), config?.pollingInterval || 60000);
+        }
+    }
+
+    useEffect(() => {
+        return () => {
+            handleDestroy();
+        }
+    }, []);
+
+    // 静态数据处理
+    useEffect(() => {
+        if (dataConfig?.sourceType === 'staticData') {
+            const { value } = dataConfig.staticData || {};
+            setData(value);
+        }
+    }, [dataConfig?.sourceType, dataConfig?.staticData]);
+
+    /**
+     * 数据源数据请求
+     * 1、编辑态不请求数据
+     */
+    useEffect(() => {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
+            if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
+                initSearchParams && getInitData(initSearchParams);
+            } else {
+                getInitData();
+            }
+        }
+    }, [dataConfig?.sourceType, dataConfig?.sourceId, initSearchParams]);
+
+    // 搜索参数变化时重新请求数据
+    useEffect(() => {
+        if (searchParams) {
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
+        }
+    }, [searchParams, initSearchParams]);
+
+    const value = useMemo(() => {
+        if (enume?.length > 0) { // 枚举
+            const temEnume = enume.filter(item => item.rule && (item.num || item.num === 0));
+            const item = temEnume.find((item) => eval(`${Number(data)} ${rules[item.rule]} ${item.num}`));
+            return item ? { data: translate("${" + processString(item.value, data) + "}"), color: item.color || config?.color } : { data: translate("${" + data + "}"), color: config?.color };
+        } else {
+            return { data: translate("${" + data + "}"), color: config?.color };
+        }
+    }, [data, enume]);
+
+    return (
+        <div
+            className={'data-number-component'}
+            style={{
+                ...config,
+                WebkitTextStrokeWidth: config?.strokeWidth,
+                WebkitTextStrokeColor: config?.strokeColor,
+                color: value?.color,
+            }}
+        >
+            {value?.data}
+        </div>
+    );
+});
+
 export default Index;

package/src/aldehyde/lowcode-components/data.d.ts

@@ -1,19 +1,19 @@
-export interface DataConfigProps {
-    sourceType: string;
-    serverKey?: string;
-    sourceId?: string;
-    staticData?: any;
-    isInit?: boolean;
-    initData?: any;
-    searchParams?: { [key: string]: any };
-    isInitParams?: boolean;
-    isDefRequest?: boolean;
-    wsData?: any;
-}
-
-export interface OssConfig {
-    accessKeyId: string;
-    accessKeySecret: string;
-    bucket: string;
-    endpoint: string;
+export interface DataConfigProps {
+    sourceType: string;
+    serverKey?: string;
+    sourceId?: string;
+    staticData?: any;
+    isInit?: boolean;
+    initData?: any;
+    searchParams?: { [key: string]: any };
+    isInitParams?: boolean;
+    isDefRequest?: boolean;
+    wsData?: any;
+}
+
+export interface OssConfig {
+    accessKeyId: string;
+    accessKeySecret: string;
+    bucket: string;
+    endpoint: string;
 }

package/src/aldehyde/lowcode-components/decoration/decoration1/index.less

@@ -1,8 +1,8 @@
-.decoration-1 {
-    width: 100%;
-    height: 100%;
-
-    .decoration-1-container {
-        transform-origin: left top;
-    }
+.decoration-1 {
+    width: 100%;
+    height: 100%;
+
+    .decoration-1-container {
+        transform-origin: left top;
+    }
 }