From b3a9c3eab92f5f4bacb9945a00c9cce642d3ba95 Mon Sep 17 00:00:00 2001
From: lihongyu <504404568@qq.com>
Date: Mon, 13 Feb 2023 17:23:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B/=E5=88=B6=E5=BA=A6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=96=E9=83=A8=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process.epc/diagram.attribute.custom.xml  | 29 ++++++++++---------
 .../method/process.epc/diagram.schema.tpl     |  2 +-
 .../diagram.attribute.custom.xml              | 10 ++++++-
 .../process.flowchart/diagram.schema.tpl      |  6 +++-
 .../control.kpi/diagram.attribute.custom.xml  |  4 +--
 .../control.ma/diagram.attribute.custom.xml   |  9 +++---
 .../diagram.attribute.custom.xml              |  9 +++---
 .../data.form/diagram.attribute.custom.xml    |  4 +--
 8 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml
index f9009c34..f17e237b 100644
--- a/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml
+++ b/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml
@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <attributes type="customer"> 
-  <attribute key="auditor" title="审核人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="审核人" isRequired="false"/>  
-  <attribute key="reviewer" title="复核人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="复核人" isRequired="false"/>  
-  <attribute key="approver" title="审批人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="审批人" isRequired="false"/>  
+  <attribute key="auditor" title="审核人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="审核人" isRequired="true"/>  
+  <attribute key="reviewer" title="复核人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="复核人" isRequired="true"/>  
+  <attribute key="approver" title="审批人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="审批人" isRequired="true"/>  
   <attribute key="application" title="适用范围" type="textarea" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="适用范围" isRequired="true"/>  
-  <attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="文件编码" isRequired="false"/>  
+  <attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="无需填写，发布后自动生成" isRequired="false"/>  
   <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构L1" isRequired="true"/>  
   <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构l2" isRequired="true"/>  
   <attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构L3" isRequired="true"/>  
   <attribute key="ARIS" title="ARIS地址" type="textarea" value="" ref="" readonly="false" groupPath="organization" scope="%" isValid="true" desc="ARIS地址" isRequired="false"/>  
-  <attribute key="P_versions" title="版本" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="版本" isRequired="true"/>  
+  <attribute key="P_versions" title="版本" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="版本" isRequired="false"/>  
   <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="拟制/修订人" isRequired="true"/>  
   <attribute key="T_supplementary_articles" title="附则" type="textarea" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="附则" isRequired="false"/>  
   <attribute key="goal" title="目的" type="textarea" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="目的" isRequired="true"/>  
   <attribute key="activity_number" title="活动序号" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="活动序号" isRequired="false"/>  
   <attribute key="Process_performance_metrics" title="流程绩效" type="relation" value="" ref="{&quot;method&quot;:&quot;control.kpi&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="流程绩效" isRequired="false"/>  
-  <attribute key="activity_description" title="活动描述" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="活动描述" isRequired="true"/>  
-  <attribute key="output" title="输出" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="输出" isRequired="true"/>  
+  <attribute key="activity_description" title="活动描述" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="如为审批类活动，需描述审核/审批具体内容" isRequired="true"/>  
+  <attribute key="output" title="输出" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="必填，无输出请填写 “/” " isRequired="true"/>  
   <attribute key="R_relevant_flies" title="相关文件" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="相关文件" isRequired="false"/>  
-  <attribute key="relevant_flies" title="相关知识" type="link" value="" desc="相关知识" isRequired="false" ref="" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
-  <attribute key="input" title="输入" type="textarea" value="" desc="输入" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="relevant_flies" title="相关知识" type="link" value="" desc="相关知识" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="input" title="输入" type="textarea" value="" desc="必填，无输入请填写 “/” " isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="relevant_demand" title="相关要求" type="relation" value="" desc="相关要求" isRequired="false" ref="{&quot;method&quot;:&quot;itsystem&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="*" isValid="false"/>  
-  <attribute key="post" title="岗位" type="relation" value="" desc="岗位" isRequired="false" ref="{&quot;method&quot;:&quot;org.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="post" title="岗位" type="relation" value="" desc="岗位" isRequired="false" ref="{&quot;method&quot;:&quot;org.normal&quot;,&quot;type&quot;:&quot;shapeAndFile&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
   <attribute key="role" title="角色" type="relation" value="" desc="角色" isRequired="false" ref="{&quot;method&quot;:&quot;org.role&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;术语&quot;,&quot;secondColumn&quot;:&quot;定义&quot;}" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
   <attribute key="information_systems" title="信息系统" type="relation" value="" desc="信息系统" isRequired="false" ref="{&quot;method&quot;:&quot;itsystem.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="Organizational_role" title="组织/角色与职责" type="table" value="" desc="组织/角色与职责" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;名称&quot;,&quot;secondColumn&quot;:&quot;职责&quot;}" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="Organizational_role" title="组织/角色与职责" type="table" value="" desc="组织/角色与职责" isRequired="true" ref="{&quot;firstColumn&quot;:&quot;名称&quot;,&quot;secondColumn&quot;:&quot;职责&quot;}" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
   <attribute key="Drafted_and_revised_date" title="拟制/修订日期" type="DateTimePicker" value="" desc="拟制/修订日期" isRequired="true" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
-  <attribute key="effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="true" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
-  <attribute key="Issuing_department" title="发布部门" type="awsorg" value="" desc="发布部门" isRequired="true" ref="{&quot;scope&quot;:[&quot;department&quot;],&quot;multiple&quot;:false}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="effective_date" title="生效日期" type="DateTimePicker" value="" desc="无需填写，发布审批后系统自动更新" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="Issuing_department" title="发布部门" type="awsorg" value="" desc="发布部门" isRequired="true" ref="{&quot;scope&quot;:[&quot;department&quot;],&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
   <attribute key="Process_owner" title="流程责任人" type="awsorg" value="" desc="流程责任人" isRequired="true" ref="{&quot;scope&quot;:[&quot;user&quot;],&quot;multiple&quot;:false}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
   <attribute key="isPublish" title="是否发布" type="string" value="" desc="是否发布" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="ARIS_process_name" title="ARIS流程名称" type="string" value="" desc="ARIS流程名称" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
   <attribute key="lead_process" title="上游流程" type="relation" value="" desc="上游流程" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
   <attribute key="rear_process" title="下游流程" type="relation" value="" desc="下游流程" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
   <attribute key="support_files" title="支持文件" type="relation" value="" desc="支持文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
-  <attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="textarea" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/> 
+  <attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="textarea" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="Out_relevant_files" title="外部相关文件" type="textarea" value="" desc="填写外部相关文件名称，多个用逗号隔开" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/> 
 </attributes>
diff --git a/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.schema.tpl b/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.schema.tpl
index 07c7a7f5..8fcc2b2e 100644
--- a/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.schema.tpl
+++ b/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.schema.tpl
@@ -321,7 +321,7 @@ Schema.addShape({name:"method_service_node", title:"线下审批", text:"线下
                                                                                                                                         {lineStyle:{lineWidth:1, lineColor:"137,188,255", lineStyle:"solid"}, fillStyle:{type:"solid"}, actions:{ref:"method_service_task"}},
                                                                                                                                         {lineStyle:{lineWidth:0}, fillStyle:{type:"none"}, actions:{ref:"roundRectangle"}}
                                                                                                                                     ]});
-Schema.addShape({name:"method_service_node4", title:"人工任务", text:"人工任务",groupName:"features3", category:"process_epc",  props:{w:110, h:50}, lineStyle:{lineWidth:1, lineColor:"137,188,255"}, fillStyle:{type:"gradient", gradientType:"linear", beginColor:"245,250,255", endColor:"232,242,255", angle:Math.PI * 0.5}, path:[
+Schema.addShape({name:"method_service_node4", title:"人工任务", text:"人工任务",groupName:"features3", category:"process_epc",  props:{w:150, h:66}, lineStyle:{lineWidth:1, lineColor:"137,188,255"}, fillStyle:{type:"gradient", gradientType:"linear", beginColor:"245,250,255", endColor:"232,242,255", angle:Math.PI * 0.5}, path:[
                                                                                                                            {actions:[
                                                                                                                                {action:"move", x:"w*0", y:"5"},
                                                                                                                                {action:"quadraticCurve", x1:"0", y1:"0", x:"5", y:"0"},
diff --git a/com.actionsoft.apps.coe.method.process.flowchart/method/process.flowchart/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.method.process.flowchart/method/process.flowchart/diagram.attribute.custom.xml
index e29f4bf0..d6cf8d0c 100644
--- a/com.actionsoft.apps.coe.method.process.flowchart/method/process.flowchart/diagram.attribute.custom.xml
+++ b/com.actionsoft.apps.coe.method.process.flowchart/method/process.flowchart/diagram.attribute.custom.xml
@@ -2,5 +2,13 @@
 
 <attributes type="customer"> 
   <attribute key="lead_process" title="上游流程" type="relation" value="" desc="上游流程" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
-  <attribute key="rear_process" title="下游流程" type="relation" value="" desc="下游流程" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>
+  <attribute key="rear_process" title="下游流程" type="relation" value="" desc="下游流程" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="file_number" title="文件编码" type="string" value="" desc="无需填写，发布后自动生成" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="Issuing_department" title="发布部门" type="awsorg" value="" desc="发布部门" isRequired="true" ref="{&quot;scope&quot;:[&quot;department&quot;],&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="P_versions" title="版本" type="string" value="" desc="版本" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="流程架构L1" isRequired="true" ref="" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="流程架构l2" isRequired="true" ref="" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="流程架构L3" isRequired="true" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="effective_date" title="生效日期" type="DateTimePicker" value="" desc="无需填写，发布审批后系统自动更新" isRequired="true" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="Out_relevant_flies" title="外部相关文件" type="textarea" value="" desc="多个外部文件用英文逗号隔开" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
 </attributes>
diff --git a/com.actionsoft.apps.coe.method.process.flowchart/method/process.flowchart/diagram.schema.tpl b/com.actionsoft.apps.coe.method.process.flowchart/method/process.flowchart/diagram.schema.tpl
index 594a9ed7..32a3ebdf 100644
--- a/com.actionsoft.apps.coe.method.process.flowchart/method/process.flowchart/diagram.schema.tpl
+++ b/com.actionsoft.apps.coe.method.process.flowchart/method/process.flowchart/diagram.schema.tpl
@@ -381,7 +381,7 @@ Schema.addShape({name:"method_service_node4", title:"人工任务", text:"人工
 
 
 
-/***菱形：Decision*/Schema.addShape({name:"decision", title:"判定", text:"判定", category:"process_flowchart", props:{w:90, h:50},fillStyle:{color:"175,210,255"}, path:[
+/***菱形：Decision*/Schema.addShape({name:"decision", title:"判定", text:"判定", category:"process_flowchart", props:{w:150, h:66},fillStyle:{color:"175,210,255"}, path:[
     {actions:[
         {action:"move", x:"0", y:"h/2"},
         {action:"line", x:"w/2", y:"0"},
@@ -408,6 +408,8 @@ Schema.addShape({name:"method_service_node4", title:"人工任务", text:"人工
         {action:"close"}
     ]}
 ]});
+/***矩形*/Schema.addShape({name:"process", title:"备注", text:"备注", category:"process_flowchart", props:{w:150, h:66}, path:[{actions:{ref:"rectangle"}}
+]});
 /***平行四边形：Data*/Schema.addShape({name:"data", title:"数据", text:"数据", category:"process_flowchart", props:{w:150, h:66}, anchors:[
     {x:"w*0.5", y:"0"},
     {x:"w-Math.min(h/3,w/3)/2", y:"h*0.5"},
@@ -571,6 +573,8 @@ Schema.addShape({name:"verticalPool", title:"泳池(垂直)",text:"泳池(垂直
             ]}
         ]
     }});
+	
+
 Schema.addShape({name:"verticalLane", title:"泳道(垂直)", text:"泳道(垂直)", category:"lane", attribute:{container:true, rotatable:false, linkable:false}, props:{w:250, h:500}, textBlock:{x:10, y:0, w:"w-20", h:30},textBlockFinal:{x:"w/2-60", y:"h", w:"120", h:"30"},
     anchors:[], resizeDir:["l", "b", "r"], path:[
         {fillStyle:{type:"none"}, lineStyle:{lineStyle:"solid"}, actions:{ref:"rectangle"}},
diff --git a/com.actionsoft.apps.coe.pal/method/control.kpi/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/control.kpi/diagram.attribute.custom.xml
index 13ad6ca4..4838538b 100644
--- a/com.actionsoft.apps.coe.pal/method/control.kpi/diagram.attribute.custom.xml
+++ b/com.actionsoft.apps.coe.pal/method/control.kpi/diagram.attribute.custom.xml
@@ -6,8 +6,8 @@
   <attribute key="Process_performance_indicator_Number" title="指标编号" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="指标编号" isRequired="true"/>  
   <attribute key="Name_process_performance_indicator" title="指标名称" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="指标名称" isRequired="true"/>  
   <attribute key="ndicator_User_defined_label" title="指标自定义标签" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="指标自定义标签" isRequired="true"/>  
-  <attribute key="unit_measurement" title="计量单位" type="select" value="" ref="天,%,金额,次,小时,个,数量" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="计量单位" isRequired="true"/>  
-  <attribute key="statistical_period" title="统计周期" type="select" value="" ref="月度,季度,半年度,年度" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="统计周期" isRequired="true"/>  
+  <attribute key="unit_measurement" title="计量单位" type="select" value="" ref="天,%,金额,次,小时,个,数量,吨,份" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="计量单位" isRequired="true"/>  
+  <attribute key="statistical_period" title="统计周期" type="select" value="" ref="天,月度,季度,半年度,年度" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="统计周期" isRequired="true"/>  
   <attribute key="Platform_data_Display" title="平台数据展示" type="select" value="" ref="是,否" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="平台数据展示" isRequired="true"/>  
   <attribute key="The_upstream_indicators" title="上游指标" type="relation" value="" ref="{&quot;method&quot;:&quot;control&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true" desc="上游指标" isRequired="true"/>  
   <attribute key="Downstream_target" title="下游指标" type="relation" value="" ref="{&quot;method&quot;:&quot;control&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true" desc="下游指标" isRequired="true"/>  
diff --git a/com.actionsoft.apps.coe.pal/method/control.ma/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/control.ma/diagram.attribute.custom.xml
index a7aa4524..f88f1fb2 100644
--- a/com.actionsoft.apps.coe.pal/method/control.ma/diagram.attribute.custom.xml
+++ b/com.actionsoft.apps.coe.pal/method/control.ma/diagram.attribute.custom.xml
@@ -6,11 +6,11 @@
   <attribute key="Process_performance_indicator_Number" title="指标编号" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="指标编号" isRequired="true"/>  
   <attribute key="Name_process_performance_indicator" title="指标名称" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="指标名称" isRequired="true"/>  
   <attribute key="ndicator_User_defined_label" title="指标自定义标签" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="指标自定义标签" isRequired="true"/>  
-  <attribute key="unit_measurement" title="计量单位" type="select" value="" ref="天,%,金额,次,小时" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="计量单位" isRequired="true"/>  
+  <attribute key="unit_measurement" title="计量单位" type="select" value="" ref="天,%,次,小时,万元,万元/人,元,个,亿元,元/吨,元/人,起/百万包,万人," readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="计量单位" isRequired="true"/>  
   <attribute key="statistical_period" title="统计周期" type="select" value="" ref="月度,季度,半年度,年度" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="统计周期" isRequired="true"/>  
   <attribute key="Platform_data_Display" title="平台数据展示" type="select" value="" ref="是,否" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="平台数据展示" isRequired="true"/>  
-  <attribute key="The_upstream_indicators" title="上游指标" type="relation" value="" ref="{&quot;method&quot;:&quot;control&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true" desc="上游指标" isRequired="true"/>  
-  <attribute key="Downstream_target" title="下游指标" type="relation" value="" ref="{&quot;method&quot;:&quot;control&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true" desc="下游指标" isRequired="true"/>  
+  <attribute key="The_upstream_indicators" title="父指标" type="relation" value="" ref="{&quot;method&quot;:&quot;control&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true" desc="上游指标" isRequired="true"/>  
+  <attribute key="Downstream_target" title="支撑指标" type="relation" value="" ref="{&quot;method&quot;:&quot;control&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true" desc="下游指标" isRequired="true"/>  
   <attribute key="Index_definition" title="指标定义" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="指标定义" isRequired="true"/>  
   <attribute key="remark" title="备注" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="备注" isRequired="false"/>  
   <attribute key="Process_Architecture_L1" title="L1" type="string" value="" desc="L1" isRequired="true" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
@@ -26,5 +26,6 @@
   <attribute key="Data_fetch_logic" title="数据取数逻辑" type="textarea" value="" desc="数据取数逻辑" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="Take_the_number_aperture" title="取数路径" type="textarea" value="" desc="取数路径" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="data_sources" title="数据来源" type="textarea" value="" desc="数据来源" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="computational_formula" title="计算公式" type="textarea" value="" desc="计算公式" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> 
+  <attribute key="computational_formula" title="计算公式" type="textarea" value="" desc="计算公式" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="Belonging_Architecture" title="共同归属架构" type="string" value="" desc="架构编号" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> 
 </attributes>
diff --git a/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml
index 7b3f40a8..c95f87c0 100644
--- a/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml
+++ b/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml
@@ -3,7 +3,7 @@
 <attributes type="customer"> 
   <attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true" desc="无需填写，发布后自动生成" isRequired="false"/>  
   <attribute key="R_Organizational_and_role_responsibilities" title="组织/角色职责" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="组织/角色职责" isRequired="true"/>  
-  <attribute key="versions" title="版本" type="string" value="" desc="版本" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="versions" title="版本" type="string" value="" desc="版本" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
   <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="拟制/修订人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="流程架构L1" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
   <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="流程架构L2" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
@@ -13,11 +13,11 @@
   <attribute key="approver" title="审批人" type="string" value="" desc="审批人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="related_files" title="相关文件" type="relation" value="" desc="相关文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="support_files" title="支持文件" type="relation" value="" desc="支持文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>  
-  <attribute key="effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="effective_date" title="生效日期" type="DateTimePicker" value="" desc="无需填写，发布审批后系统自动更新" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
   <attribute key="related_knowledge" title="相关知识" type="link" value="" desc="相关知识" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="Issuing_department" title="发布部门" type="awsorg" value="" desc="发布部门" isRequired="true" ref="{&quot;scope&quot;:[&quot;department&quot;],&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="Drafted_and_revised_date" title="拟制/修订日期" type="DateTimePicker" value="" desc="拟制/修订日期" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
-  <attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="true" ref="{&quot;firstColumn&quot;:&quot;术语&quot;,&quot;secondColumn&quot;:&quot;定义&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;术语&quot;,&quot;secondColumn&quot;:&quot;定义&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="Organizational_role" title="组织角色" type="table" value="" desc="组织角色" isRequired="true" ref="{&quot;firstColumn&quot;:&quot;组织&quot;,&quot;secondColumn&quot;:&quot;职责&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="content" title="内容" type="string" value="" desc="内容" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="company" title="编制单位" type="string" value="" desc="编制单位" isRequired="false" ref="" readonly="false" groupPath="organization" scope="*" isValid="true"/>  
@@ -26,5 +26,6 @@
   <attribute key="application" title="适用范围" type="textarea" value="" desc="适用范围" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
   <attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="textarea" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="T_supplementary_articles" title="附则" type="textarea" value="" desc="附则" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
-  <attribute key="activity_number" title="活动序号" type="string" value="" desc="活动序号" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> 
+  <attribute key="activity_number" title="活动序号" type="string" value="" desc="活动序号" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="Out_related_files" title="外部相关文件" type="textarea" value="" desc="填写外部相关文件名称，多个用逗号隔开" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
 </attributes>
diff --git a/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml
index 3a88e8df..fa2460e9 100644
--- a/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml
+++ b/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml
@@ -3,7 +3,7 @@
 <attributes type="customer"> 
   <attribute key="Form_name" title="表单名称" type="string" value="" ref="" readonly="true" groupPath="baseAttribute" scope="%" isValid="true" desc="表单名称" isRequired="true"/>  
   <attribute key="form_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true" desc="无需填写，发布后自动生成" isRequired="false"/>  
-  <attribute key="P_versions" title="版本" type="string" value="" desc="版本" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="P_versions" title="版本" type="string" value="" desc="版本" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="拟制/修订人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="流程架构L1" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="流程架构L2" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
@@ -12,7 +12,7 @@
   <attribute key="auditor" title="审核人" type="string" value="" desc="审核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="reviewer" title="复核人" type="string" value="" desc="复核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="approver" title="审批人" type="string" value="" desc="审批人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
-  <attribute key="form_effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="form_effective_date" title="生效日期" type="DateTimePicker" value="" desc="无需填写，发布审批后系统自动更新" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="form_Scope_application" title="适用范围" type="textarea" value="" desc="适用范围" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="textarea" value="" desc="修订内容及理由" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="number" title="必要字段" type="string" value="" desc="必要字段" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>