aldehyde 0.2.516 → 0.2.518

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

@@ -41,6 +41,7 @@ interface ModalEditorProps extends DtmplBaseProps {
   title?: ReactNode;
   extendButtons?: ReactNode[];
   isCopy?: boolean;
+  isAudit?: boolean; // 是否审计编辑页
 }
 
 interface ModalEditorState {
@@ -488,11 +489,12 @@ export default class DtmplEditPage extends React.PureComponent<
       sourceId,
       open,
       mainCode,
+      code,
       width,
       pageType,
       maxColsOnRow,
       title,
-      serverKey, parentFormInstance
+      serverKey, parentFormInstance, isAudit
     } = this.props;
     const { dtmplConfig, id, dtmplData, valueFieldMap, drawerSize } = this.state;
     const placement = this.props.placement || "left";
@@ -535,6 +537,8 @@ export default class DtmplEditPage extends React.PureComponent<
                   onValuesChange={this.onValuesChange}
                   parentFormInstance={parentFormInstance}
                   valueFieldMap={valueFieldMap}
+                  isAudit={isAudit}
+                  code={code}
                 />
               </div>
             </Scrollbars>}
@@ -550,6 +554,7 @@ export default class DtmplEditPage extends React.PureComponent<
             size={drawerSize}
             maxSize={maxSize}
             closable={true}
+            destroyOnHidden={true}
             mask={false}
             onClose={onCancel}
             open={open}
@@ -572,6 +577,8 @@ export default class DtmplEditPage extends React.PureComponent<
                 onValuesChange={this.onValuesChange}
                 parentFormInstance={parentFormInstance}
                 valueFieldMap={valueFieldMap}
+                isAudit={isAudit}
+                code={code}
               />
             </div>
           </Drawer>
@@ -591,6 +598,8 @@ export default class DtmplEditPage extends React.PureComponent<
               onValuesChange={this.onValuesChange}
               parentFormInstance={parentFormInstance}
               valueFieldMap={valueFieldMap}
+              isAudit={isAudit}
+              code={code}
             />
           </Card>
         )}

package/src/aldehyde/module/dtmpl-view-card.tsx

@@ -1,62 +1,67 @@
 import React from 'react'
 import ActDtmplView from "./../detail/view/act-dtmpl-view";
 import DtmplEditModal from './dtmpl-edit-modal';
-import {CodeSource} from "../tmpl/interface";
+import { CodeSource } from "../tmpl/interface";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
-export interface DtmplViewCardProps  {
-    title?:any,
-    serverKey?:string,
-    sourceId?:string,
-    addTmplId?:string,
-    code?:string;
-    mainCode?:string;
-    editable?:boolean;
-    codeSource?:CodeSource,
-    showHeader?:boolean,
+export interface DtmplViewCardProps {
+    title?: any,
+    serverKey?: string,
+    sourceId?: string,
+    addTmplId?: string,
+    code?: string;
+    mainCode?: string;
+    editable?: boolean;
+    codeSource?: CodeSource,
+    showHeader?: boolean,
+    isAudit?: boolean, // 是否审计
 };
 
-export interface DtmplViewCardState  {
-    showDtmplEdit?:boolean;
+export interface DtmplViewCardState {
+    showDtmplEdit?: boolean;
 };
 
 class DtmplViewCard extends React.PureComponent<DtmplViewCardProps, DtmplViewCardState> {
 
     state = {
-        showDtmplEdit:false,
+        showDtmplEdit: false,
     }
 
-    static defaultProps={editable:true,
-        showHeader:true}
+    static defaultProps = {
+        editable: true,
+        showHeader: true,
+        isAudit: false,
+    }
 
-    goDtmpl=()=>{
+    goDtmpl = () => {
         this.setState({
-            showDtmplEdit:true,
+            showDtmplEdit: true,
         })
     }
 
-    handleDtmplEdit =  (code: string) => {
+    handleDtmplEdit = (code: string) => {
         this.setState({
-            showDtmplEdit:false,
+            showDtmplEdit: false,
         })
     }
 
     render() {
-        const {showDtmplEdit} = this.state;
-        const { sourceId,code,mainCode,editable,serverKey,codeSource,title,showHeader,addTmplId} = this.props;
-            return <>
-                <ActDtmplView showHeader={showHeader} title={title} codeSource={codeSource} serverKey={serverKey}
-                              goDtmpl={editable?this.goDtmpl:null}  sourceId={sourceId}
-                              code={code} mainCode={mainCode}></ActDtmplView>
-                {showDtmplEdit? <DtmplEditModal  addTmplId={addTmplId} codeSource={codeSource} serverKey={serverKey} open={showDtmplEdit} onCancel={()=>{
-                        this.setState({
-                            showDtmplEdit:false,
-                        })}}
-                                   sourceId={sourceId}
-                                   code={code}
-                                   onOk={this.handleDtmplEdit} />:null}
-              </>
+        const { showDtmplEdit } = this.state;
+        const { sourceId, code, mainCode, editable, serverKey, codeSource, title, showHeader, addTmplId, isAudit } = this.props;
+        return <>
+            <ActDtmplView showHeader={showHeader} title={title} codeSource={codeSource} serverKey={serverKey}
+                goDtmpl={editable ? this.goDtmpl : null} sourceId={sourceId}
+                code={code} mainCode={mainCode} isAudit={isAudit} />
+            {showDtmplEdit ? <DtmplEditModal addTmplId={addTmplId} codeSource={codeSource} serverKey={serverKey} open={showDtmplEdit} onCancel={() => {
+                this.setState({
+                    showDtmplEdit: false,
+                })
+            }}
+                sourceId={sourceId}
+                code={code}
+                onOk={this.handleDtmplEdit} /> : null}
+        </>
     }
 }
 

package/src/aldehyde/module/dtmpl-view-drawer.tsx

@@ -12,6 +12,7 @@ interface DtmplViewDrawerProps extends DtmplBaseProps {
     height?: string | number,
     cancelText: string,
     editable?: boolean,
+    isAudit?: boolean, // 是否审计
 }
 
 interface DtmplViewDrawerState {
@@ -32,6 +33,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
         placement: 'left',
         open: false,
         editable: true,
+        isAudit: false
     }
 
     async componentDidMount() {
@@ -41,7 +43,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
     }
 
     render() {
-        const { title, sourceId, code, open, onClose, cancelText, editable, serverKey, codeSource } = this.props;
+        const { title, sourceId, code, open, onClose, cancelText, editable, serverKey, codeSource, isAudit } = this.props;
         const { drawerSize } = this.state;
         const placement = this.props.placement || 'left';
         const maxSize = ["top", "bottom"].includes(placement) ? document.documentElement.clientHeight : document.documentElement.clientWidth * 0.9;
@@ -64,7 +66,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
                 </Space>
             }
         >
-            <DtmplViewCard codeSource={codeSource} serverKey={serverKey} editable={editable} sourceId={sourceId} code={code} />
+            <DtmplViewCard isAudit={isAudit} codeSource={codeSource} serverKey={serverKey} editable={editable} sourceId={sourceId} code={code} />
         </Drawer>)
     }
 }

package/src/aldehyde/module/dtmpl-view-modal.tsx

@@ -11,6 +11,7 @@ interface DtmplViewModalProps extends DtmplBaseProps {
     onClose: () => void,
     width?: string | number,
     height?: string | number,
+    isAudit?: boolean;
 }
 
 interface DtmplViewModalState {
@@ -29,6 +30,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
         forceRender: true,
         style: { maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)' },
         open: false,
+        isAudit: false,
     }
 
     async componentDidMount() {
@@ -36,7 +38,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
     }
 
     render() {
-        const { title, sourceId, code, open, onClose, width, height, serverKey, codeSource } = this.props;
+        const { title, sourceId, code, open, onClose, width, height, serverKey, codeSource, isAudit } = this.props;
         return <DraggableModal
             open={open}
             width={width}
@@ -48,7 +50,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
             className='dtmpl-view-modal'
         >
             <Scrollbars autoHide autoHideTimeout={1000}>
-                <DtmplViewCard codeSource={codeSource} serverKey={serverKey} sourceId={sourceId} code={code}></DtmplViewCard>
+                <DtmplViewCard isAudit={isAudit} codeSource={codeSource} serverKey={serverKey} sourceId={sourceId} code={code} />
             </Scrollbars>
         </DraggableModal>
     }

package/src/aldehyde/module/ttmpl-table.tsx

@@ -282,6 +282,7 @@ const TtmplTable = (props: TtmplTableProps) => {
                     bordered={bordered}
                     showHeader={showHeader}
                     expandable={(subNodes?.length || recursiveRatmplId) ? { expandedRowRender } : undefined} // 嵌套表格
+                    showEmpty={false}
                 />
                 {buttons.includes("detail") && showDtmplView ? (
                     <ModalDtmplView

package/src/aldehyde/routable/index.less

@@ -28,5 +28,10 @@
 .ttmpl-table-route {
     .ant-table-expanded-row>.ant-table-cell {
         padding: 0 8px !important;
+        border-bottom: none;
+    }
+
+    .ant-table-expanded-row .ant-table-placeholder {
+        display: none;
     }
 }