aldehyde 0.2.517 → 0.2.519

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

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

@@ -50,6 +50,7 @@ export interface LtmplRouteState {
     showEdit2D?: boolean; // 编辑2D图
     showView2D?: boolean; // 查看2D图
     isCopy?: boolean; // 是否复制
+    isAudit?: boolean; // 是否审计
 }
 
 class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
@@ -83,7 +84,8 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         drawerSize: "92vw",
         showEdit2D: false,
         showView2D: false,
-        isCopy: false
+        isCopy: false,
+        isAudit: false
     };
 
     async componentDidMount() {
@@ -152,7 +154,8 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                 showWindowType: undefined,
                 showEdit: false,
                 selectedCode: undefined,
-                toCustomPage: false
+                toCustomPage: false,
+                isAudit: false
             }
         )
     };
@@ -323,6 +326,35 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         this.setState({ showView2D: true, selectedCode: val });
     }
 
+    // 审计查看
+    doAuditView = (val: string) => {
+        const { sourceId } = this.props.params;
+        const { ltmplConfigRes } = this.state;
+        let ltmplConfig: LtmplConfig = ltmplConfigRes.ltmplConfig;
+        let showType: string = !ltmplConfig.buttonViewConfig ? "drawer" : ltmplConfig.buttonViewConfig.showType;
+        this.setState({
+            showViewModal: showType === "modal",
+            showViewDrawer: ["drawer", "default"].includes(showType),
+            selectedCode: val,
+            viewSourceId: sourceId,
+            isAudit: true
+        });
+    }
+    // 审计编辑
+    doAuditEdit = (val: string) => {
+        const { sourceId } = this.props.params;
+        const { ltmplConfigRes } = this.state;
+        let ltmplConfig: LtmplConfig = ltmplConfigRes.ltmplConfig;
+        let showWindowType: PageType = !ltmplConfig.buttonEditConfig ? "drawer" : ltmplConfig.buttonEditConfig.showType;
+        this.setState({
+            showEdit: true,
+            showWindowType: showWindowType === "default" ? "drawer" : showWindowType,
+            selectedCode: val,
+            editSourceId: sourceId,
+            isAudit: true
+        });
+    }
+
     pathMark = () => {
         const { tableType } = this.props;
         return tableType && tableType == "report" ? "report-table" : "act-table";
@@ -399,7 +431,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         const {
             ltmplConfigRes, showDraw, showWindowType, ractionId, selectedCode,
             showViewDrawer, showViewModal, showEdit, editSourceId, viewSourceId, toCustomPage, userPageConfig,
-            themeConfig, pageSizeOptions, userPageConfigLoading, drawerSize, showEdit2D, showView2D, isCopy
+            themeConfig, pageSizeOptions, userPageConfigLoading, drawerSize, showEdit2D, showView2D, isCopy, isAudit
         } = this.state;
         const { location, params, tableType, rowOperatable, defShowType } = this.props;
         const { sourceId } = params;
@@ -448,6 +480,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                         defShowType={defShowType} userPageConfig={userPageConfig} setUserPageConfig={this.setUserPageConfig}
                         resetUserPageConfig={this.resetUserPageConfig} allowUserConfig={themeConfig?.allowUserConfig}
                         onUpdatePageSizeOptions={this.onUpdatePageSizeOptions} doEdit2D={this.doEdit2D} doView2D={this.doView2D}
+                        doAuditView={this.doAuditView} doAuditEdit={this.doAuditEdit}
                     />
                     {showDraw ? (
                         <Drawer
@@ -478,6 +511,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                                 open={showViewDrawer}
                                 sourceId={viewSourceId ? viewSourceId : sourceId}
                                 code={selectedCode}
+                                isAudit={isAudit}
                             />
                     ) : null}
                     {showViewModal && selectedCode ? (
@@ -486,7 +520,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                             <DtmplViewModal
                                 serverKey={serverKey} width={windowWidth} height={windowHeight} onClose={this.doClose}
                                 open={showViewModal} sourceId={viewSourceId ? viewSourceId : sourceId}
-                                code={selectedCode}
+                                code={selectedCode} isAudit={isAudit}
                             />
                     ) : null}
                     {showEdit && ltmplConfig ? (
@@ -517,6 +551,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                                 code={selectedCode}
                                 onOk={this.doSubmited}
                                 isCopy={isCopy}
+                                isAudit={isAudit}
                             />
                         )
                     ) : null}

package/src/aldehyde/routable/ttmpl-table-route.tsx

@@ -274,6 +274,7 @@ const Index = (props: Props) => {
             bordered={false}
             showHeader={false}
             requestQueryKey={HcserviceV3.requestEttmplQueryKey}
+            showEmpty={false}
         />;
     };
 

package/src/aldehyde/table/act-table.tsx

@@ -88,6 +88,8 @@ interface ActTableProps extends TmplBaseProps {
   loadDataCallback?: (val: object[]) => void; // 请求数据回调函数
   doEdit2D?: (val: string) => void; // 2D图编辑
   doView2D?: (val: string) => void; // 2D图查看
+  doAuditView?: (val: string) => void; // 审计查看
+  doAuditEdit?: (val: string) => void; // 审计编辑
   showTableAdd?: boolean; // 是否支持添加列表
   expandable?: { expandedRowRender: (val: { [key: string]: any }) => React.JSX.Element }; // 嵌套表格
   hideOnSinglePage?: boolean; // 分页配置,只有一页时是否隐藏分页器
@@ -1572,7 +1574,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       title, collapsible,
       onChangePage, serverKey, criteriaData, showEmpty, loadDataCallback,
       showView, doEdit, doRAction, customEditable, readOnly, tableType, showPagination, showAggregates, userPageConfig,
-      doEdit2D, doView2D, showTableAdd, setUserPageConfig, expandable, hideOnSinglePage, bordered, showHeader
+      doEdit2D, doView2D, showTableAdd, setUserPageConfig, expandable, hideOnSinglePage, bordered, showHeader, doAuditView, doAuditEdit
     } = this.props;
     const { translate } = this.context;
 
@@ -1598,12 +1600,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         doRowAction: this.doRowAction, doDeleteByCode: this.doDeleteByCode, sortColumns: criteriaData["sortColIds"],
         editings, editRowEdit: this.editRowEdit, cancelRowEdit: this.cancelRowEdit, saveRowData: this.saveRowData,
         doDelModalOpen: this.doDelModalOpen, mainCode, criteriaData: userCriteriaData, actTableDoSearch: this.actTableDoSearch,
-        columnResize: userPageConfig?.colResize, doEdit2D, doView2D
+        columnResize: userPageConfig?.colResize, doEdit2D, doView2D, doAuditView, doAuditEdit
       }
     );
 
     let { buttons, extDisplayConfig, rowCardCount, customViewPagePath, splitTabShowType } = ltmplConfig;
-    let { primaryColumn, primaryColumnLabel, secondColumn, secondColumnLabel, mainPicture, mainPictureLabel, labelColumn, cardShowCols, notDisplayFieldName, colNumOnRow } = extDisplayConfig;
+    let { primaryColumn, primaryColumnLabel, secondColumn, secondColumnLabel, mainPicture, mainPictureLabel, labelColumn, cardShowCols, notDisplayFieldName, colNumOnRow, secondaryPicture } = extDisplayConfig;
     let displayCriteriaCard: boolean = false;
     if (funcMode == "simple" || funcMode == "common") {
       displayCriteriaCard = false;
@@ -1665,7 +1667,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         groupIColumns={ltmplConfig.groupIColumns}
         doSearch={this.actTableDoSearch}
         sortColumnData={sortColumnData}
-        cardListConfig={{ primaryColumn, primaryColumnLabel, secondColumn, secondColumnLabel, mainPicture, mainPictureLabel, labelColumn, cardShowCols, rowCardCount, buttons, customViewPagePath, mainCode, notDisplayFieldName, colNumOnRow }}
+        cardListConfig={{ primaryColumn, primaryColumnLabel, secondColumn, secondColumnLabel, mainPicture, mainPictureLabel, labelColumn, cardShowCols, rowCardCount, buttons, customViewPagePath, mainCode, notDisplayFieldName, colNumOnRow, secondaryPicture }}
         ltmplConfig={ltmplConfig}
         showView={showView}
         showPagination={showPagination}

package/src/aldehyde/table/column/column-builder.tsx

@@ -12,7 +12,8 @@ import {
     FormOutlined,
     KeyOutlined,
     MenuOutlined, QuestionCircleOutlined, PlaySquareOutlined,
-    SettingOutlined, UpSquareFilled, DownSquareFilled
+    SettingOutlined, UpSquareFilled, DownSquareFilled, AlignCenterOutlined,
+    EditOutlined
 } from "@ant-design/icons";
 import ActionUtils from "../../controls/action/utils";
 import ViewButton from "../../detail/button/view-button";
@@ -553,7 +554,7 @@ export default {
             readOnly,
             sourceId, translate, doCustomButton, doRowJump, blockMenuTreeDrawerOpen,
             doRowAction, doDeleteByCode, editRowEdit, editings, cancelRowEdit, saveRowData, doDelModalOpen,
-            doView2D, doEdit2D, actTableDoSearch
+            doView2D, doEdit2D, actTableDoSearch, doAuditView, doAuditEdit
         } = props;
         const { buttons, builtInButtons, defShowRowActionCount, strongDeleteConfirmText, edit2DBtnTitle, view2DBtnTitle, deleteBtnTitle, copyMode } = ltmplConfig;
         let actionButtons: any[] = [];
@@ -588,6 +589,16 @@ export default {
             )
         };
 
+        // 审计查看
+        if (buttons.includes("auditView") && doAuditView && !readOnly && ActionUtils.isShow(ltmplConfig.buttonAuditViewAction?.preposes, [record], undefined)) {
+            actionButtons.push(<Tooltip title={translate("${审计查看}")}><Button type="primary" size="small" onClick={() => doAuditView(record.code)} icon={<AlignCenterOutlined />} /></Tooltip>);
+        };
+
+        // 审计编辑
+        if (buttons.includes("auditEdit") && doAuditEdit && !readOnly && ActionUtils.isShow(ltmplConfig.buttonAuditEditAction?.preposes, [record], undefined)) {
+            actionButtons.push(<Tooltip title={translate("${审计编辑}")}><Button size="small" onClick={() => doAuditEdit(record.code)} icon={<EditOutlined />} /></Tooltip>);
+        };
+
         // 2D图编辑
         if (buttons.includes("edit2D") && doEdit2D && !readOnly) {
             actionButtons.push((!edit2DBtnTitle || edit2DBtnTitle?.length < 4) ? <Button size="small" onClick={() => doEdit2D(record.code)}>{edit2DBtnTitle || <SettingOutlined />}</Button> :

package/src/aldehyde/table/pagination.tsx

@@ -55,7 +55,7 @@ class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
 
     return (
       <div className="Pagination" style={{ justifyContent: paginationPosition === "middle" ? "center" : (paginationPosition || "left"), marginTop: !(hideOnSinglePage && (total < (pageInfo.pageSize || 10))) ? "10px" : 0 }}>
-        {!(hideOnSinglePage && (total < (pageInfo.pageSize || 10))) ?
+        {!(hideOnSinglePage && ((total || 0) < (pageInfo.pageSize || 10))) ?
           <span
             className={sewTotal ? "sewTotal" : "seeTotal"}
             onClick={queryTotal}

package/src/aldehyde/table/relation-table.tsx

@@ -8,7 +8,7 @@ import {
     Space,
     Tooltip,
     Typography, Popconfirm, FormInstance,
-    message
+    message, Tag
 } from "antd";
 import Table from "./control-table-x-axis-wrapper";
 import {
@@ -17,7 +17,7 @@ import {
     EditOutlined,
     FormOutlined,
     PlusSquareOutlined, QuestionCircleOutlined,
-    SnippetsOutlined,
+    SnippetsOutlined, ExclamationCircleOutlined
 } from "@ant-design/icons";
 import "./index.css";
 import {
@@ -47,6 +47,12 @@ import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
 const FormItem = AntdForm.Item;
 const { Text } = Typography;
 
+const auditDataStates = {
+    add: { "text": "新增", "color": "green" },
+    edit: { "text": "修改", "color": "orange" },
+    remove: { "text": "删除", "color": "red" },
+};
+
 interface RelationTableProps {
     showRightNav?: boolean;
     mainCode?: string;
@@ -62,6 +68,7 @@ interface RelationTableProps {
     onEditing?: (editing: boolean) => void;
     initCollapse?: boolean;
     showCollapseCard?: boolean; // 是否显示折叠卡片，默认显示
+    audit?: { isAudit: boolean, previousData: any, changeInfo: any }; // 审计页面配置
 }
 
 interface RelationTableStat {
@@ -126,14 +133,14 @@ class RelationTable extends React.PureComponent<
 
     buildDataSource = () => {
         const { filterStr } = this.state;
-        const { value } = this.props;
+        const { value, audit } = this.props;
         let dataSource = undefined;
 
         /** 构建 dataSource **/
         if (value) {
             dataSource = [];
-            value.forEach((item, index) => {
-                let flag = true;
+            value.forEach((item) => {
+                let flag = true, opt, preData;
                 if (filterStr) {
                     flag = false;
                     for (let value of Object.values(item.fieldMap)) {
@@ -143,23 +150,52 @@ class RelationTable extends React.PureComponent<
                     }
                 }
                 if (flag) {
+                    if (audit?.isAudit) { // 审计页面
+                        const temChange = audit.changeInfo?.find(r => r.code === item.code);
+                        opt = temChange?.opt; // 数据类型
+                        // 修改类型的数据
+                        if (opt === "edit") {
+                            const temData = audit?.previousData?.get(item.code)?.fieldMap;
+                            preData = temChange.changeFields?.reduce((total, item) => {
+                                total[item] = temData[item];
+                                return total;
+                            }, {});
+                        }
+                    }
                     let row = {
                         key: item.code,
                         editStatus: item.editStatus,
                         relationLabel: item.relationLabel,
                         code: item.code, //增加code,为了删除操作
+                        opt, // 审计页面展示数据状态
+                        preData, // 审计页面修改数据展示上次数据
                         ...item.fieldMap,
                     };
                     dataSource.push(row);
                 }
             });
-        }
 
+            if (audit?.isAudit) { // 审计页面上次删除数据展示
+                const delDatas = audit.changeInfo?.filter(r => r.opt === "remove") || [];
+                delDatas.forEach(item => {
+                    const tData = audit.previousData.get(item.code);
+                    const row = {
+                        key: item.code,
+                        editStatus: tData.editStatus,
+                        relationLabel: tData.relationLabel,
+                        code: item.code,
+                        opt: "remove",
+                        ...tData.fieldMap,
+                    };
+                    dataSource.push(row);
+                });
+            }
+        }
         return dataSource;
     };
 
     buildColumns = () => {
-        const { viewOrEdit, fieldGroupConfig, serverKey, parentFormInstance } = this.props;
+        const { viewOrEdit, fieldGroupConfig, serverKey, parentFormInstance, audit } = this.props;
         const {
             buttons,
             fields,
@@ -173,6 +209,18 @@ class RelationTable extends React.PureComponent<
         let columns = [];
         /** 构建column **/
         let s = 0;
+
+        if (audit?.isAudit) { // 审计页面-增加数据状态列显示
+            let column = {};
+            columns.push(column);
+            column["dataIndex"] = "数据状态";
+            column["title"] = translate("${数据状态}");
+            column["render"] = (_, record) => {
+                const state = auditDataStates[record.opt];
+                return state ? <Tag key={record.opt} color={state.color} >{state.text}</Tag> : "";
+            };
+        }
+
         fields.forEach((item) => {
             let column = {};
             columns.push(column);
@@ -209,13 +257,28 @@ class RelationTable extends React.PureComponent<
                             fieldConfig={{ ...item }}
                             value={record[item.id]}
                             editStatus={record.editStatus}
-                        /></FormItem> :
-                    <ViewControl
-                        serverKey={serverKey}
-                        holderType={"table"}
-                        fieldConfig={item}
-                        value={record[item.id]}
-                    />
+                        /></FormItem> : (
+                        (audit?.isAudit && record.opt === "edit" && record.preData?.[item.id]) ?
+                            <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between" }}>
+                                <div style={{ width: "calc(100% - 20px)" }}>
+                                    <ViewControl
+                                        serverKey={serverKey}
+                                        holderType={"table"}
+                                        fieldConfig={item}
+                                        value={record[item.id]}
+                                    />
+                                </div>
+                                <Tooltip title={<ViewControl serverKey={serverKey} holderType={"table"} fieldConfig={item} value={record.preData[item.id]} />}>
+                                    <ExclamationCircleOutlined style={{ color: "red", cursor: "pointer" }} />
+                                </Tooltip>
+                            </div> :
+                            <ViewControl
+                                serverKey={serverKey}
+                                holderType={"table"}
+                                fieldConfig={item}
+                                value={record[item.id]}
+                            />
+                    )
                 );
             };
         });
@@ -1008,8 +1071,6 @@ class RelationTable extends React.PureComponent<
                     /></AntdForm>}
         </div>;
 
-        console.log("showCollapseCard", showCollapseCard);
-
         return fieldGroupConfig.displayConfig.includes("nonDataNonDisplayed") &&
             (!value || value.length <= 0) ? "" : (
             <>

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -465,6 +465,17 @@ export default class HcserviceV3 {
     );
   }
 
+  // 查询审计数据
+  static async requestViewDtmplAuditData(serverKey: string, sourceId: string, code, versionId) {
+    let url = `/v3/dtmpl/audit-data`;
+    let res = await Super.super({ url, serverKey, query: { code, versionId, sourceId }, method: "GET" });
+    if (res?.status === "success") {
+      return { sourceId, ...res };
+    } else {
+      return null;
+    }
+  }
+
   static async requestMstrucViewDtmplData(
     serverKey: string,
     sourceId,

package/src/aldehyde/tmpl/interface.tsx

@@ -60,6 +60,7 @@ export interface CardListConfig {
   mainPictureLabel?: ColumnConfig;
   labelColumn?: ColumnConfig;
   cardShowCols?: ColumnConfig[];
+  secondaryPicture?: ColumnConfig;
   rowCardCount?: number;
   buttons?: string[];
   customViewPagePath?: string;
@@ -152,7 +153,8 @@ export interface DtmplFormProps extends DtmplBaseProps {
   showHeader?: boolean;
   onFinish: (code: string | boolean) => void;
   onValuesChange?: (changedValues, allValues: DtmplData) => void;
-  valueFieldMap?: { [key: string]: any } // 表单关联项
+  valueFieldMap?: { [key: string]: any }; // 表单关联项
+  isAudit?: boolean; // 是否审计编辑页
 }
 
 export interface CQueryConfig extends OrderableTmplBase {
@@ -352,7 +354,7 @@ export type ButtonName =
   | "ltmplSelectAdd"
   | "reStat"
   | "drilling"
-  | "ratmplSelect" | "edit2D" | "view2D" | "showTableAdd";
+  | "ratmplSelect" | "edit2D" | "view2D" | "showTableAdd" | "auditView" | "auditEdit";
 
 export type ChartType = "line" | "pie" | "column";
 export type GroupDisplayConfig =
@@ -524,6 +526,8 @@ export interface ActionRenderProps {
   doView2D?: (recordCode: string) => any,
   doEdit2D?: (recordCode: string) => any,
   actTableDoSearch?: (data: object) => void,
+  doAuditView?: (recordCode: string) => any, // 审计查看
+  doAuditEdit?: (recordCode: string) => any, // 审计编辑
 }
 
 export interface FileRule {
@@ -672,6 +676,7 @@ export interface LtmplConfig extends SelectConfig {
     cardShowCols?: ColumnConfig[];
     notDisplayFieldName?: boolean;
     colNumOnRow?: number; // 卡片展示字段每行列数
+    secondaryPicture?: ColumnConfig; // 次图片字段
   };
   rowCardCount?: number;
   defaultDtmplData?: DtmplData;
@@ -715,6 +720,8 @@ export interface LtmplConfig extends SelectConfig {
   totalNumInTotalViewTitle?: string; // 聚合视图中显示总数的标题
   notAutoQuery?: boolean; // 页面是否默认查询
   tableLayout?: "auto" | "fixed"; // 表格布局(自适应列宽/固定列宽)
+  buttonAuditViewAction?: ActionConfig; // 审计查看按钮
+  buttonAuditEditAction?: ActionConfig; // 审计编辑按钮
 }
 
 export interface EnumItem {
@@ -964,4 +971,13 @@ export interface ThemeConfig {
   supportedLanguages?: string[]; // 支持语言
   defaultLanguage?: string; // 默认语言
   wsTypes?: ("sys-messages" | "user-notification")[];
-}
+}
+
+export interface AuditData { // 审计对比数据
+  entity: DtmplData;
+  previous?: DtmplData;
+  changeInfo?: {
+    changeFields: string[];
+    arrayChangeInfos: object
+  }
+};