aldehyde 0.2.527 → 0.2.528

package/src/aldehyde/lowcode-components/text-scroller/index.less

@@ -1,29 +1,29 @@
-.text-scroller-container {
-  --speed: 10s;
-  --container-width: 320px;
-
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  white-space: nowrap;
-  position: relative;
-
-  .text-scroller {
-    height: inherit;
-    position: absolute;
-    color: white;
-    animation: scrollText var(--speed) linear infinite;
-    display: flex;
-    align-items: center;
-  }
-
-  @keyframes scrollText {
-    0% {
-      transform: translateX(var(--container-width));
-    }
-
-    100% {
-      transform: translateX(-100%);
-    }
-  }
+.text-scroller-container {
+  --speed: 10s;
+  --container-width: 320px;
+
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  position: relative;
+
+  .text-scroller {
+    height: inherit;
+    position: absolute;
+    color: white;
+    animation: scrollText var(--speed) linear infinite;
+    display: flex;
+    align-items: center;
+  }
+
+  @keyframes scrollText {
+    0% {
+      transform: translateX(var(--container-width));
+    }
+
+    100% {
+      transform: translateX(-100%);
+    }
+  }
 }

package/src/aldehyde/lowcode-components/text-scroller/index.tsx

@@ -1,174 +1,174 @@
-import React, { forwardRef, ForwardedRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
-import './index.less';
-import _ from "lodash";
-import { useLocale } from "../../locale/useLocale";
-import HydrocarbonService from "../../tmpl/hcservice-v3";
-import { DataConfigProps } from "../data";
-
-// 处理数据格式
-const handleData = (data: { config: { [key: string]: string }, value: { [key: string]: any }[] }[]) => {
-    const temData = data?.[0]?.value?.[0]?.v1;
-    return temData;
-}
-
-export interface ComponentStyle {
-    speed?: number;
-    fontSize?: number;
-    color?: string;
-    fontFamily?: string;
-    fontWeight?: number;
-    defaultValue?: string;
-}
-
-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 [speed, setSpeed] = useState<number>(style?.speed || 5);
-    const [dataConfig, setDataConfig] = useState<DataConfigProps>({ ...propsData }); // 数据源配置
-    const [data, setData] = useState<string>('');
-    const [searchParams, setSearchParams] = useState<{ [key: string]: any }>();
-    const [initSearchParams, setInitSearchParams] = useState<{ [key: string]: any }>();
-    const textScrollerRef = useRef<HTMLDivElement>(null);
-    const textContainerRef = useRef<HTMLDivElement>(null);
-    const resizeObserverRef = useRef<ResizeObserver | null>(null);
-    const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
-    const { translate } = useLocale();
-
-    const handleDestroy = () => {
-        resizeObserverRef.current && resizeObserverRef.current.disconnect();
-        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);
-            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 { value } = val.initData;
-            const temData = handleData(value);
-            setData(temData);
-        }
-    }
-
-    useImperativeHandle(ref, () => ({
-        updateConfig: (newConfig) => {
-            const { style: newStyle, data: newDataConfig, initSearchParams: newISParams } = newConfig;
-            setConfig({ ...(newStyle || {}) });
-            setSpeed(newStyle?.speed || 5);
-            setDataConfig({ ...newDataConfig });
-            handleInitData(newDataConfig);
-            setSearchParams(newDataConfig.searchParams);
-            setInitSearchParams(newISParams);
-            handleWSData(newDataConfig);
-        },
-        destroy: handleDestroy,
-    }));
-
-    useEffect(() => {
-        if (textContainerRef.current) {
-            resizeObserverRef.current = new ResizeObserver(_.debounce((entries) => {
-                for (const entry of entries) {
-                    const { width } = entry.contentRect;
-                    textContainerRef.current.style.setProperty('--container-width', `${width}px`);
-                }
-            }, 100));
-            // 开始观察
-            resizeObserverRef.current.observe(textContainerRef.current);
-        }
-        return () => {
-            handleDestroy();
-        }
-    }, []);
-
-    useEffect(() => {
-        if (textContainerRef.current) {
-            textContainerRef.current.style.setProperty('--speed', `${speed || 5}s`);
-        }
-    }, [speed]);
-
-    // 请求数据
-    const getData = async (params?: object) => {
-        const { data } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId, params) || {};
-        const { config, value } = data || {};
-        const temData = handleData(value);
-        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(() => {
-        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();
-            }
-        } else if (dataConfig?.sourceType === 'sourceId') {
-            setData("文本跑马灯");
-        }
-    }, [dataConfig?.sourceType, dataConfig?.sourceId, initSearchParams]);
-
-    // 搜索参数变化时重新请求数据
-    useEffect(() => {
-        if (searchParams) {
-            const params = { ...(initSearchParams || {}), ...searchParams };
-            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
-                initSearchParams && getInitData(params);
-            } else {
-                getInitData(params);
-            }
-        }
-    }, [searchParams, initSearchParams]);
-
-    return (
-        <div className="text-scroller-container" ref={textContainerRef}>
-            <div className="text-scroller" style={{ ...config }} ref={textScrollerRef}>
-                {translate("${" + data + "}")}
-            </div>
-        </div>
-    );
-});
-
+import React, { forwardRef, ForwardedRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
+import './index.less';
+import _ from "lodash";
+import { useLocale } from "../../locale/useLocale";
+import HydrocarbonService from "../../tmpl/hcservice-v3";
+import { DataConfigProps } from "../data";
+
+// 处理数据格式
+const handleData = (data: { config: { [key: string]: string }, value: { [key: string]: any }[] }[]) => {
+    const temData = data?.[0]?.value?.[0]?.v1;
+    return temData;
+}
+
+export interface ComponentStyle {
+    speed?: number;
+    fontSize?: number;
+    color?: string;
+    fontFamily?: string;
+    fontWeight?: number;
+    defaultValue?: string;
+}
+
+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 [speed, setSpeed] = useState<number>(style?.speed || 5);
+    const [dataConfig, setDataConfig] = useState<DataConfigProps>({ ...propsData }); // 数据源配置
+    const [data, setData] = useState<string>('');
+    const [searchParams, setSearchParams] = useState<{ [key: string]: any }>();
+    const [initSearchParams, setInitSearchParams] = useState<{ [key: string]: any }>();
+    const textScrollerRef = useRef<HTMLDivElement>(null);
+    const textContainerRef = useRef<HTMLDivElement>(null);
+    const resizeObserverRef = useRef<ResizeObserver | null>(null);
+    const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
+    const { translate } = useLocale();
+
+    const handleDestroy = () => {
+        resizeObserverRef.current && resizeObserverRef.current.disconnect();
+        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);
+            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 { value } = val.initData;
+            const temData = handleData(value);
+            setData(temData);
+        }
+    }
+
+    useImperativeHandle(ref, () => ({
+        updateConfig: (newConfig) => {
+            const { style: newStyle, data: newDataConfig, initSearchParams: newISParams } = newConfig;
+            setConfig({ ...(newStyle || {}) });
+            setSpeed(newStyle?.speed || 5);
+            setDataConfig({ ...newDataConfig });
+            handleInitData(newDataConfig);
+            setSearchParams(newDataConfig.searchParams);
+            setInitSearchParams(newISParams);
+            handleWSData(newDataConfig);
+        },
+        destroy: handleDestroy,
+    }));
+
+    useEffect(() => {
+        if (textContainerRef.current) {
+            resizeObserverRef.current = new ResizeObserver(_.debounce((entries) => {
+                for (const entry of entries) {
+                    const { width } = entry.contentRect;
+                    textContainerRef.current.style.setProperty('--container-width', `${width}px`);
+                }
+            }, 100));
+            // 开始观察
+            resizeObserverRef.current.observe(textContainerRef.current);
+        }
+        return () => {
+            handleDestroy();
+        }
+    }, []);
+
+    useEffect(() => {
+        if (textContainerRef.current) {
+            textContainerRef.current.style.setProperty('--speed', `${speed || 5}s`);
+        }
+    }, [speed]);
+
+    // 请求数据
+    const getData = async (params?: object) => {
+        const { data } = await HydrocarbonService.requestChartData(null, dataConfig?.sourceId, params) || {};
+        const { config, value } = data || {};
+        const temData = handleData(value);
+        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(() => {
+        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();
+            }
+        } else if (dataConfig?.sourceType === 'sourceId') {
+            setData("文本跑马灯");
+        }
+    }, [dataConfig?.sourceType, dataConfig?.sourceId, initSearchParams]);
+
+    // 搜索参数变化时重新请求数据
+    useEffect(() => {
+        if (searchParams) {
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
+        }
+    }, [searchParams, initSearchParams]);
+
+    return (
+        <div className="text-scroller-container" ref={textContainerRef}>
+            <div className="text-scroller" style={{ ...config }} ref={textScrollerRef}>
+                {translate("${" + data + "}")}
+            </div>
+        </div>
+    );
+});
+
 export default Index;

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

@@ -79,7 +79,6 @@ export default class DtmplEditCard extends React.PureComponent<
             if (prevProps.sourceId != this.props.sourceId || dtmplConfig == null || (!this.props.code && prevProps.code)) {
                 await this.loadConfigData();
             } else if (prevProps.sourceId != this.props.sourceId || queryingCode != code || !dtmplData) {
-                await this.handleBuildInFuncFields(dtmplConfig);
                 //防止反复请求 code
                 if (code) {
                     await this.loadCodeData(dtmplConfig, code);
@@ -115,7 +114,6 @@ export default class DtmplEditCard extends React.PureComponent<
                 addTmplId
             );
         }
-        await this.handleBuildInFuncFields(dtmplConfig);
         this.handleRelValueField(dtmplConfig);
         if (dtmplConfig.entity) {
             let dtmplData = dtmplConfig.entity;
@@ -125,12 +123,10 @@ export default class DtmplEditCard extends React.PureComponent<
             } else {
                 this.setState({ queryingCode: code, dtmplData, dtmplConfig, loading: false });
             }
+            setTimeout(() => this.handleBuildInFuncFields(dtmplConfig), 300);
         } else {
             await this.loadData(dtmplConfig);
-            this.setState({
-                dtmplConfig,
-                loading: false,
-            });
+            this.setState({ dtmplConfig, loading: false });
         }
     };
 

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

@@ -121,7 +121,6 @@ export default class DtmplEditPage extends React.PureComponent<
       ) {
         await this.loadConfigData();
       } else {
-        await this.handleBuildInFuncFields(dtmplConfig);
         await this.loadData(dtmplConfig);
       }
     }
@@ -153,7 +152,6 @@ export default class DtmplEditPage extends React.PureComponent<
       );
     }
     this.handleRelValueField(dtmplConfig);
-    await this.handleBuildInFuncFields(dtmplConfig);
     // 直接复制
     if (dtmplConfig?.entity && dtmplConfig?.entity?.code == code) {
       let dtmplData = dtmplConfig.entity;
@@ -163,13 +161,11 @@ export default class DtmplEditPage extends React.PureComponent<
       } else {
         this.setState({ dtmplData, id: code, loading: false });
       }
+      setTimeout(() => this.handleBuildInFuncFields(), 300);
     } else {
       await this.loadData(dtmplConfig);
     }
-    this.setState({
-      dtmplConfig,
-      loading: false,
-    });
+    this.setState({ dtmplConfig, loading: false });
   };
 
   // 表单关联项secondCriterion处理start

package/src/aldehyde/module/ttmpl-table.tsx

@@ -48,6 +48,9 @@ export interface TtmplTableProps {
     bordered?: boolean; // 表格是否显示边框
     showHeader?: boolean; // 表格是否显示表头
     ettmplConfig?: EttmplConfig; // 展开树配置
+    ettmplRootSourceId?: string; // 展开树配置根 sourceId
+    isRecursion?: boolean; // 是否递归
+    recursionSourceId?: string; // 递归 sourceId
 }
 
 const TtmplTable = (props: TtmplTableProps) => {
@@ -80,7 +83,8 @@ const TtmplTable = (props: TtmplTableProps) => {
         hideOnSinglePage,
         bordered,
         showHeader,
-        ettmplConfig: pEttmplConfig
+        ettmplConfig: pEttmplConfig,
+        ettmplRootSourceId, isRecursion = false, recursionSourceId
     } = props;
     const { translate } = useContext(LocaleContext);
     const [ltmplConfigRes, setLtmplConfigRes] = useState<LtmplConfigRes>();
@@ -99,6 +103,7 @@ const TtmplTable = (props: TtmplTableProps) => {
     const [drawerSize, setDrawerSize] = useState<number | string>("92vw"); // 抽屉组件
     const [isCopy, setIsCopy] = useState<boolean>(false); // 是否复制
     const [ettmplConfig, setEttmplConfig] = useState<EttmplConfig>(pEttmplConfig); // 展开树配置
+    const [treeAddData, setTreeAddData] = useState<{ [key: string]: any }>(); // 展开树添加递归及关联关系配置
     const { token } = useToken();
 
     const toCriteriaData = (values: object) => {
@@ -113,11 +118,11 @@ const TtmplTable = (props: TtmplTableProps) => {
     };
 
     const loadLtmplConfig = async () => {
-        const res: LtmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey, sourceId);
         if (!pEttmplConfig) {
             const ettmplConfig_: EttmplConfig = await HCDataSource.requestEttmplConfig(serverKey, sourceId);
             setEttmplConfig(ettmplConfig_);
         }
+        const res: LtmplConfigRes = await HCDataSource.requestEttmplLtmplConfig(serverKey, ettmplRootSourceId, isRecursion ? recursionSourceId : sourceId);
         let criteriaData_: object;
         let defCriteriaValue = {};
         //提取 过滤条件的默认值
@@ -191,6 +196,14 @@ const TtmplTable = (props: TtmplTableProps) => {
         }
     };
 
+
+    // 展开树行操作添加按钮
+    const doAddRaction = (ractionId: string, mainCode: string) => {
+        setSelectedCode(null);
+        setShowDtmplEdit(true);
+        setTreeAddData({ ractionId, mainCode });
+    }
+
     const doSearch = (params_?: object) => {
         let params = { ...(criteriaData || {}), ...params_ };
         //追加过滤条件，hiddenColIds，innerQueryKey
@@ -222,11 +235,14 @@ const TtmplTable = (props: TtmplTableProps) => {
 
     // 嵌套表格配置
     const expandedRowRender = (val: { [key: string]: any }) => {
-        const { subNodes, recursiveRatmplId } = ettmplConfig;
+        const { subNodes, recursiveRatmplId, sourceId: ettmplSourceId } = ettmplConfig;
         return <div style={{ marginLeft: "24px", background: token.colorBgContainer }}>
             {recursiveRatmplId ?
                 <TtmplTable
+                    isRecursion={true}
+                    recursionSourceId={ettmplSourceId}
                     ettmplConfig={ettmplConfig}
+                    ettmplRootSourceId={ettmplRootSourceId}
                     hideOnSinglePage={true}
                     funcMode="simple"
                     serverKey={serverKey}
@@ -237,6 +253,7 @@ const TtmplTable = (props: TtmplTableProps) => {
                 {subNodes.length > 1 ? <h4 style={{ padding: "12px 0 0 12px" }}>{item.title}</h4> : ""}
                 <TtmplTable
                     ettmplConfig={item}
+                    ettmplRootSourceId={ettmplRootSourceId}
                     hideOnSinglePage={true}
                     funcMode="simple"
                     serverKey={serverKey}
@@ -283,6 +300,7 @@ const TtmplTable = (props: TtmplTableProps) => {
                     showHeader={showHeader}
                     expandable={(subNodes?.length || recursiveRatmplId) ? { expandedRowRender } : undefined} // 嵌套表格
                     showEmpty={false}
+                    doAddRaction={doAddRaction}
                 />
                 {buttons.includes("detail") && showDtmplView ? (
                     <ModalDtmplView
@@ -301,8 +319,8 @@ const TtmplTable = (props: TtmplTableProps) => {
                         serverKey={serverKey}
                         open={showDtmplEdit}
                         onCancel={() => setShowDtmplEdit(false)}
-                        sourceId={dtmplSourceId ? dtmplSourceId : sourceId}
-                        mainCode={mainCode}
+                        sourceId={treeAddData?.ractionId || (dtmplSourceId ? dtmplSourceId : sourceId)}
+                        mainCode={treeAddData?.mainCode || mainCode}
                         code={selectedCode}
                         onOk={handleDtmplEdit}
                         isCopy={isCopy}
@@ -317,8 +335,8 @@ const TtmplTable = (props: TtmplTableProps) => {
                             setShowDtmplCustomEdit(false);
                         }}
                         customPath={customEditPagePath}
-                        sourceId={sourceId}
-                        mainCode={mainCode}
+                        sourceId={treeAddData?.ractionId || sourceId}
+                        mainCode={treeAddData?.mainCode || mainCode}
                         code={selectedCode}
                         isCopy={isCopy}
                     />