aldehyde 0.2.518 → 0.2.520

package/src/aldehyde/controls/icon-selector/icon/phonenode-menu-icon/iconfont.json

@@ -1,156 +1,156 @@
-{
-  "id": "5037136",
-  "name": "phonenode-menu-icon",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon-",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "1314143",
-      "name": "业务人员信息管理",
-      "font_class": "yewurenyuanxinxiguanli",
-      "unicode": "e60e",
-      "unicode_decimal": 58894
-    },
-    {
-      "icon_id": "2076280",
-      "name": " 订单 处理中",
-      "font_class": "dingdanchulizhong",
-      "unicode": "e896",
-      "unicode_decimal": 59542
-    },
-    {
-      "icon_id": "5325477",
-      "name": "车辆信息",
-      "font_class": "cheliangxinxi",
-      "unicode": "e755",
-      "unicode_decimal": 59221
-    },
-    {
-      "icon_id": "30184485",
-      "name": "销售订单管理",
-      "font_class": "a-SalesOrderManagement",
-      "unicode": "e635",
-      "unicode_decimal": 58933
-    },
-    {
-      "icon_id": "35014974",
-      "name": "采购订单@3x",
-      "font_class": "a-caigoudingdan3x",
-      "unicode": "e615",
-      "unicode_decimal": 58901
-    },
-    {
-      "icon_id": "40956109",
-      "name": "过磅记录",
-      "font_class": "guobangjilu",
-      "unicode": "e64d",
-      "unicode_decimal": 58957
-    },
-    {
-      "icon_id": "42976294",
-      "name": "参数配置",
-      "font_class": "canshupeizhi",
-      "unicode": "e609",
-      "unicode_decimal": 58889
-    },
-    {
-      "icon_id": "46265573",
-      "name": "误差统计",
-      "font_class": "wuchatongji",
-      "unicode": "e890",
-      "unicode_decimal": 59536
-    },
-    {
-      "icon_id": "48016567",
-      "name": "并购重组",
-      "font_class": "binggouzhongzu",
-      "unicode": "e660",
-      "unicode_decimal": 58976
-    },
-    {
-      "icon_id": "1079710",
-      "name": "停车位",
-      "font_class": "tingchewei",
-      "unicode": "e664",
-      "unicode_decimal": 58980
-    },
-    {
-      "icon_id": "1305474",
-      "name": "权限",
-      "font_class": "quanxian",
-      "unicode": "e63f",
-      "unicode_decimal": 58943
-    },
-    {
-      "icon_id": "1998826",
-      "name": "工位",
-      "font_class": "gongwei",
-      "unicode": "e641",
-      "unicode_decimal": 58945
-    },
-    {
-      "icon_id": "10487476",
-      "name": "维修",
-      "font_class": "weixiu",
-      "unicode": "e690",
-      "unicode_decimal": 59024
-    },
-    {
-      "icon_id": "12184880",
-      "name": "部门",
-      "font_class": "bumen",
-      "unicode": "e686",
-      "unicode_decimal": 59014
-    },
-    {
-      "icon_id": "20951818",
-      "name": "生产基地",
-      "font_class": "shengchanjidi",
-      "unicode": "e63b",
-      "unicode_decimal": 58939
-    },
-    {
-      "icon_id": "765849",
-      "name": "地址",
-      "font_class": "shouye",
-      "unicode": "e63c",
-      "unicode_decimal": 58940
-    },
-    {
-      "icon_id": "8629256",
-      "name": "人员",
-      "font_class": "renyuan",
-      "unicode": "e66c",
-      "unicode_decimal": 58988
-    },
-    {
-      "icon_id": "9921751",
-      "name": "apply",
-      "font_class": "apply",
-      "unicode": "e61c",
-      "unicode_decimal": 58908
-    },
-    {
-      "icon_id": "39260433",
-      "name": "厂区管理",
-      "font_class": "changquguanli",
-      "unicode": "e607",
-      "unicode_decimal": 58887
-    },
-    {
-      "icon_id": "8329706",
-      "name": "kuaidi",
-      "font_class": "kuaidi",
-      "unicode": "e6c0",
-      "unicode_decimal": 59072
-    },
-    {
-      "icon_id": "15838501",
-      "name": "menu",
-      "font_class": "menu",
-      "unicode": "e677",
-      "unicode_decimal": 58999
-    }
-  ]
-}
+{
+  "id": "5037136",
+  "name": "phonenode-menu-icon",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "1314143",
+      "name": "业务人员信息管理",
+      "font_class": "yewurenyuanxinxiguanli",
+      "unicode": "e60e",
+      "unicode_decimal": 58894
+    },
+    {
+      "icon_id": "2076280",
+      "name": " 订单 处理中",
+      "font_class": "dingdanchulizhong",
+      "unicode": "e896",
+      "unicode_decimal": 59542
+    },
+    {
+      "icon_id": "5325477",
+      "name": "车辆信息",
+      "font_class": "cheliangxinxi",
+      "unicode": "e755",
+      "unicode_decimal": 59221
+    },
+    {
+      "icon_id": "30184485",
+      "name": "销售订单管理",
+      "font_class": "a-SalesOrderManagement",
+      "unicode": "e635",
+      "unicode_decimal": 58933
+    },
+    {
+      "icon_id": "35014974",
+      "name": "采购订单@3x",
+      "font_class": "a-caigoudingdan3x",
+      "unicode": "e615",
+      "unicode_decimal": 58901
+    },
+    {
+      "icon_id": "40956109",
+      "name": "过磅记录",
+      "font_class": "guobangjilu",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "42976294",
+      "name": "参数配置",
+      "font_class": "canshupeizhi",
+      "unicode": "e609",
+      "unicode_decimal": 58889
+    },
+    {
+      "icon_id": "46265573",
+      "name": "误差统计",
+      "font_class": "wuchatongji",
+      "unicode": "e890",
+      "unicode_decimal": 59536
+    },
+    {
+      "icon_id": "48016567",
+      "name": "并购重组",
+      "font_class": "binggouzhongzu",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "1079710",
+      "name": "停车位",
+      "font_class": "tingchewei",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "1305474",
+      "name": "权限",
+      "font_class": "quanxian",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "1998826",
+      "name": "工位",
+      "font_class": "gongwei",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "10487476",
+      "name": "维修",
+      "font_class": "weixiu",
+      "unicode": "e690",
+      "unicode_decimal": 59024
+    },
+    {
+      "icon_id": "12184880",
+      "name": "部门",
+      "font_class": "bumen",
+      "unicode": "e686",
+      "unicode_decimal": 59014
+    },
+    {
+      "icon_id": "20951818",
+      "name": "生产基地",
+      "font_class": "shengchanjidi",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
+    {
+      "icon_id": "765849",
+      "name": "地址",
+      "font_class": "shouye",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "8629256",
+      "name": "人员",
+      "font_class": "renyuan",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "9921751",
+      "name": "apply",
+      "font_class": "apply",
+      "unicode": "e61c",
+      "unicode_decimal": 58908
+    },
+    {
+      "icon_id": "39260433",
+      "name": "厂区管理",
+      "font_class": "changquguanli",
+      "unicode": "e607",
+      "unicode_decimal": 58887
+    },
+    {
+      "icon_id": "8329706",
+      "name": "kuaidi",
+      "font_class": "kuaidi",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "15838501",
+      "name": "menu",
+      "font_class": "menu",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    }
+  ]
+}

package/src/aldehyde/detail/view/act-dtmpl-view.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { Button, Card, Form as AntdForm, FormInstance, message, Tooltip } from "antd";
-import { DtmplBaseProps, DtmplConfig, DtmplData } from "../../tmpl/interface";
+import { DtmplBaseProps, DtmplConfig, DtmplData, AuditData } from "../../tmpl/interface";
 import { EditOutlined, ReloadOutlined, ScheduleOutlined, } from "@ant-design/icons";
 import HCDataSource from "../../tmpl/hc-data-source";
 import "../dtmpl.css";
@@ -11,6 +11,7 @@ import ToolTipBar from "../tooltipbar";
 import { LocaleContext } from "../../locale/LocaleProvider";
 import Action from "../../controls/action";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
+import AuditDataPopover from "./audit-data-popover";
 
 export interface ActDtmplViewProps extends DtmplBaseProps {
     versionId?: number;
@@ -28,6 +29,7 @@ export interface ActDtmplViewStat {
     layout?: object;
     refreshCode?: string;
     actionDtmplData?: DtmplData;
+    auditData?: AuditData; // 审计页面变更数据
 }
 
 class ActDtmplView extends React.PureComponent<
@@ -55,6 +57,7 @@ class ActDtmplView extends React.PureComponent<
         },
         refreshCode: undefined,
         actionDtmplData: undefined,
+        auditData: undefined,
     };
 
     async componentDidMount() {
@@ -174,7 +177,7 @@ class ActDtmplView extends React.PureComponent<
             loading,
             layout,
             snapshotOpen,
-            refreshCode, actionDtmplData,
+            refreshCode, actionDtmplData, auditData
         } = this.state;
         const { translate } = this.context;
         const { pageLayout, buttons, premises } = dtmplConfig || {};
@@ -187,6 +190,7 @@ class ActDtmplView extends React.PureComponent<
         }
 
         const renderAction = <div className="fr">
+            {isAudit ? <AuditDataPopover translate={translate} auditData={auditData} dtmplConfig={dtmplConfig} serverKey={serverKey} /> : ""}
             {buttons &&
                 buttons.includes("dtmplEdit") &&
                 goDtmpl &&
@@ -265,6 +269,7 @@ class ActDtmplView extends React.PureComponent<
                     code={code}
                     tabBarExtraContent={renderAction}
                     isAudit={isAudit}
+                    getAuditData={(val) => this.setState({ auditData: val })}
                 />
                 <AntdForm
                     scrollToFirstError={true}

package/src/aldehyde/detail/view/audit-data-popover.tsx

@@ -0,0 +1,70 @@
+import React, { useMemo } from "react";
+import { Button, Popover, Table } from "antd";
+import { OneToOneOutlined } from "@ant-design/icons";
+import { AuditData, DtmplConfig } from "../../tmpl/interface";
+import ViewControl from "../../controls/view-control";
+
+interface Props {
+    translate: Function;
+    auditData: AuditData;
+    serverKey: string;
+    dtmplConfig?: DtmplConfig;
+}
+
+const Index = (props: Props) => {
+    const { translate, auditData, dtmplConfig, serverKey } = props;
+
+    const columns = [
+        {
+            title: translate("${变更数据}"),
+            dataIndex: 'fieldTitle',
+        },
+        {
+            title: translate("${当前数据}"),
+            dataIndex: 'entityVal',
+            render: (text, record) => {
+                return <ViewControl
+                    serverKey={serverKey}
+                    holderType={"table"}
+                    fieldConfig={record.field}
+                    value={record.entityVal}
+                />;
+            }
+        },
+        {
+            title: translate("${变更前}"),
+            dataIndex: 'previousVal',
+            render: (text, record) => {
+                return <ViewControl
+                    serverKey={serverKey}
+                    holderType={"table"}
+                    fieldConfig={record.field}
+                    value={record.previousVal}
+                />;
+            }
+        },
+    ];
+
+    const dataSource = useMemo(() => {
+        if (!auditData) return [];
+        const { changeInfo, entity, previous } = auditData;
+        const fields = dtmplConfig?.groups?.[0]?.fields || [];
+        const temData = changeInfo?.changeFields?.map(item => {
+            const field = fields?.find(r => r.id === item);
+            const entityVal = entity?.fieldMap?.[item];
+            const previousVal = previous?.fieldMap?.[item];
+            return { fieldTitle: translate("${" + field?.title + "}"), entityVal, previousVal, field };
+        });
+        return temData;
+    }, [auditData])
+
+    const content = <Table columns={columns} dataSource={dataSource} pagination={false} />;
+
+    return <Popover content={content} trigger="click">
+        <Button className="hoverbig" title={translate("${数据对比}")}>
+            <OneToOneOutlined />
+        </Button>
+    </Popover>;
+};
+
+export default Index;

package/src/aldehyde/detail/view/dtmpl-view.tsx

@@ -3,7 +3,7 @@ import {
   DtmplBaseProps,
   DtmplConfig,
   DtmplData,
-  FieldGroupConfig,
+  FieldGroupConfig, AuditData
 } from "../../tmpl/interface";
 import RelationTable from "../../table/relation-table";
 import FieldViewGroup from "./field-view-group";
@@ -25,6 +25,7 @@ export interface DtmplViewProps extends DtmplBaseProps {
   parentId?: string;
   tabBarExtraContent?: ReactNode;
   isAudit?: boolean; // 是否审计
+  getAuditData?: (val: AuditData) => void; // 获取审计变更数据
 }
 
 export interface DtmplViewStat {
@@ -33,7 +34,7 @@ export interface DtmplViewStat {
   dtmplData?: DtmplData;
   premisesTitle?: string;
   layout?: object;
-  auditData?: { entity: DtmplData, previous?: DtmplData, changeInfo?: { changeFields: string[], arrayChangeInfos: object } }; // 审计对比数据
+  auditData?: AuditData;
 }
 
 class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
@@ -77,7 +78,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
   }
 
   loadData = async () => {
-    const { sourceId, code: propsCode, versionId, serverKey, codeSource, isAudit } = this.props;
+    const { sourceId, code: propsCode, versionId, serverKey, codeSource, isAudit, getAuditData } = this.props;
     let code = propsCode;
     if (!code && codeSource) {
       code = await HcserviceV3.queryCode(sourceId, codeSource, serverKey);
@@ -88,6 +89,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
       if (isAudit) { // 审计查看页面
         auditData = await HcserviceV3.requestViewDtmplAuditData(serverKey, sourceId, code, versionId);
         dtmplData = { ...(auditData?.entity || {}), sourceId: auditData?.sourceId };
+        getAuditData(auditData);
       } else { // 普通查看页面
         dtmplData = await HcserviceV3.requestViewDtmplData(serverKey, sourceId, code, versionId);
       }

package/src/aldehyde/draw-canvas-edit/components/asset-bar/index.less

@@ -1,36 +1,36 @@
-.asset-bar {
-  background-color: #f5f5f5;
-  width: 200px;
-  min-height: 100%;
-
-  .asset-list {
-    display: flex;
-    flex-wrap: wrap;
-    padding: 4px;
-    margin: 0;
-    list-style: none;
-
-    &>li {
-      width: 20%;
-      padding-top: 20%;
-      flex-shrink: 0;
-      cursor: pointer;
-      position: relative;
-      border-radius: 4px;
-
-      &:hover {
-        background-color: #ddd;
-      }
-
-      &>img {
-        position: absolute;
-        top: 6px;
-        left: 6px;
-        object-fit: contain;
-        width: calc(~"100% - 12px");
-        height: calc(~"100% - 12px");
-        pointer-events: none;
-      }
-    }
-  }
+.asset-bar {
+  background-color: #f5f5f5;
+  width: 200px;
+  min-height: 100%;
+
+  .asset-list {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 4px;
+    margin: 0;
+    list-style: none;
+
+    &>li {
+      width: 20%;
+      padding-top: 20%;
+      flex-shrink: 0;
+      cursor: pointer;
+      position: relative;
+      border-radius: 4px;
+
+      &:hover {
+        background-color: #ddd;
+      }
+
+      &>img {
+        position: absolute;
+        top: 6px;
+        left: 6px;
+        object-fit: contain;
+        width: calc(~"100% - 12px");
+        height: calc(~"100% - 12px");
+        pointer-events: none;
+      }
+    }
+  }
 }