diff --git a/com.actionsoft.apps.coe.pal/i18n/resource.xml b/com.actionsoft.apps.coe.pal/i18n/resource.xml
index 70939210..99a96b7f 100755
--- a/com.actionsoft.apps.coe.pal/i18n/resource.xml
+++ b/com.actionsoft.apps.coe.pal/i18n/resource.xml
@@ -61,6 +61,11 @@
+ -
+
+
+
+
-
@@ -130,7 +135,12 @@
-
+
+ -
+
+
+
+
-
diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
index 3b78120f..5849adda 100644
Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ
diff --git a/com.actionsoft.apps.coe.pal/manifest.xml b/com.actionsoft.apps.coe.pal/manifest.xml
index a4c15cab..d167f54b 100755
--- a/com.actionsoft.apps.coe.pal/manifest.xml
+++ b/com.actionsoft.apps.coe.pal/manifest.xml
@@ -1,14 +1,14 @@
-
- CoE PAL流程资产库
- 6.5
- 94
- 北京炎黄盈动科技发展有限责任公司
-
- false
- 2013-08-01
-
+
+ CoE PAL流程资产库
+ 6.5
+ 94
+ 北京炎黄盈动科技发展有限责任公司
+
+ false
+ 2013-08-01
+
** 特别说明
-使用BPMN2流程模型梳理的流程，可以直接在AWS BPMS中执行
- ]]>
- 2013-08-01 15:08:08
- com.actionsoft.apps.coe.pal.plugin.InstallListener
- com.actionsoft.apps.coe.pal.plugin.Plugins
- com.actionsoft.apps.coe.pal.plugin.StartListener
- com.actionsoft.apps.coe.pal.plugin.StopListener
-
-
- true
-
-
-
-
-
-
-
- true
- true
- _bpm.platform
-
+ ]]>
+ 2013-08-01 15:08:08
+ com.actionsoft.apps.coe.pal.plugin.InstallListener
+ com.actionsoft.apps.coe.pal.plugin.Plugins
+ com.actionsoft.apps.coe.pal.plugin.StartListener
+ com.actionsoft.apps.coe.pal.plugin.StopListener
+
+
+ true
+
+
+
+
+
+
+
+ true
+ true
+ _bpm.platform
+
0
0
false
@@ -85,8 +85,8 @@ AWS PAL(Process Asset Library)流程资产库是AWS CoE平台的重要产品组
[{"name":"建模操作快速引导","url":"","children":[{"name":"1.如何创建符号与连线","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=e0606a45-56d3-4cff-b51f-e0a9d64e522a"},{"name":"2.快速调整布局","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=6e58d212-fb95-4483-93b7-17499d632805"},{"name":"3.术语的新建与删除","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=e5ef6605-3bc0-44b9-8bb8-a252fe20837b"},{"name":"4.流程绩效指标的新建与修改","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=59b638b6-7e3a-4a79-bd71-cd739259c89d"},{"name":"5.新建表单模型","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=0b964b9e-6701-44a8-8159-91b4ceba9c80"},{"name":"6.新建制度模型","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=c1e30c18-db59-4bde-ab60-b9589922ab2e"},{"name":"7.流程文件的生成","url":"./w?sid=@sid&cmd=com.actionsoft.apps.cms_get_message&messageId=d799ced4-2313-45ba-911f-03cdb6db9e06"},{"name":"8.新建角色与岗位","url":"./w?sid=@sid&cmd=com.actiosoft.apps.cms_get_message&messageId=93559257-8280-444c-bd88-116748b919bf"}]}]
{"control.risk":{"risk":{"desc":"描述企业内部流程涉及的各级风险点"},"control":{"desc":"描述企业内部流程涉及的各级风险的控制措施"}},"itsystem.normal":{"cloudServer":{"desc":"描述企业接入的云服务设施"},"database":{"desc":"描述企业提供的数据库服务类型，如某Oracle数据库"},"appSystem":{"desc":"描述企业提供的应用系统，如某供应链管理系统、业务流程管理平台"},"device":{"desc":"描述企业提供的各种IT设备"}},"control.kpi":{"kpi":{"desc":"从流程的目标（业务的目标、管理的要求等）出发设计流程绩效指标，用于衡量和评估末级流程的执行效果和对流程业务的支撑作用。"}},"process.evc":{"valueChain6":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain5":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain4":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain3":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain2":{"desc":"一个基本增值活动或辅助增值活动"},"valueChain1":{"desc":"一个基本增值活动或辅助增值活动"}},"control.policy":{"item":{"desc":"描述企业内部各级管理制度的具体条款"},"regulation":{"desc":"描述企业内部流程涉及的各级管理制度"}},"data.form":{"form":{"desc":"输入或输出的数据是一个完整的数据结构（或单据）"},"forms":{"desc":"输入或输出的数据由多个数据结构（或单据）组成"}},"process.flowchart":{"internalStorage":{"desc":"存储在存储器中的数据"},"predefinedProcess":{"desc":"在另外地方已得到详细说明的一个操作或一组操作"},"data":{"desc":"表示数据"},"document":{"desc":"表示属于该过程的书面信息"},"paperTape":{"desc":"旧式电脑使用的穿孔纸带输入"},"storedData":{"desc":"表示一般的数据存储"},"preparation":{"desc":"表示修改一条指令或一组指令以影响随后的活动"},"horizontalPool":{"desc":"包含多个泳道，对元素进行区分"},"verticalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"parallelMode":{"desc":"表示同步进行两个或两个以上并行方式的操作"},"terminator":{"desc":"表示过程的开始或结束"},"offPageReference":{"desc":"表示一组流程，可以用跨页引用进行标识"},"horizontalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"annotation":{"desc":"标识注解的内容"},"manualInput":{"desc":"人工输入的数据"},"onPageReference":{"desc":"表示流程图的待续，圈内有一子字母或数字"},"process":{"desc":"表示过程中的一个单独步骤"},"manualOperation":{"desc":"由人工完成的操作"},"loopLimit":{"desc":"去上角的上限值和去下角的下限值分别表示循环的开始和结束"},"decision":{"desc":"表示过程中的一项判定或一个分岔点"},"display":{"desc":"在机器上显示"},"verticalPool":{"desc":"包含多个泳道，对元素进行区分"},"sequentialData":{"desc":"老式磁带存储的数据"},"directData":{"desc":"表示流程图中存储在硬盘上的数据源"},"card":{"desc":"旧式电脑使用的打孔卡"}},"process.epc":{"or":{"desc":"表示一件事情可能产生的几个结果中，至少有一个会发生"},"method_service_node":{"desc":"描述流程中的手工活动"},"verticalPool":{"desc":"包含多个泳道，对元素进行区分"},"procedure":{"desc":"本流程的某个环节后引用的其它流程"},"method_approval_node":{"desc":"流程中审核、审批性质的活动"},"horizontalPool":{"desc":"包含多个泳道，对元素进行区分"},"verticalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"method_approval_node3":{"desc":"流程中需要执行某种操作的活动"},"and":{"desc":"表示一件事情可能产生的几个结果或后续活动，全部发生；或表示一件事情的发生需要几个条件同时满足"},"method_service_node4":{"desc":"描述流程中的手工活动"},"xor":{"desc":"表示一件事情可能产生的几个结果中，有且只有一个会发生"},"event":{"desc":"描述流程运行的状态"},"horizontalLane":{"desc":"对泳池里的流程元素的进行组织和分类"}},"org.role":{"role":{"desc":"一般用于表示执行某一流程步骤的流程角色"}},"process.bpmn2":{"signalIntermediateThrowingEvent":{"desc":"向外广播信号后，流程继续向后执行"},"callActivityCallingProcess":{"desc":"调用定义的全局过程"},"textAnnotation":{"desc":"给元素附加信息，便于理解"},"timerStartEvent":{"desc":"到达设置的日期/时间后，触发流程执行"},"horizontalPool":{"desc":"包含多个泳道，对元素进行区分"},"signalEndEvent":{"desc":"向外广播信号，结束所在分支的执行"},"verticalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"errorBoundaryInterrputingEvent":{"desc":"捕获活动内部抛出的错误信息，中断正常流程，触发错误处理流程"},"endEvent":{"desc":"结束所在分支的执行"},"serviceTask":{"desc":"使用Web服务或自动化应用的任务"},"exclusiveGateway":{"desc":""},"startEvent":{"desc":"触发流程的执行"},"receiveTask":{"desc":"等待并接受外部参与者发送的消息，消息接受完毕则任务执行完毕"},"signalStartEvent":{"desc":"接收信息，并触发流程的执行"},"messageIntermediateCatchEvent":{"desc":"捕获到特定消息后，该事件被触发，流程继续向后执行"},"messageIntermediateThrowingEvent":{"desc":"向其他参与方发送消息后，流程继续向后执行"},"signalIntermediateCatchEvent":{"desc":"捕获到其他参与方广播的信号后，该事件被触发，流程继续向后执行"},"errorEndEvent":{"desc":"错误结束事件"},"horizontalLane":{"desc":"对泳池里的流程元素的进行组织和分类"},"group":{"desc":"对元素进行分类，不影响流程的执行"},"scriptTask":{"desc":"定义一段执行脚本，由流程引擎执行，脚本执行完毕则任务执行完毕"},"businessRuleTask":{"desc":"调用业务规则引擎进行数据的计算并获得计算结果"},"manualTask":{"desc":"没有任何流程引擎和应用程序协助的纯手工任务"},"signalBoundaryInterrputingEvent":{"desc":"捕获特定信号，中断正常流程，触发异常处理流程"},"verticalPool":{"desc":"包含多个泳道，对元素进行区分"},"compensationBoundaryInterrputingEvent":{"desc":"捕获活动内部抛出的补偿信息，中断正常流程，触发执行补偿活动"},"userTask":{"desc":"在应用程序的协助下，由人工完成的任务"},"terminateEndEvent":{"desc":"结束所有分支的执行"},"messageStartEvent":{"desc":"接收消息，并触发流程的执行"},"messageEndEvent":{"desc":"向其他参与方发送消息，结束所在分支的执行"},"sendTask":{"desc":"向外部参与者发送消息，消息发送完毕则任务执行完毕"},"messageBoundaryInterrputingEvent":{"desc":"捕获特定消息，中断正常流程，触发异常处理流程"},"transaction":{"desc":"遵循特定事务规约的一系列活动"},"timerIntermediateCatchEvent":{"desc":"到达某个特定时间/日期后，触发该事件，流程继续向后执行"}},"org.normal":{"role":{"desc":"一般用于表示执行某一流程步骤的流程角色"},"organization":{"desc":"描述企业内部固定的组织单位"},"position":{"desc":"描述企业内部各部门的实际岗位"},"employee":{"desc":"表示企业的具体员工"}}}
false
-
-
-
- {"default":{"code":"","color":"#FFB718"},"process.businessLevel":{"code":"","color":"#FFB718"},"process.businessArea":{"code":"","color":"#FFB718"},"process.processGroup":{"code":"","color":"#FFB718"},"control.kpi":{"code":"","color":"#ff9421"},"control.ma":{"code":"","color":"#ff9421"},"control.policy":{"code":"","color":"#009b52"},"control.risk":{"code":"","color":"#dc4f39"},"data.form":{"code":"","color":"#009b52"},"itsystem.normal":{"code":"","color":"#4E7FF9"},"org.normal":{"code":"","color":"#ff9421"},"process.bpmn2":{"code":"","color":"#4E7FF9"},"process.evc":{"code":"","color":"#4E7FF9"}}
+
+
+
+ {"default":{"code":"","color":"#FFB718"},"process.businessLevel":{"code":"","color":"#FFB718"},"process.businessArea":{"code":"","color":"#FFB718"},"process.processGroup":{"code":"","color":"#FFB718"},"process.scheme":{"code":"","color":"#ff9421"},"control.kpi":{"code":"","color":"#ff9421"},"control.ma":{"code":"","color":"#ff9421"},"control.policy":{"code":"","color":"#009b52"},"engineering.standard":{"code":"","color":"#009b52"},"control.risk":{"code":"","color":"#dc4f39"},"data.form":{"code":"","color":"#009b52"},"itsystem.normal":{"code":"","color":"#4E7FF9"},"org.normal":{"code":"","color":"#ff9421"},"process.bpmn2":{"code":"","color":"#4E7FF9"},"process.evc":{"code":"","color":"#4E7FF9"}}
diff --git a/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.attribute.custom.xml
new file mode 100644
index 00000000..7b3f40a8
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.attribute.custom.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.attribute.custom.xml_bak b/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.attribute.custom.xml_bak
new file mode 100644
index 00000000..b6311f45
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.attribute.custom.xml_bak
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.attribute.xml b/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.attribute.xml
new file mode 100644
index 00000000..42bccf62
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.attribute.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.import.xml b/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.import.xml
new file mode 100644
index 00000000..6bdc39a7
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.import.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.linker.xml b/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.linker.xml
new file mode 100644
index 00000000..f1ecdbe3
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.linker.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.schema.tpl b/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.schema.tpl
new file mode 100644
index 00000000..1c5548fa
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/engineering.standard/diagram.schema.tpl
@@ -0,0 +1,40 @@
+/**
+ * Engineering
+ */
+
+Schema.addCategory({
+ name: "engineering_standard",
+ text: "工程技术标准",
+ dataAttributes: []
+});
+/* Regulation*/
+Schema.addShape({name:"regulation", title:"工程技术标准",text:"工程技术标准", category:"engineering_standard",lineStyle:{lineWidth: 1}, props:{w:150, h:66}, anchors:[
+ {x:"w*0.5", y:"0"},
+ {x:"w", y:"h*0.5"},
+ {x:"w*0.5", y:"h-Math.min(h/8,w/12)"},
+ {x:"0", y:"h*0.5"}
+], textBlock:{x:"0", y:"0", w:"w", h:"h*0.9"},textBlockFinal:{x:"w/2-60", y:"h", w:"120", h:"30"}, path:[
+ {actions:[
+ {action:"move", x:"0", y:"h-Math.min(h/8,w/12)"},
+ {action:"line", x:"0", y:"0"},
+ {action:"line", x:"w", y:"0"},
+ {action:"line", x:"w", y:"h-Math.min(h/8,w/12)"},
+ {action:"quadraticCurve", x1:"w*0.75", y1:"h-3*Math.min(h/8,w/12)", x:"w*0.5", y:"h-Math.min(h/8,w/12)"},
+ {action:"quadraticCurve", x1:"w*0.25", y1:"h+Math.min(h/8,w/12)", x:"0", y:"h-Math.min(h/8,w/12)"},
+ {action:"close"}
+ ]},
+ {actions:[
+ {action:"move",x:"w", y:"h*0.4"},
+ {action:"line",x:"w*0.76",y:"h-2*Math.min(h/8,w/12)"}
+ ]},
+ {lineStyle:{lineStyle:"none"}, fillStyle:{type:"none"}, actions:[
+ {action:"move", x:"0", y:"h-Math.min(h/8,w/12)"},
+ {action:"line", x:"0", y:"0"},
+ {action:"line", x:"w", y:"0"},
+ {action:"line", x:"w", y:"h-Math.min(h/8,w/12)"},
+ {action:"quadraticCurve", x1:"w*0.75", y1:"h-3*Math.min(h/8,w/12)", x:"w*0.5", y:"h-Math.min(h/8,w/12)"},
+ {action:"quadraticCurve", x1:"w*0.25", y1:"h+Math.min(h/8,w/12)", x:"0", y:"h-Math.min(h/8,w/12)"},
+ {action:"close"}
+ ]}
+]});
+
diff --git a/com.actionsoft.apps.coe.pal/method/engineering.standard/fragment/abc.tpl b/com.actionsoft.apps.coe.pal/method/engineering.standard/fragment/abc.tpl
new file mode 100644
index 00000000..f13845d4
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/engineering.standard/fragment/abc.tpl
@@ -0,0 +1,3 @@
+
diff --git a/com.actionsoft.apps.coe.pal/method/engineering.standard/fragment/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/engineering.standard/fragment/diagram.attribute.custom.xml
new file mode 100644
index 00000000..1e0ea495
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/engineering.standard/fragment/diagram.attribute.custom.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/engineering.standard/fragment/diagram.attribute.xml b/com.actionsoft.apps.coe.pal/method/engineering.standard/fragment/diagram.attribute.xml
new file mode 100644
index 00000000..42bccf62
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/engineering.standard/fragment/diagram.attribute.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/method/cache/PALMethodCache.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/method/cache/PALMethodCache.java
index 0b42092c..dac1dadc 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/method/cache/PALMethodCache.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/method/cache/PALMethodCache.java
@@ -131,7 +131,7 @@ public class PALMethodCache {
} else {
List result = new ArrayList<>();
//String[] methodArray = new String[] { "process", "org", "data", "itsystem", "control" };
- String[] methodArrays = new String[] { "process","data","control","org","itsystem"};
+ String[] methodArrays = new String[] { "process","data","control","org","itsystem","engineering"};
for (String method : methodArrays) {
if (list.contains(method)) {
result.add(method);
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
index 96fb1d0e..0ed00a6c 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
@@ -4202,6 +4202,7 @@ public class CoeDesignerWeb extends ActionWeb {
lastplModel.setCreateDate(nowTime);
lastplModel.setModifyUser(uid);
lastplModel.setModifyDate(nowTime);
+
//密级
lastplModel.setSecurityLevel(-1);
int store = 0;
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/plugin/StartListener.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/plugin/StartListener.java
index b4599aed..eb5e1aa2 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/plugin/StartListener.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/plugin/StartListener.java
@@ -289,6 +289,11 @@ public class StartListener implements AppListener{
MethodAppManager.register("control.ma", appContext, "control.ma", "L1-L3流程绩效指标");
+
+ //新增engineering.standard by zhaolei
+ MethodAppManager.register("engineering.standard", appContext, "engineering.standard", "工程技术标准");
+
+
//新增process.scheme by zhaolei
MethodAppManager.register("process.scheme", appContext, "process.scheme", "方案图");