绩效回填代码调整

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java

@@ -169,7 +169,9 @@ public class UpfileWeb extends ActionWeb {
 				methodValueAttrsMap.put("Associated_process_name",parentpalModel.getName());
 
 				ro.put("methodValueAttrsMap",methodValueAttrsMap);
-			}
+			}else{
+                ro.put("methodValueAttrsMap","");
+            }
 
 
 

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java

@@ -5258,7 +5258,8 @@ public class CoeProcessLevelWeb extends ActionWeb {
 			newModel.setExt1(oldModel.getExt1());
 			newModel.setExt2(oldModel.getExt2());
 			newModel.setExt3(oldModel.getExt3());
-			newModel.setExt4(oldModel.getExt4());
+			//设置ext4不进行复制
+			newModel.setExt4("");
 			version++;
 			// 创建
 			try {
@@ -8548,9 +8549,6 @@ public class CoeProcessLevelWeb extends ActionWeb {
 
 				}
 
-
-
-
 				//复制文件属性
 				updateFileProperty(uuid,model.getId());
 
@@ -8562,7 +8560,6 @@ public class CoeProcessLevelWeb extends ActionWeb {
 					newElements.put(shapeObj.getString("id"), shapeObj);
 				}
 
-
 				definition.put("elements", newElements);
 
 				//如果点击跳转绩效模型执行获取来自跳转模型的数据，并获取名称
@@ -8597,6 +8594,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
 
 					this.handleShapeDefaultAttr(wsId, parentModel, newElements, methodAttrsMap);
 
+					//拿去流程数据填充绩效模型中数据属性
 					for (String key : newElements.keySet()) {
 						JSONObject shape1 = newElements.getJSONObject(key);
 						if ("linker".equals(shape1.getString("name"))) {

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.core.js

@@ -351,27 +351,28 @@ Model.create = function(l, h, j) {
 		var i = o.dataAttributes[k];
 		i.id = Utils.newId();
 		if (i.attributesJsonArray) {
-
-			//判断如果为流程跳转绩效模型，填充相应数据
-			var propertyInfoArray= new Array();
-			$.ajax({
-				type : "POST",
-				async : false,
-				url : "./jd?sid="
-					+ CLB.sid
-					+ "&cmd=com.actionsoft.apps.coe.pal_processlevel_getPerformance",
-				data : {
-					fileId : ruuid,
-					methodId: methodId
-				},
-				success : function(msg) {
-					if (msg.result == "ok") {
-						if(msg.data.methodValueAttrsMap!=''){
-							propertyInfoArray.push(msg.data.methodValueAttrsMap);
+			var propertyInfoArray = new Array();
+			if (methodId == "control.kpi") {
+				//判断如果为流程跳转绩效模型，填充相应数据
+				$.ajax({
+					type: "POST",
+					async: false,
+					url: "./jd?sid="
+						+ CLB.sid
+						+ "&cmd=com.actionsoft.apps.coe.pal_processlevel_getPerformance",
+					data: {
+						fileId: ruuid,
+						methodId: methodId
+					},
+					success: function (msg) {
+						if (msg.result == "ok") {
+							if (msg.data.methodValueAttrsMap != '') {
+								propertyInfoArray.push(msg.data.methodValueAttrsMap);
+							}
 						}
 					}
-				}
-			});
+				});
+			}
 			if (Model.define.localAttribute != undefined && Model.define.localAttribute[o.name] != undefined && Model.define.localAttribute[o.name] != null && Model.define.localAttribute[o.name].length > 0) {
 				for (var n in Model.define.localAttribute[o.name]) {
 					if(propertyInfoArray.length>0){

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js

@@ -1305,7 +1305,6 @@ function noPermissionMsg(){
 // 属性的动态切换
 
 function attributeShowTabContent(currentShape) {
-
 	// 属性弹出层显示的内容
 	var shape = Utils.getSelected()[0];
 	if (!shape) {