aldehyde 0.2.516 → 0.2.518

package/src/aldehyde/draw-canvas-edit/components/render/utils/bezier-scene-func.ts

@@ -1,73 +1,73 @@
-import Konva from 'konva';
-
-function rotatePoint(x1: number, y1: number, x2: number, y2: number, angleInDegrees: number) {
-  const radians = angleInDegrees * (Math.PI / 180);
-  const cosTheta = Math.cos(radians);
-  const sinTheta = Math.sin(radians);
-
-  // Translate point (x2, y2) to be relative to (x1, y1)
-  const x = x2 - x1;
-  const y = y2 - y1;
-
-  // Rotate point
-  const xPrime = cosTheta * x - sinTheta * y;
-  const yPrime = sinTheta * x + cosTheta * y;
-
-  // Translate back
-  const xNew = xPrime + x1;
-  const yNew = yPrime + y1;
-
-  return { x: xNew, y: yNew };
-}
-
-function drawPointer(ctx: Konva.Context, shape: Konva.Shape, startX: number, startY: number, ctrlX: number, ctrlY: number) {
-  const x2 = startX + 12;
-  const y2 = startY - 6;
-  const x3 = startX + 12;
-  const y3 = startY + 6;
-  const angle = (Math.atan2(ctrlY - startY, ctrlX - startX) * 180) / Math.PI;
-  const p2 = rotatePoint(startX, startY, x2, y2, angle);
-  const p3 = rotatePoint(startX, startY, x3, y3, angle);
-  ctx.beginPath();
-  ctx.moveTo(startX, startY);
-  ctx.lineTo(p2.x, p2.y);
-  ctx.lineTo(p3.x, p3.y);
-  ctx.lineTo(startX, startY);
-  ctx.lineTo(p2.x, p2.y);
-  ctx.strokeShape(shape);
-  ctx.fillShape(shape);
-}
-
-export function BezierSceneFunc(ctx: Konva.Context, shape: Konva.Shape) {
-  if (shape instanceof Konva.Arrow) {
-    const ps = shape.points();
-    if (ps.length / 2 === 4) {
-      // 三次
-      ctx.beginPath();
-      ctx.moveTo(ps[0], ps[1]);
-      ctx.bezierCurveTo(ps[2], ps[3], ps[4], ps[5], ps[6], ps[7]);
-      ctx.strokeShape(shape);
-      ctx.closePath();
-      shape.pointerAtBeginning() && drawPointer(ctx, shape, ps[0], ps[1], ps[2], ps[3]);
-      shape.pointerAtEnding() && drawPointer(ctx, shape, ps[6], ps[7], ps[4], ps[5]);
-    } else if (ps.length / 2 === 3) {
-      // 二次
-      ctx.beginPath();
-      ctx.moveTo(ps[0], ps[1]);
-      ctx.quadraticCurveTo(ps[2], ps[3], ps[4], ps[5]);
-      ctx.strokeShape(shape);
-      ctx.closePath();
-      shape.pointerAtBeginning() && drawPointer(ctx, shape, ps[0], ps[1], ps[2], ps[3]);
-      shape.pointerAtEnding() && drawPointer(ctx, shape, ps[4], ps[5], ps[2], ps[3]);
-    } else {
-      // 直线
-      ctx.beginPath();
-      ctx.moveTo(ps[0], ps[1]);
-      ctx.lineTo(ps[2], ps[3]);
-      ctx.strokeShape(shape);
-      ctx.closePath();
-      shape.pointerAtBeginning() && drawPointer(ctx, shape, ps[0], ps[1], ps[2], ps[3]);
-      shape.pointerAtEnding() && drawPointer(ctx, shape, ps[2], ps[3], ps[0], ps[1]);
-    }
-  }
+import Konva from 'konva';
+
+function rotatePoint(x1: number, y1: number, x2: number, y2: number, angleInDegrees: number) {
+  const radians = angleInDegrees * (Math.PI / 180);
+  const cosTheta = Math.cos(radians);
+  const sinTheta = Math.sin(radians);
+
+  // Translate point (x2, y2) to be relative to (x1, y1)
+  const x = x2 - x1;
+  const y = y2 - y1;
+
+  // Rotate point
+  const xPrime = cosTheta * x - sinTheta * y;
+  const yPrime = sinTheta * x + cosTheta * y;
+
+  // Translate back
+  const xNew = xPrime + x1;
+  const yNew = yPrime + y1;
+
+  return { x: xNew, y: yNew };
+}
+
+function drawPointer(ctx: Konva.Context, shape: Konva.Shape, startX: number, startY: number, ctrlX: number, ctrlY: number) {
+  const x2 = startX + 12;
+  const y2 = startY - 6;
+  const x3 = startX + 12;
+  const y3 = startY + 6;
+  const angle = (Math.atan2(ctrlY - startY, ctrlX - startX) * 180) / Math.PI;
+  const p2 = rotatePoint(startX, startY, x2, y2, angle);
+  const p3 = rotatePoint(startX, startY, x3, y3, angle);
+  ctx.beginPath();
+  ctx.moveTo(startX, startY);
+  ctx.lineTo(p2.x, p2.y);
+  ctx.lineTo(p3.x, p3.y);
+  ctx.lineTo(startX, startY);
+  ctx.lineTo(p2.x, p2.y);
+  ctx.strokeShape(shape);
+  ctx.fillShape(shape);
+}
+
+export function BezierSceneFunc(ctx: Konva.Context, shape: Konva.Shape) {
+  if (shape instanceof Konva.Arrow) {
+    const ps = shape.points();
+    if (ps.length / 2 === 4) {
+      // 三次
+      ctx.beginPath();
+      ctx.moveTo(ps[0], ps[1]);
+      ctx.bezierCurveTo(ps[2], ps[3], ps[4], ps[5], ps[6], ps[7]);
+      ctx.strokeShape(shape);
+      ctx.closePath();
+      shape.pointerAtBeginning() && drawPointer(ctx, shape, ps[0], ps[1], ps[2], ps[3]);
+      shape.pointerAtEnding() && drawPointer(ctx, shape, ps[6], ps[7], ps[4], ps[5]);
+    } else if (ps.length / 2 === 3) {
+      // 二次
+      ctx.beginPath();
+      ctx.moveTo(ps[0], ps[1]);
+      ctx.quadraticCurveTo(ps[2], ps[3], ps[4], ps[5]);
+      ctx.strokeShape(shape);
+      ctx.closePath();
+      shape.pointerAtBeginning() && drawPointer(ctx, shape, ps[0], ps[1], ps[2], ps[3]);
+      shape.pointerAtEnding() && drawPointer(ctx, shape, ps[4], ps[5], ps[2], ps[3]);
+    } else {
+      // 直线
+      ctx.beginPath();
+      ctx.moveTo(ps[0], ps[1]);
+      ctx.lineTo(ps[2], ps[3]);
+      ctx.strokeShape(shape);
+      ctx.closePath();
+      shape.pointerAtBeginning() && drawPointer(ctx, shape, ps[0], ps[1], ps[2], ps[3]);
+      shape.pointerAtEnding() && drawPointer(ctx, shape, ps[2], ps[3], ps[0], ps[1]);
+    }
+  }
 }

package/src/aldehyde/draw-canvas-edit/components/setting-form/imag-upload.tsx

@@ -1,119 +1,119 @@
-import React, { useEffect, useState } from "react";
-import { Upload as AntdUpLoad, UploadFile, message } from "antd";
-import { RcFile } from "antd/es/upload";
-import { PlusOutlined } from "@ant-design/icons";
-import { HydrocarbonService, Superagent, ProgramConfig } from "../../../index";
-import { fileUpload } from "../../constant";
-import { useLocale } from "../../../locale/useLocale";
-
-const { sourceId, serverKey } = fileUpload;
-
-// 本地文件上传，处理url
-const handleImgUrl = (basePath: string) => {
-    if (basePath.startsWith("http")) {
-        return basePath;
-    }
-    const url = encodeURI(ProgramConfig.joinPath(
-        ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
-        basePath
-    )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode(serverKey)}&@applicationToken=${ProgramConfig.applicationCode(serverKey)}`;
-    return url;
-}
-
-const fileInfo = {
-    uid: '-1',
-    name: 'image.png',
-    status: 'done',
-};
-
-export interface CommonFilePath {
-    fileName?: string;
-    contentType?: string;//文件类型
-    path?: string;
-    iconPath?: string;
-    valid?: string;
-    baseType?: string;
-    basePath?: string;
-};
-
-
-export interface UploadProps {
-    accept?: string;
-    size?: number;
-    onChange?: (data: { src: string, code: string }) => void;
-    value?: { src: string, code: string };
-    recordCode?: string; // 当前画面关联数据code,用于图片命名区分
-}
-
-const ImageUpload: React.FC<UploadProps> = (props) => {
-    const { onChange, accept, size, recordCode, value } = props;
-    const [fileList, setFileList] = useState([]);
-    const [imgCode, setImgCode] = useState<string>(); // 本地图片code
-    const { translate } = useLocale();
-
-    useEffect(() => {
-        setFileList(value?.src ? [{ ...fileInfo, url: handleImgUrl(value?.src) }] : []);
-        setImgCode(value?.code);
-    }, [value]);
-
-    const beforeUpload = async (file: RcFile) => {
-        if (size && file.size > size * 1024 * 1024) {
-            message.warning(translate("${文件大小不能超过}") + `${size}M`);
-            return false;
-        }
-        return true;
-    }
-
-    const handleChange = async (info) => {
-        if (info.file.status == "done") {
-            const fileKey = info.file.response.fileKey;
-            const fileName = info.file.name;
-            const data = { valid: "new", fileKey, fileName };
-            const result = { 描述: `${recordCode || ""}-${fileName}`, 文件: JSON.stringify(data) };
-            const { code } = await HydrocarbonService.postMstrucDtmplData(serverKey, sourceId, result, message);
-            setImgCode(code);
-            const imgData = await HydrocarbonService.requestMstrucDtmplData(serverKey, sourceId, code, null);
-            const basePath = JSON.parse(imgData.fieldMap["文件"] || "{}").base?.path;
-            if (basePath) {
-                const url = handleImgUrl(basePath);
-                setFileList([{ ...info.file, url }]);
-                // onChange?.(url);
-                onChange?.({ src: basePath, code });
-            } else {
-                setFileList([...info.fileList]);
-            }
-        } else {
-            setFileList([...info.fileList]);
-        }
-    };
-
-    const handleDelete = async () => {
-        await HydrocarbonService.deleteByCode(serverKey, sourceId, [imgCode]);
-        setFileList([]);
-        onChange?.(null);
-    };
-
-    return (
-        <AntdUpLoad
-            action={(file) => HydrocarbonService.postFileAction(serverKey, file)}
-            headers={Superagent.getHeaderObj(serverKey)}
-            name={'file'}
-            beforeUpload={beforeUpload}
-            listType={'picture-card'}
-            fileList={fileList?.length ? fileList as Array<UploadFile> : undefined}
-            accept={accept}
-            onChange={handleChange}
-            onRemove={handleDelete}
-            onPreview={() => window.open(fileList[0].url)}
-            styles={{ root: { overflow: "hidden" } }}
-        >
-            {fileList.length > 0 ? null : <div className={'upload-btn'}>
-                <PlusOutlined />
-                <div style={{ marginTop: 8 }}>{translate("${上传图片}")}</div>
-            </div>}
-        </AntdUpLoad>
-    )
-};
-
-export default ImageUpload;
+import React, { useEffect, useState } from "react";
+import { Upload as AntdUpLoad, UploadFile, message } from "antd";
+import { RcFile } from "antd/es/upload";
+import { PlusOutlined } from "@ant-design/icons";
+import { HydrocarbonService, Superagent, ProgramConfig } from "../../../index";
+import { fileUpload } from "../../constant";
+import { useLocale } from "../../../locale/useLocale";
+
+const { sourceId, serverKey } = fileUpload;
+
+// 本地文件上传，处理url
+const handleImgUrl = (basePath: string) => {
+    if (basePath.startsWith("http")) {
+        return basePath;
+    }
+    const url = encodeURI(ProgramConfig.joinPath(
+        ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
+        basePath
+    )) +
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode(serverKey)}&@applicationToken=${ProgramConfig.applicationCode(serverKey)}`;
+    return url;
+}
+
+const fileInfo = {
+    uid: '-1',
+    name: 'image.png',
+    status: 'done',
+};
+
+export interface CommonFilePath {
+    fileName?: string;
+    contentType?: string;//文件类型
+    path?: string;
+    iconPath?: string;
+    valid?: string;
+    baseType?: string;
+    basePath?: string;
+};
+
+
+export interface UploadProps {
+    accept?: string;
+    size?: number;
+    onChange?: (data: { src: string, code: string }) => void;
+    value?: { src: string, code: string };
+    recordCode?: string; // 当前画面关联数据code,用于图片命名区分
+}
+
+const ImageUpload: React.FC<UploadProps> = (props) => {
+    const { onChange, accept, size, recordCode, value } = props;
+    const [fileList, setFileList] = useState([]);
+    const [imgCode, setImgCode] = useState<string>(); // 本地图片code
+    const { translate } = useLocale();
+
+    useEffect(() => {
+        setFileList(value?.src ? [{ ...fileInfo, url: handleImgUrl(value?.src) }] : []);
+        setImgCode(value?.code);
+    }, [value]);
+
+    const beforeUpload = async (file: RcFile) => {
+        if (size && file.size > size * 1024 * 1024) {
+            message.warning(translate("${文件大小不能超过}") + `${size}M`);
+            return false;
+        }
+        return true;
+    }
+
+    const handleChange = async (info) => {
+        if (info.file.status == "done") {
+            const fileKey = info.file.response.fileKey;
+            const fileName = info.file.name;
+            const data = { valid: "new", fileKey, fileName };
+            const result = { 描述: `${recordCode || ""}-${fileName}`, 文件: JSON.stringify(data) };
+            const { code } = await HydrocarbonService.postMstrucDtmplData(serverKey, sourceId, result, message);
+            setImgCode(code);
+            const imgData = await HydrocarbonService.requestMstrucDtmplData(serverKey, sourceId, code, null);
+            const basePath = JSON.parse(imgData.fieldMap["文件"] || "{}").base?.path;
+            if (basePath) {
+                const url = handleImgUrl(basePath);
+                setFileList([{ ...info.file, url }]);
+                // onChange?.(url);
+                onChange?.({ src: basePath, code });
+            } else {
+                setFileList([...info.fileList]);
+            }
+        } else {
+            setFileList([...info.fileList]);
+        }
+    };
+
+    const handleDelete = async () => {
+        await HydrocarbonService.deleteByCode(serverKey, sourceId, [imgCode]);
+        setFileList([]);
+        onChange?.(null);
+    };
+
+    return (
+        <AntdUpLoad
+            action={(file) => HydrocarbonService.postFileAction(serverKey, file)}
+            headers={Superagent.getHeaderObj(serverKey)}
+            name={'file'}
+            beforeUpload={beforeUpload}
+            listType={'picture-card'}
+            fileList={fileList?.length ? fileList as Array<UploadFile> : undefined}
+            accept={accept}
+            onChange={handleChange}
+            onRemove={handleDelete}
+            onPreview={() => window.open(fileList[0].url)}
+            styles={{ root: { overflow: "hidden" } }}
+        >
+            {fileList.length > 0 ? null : <div className={'upload-btn'}>
+                <PlusOutlined />
+                <div style={{ marginTop: 8 }}>{translate("${上传图片}")}</div>
+            </div>}
+        </AntdUpLoad>
+    )
+};
+
+export default ImageUpload;

package/src/aldehyde/form/dtmpl-form.tsx

@@ -4,7 +4,7 @@ import {
   Card,
   Form as AntdForm,
   message,
-  Switch,
+  Switch, Collapse
 } from "antd";
 import {
   DtmplConfig,
@@ -28,6 +28,8 @@ import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
 import DtmplViewCard from "../module/dtmpl-view-card";
 import { LocaleContext } from "../locale/LocaleProvider";
 
+interface AuditData { entity: DtmplData, previous?: DtmplData, changeInfo?: { changeFields: string[], arrayChangeInfos: object } }; // 审计对比数据
+
 interface DtmplFormStat {
   loading?: boolean;
   currentDtmplData?: DtmplData;
@@ -35,6 +37,7 @@ interface DtmplFormStat {
   embedForm?: object;
   embedRefValue?: object;
   editingGroups?: string[];
+  auditData?: AuditData;
 }
 
 export default class DtmplForm extends React.PureComponent<
@@ -49,6 +52,7 @@ export default class DtmplForm extends React.PureComponent<
   state = {
     loading: true,
     currentDtmplData: undefined,
+    auditData: undefined,
     appDtmplConfig: undefined,
     embedForm: {},
     embedRefValue: {},
@@ -58,6 +62,7 @@ export default class DtmplForm extends React.PureComponent<
     maxCols: 2,
     showHeader: true,
     showRightNav: false,
+    isAudit: false,
   };
 
   async componentDidMount() {
@@ -73,51 +78,31 @@ export default class DtmplForm extends React.PureComponent<
   }
 
   loadData = async () => {
-    const {
-      sourceId,
-      code,
-      formRef,
-      dtmplData,
-      dtmplConfig,
-      serverKey,
-    } = this.props;
-    let dtmplData_;
-    if (code) {
-      this.setState({
-        loading: true,
-      });
-      dtmplData_ = await HcserviceV3.requestDtmplData(
-        serverKey,
-        sourceId,
-        code,
-        null
-      );
-    } else if (dtmplData) {
-      dtmplData_ = dtmplData;
+    const { sourceId, code, formRef, dtmplData, serverKey, isAudit } = this.props;
+    let dtmplData_, auditData_;
+    if (isAudit && code) { // 审计编辑页面
+      auditData_ = await HcserviceV3.requestViewDtmplAuditData(serverKey, sourceId, code, null);
+      dtmplData_ = { ...(auditData_?.entity || {}), sourceId: auditData_?.sourceId };
     } else {
-      dtmplData_ = {
-        code: undefined,
-        title: undefined,
-        fieldMap: {},
-        arrayMap: {},
-      };
+      if (dtmplData) {
+        dtmplData_ = dtmplData;
+      } else if (code) {
+        this.setState({ loading: true });
+        dtmplData_ = await HcserviceV3.requestDtmplData(serverKey, sourceId, code, null);
+      } else {
+        dtmplData_ = { code: undefined, title: undefined, fieldMap: {}, arrayMap: {} };
+      }
     }
     //应用静态配置
-    let appDtmplConfig = ProgramConfig.getAppDtmplConfig(
-      dtmplConfig,
-      dtmplData,
-      this.props
-    );
+    let appDtmplConfig = ProgramConfig.getAppDtmplConfig(this.props.dtmplConfig, dtmplData, this.props);
     this.setState({
       appDtmplConfig,
       currentDtmplData: dtmplData_,
+      auditData: auditData_,
       loading: false,
       embedRefValue: {},
     });
-    setTimeout(
-      () => (formRef.current ? formRef.current.resetFields() : undefined),
-      200
-    );
+    setTimeout(() => (formRef.current ? formRef.current.resetFields() : undefined), 200);
   };
 
   doRefresh = async () => {
@@ -271,16 +256,8 @@ export default class DtmplForm extends React.PureComponent<
     }
   };
 
-  fieldGroupList = (dtmplConfig: DtmplConfig, dtmplData: DtmplData) => {
-    const {
-      parentId,
-      maxColsOnRow,
-      mainCode,
-      formRef,
-      serverKey,
-      showRightNav,
-      valueFieldMap
-    } = this.props;
+  fieldGroupList = (dtmplConfig: DtmplConfig, dtmplData: DtmplData, auditData: AuditData) => {
+    const { parentId, maxColsOnRow, mainCode, formRef, serverKey, showRightNav, valueFieldMap, isAudit } = this.props;
     const { loading, embedForm } = this.state;
     let groups: FieldGroupConfig[] = [];
     if (dtmplConfig) {
@@ -383,8 +360,16 @@ export default class DtmplForm extends React.PureComponent<
           if (dtmplData) {
             data = dtmplData.arrayMap[item.id];
           }
-          debugger
-          return (
+          return <CollapseCard
+            showRightNav={showRightNav}
+            initCollapse={item.displayConfig.includes("folded")}
+            title={item.title}
+            tip={item.tip}
+            id={parentId + item.id}
+            className="hoverable"
+            styles={{ header: { background: "#f2f4f5" }, body: { padding: "6px" } }}
+            loading={loading}
+          >
             <RelationTable
               showRightNav={showRightNav}
               serverKey={serverKey}
@@ -396,12 +381,30 @@ export default class DtmplForm extends React.PureComponent<
               value={data}
               parentFormInstance={formRef?.current}
               viewOrEdit={item.readOnly ? "view" : "edit"}
-              onEditing={(editing) => {
-                this.onGroupEditing(item.id, editing);
-              }}
+              onEditing={(editing) => this.onGroupEditing(item.id, editing)}
               onChange={this.onGroupChange}
+              showCollapseCard={false}
             />
-          );
+            {(isAudit && auditData?.changeInfo?.arrayChangeInfos?.[item.id]?.length) ?
+              <Collapse ghost size="small"
+                styles={{ header: { padding: "6px 0", color: "red" } }}
+                items={[{
+                  key: "audit", label: "变更数据",
+                  children: <RelationTable
+                    serverKey={serverKey}
+                    initCollapse={dtmplData && (!data || data.length <= 0)}
+                    loading={loading}
+                    parentId={parentId}
+                    key={item.id}
+                    fieldGroupConfig={item}
+                    value={data}
+                    viewOrEdit={"view"}
+                    showCollapseCard={false}
+                    audit={{ isAudit, previousData: ProgramConfig.arrayToMap(auditData?.previous?.arrayMap?.[item.id], "code"), changeInfo: auditData?.changeInfo?.arrayChangeInfos?.[item.id] }}
+                  />
+                }]} />
+              : ""}
+          </CollapseCard>;
         }
       } else {
         //字段组
@@ -431,6 +434,7 @@ export default class DtmplForm extends React.PureComponent<
                 valueMap={dtmplData ? dtmplData.fieldMap : undefined}
                 valueFieldMap={valueFieldMap}
                 editStatus={dtmplData?.code ? "changed" : "new"} // 新增或修改状态
+                audit={{ dataCode: dtmplData ? dtmplData.code : null, isAudit, auditMap: auditData?.previous?.fieldMap || undefined, changeFields: auditData?.changeInfo?.changeFields }}
               />}
           </CollapseCard>
         );
@@ -491,7 +495,7 @@ export default class DtmplForm extends React.PureComponent<
       showHeader,
       serverKey, dtmplData,
     } = this.props;
-    const { currentDtmplData, appDtmplConfig } = this.state;
+    const { currentDtmplData, appDtmplConfig, auditData } = this.state;
     const { translate } = this.context;
     if (!dtmplConfig || !dtmplData) {
       return <Card loading={true}>{translate("${加载中}")}... ...</Card>;
@@ -549,7 +553,7 @@ export default class DtmplForm extends React.PureComponent<
           <AntdForm.Item hidden={true} name={"actionId"}></AntdForm.Item>
           <AntdForm.Item hidden={true} name={"mainCode"}></AntdForm.Item>
           {this.addHiddenItem(dtmplConfig.hiddenFields)}
-          {this.fieldGroupList(appDtmplConfig, currentDtmplData)}
+          {this.fieldGroupList(appDtmplConfig, currentDtmplData, auditData)}
         </AntdForm>
         {premises && premises.length > 0 ? (
           <CollapseCard

package/src/aldehyde/form/form-Item-group.tsx

@@ -1,7 +1,8 @@
-import React, { RefObject, useState, useMemo } from "react";
-import { Col, Form, Row, Popconfirm } from "antd";
+import React, { RefObject, useState, useMemo, ReactNode } from "react";
+import { Col, Form, Row, Popconfirm, Tooltip } from "antd";
 import { FieldConfig, EditStatus } from "../tmpl/interface";
 import EntryControl from "../controls/entry-control";
+import ViewControl from "../controls/view-control";
 import Units from "../units";
 import { FormInstance } from "antd/lib/form/hooks/useForm";
 import { LocaleContext } from "../locale/LocaleProvider";
@@ -66,7 +67,8 @@ export interface FieldGroupProps {
   dataCode?: string,
   layout?: "horizontal" | "vertical";
   valueFieldMap?: { [key: string]: any }; // 表单关联项配置
-  editStatus?: EditStatus
+  editStatus?: EditStatus;
+  audit?: { dataCode: string; isAudit: boolean, auditMap?: object, changeFields?: string[] }; // 是否审计编辑，审计编辑配置
 }
 
 interface FieldGroupState {
@@ -80,6 +82,7 @@ export default class FormItemGroup extends React.PureComponent<
   static defaultProps = {
     nameAttr: "id",
     maxColsOnRow: 2,
+    audit: { isAudit: false }
   };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
@@ -125,7 +128,7 @@ export default class FormItemGroup extends React.PureComponent<
     return fieldConfig;
   };
   initFormItem = (fieldConfig: FieldConfig, fieldValue) => {
-    const { nameAttr, maxColsOnRow, layout } = this.props;
+    const { nameAttr, maxColsOnRow, layout, serverKey, audit } = this.props;
     const { translate } = this.context;
     let item = this.getFieldConfig(fieldConfig);
 
@@ -139,9 +142,17 @@ export default class FormItemGroup extends React.PureComponent<
       wrapperColSpan = maxColsOnRow == 1 ? 18 : item.colSpan == 1 ? 15 : 19;
     }
 
+    let label: ReactNode = translate("${" + item.title + "}");
+    if (audit?.isAudit && audit.changeFields?.includes(item.id)) { // 审计查看页面-上次更新内容在label标注
+      const tValue = audit.auditMap ? audit.auditMap[item.id] : undefined;
+      const tTitle = <ViewControl dataCode={audit.dataCode} serverKey={serverKey} holderType={"descriptions"} value={tValue} fieldConfig={item} />
+      label = <span style={{ cursor: "pointer", color: "#ff4d4f" }}>{label}</span>;
+      label = (tValue || tValue === 0) ? <Tooltip title={tTitle}>{label}</Tooltip> : label;
+    }
+
     return (
       <FormItem
-        label={translate("${" + item.title + "}")}
+        label={label}
         noStyle={item.noStyle || false}
         hidden={item.hidden}
         name={fieldConfig.controlType == "field-history" ? undefined : item[nameAttr]}