aldehyde 0.2.354 → 0.2.356

package/src/aldehyde/lowcode-components/stroke-animation/index.tsx

@@ -24,6 +24,7 @@ export interface ComponentProps {
     base: { width: number, height: number },
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
+    initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
 }
 
 export interface ComponentRef {
@@ -38,6 +39,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     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 chartRef = useRef<HTMLDivElement>(null);
     const chart = useRef<any>(null);
     const pollingIntervalRef = useRef<number | NodeJS.Timeout>(null);
@@ -62,12 +64,13 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     useImperativeHandle(ref, () => ({
         updateConfig: (newConfig) => {
-            const { base, style: newStyle, data: newDataConfig } = newConfig;
+            const { base, style: newStyle, data: newDataConfig, initSearchParams: newISParams } = newConfig;
             setConfig({ ...(newStyle || {}) });
             setSize({ width: base.width, height: base.height });
             setDataConfig(newDataConfig);
             handleInitData(newDataConfig);
             setSearchParams(newDataConfig.searchParams);
+            setInitSearchParams(newISParams || {});
         },
         destroy: handleDestroy,
     }));
@@ -117,16 +120,20 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      */
     useEffect(() => {
         if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit) {
-            getInitData();
+            if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
+                initSearchParams && getInitData(initSearchParams);
+            } else {
+                getInitData();
+            }
         } else if (dataConfig?.sourceType === 'sourceId') {
             setData("关键帧描边动画");
         }
-    }, [dataConfig?.sourceType, dataConfig?.sourceId]);
+    }, [dataConfig?.sourceType, dataConfig?.sourceId, initSearchParams]);
 
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData(searchParams);
+            getInitData({ ...(initSearchParams || {}), ...searchParams });
         }
     }, [searchParams]);
 

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

@@ -23,6 +23,7 @@ export interface ComponentProps {
     style?: ComponentStyle;
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
+    initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
 }
 
 export interface ComponentRef {
@@ -37,6 +38,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     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);
@@ -61,12 +63,13 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
 
     useImperativeHandle(ref, () => ({
         updateConfig: (newConfig) => {
-            const { style: newStyle, data: newDataConfig } = newConfig;
+            const { style: newStyle, data: newDataConfig, initSearchParams: newISParams } = newConfig;
             setConfig({ ...(newStyle || {}) });
             setSpeed(newStyle?.speed || 5);
             setDataConfig({ ...newDataConfig });
             handleInitData(newDataConfig);
             setSearchParams(newDataConfig.searchParams);
+            setInitSearchParams(newISParams || {});
         },
         destroy: handleDestroy,
     }));
@@ -125,16 +128,20 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      */
     useEffect(() => {
         if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit) {
-            getInitData();
+            if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
+                initSearchParams && getInitData(initSearchParams);
+            } else {
+                getInitData();
+            }
         } else if (dataConfig?.sourceType === 'sourceId') {
             setData("文本跑马灯");
         }
-    }, [dataConfig?.sourceType, dataConfig?.sourceId]);
+    }, [dataConfig?.sourceType, dataConfig?.sourceId, initSearchParams]);
 
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData(searchParams);
+            getInitData({ ...(initSearchParams || {}), ...searchParams });
         }
     }, [searchParams]);
 

package/src/aldehyde/welcome/HCWelcome.js

@@ -5,6 +5,7 @@ import "./index.css";
 import Units from "../units";
 import withRouter from "../routable/withroute";
 import WelcomeBg from "./img/welcome.png";
+import welcomeBg2 from "./img/welcome2.png";
 import { useParams } from "react-router-dom";
 
 // interface HCWelcomeProps {}
@@ -309,7 +310,7 @@ const HCWelcome = (props) => {
           <QuickEntrance></QuickEntrance>
         </div>
       </div>
-      {["v2", "v5"].includes(layoutRootPath) ? <img src={WelcomeBg} alt="" width="100%" height="100%" /> : ""}
+      <img src={["v2", "v5"].includes(layoutRootPath) ? WelcomeBg : welcomeBg2} alt="" width="100%" height="100%" />
     </>
   );
 };