aldehyde 0.2.503 → 0.2.504

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;

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-page.tsx

@@ -412,14 +412,6 @@ export default class DtmplEditPage extends React.PureComponent<
     const { saveBtnTitle, continueSaveBtnTitle } = dtmplConfig || {};
     const { translate } = this.context;
     if (dtmplConfig?.buttons?.includes("dtmplSave")) {
-      footerButtons.unshift(
-        <Button type="primary" loading={loading || btnLoading === "saveLoading"} onClick={() => {
-          this.setState({ btnLoading: "saveLoading" });
-          this.doSubmit();
-        }}>
-          {translate("${" + (saveBtnTitle || "保存") + "}")}
-        </Button>
-      );
       if (continueSaveBtnTitle) {
         footerButtons.unshift(
           <Button type="primary" loading={loading || btnLoading === "continueSaveLoading"} onClick={() => {
@@ -429,6 +421,15 @@ export default class DtmplEditPage extends React.PureComponent<
             {translate("${" + continueSaveBtnTitle + "}")}
           </Button>
         );
+      } else {
+        footerButtons.unshift(
+          <Button type="primary" loading={loading || btnLoading === "saveLoading"} onClick={() => {
+            this.setState({ btnLoading: "saveLoading" });
+            this.doSubmit();
+          }}>
+            {translate("${" + (saveBtnTitle || "保存") + "}")}
+          </Button>
+        );
       }
     }
     //处理action
@@ -475,9 +476,8 @@ export default class DtmplEditPage extends React.PureComponent<
     if (code) {
       if (propsCode && isContinueSave) {
         this.loadConfigData();
-      } else {
-        this.props.onOk(code, isContinueSave);
       }
+      this.props.onOk(code, isContinueSave);
     }
   }
 

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

@@ -767,20 +767,19 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   doJump = async (jump: JumpConfig, record_: DtmplData) => {
     let record = record_.fieldMap ? record_.fieldMap : record_;
     const version = localStorage.getItem("version") || "";
-
     let url = null;
     let path = jump.path;
     if (!path) {
       path = "/";
     }
     //是否以http开头
-    if (path?.indexOf("#") == 0 || url?.indexOf("/#") == 0) {
+    if (path?.startsWith("#") || url?.startsWith("/#")) {
       url = "";
     } else if (
-      path.indexOf("http://") == 0 ||
-      path.indexOf("HTTP://") == 0 ||
-      path.indexOf("https://") == 0 ||
-      path.indexOf("HTTPS://") == 0
+      path.startsWith("http://") ||
+      path.startsWith("HTTP://") ||
+      path.startsWith("https://") ||
+      path.startsWith("HTTPS://")
     ) {
       url = path.split("//")[0] + "//";
       path = path.split("//")[1];
@@ -1634,6 +1633,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       leftFixedCols={ltmplConfig.leftFixedCols}
       onChangeResize={this.onChangeResize}
       showEmpty={showEmpty}
+      tableLayout={ltmplConfig.tableLayout}
     /> :
       <QueryTable key={"querytable" + sourceId} sourceId={sourceId}
         // queryTotal={this.queryTotal}