aldehyde 0.2.516 → 0.2.518

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/controls/view-control.tsx

@@ -221,6 +221,7 @@ function renderControl(
         viewControl = <DirectFileView {...controlProps} />;
         break;
       case "relfile":
+      case "relimage":
         //只是配置了，内部未做开发
         viewControl = <MultiFileView {...controlProps}></MultiFileView>;
         break;

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

@@ -17,6 +17,7 @@ export interface ActDtmplViewProps extends DtmplBaseProps {
     goBackToLtmpl?: () => void,
     title?: any;
     showHeader?: boolean;
+    isAudit?: boolean; // 是否审计
 }
 
 export interface ActDtmplViewStat {
@@ -37,6 +38,7 @@ class ActDtmplView extends React.PureComponent<
         showRightNav: true,
         rightBarPositionRight: 15,
         showHeader: true,
+        isAudit: false,
     };
     formRef = React.createRef<FormInstance>();
     static contextType = LocaleContext;
@@ -164,7 +166,7 @@ class ActDtmplView extends React.PureComponent<
             serverKey,
             codeSource,
             title,
-            showHeader,
+            showHeader, isAudit
         } = this.props;
         const {
             dtmplConfig,
@@ -262,6 +264,7 @@ class ActDtmplView extends React.PureComponent<
                     sourceId={sourceId}
                     code={code}
                     tabBarExtraContent={renderAction}
+                    isAudit={isAudit}
                 />
                 <AntdForm
                     scrollToFirstError={true}

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

@@ -16,6 +16,7 @@ import TmplConfigAnalysis from "../../tmpl/tmpl-config-analysis";
 import { Card, Tabs } from "antd";
 import LtmplTable from "../../module/ltmpl-table";
 import DtmplViewCard from "../../module/dtmpl-view-card";
+import { ProgramConfig } from "../../index";
 
 export interface DtmplViewProps extends DtmplBaseProps {
   versionId?: number;
@@ -23,6 +24,7 @@ export interface DtmplViewProps extends DtmplBaseProps {
   refreshCode?: string;
   parentId?: string;
   tabBarExtraContent?: ReactNode;
+  isAudit?: boolean; // 是否审计
 }
 
 export interface DtmplViewStat {
@@ -31,12 +33,14 @@ export interface DtmplViewStat {
   dtmplData?: DtmplData;
   premisesTitle?: string;
   layout?: object;
+  auditData?: { entity: DtmplData, previous?: DtmplData, changeInfo?: { changeFields: string[], arrayChangeInfos: object } }; // 审计对比数据
 }
 
 class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
   static defaultProps = {
     showRightNav: true,
     maxColsOnRow: 2,
+    isAudit: false,
   };
 
   state = {
@@ -44,6 +48,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
     id: "dtmplView" + Units.getRandomNum(6),
     snapshotOpen: false,
     dtmplData: undefined,
+    auditData: undefined,
     premisesTitle: "默认字段",
     layout: {
       labelCol: { span: 8 },
@@ -72,36 +77,23 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
   }
 
   loadData = async () => {
-    const {
-      sourceId,
-      code: propsCode,
-      versionId,
-      serverKey,
-      codeSource,
-    } = this.props;
+    const { sourceId, code: propsCode, versionId, serverKey, codeSource, isAudit } = this.props;
     let code = propsCode;
     if (!code && codeSource) {
       code = await HcserviceV3.queryCode(sourceId, codeSource, serverKey);
     }
     if (code) {
-      this.setState({
-        loading: true,
-        dtmplData: undefined,
-      });
-      const dtmplData = await HcserviceV3.requestViewDtmplData(
-        serverKey,
-        sourceId,
-        code,
-        versionId
-      );
-      this.setState({
-        dtmplData,
-        loading: false,
-      });
+      this.setState({ loading: true, dtmplData: undefined });
+      let dtmplData, auditData;
+      if (isAudit) { // 审计查看页面
+        auditData = await HcserviceV3.requestViewDtmplAuditData(serverKey, sourceId, code, versionId);
+        dtmplData = { ...(auditData?.entity || {}), sourceId: auditData?.sourceId };
+      } else { // 普通查看页面
+        dtmplData = await HcserviceV3.requestViewDtmplData(serverKey, sourceId, code, versionId);
+      }
+      this.setState({ dtmplData, auditData, loading: false });
     } else {
-      this.setState({
-        loading: false,
-      });
+      this.setState({ loading: false });
     }
   };
 
@@ -111,9 +103,9 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
       serverKey,
       mainCode,
       showRightNav,
-      parentId, maxColsOnRow, code
+      parentId, maxColsOnRow, code, isAudit
     } = this.props;
-    const { dtmplData, loading, id } = this.state;
+    const { dtmplData, loading, id, auditData } = this.state;
     const { pageLayout } = dtmplConfig;
     let groups: FieldGroupConfig[] = [];
     if (dtmplConfig) {
@@ -224,6 +216,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
             value={data}
             viewOrEdit={"view"}
             showCollapseCard={pageLayout !== "horizontalTabs"}
+            audit={{ isAudit, previousData: ProgramConfig.arrayToMap(auditData?.previous?.arrayMap?.[item.id], "code"), changeInfo: auditData?.changeInfo?.arrayChangeInfos?.[item.id] }}
           />;
           return pageLayout === "horizontalTabs" ? { key: item.id, label: item.title, children } : children;
         }
@@ -234,6 +227,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
           fields={item.fields}
           valueMap={dtmplData ? dtmplData.fieldMap : undefined}
           width={220}
+          audit={{ isAudit, auditMap: auditData?.previous?.fieldMap || undefined, changeFields: auditData?.changeInfo?.changeFields }}
         />;
         return (
           pageLayout === "horizontalTabs" ?

package/src/aldehyde/detail/view/field-view-group.tsx

@@ -1,8 +1,9 @@
-import React from "react";
-import { Col, Row, Descriptions } from "antd";
-import { FieldConfig, FieldGroupConfig } from "../../tmpl/interface";
+import React, { ReactNode } from "react";
+import { Descriptions, Tooltip } from "antd";
+import { FieldConfig } from "../../tmpl/interface";
 import ViewControl from "../../controls/view-control";
 import { LocaleContext } from "../../locale/LocaleProvider";
+import "./index.less";
 
 interface FieldViewGroupProps {
   serverKey?: string;
@@ -11,6 +12,7 @@ interface FieldViewGroupProps {
   width?: number;
   dataCode?: string;
   column?: number;
+  audit?: { isAudit: boolean, auditMap?: object, changeFields?: string[] }; // 是否审计查看，审计查看配置
 }
 
 interface FieldViewGroupState {
@@ -29,41 +31,37 @@ export default class FieldViewGroup extends React.PureComponent<
   }
   static defaultProps = {
     column: 2,
+    audit: { isAudit: false }
   };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
 
   initViewList = () => {
-    const { fields, valueMap, serverKey, dataCode } = this.props;
+    const { fields, valueMap, serverKey, dataCode, audit } = this.props;
     const { translate } = this.context;
     const formItemList = [];
 
     if (fields.length > 0) {
       fields.forEach((item, index) => {
-        const title = item.title;
         let fieldValue = valueMap ? valueMap[item.id] : undefined;
         //fieldValue 没有值时不能为null 要为 undefined。antd input所限制
-        fieldValue = fieldValue
-          ? fieldValue
-          : item.defaultValue
-          ? item.defaultValue
-          : undefined;
-        const fieldKey = item.id + Math.random() * 100;
-
-        if (item.extControlType != "hidden" && !item.hidden) {
+        fieldValue = fieldValue ? fieldValue : item.defaultValue ? item.defaultValue : undefined;
+        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={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;
+        }
+        if (item.extControlType !== "hidden" && !item.hidden) {
           const formItem = (
             <Descriptions.Item
-              label={translate("${" + item.title + "}")}
+              label={label}
               span={item.colSpan}
               key={index}
               className="labelcss"
             >
-              <div
-                className="description-content"
-                style={{
-                  width: "100%",
-                }}
-              >
+              <div className="description-content" style={{ width: "100%" }}>
                 <ViewControl
                   dataCode={dataCode}
                   serverKey={serverKey}
@@ -82,7 +80,7 @@ export default class FieldViewGroup extends React.PureComponent<
   };
 
   render() {
-    const {column} = this.props;
-    return <Descriptions column={column} >{this.initViewList()}</Descriptions>;
+    const { column } = this.props;
+    return <Descriptions className="field-view-group" column={column} >{this.initViewList()}</Descriptions>;
   }
 }

package/src/aldehyde/detail/view/index.less

@@ -0,0 +1,6 @@
+.field-view-group {
+    .ant-descriptions-view>table {
+        table-layout: fixed;
+        width: 100%;
+    }
+}

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