aldehyde 0.2.494 → 0.2.495

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/ltmpl-table.tsx

@@ -40,6 +40,8 @@ export interface LtmplTableProps {
   loadDataCallback?: (val: object[]) => void; // 请求数据回调函数
   defRowCardCount?: number; // 卡片展示模式-默认行卡片数量
   showTableAdd?: boolean; // 是否支持添加列表
+  userPageConfig?: { [key: string]: any }; // 用户自定义页面配置(搜索条件等缓存,多表格模式)
+  setUserPageConfig?: (config: { [key: string]: any }) => void; // 用户自定义页面配置(搜索条件等缓存,多表格模式)
 }
 
 export interface LtmplTableState {
@@ -89,6 +91,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
     showPagination: true,
     showAggregates: true,
     showTableAdd: false,
+    userPageConfig: undefined,
   };
 
   async componentDidMount() {
@@ -112,7 +115,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
   }
 
   loadLtmplConfig = async () => {
-    const { sourceId, serverKey, defaultCriteriaValue } = this.props;
+    const { sourceId, serverKey, defaultCriteriaValue, userPageConfig } = this.props;
     let ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(
       serverKey,
       sourceId
@@ -130,7 +133,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
     if (defaultCriteriaValue) {
       defCriteriaValue = { ...defCriteriaValue, ...defaultCriteriaValue }
     }
-    criteriaData = this.toCriteriaData(defCriteriaValue);
+    criteriaData = userPageConfig?.criteriaData || this.toCriteriaData(defCriteriaValue);
     this.setState({
       ltmplConfigRes,
       criteriaData,
@@ -140,7 +143,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
     let criteriaData = {};
     if (values) {
       for (let key in values) {
-        criteriaData[key] = Units.configParamTrans(values[key], null);
+        criteriaData[key] = (values[key] || values[key] === 0) ? Units.configParamTrans(values[key], null) : undefined;
       }
     }
     criteriaData["sequence"] = Units.getRandomNum(6);
@@ -214,7 +217,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
   };
 
   doSearch = (params_) => {
-    const { sourceId, mainCode, collapsible } = this.props;
+    const { sourceId, mainCode, collapsible, setUserPageConfig } = this.props;
     const { criteriaData } = this.state;
     let params = { ...criteriaData, ...params_ };
     //追加过滤条件，hiddenColIds，innerQueryKey
@@ -223,20 +226,14 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
     }
     params["sourceId"] = sourceId;
     if (collapsible) {
-      this.setState({
-        collapse: false,
-      });
+      this.setState({ collapse: false });
     }
-    this.setState({
-      criteriaData: this.toCriteriaData(params),
-    });
+    this.setState({ criteriaData: this.toCriteriaData(params) });
+    if (setUserPageConfig) setUserPageConfig({ criteriaData: this.toCriteriaData(params) }); // 搜索条件缓存
   };
 
   onChangePage = (pageNo, pageSize) => {
-    this.setState({
-      pageNo,
-      pageSize,
-    });
+    this.setState({ pageNo, pageSize });
   };
 
   handleDtmplEdit = (code: string, isContinueSave?: boolean) => {
@@ -270,7 +267,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
       tip, title, collapsible,
       initCollapse, doCustomEdit, doCustomCreate,
       serverKey, rowOperatable, readOnly, defShowType, showPagination, showAggregates, deleteCallback,
-      loadDataCallback, defRowCardCount, showTableAdd
+      loadDataCallback, defRowCardCount, showTableAdd, userPageConfig, setUserPageConfig
     } = this.props;
     const { translate } = this.context;
 
@@ -300,6 +297,8 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
             deleteCallback={deleteCallback}
             loadDataCallback={loadDataCallback}
             showTableAdd={showTableAdd}
+            userPageConfig={userPageConfig}
+            setUserPageConfig={setUserPageConfig}
           />
           {buttons.includes("detail") && showDtmplView ? (
             <ModalDtmplView

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

@@ -67,6 +67,12 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
     return menuId;
   };
 
+  getServerKey = () => { // 获取serverKey
+    const { searchParams } = this.props;
+    let serverKey = searchParams.get("serverKey");
+    return serverKey || null;
+  };
+
   getCodeSource = () => {
     const { searchParams } = this.props;
     // let params=Units.transQueryStrToParams(location.search);
@@ -84,16 +90,15 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
   };
 
   goNavigatel = () => {
-    this.props.navigate(window.location.hash.replace("#/","/"));
+    this.props.navigate(window.location.hash.replace("#/", "/"));
     //.reload();
   };
 
   goDtmpl = (code: string) => {
     const { sourceId } = this.props.params;
     const { basePath } = this.props;
-    let url = `${basePath}${
-      this.computedLayoutPath
-    }/${sourceId}/detail-edit?menuId=${this.getMenuId()}`;
+    let url = `${basePath}${this.computedLayoutPath
+      }/${sourceId}/detail-edit?menuId=${this.getMenuId()}`;
     if (code) {
       url = url + `&code=${code}`;
     }
@@ -130,6 +135,7 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
   render() {
     const { location, params, searchParams } = this.props;
     const { sourceId } = params;
+    const serverKey = this.getServerKey();
 
     const { codeSource } = this.state;
     if (!location) {
@@ -143,8 +149,8 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
     let versionId = params["versionId"];
     if (location.pathname.endsWith("detail-view")) {
       return (
-        <TabActDtmplView key={sourceId+code+versionId}
-          serverKey={null}
+        <TabActDtmplView key={sourceId + code + versionId}
+          serverKey={serverKey}
           goBackToLtmpl={codeSource ? undefined : this.goBackToLtmpl}
           goDtmpl={this.goDtmpl}
           sourceId={sourceId}
@@ -155,9 +161,9 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
       );
     } else {
       return (
-        <DtmplEdit key={sourceId+code+versionId}
+        <DtmplEdit key={sourceId + code + versionId}
           addTmplId={searchParams.get("addTmplId")}
-          serverKey={null}
+          serverKey={serverKey}
           addOrUpdate={this.getMode()}
           sourceId={sourceId}
           code={code}

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

@@ -2,13 +2,12 @@ import React from "react";
 import { RouterCompProps } from "../tmpl/interface";
 import ExcelImport from "../import/excel-import";
 import withRouter from "./withroute";
-import Units from "../units";
 
 export interface ImportRouteProps extends RouterCompProps {
   serverKey?: string;
   layoutRootPath?: string;
 }
-interface ImportRouteStat {}
+interface ImportRouteStat { }
 
 class ExcelImportRoute extends React.PureComponent<
   ImportRouteProps,
@@ -16,7 +15,7 @@ class ExcelImportRoute extends React.PureComponent<
 > {
   state = {};
 
-  async componentDidMount() {}
+  async componentDidMount() { }
 
   get computedLayoutPath() {
     const { layoutRootPath } = this.props;
@@ -24,11 +23,19 @@ class ExcelImportRoute extends React.PureComponent<
     return "";
   }
 
+  getServerKey = () => { // 获取serverKey
+    const { searchParams, serverKey } = this.props;
+    if (serverKey) return serverKey;
+    let temServerKey = searchParams.get("serverKey");
+    return temServerKey || null;
+  };
+
   render() {
-    const { params, serverKey } = this.props;
+    const { params } = this.props;
     const { sourceId } = params;
+    const serverKey = this.getServerKey();
     return (
-      <ExcelImport key={"excelimport"+sourceId} serverKey={serverKey} sourceId={sourceId}></ExcelImport>
+      <ExcelImport key={"excelimport" + sourceId} serverKey={serverKey} sourceId={sourceId}></ExcelImport>
     );
   }
 }