aldehyde 0.2.366 → 0.2.368

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}>

package/src/aldehyde/routable/ltmpl-route.tsx

@@ -387,16 +387,17 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                         </Drawer>
                     ) : null}
                     {showViewDrawer && selectedCode ? (
-                        <DtmplViewDrawer
-                            serverKey={null} placement={ltmplConfig?.buttonViewConfig?.windowPosition}
-                            width={windowWidth}
-                            height={windowHeight}
-                            onClose={this.doClose}
-                            open={showViewDrawer}
-                            sourceId={viewSourceId ? viewSourceId : sourceId}
-                            code={selectedCode}
-
-                        ></DtmplViewDrawer>
+                        toCustomPage && ltmplConfig.customViewPagePath ? <CustomDetailModalPage width={1000} minHeight="70vh" mainCode={mainCode} sourceId={sourceId} code={selectedCode} open={showViewModal} customPath={ltmplConfig.customViewPagePath} onCancel={this.doClose} />
+                            :
+                            <DtmplViewDrawer
+                                serverKey={null} placement={ltmplConfig?.buttonViewConfig?.windowPosition}
+                                width={windowWidth}
+                                height={windowHeight}
+                                onClose={this.doClose}
+                                open={showViewDrawer}
+                                sourceId={viewSourceId ? viewSourceId : sourceId}
+                                code={selectedCode}
+                            />
                     ) : null}
                     {showViewModal && selectedCode ? (
                         toCustomPage && ltmplConfig.customViewPagePath ? <CustomDetailModalPage width={1000} minHeight="70vh" mainCode={mainCode} sourceId={sourceId} code={selectedCode} open={showViewModal} customPath={ltmplConfig.customViewPagePath} onCancel={this.doClose} />

package/src/aldehyde/units/index.tsx

@@ -559,6 +559,9 @@ export default {
       window.location.hash = version === "v2" ? "#/login2/" : "#/login/";
     }
   },
+  logout() { // 退出登录，清除数据缓存
+    currentUser = undefined;
+  },
   async downloadFile(url, fileName) {
     try {
       // 检查是否跨域