diff --git a/com.actionsoft.apps.coe.pal/i18n/resource.xml b/com.actionsoft.apps.coe.pal/i18n/resource.xml
index 1c4ef271..70939210 100755
--- a/com.actionsoft.apps.coe.pal/i18n/resource.xml
+++ b/com.actionsoft.apps.coe.pal/i18n/resource.xml
@@ -56,6 +56,11 @@
+ -
+
+
+
+
-
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 c8fe1302..1a8f6361 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/method/process.scheme/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.attribute.custom.xml
new file mode 100644
index 00000000..a9e55197
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.attribute.custom.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.attribute.xml b/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.attribute.xml
new file mode 100644
index 00000000..42bccf62
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.attribute.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.import.xml b/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.import.xml
new file mode 100644
index 00000000..6bdc39a7
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.import.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.linker.xml b/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.linker.xml
new file mode 100644
index 00000000..f1ecdbe3
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.linker.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.schema.tpl b/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.schema.tpl
new file mode 100644
index 00000000..3259906d
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/process.scheme/diagram.schema.tpl
@@ -0,0 +1,53 @@
+/**
+ * Scheme
+ */
+
+Schema.addCategory({
+ name: "process_scheme",
+ text: "方案图",
+ dataAttributes: []
+});
+/***纸牌:Card*/Schema.addShape({name:"card", title:"方案", text:"方案", category:"process_scheme", props:{w:100, h:70}, path:[
+ {actions:[
+ {action:"move", x:"0", y:"Math.min(h/2,w/4)"},
+ {action:"line", x:"Math.min(h/2,w/4)", y:"0"},
+ {action:"line", x:"w", y:"0"},
+ {action:"line", x:"w", y:"h"},
+ {action:"line", x:"0", y:"h"},
+ {action:"line", x:"0", y:"Math.min(h/2,w/4)"},
+ {action:"close"}
+ ]}
+]});
+
+/*Item*/
+Schema.addShape({name:"item1", title:"正文",text:"正文", category:"process_scheme", lineStyle:{lineWidth: 1},
+props:{w:220, h:50}, textBlock:{x:"w*0.1", y:"2", w:"(w-Math.min(h/2,w/6))*0.8", h:"h-2"},textBlockFinal:{x:"w/2-60", y:"h", w:"120", h:"30"}, anchors:[
+ {x:"w*0.5", y:"0"},
+ {x:"w-Math.min(h/2,w/6)", y:"h*0.5"},
+ {x:"w*0.5", y:"h"},
+ {x:"0", y:"h*0.5"}
+],path:[
+ {actions:[
+ {action:"move", x:"0", y:"0"},
+ {action:"line", x:"w", y:"0"},
+ {action:"line", x:"w-Math.min(h/2,w/6)", y:"h*0.5"},
+ {action:"line", x:"w", y:"h"},
+ {action:"line", x:"0", y:"h"},
+ {action:"line", x:"0", y:"0"},
+ {action:"close"}
+ ]}
+]});
+
+
+/***胶囊型:Terminator*/Schema.addShape({name:"item2", title:"条款", text:"条款", category:"process_scheme",lineStyle:{lineWidth: 1},
+ props:{w:220, h:50},textBlock:{x:"Math.min(w,h)/3", y:"2", w:"w-(Math.min(w,h)/3)*2", h:"h-2"}, path:[
+ {actions:[
+ {action:"move", x:"Math.min(w,h)/3+5", y:"0"},
+ {action:"line", x:"w-Math.min(w,h)/3-5", y:"0"},
+ {action:"curve", x1:"w+Math.min(w,h)/3/3", y1:"0", x2:"w+Math.min(w,h)/3/3", y2:"h", x:"w-Math.min(w,h)/3-5", y:"h"},
+ {action:"line", x:"Math.min(w,h)/3+5", y:"h"},
+ {action:"curve", x1:"-Math.min(w,h)/3/3", y1:"h", x2:"-Math.min(w,h)/3/3", y2:"0", x:"Math.min(w,h)/3+5", y:"0"},
+ {action:"close"}
+ ]}
+
+]});
diff --git a/com.actionsoft.apps.coe.pal/method/process.scheme/fragment/abc.tpl b/com.actionsoft.apps.coe.pal/method/process.scheme/fragment/abc.tpl
new file mode 100644
index 00000000..f13845d4
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/process.scheme/fragment/abc.tpl
@@ -0,0 +1,3 @@
+
diff --git a/com.actionsoft.apps.coe.pal/method/process.scheme/fragment/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/process.scheme/fragment/diagram.attribute.custom.xml
new file mode 100644
index 00000000..1e0ea495
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/process.scheme/fragment/diagram.attribute.custom.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/process.scheme/fragment/diagram.attribute.xml b/com.actionsoft.apps.coe.pal/method/process.scheme/fragment/diagram.attribute.xml
new file mode 100644
index 00000000..42bccf62
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/process.scheme/fragment/diagram.attribute.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
index b5b9aa20..42b8cc52 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
@@ -9044,8 +9044,8 @@ public class CoeProcessLevelWeb extends ActionWeb {
StringBuffer sb3=new StringBuffer();
StringBuffer sb4 = new StringBuffer();;
sb.append("质量校验
");
- sb1.append("文件属性:");
- //sb2.append("节点名称:");
+
+ /***************************************************文件属性校验*************************************************/
for (PALRepositoryPropertyModel property : propertys) {
String id = property.getPropertyId();
@@ -9072,12 +9072,16 @@ public class CoeProcessLevelWeb extends ActionWeb {
}
}
- /***************************************************数据属性校验*************************************************/
- if(flag1==false){
+
+ if(sb1.length()>0){
+ sb.append("文件属性:");
sb.append(sb1.substring(0, sb1.length()-1));
sb.append("未填写,请检查!").append("");
}
+
+ /***************************************************数据属性校验*************************************************/
+
Map methodAttributeModelMap = new HashMap<>();
// 校验形状
List elements = ShapeUtil.getShapeJsonToJsonObject(obj);
@@ -9092,8 +9096,6 @@ public class CoeProcessLevelWeb extends ActionWeb {
for (int i = 0; i < attributesJsonArray.size(); i++) {
-
-
JSONObject attr = attributesJsonArray.getJSONObject(i);
String attrId = attr.getString("id");
String value = attr.getString("value");
@@ -9112,7 +9114,6 @@ public class CoeProcessLevelWeb extends ActionWeb {
}
PALMethodAttributeModel attrModel = methodAttributeModelMap.get(shapeName + "-" + attrId);
if (attrModel.getIsRequired()) {// 筛选必填
- sb2=new StringBuffer();
String attrType = attrModel.getType();
if ("relation".equals(attrType) || "awsorg".equals(attrType)) {
List list = DesignerShapeRelationCache.getListByAttrId(model.getId(), shapeId, attrId);
@@ -9123,27 +9124,15 @@ public class CoeProcessLevelWeb extends ActionWeb {
flag2 = UtilString.isNotEmpty(value);
}
if (!flag2) {
- JSONObject tmp = new JSONObject();
- tmp.put("shapeId", shapeId);
- tmp.put("shapeName", text);
- tmp.put("attrName", attrModel.getNewTitle());
- tmp.put("attrId", attrId);
- resultList.add(tmp);
- sb2.append("''"+attrModel.getNewTitle()+"''").append(",");
+ sb2.append("节点名称:"+"【"+text+"】").append("''"+attrModel.getNewTitle()+"''").append("");
}
}
}
- if (!flag2) {
- sb4.append("节点名称:"+"【"+text+"】").append(sb2).append("");
- }
}
- System.out.println(resultList);
- ro.setData(resultList);
- if( flag2==false){
-
-
- sb.append(sb4.substring(0, sb4.length()-1));
+ if(sb2.length()>0){
+ sb.append("数据属性:");
+ sb.append(sb2.substring(0, sb2.length()-1));
sb.append("未填写,请检查!");
}
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 11c9ccee..b4599aed 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
@@ -288,6 +288,11 @@ public class StartListener implements AppListener{
//新增control.kpiMA by zhaolei
MethodAppManager.register("control.ma", appContext, "control.ma", "L1-L3流程绩效指标");
+
+ //新增process.scheme by zhaolei
+ MethodAppManager.register("process.scheme", appContext, "process.scheme", "方案图");
+
+
// MethodAppManager.register("product.normal", appContext);
MethodAppManager.register("itsystem.normal", appContext, "itsystem.normal", "itsystem建模方法");
MethodAppManager.register("control.policy", appContext, "control.policy", "policy建模方法");
@@ -434,8 +439,12 @@ public class StartListener implements AppListener{
//org.role 赵磊
handleCustomXml(methodPath + "org.role/" + customXmlName);
+ //process.scheme 赵磊
+ handleCustomXml(methodPath + "process.scheme/" + customXmlName);
- //control.kpiMA 赵磊
+
+
+ //control.kpiMA 赵磊
//handleCustomXml(methodPath + "control.kpiMA/" + customXmlName);
diff --git a/com.actionsoft.apps.coe.pal/template/page/main.htm b/com.actionsoft.apps.coe.pal/template/page/main.htm
index 2047931b..6dc97910 100644
--- a/com.actionsoft.apps.coe.pal/template/page/main.htm
+++ b/com.actionsoft.apps.coe.pal/template/page/main.htm
@@ -4,7 +4,7 @@
var notificationSoundTips = false; // 是否开启消息到达声音提醒
var notificationMsgLoadFrequency = 60; // 通知消息检查频率
var isSecurityPwdChange = <#isSecurityPwdChange>; // 是否允许用户修改口令
- var forceChangePwd = false; // 默认口令验证,是否强制修改默认密码
+ var forceChangePwd = <#forceChangePwd>; // 默认口令验证,是否强制修改默认密码
var isSecurityPwdComplexity = <#isSecurityPwdComplexity>; // 密码强度
var securityMinPwdLength = <#securityMinPwdLength>; // 允许账户口令最小长度,0表示无限制
var securityMaxPwdLength = <#securityMaxPwdLength>; // 允许账户口令最大长度,最多32位长度
@@ -13,4 +13,4 @@
var mainType = "<#mainType>";
var uid = "<#uid>";
var wHref = "./w";
- var jdHref = "./jd";