aldehyde 0.2.366 → 0.2.367

package/src/aldehyde/lowcode-components/bar-chart/index.tsx

@@ -181,7 +181,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -195,9 +195,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
         const { grid, barMaxWidth, legend, tooltip, color, xAxis, yAxis, } = config

package/src/aldehyde/lowcode-components/base-map/index.tsx

@@ -167,7 +167,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -182,9 +182,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     // 自定义弹窗渲染
     const customizeTooltipConfig = (config) => {

package/src/aldehyde/lowcode-components/base-radio/index.tsx

@@ -14,11 +14,11 @@ const handleTimes = (type: string) => {
             temTime = dayjs().subtract(1, "day");
             return `${temTime.startOf("day").format(format)}~${temTime.endOf("day").format(format)}`;
         case "last7days":
-            temTime = dayjs().subtract(7, "day");
-            return `${temTime.startOf("day").format(format)}~${temTime.endOf("day").format(format)}`;
+            temTime = dayjs().subtract(6, "day");
+            return `${temTime.startOf("day").format(format)}~${dayjs().endOf("day").format(format)}`;
         case "last30days":
-            temTime = dayjs().subtract(30, "day");
-            return `${temTime.startOf("day").format(format)}~${temTime.endOf("day").format(format)}`;
+            temTime = dayjs().subtract(29, "day");
+            return `${temTime.startOf("day").format(format)}~${dayjs().endOf("day").format(format)}`;
         case "thisMonth":
             return `${dayjs().startOf("month").format(format)}~${dayjs().endOf("day").format(format)}`;
         case "lastMonth":

package/src/aldehyde/lowcode-components/capsule-bar-chart/index.tsx

@@ -199,7 +199,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -213,9 +213,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
         const { grid, barMaxWidth, legend, tooltip, color, xAxis, yAxis, label } = config

package/src/aldehyde/lowcode-components/carousel/index.tsx

@@ -142,7 +142,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -156,9 +156,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     return <Carousel adaptiveHeight={true} {...config} autoplaySpeed={(config.autoplaySpeed || 3) * 1000}>
         {data.length && data.map((r, index) => <div key={index}> <Image style={{ width: size.width, height: size.height }} src={r} preview={isDesignMode ? false : config.preview} /></div>)}

package/src/aldehyde/lowcode-components/circular-progress-chart/index.tsx

@@ -189,7 +189,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -203,9 +203,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
         const { title, color, backgroundColor, barWidth } = config;

package/src/aldehyde/lowcode-components/column-3d-chart/index.tsx

@@ -238,7 +238,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -252,9 +252,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
         const { grid, barWidth, legend, tooltip, color, xAxis, yAxis, isBackground } = config;

package/src/aldehyde/lowcode-components/column-chart/index.tsx

@@ -203,7 +203,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -217,9 +217,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
         const { grid, barMaxWidth, legend, tooltip, color, xAxis, yAxis, } = config

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

@@ -159,7 +159,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -171,9 +171,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const value = useMemo(() => {
         if (enume?.length > 0) { // 枚举

package/src/aldehyde/lowcode-components/effectScatter-map/index.tsx

@@ -193,7 +193,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -207,9 +207,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     // 自定义弹窗渲染
     const customizeTooltipConfig = (config) => {

package/src/aldehyde/lowcode-components/effectScatter-map-3d/index.tsx

@@ -289,7 +289,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -303,9 +303,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     // 自定义弹窗渲染
     const customizeTooltipConfig = (config) => {

package/src/aldehyde/lowcode-components/gauge-chart/index.tsx

@@ -150,7 +150,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -164,9 +164,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
         const { tooltip, radius, startAngle, endAngle, min, max, axisLine, splitLine, axisTick, axisLabel, detail, progress, center } = config;

package/src/aldehyde/lowcode-components/line-bar-chart/index.tsx

@@ -193,7 +193,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -207,9 +207,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
         const { grid, legend, tooltip, color, xAxis, yAxis, smooth, lineStyle, step, isArea, isGradient, areaStyle, barMaxWidth, symbol } = config;

package/src/aldehyde/lowcode-components/line-chart/index.tsx

@@ -187,7 +187,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -201,9 +201,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
         const { grid, legend, tooltip, color, xAxis, yAxis, smooth, lineStyle, step, isArea, isGradient, areaStyle, symbol: { itemStyle, ...symbol } } = config;

package/src/aldehyde/lowcode-components/liquid-chart/index.tsx

@@ -166,7 +166,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -180,9 +180,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
         const { tooltip, radius, center, shape, amplitude, dataNum, color, backgroundStyle, label } = config;

package/src/aldehyde/lowcode-components/lowcode-view/component/component-container.tsx

@@ -47,7 +47,7 @@ const ComponentContainer = memo((props: ComponentContainerProps) => {
              */
             //todo 此处逻辑应该使用设计模式优化，而非写死
             registerProxy(layer.id!, Controller);
-            setCompController(val => ({ ...val, [layer.id]: Controller }))
+            setCompController(val => ({ ...val, [layer.id]: Controller }));
             Controller.create(ref.current!, { ...config, navigate, setSearchParams }).then(() => {
                 //设置组件滤镜效果（todo 考虑是否应该在此处设置？）
                 Controller.updateFilter(Controller.getConfig()?.filter);

package/src/aldehyde/lowcode-components/lowcode-view/component/component-controller.ts

@@ -103,6 +103,11 @@ export class ComponentController extends AbstractDesignerController {
             this.instance?.updateConfig(this.config);
             return;
         }
+        if (data?.type === "initSearchParams") { // 外部传参，组件参数更新
+            this.config.initSearchParams = data?.initSearchParams;
+            this.instance?.updateConfig(this.config);
+            return;
+        }
         // 默认组件静态数据更新
         this.config.data.staticData = data;
         this.instance?.updateConfig(this.config);

package/src/aldehyde/lowcode-components/lowcode-view/index.tsx

@@ -94,7 +94,7 @@ const LowcodeView = (props: Props) => {
         const dataSourceConfigs = Object.keys(elemConfigs || {}).reduce((total, next) => {
             const { data: item = {}, base } = elemConfigs[next] || {};
             if ((item.isInitParams || base.type === "PlaceholderComponent") && controllers[next]) {
-                controllers[next].instance.updateConfig({ ...elemConfigs[next], initSearchParams });
+                controllers[next].changeData({ ...elemConfigs[next], initSearchParams, type: "initSearchParams" });
             }
             if (item.sourceType === "sourceId" && item.sourceId && item.isInit) {
                 total.push({ sourceId: item.sourceId, chartCode: next, ...(item.isInitParams ? initSearchParams : {}) });

package/src/aldehyde/lowcode-components/pie-chart/index.tsx

@@ -223,7 +223,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -237,9 +237,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const legendFormatter = ({ name, formatter }) => {
         if (!formatter || formatter === "a") {

package/src/aldehyde/lowcode-components/progress-chart/index.tsx

@@ -197,7 +197,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -211,9 +211,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
         const { title, max, background, barWidth, label, color } = config;

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

@@ -119,7 +119,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -133,9 +133,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
         const { fontSize, fontWeight, color, lineWidth, duration = 3, loop, fontFamily } = config;

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

@@ -127,7 +127,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
      * 1、编辑态不请求数据
      */
     useEffect(() => {
-        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest == false) {
+        if (!isDesignMode && dataConfig?.sourceType === 'sourceId' && dataConfig?.sourceId && !dataConfig?.isInit && dataConfig?.isDefRequest !== false) {
             if (dataConfig?.isInitParams) { // 组件数据源接收外部参数
                 initSearchParams && getInitData(initSearchParams);
             } else {
@@ -141,9 +141,14 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     // 搜索参数变化时重新请求数据
     useEffect(() => {
         if (searchParams) {
-            getInitData({ ...(initSearchParams || {}), ...searchParams });
+            const params = { ...(initSearchParams || {}), ...searchParams };
+            if (dataConfig?.isInitParams) { // 数据源接收外部参数，则参数存在再请求
+                initSearchParams && getInitData(params);
+            } else {
+                getInitData(params);
+            }
         }
-    }, [searchParams]);
+    }, [searchParams, initSearchParams]);
 
     return (
         <div className="text-scroller-container" ref={textContainerRef}>