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 1fc85570..b4d07e39 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/src/com/actionsoft/apps/coe/pal/CoEPALController.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
index 91f51183..7970fa14 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
@@ -353,9 +353,6 @@ public class CoEPALController {
@Mapping("com.actionsoft.apps.coe.pal_pl_manage_method_attr_add_or_update_save")
public String coePalPlManageMainAttrSave(UserContext me, String methodId, boolean isCreate, String key, String title, String type, String ref, String value, boolean readonly, String groupPath, boolean isValid, String scope, boolean bpmFileShow, boolean bpmShapeShow, String desc, boolean isRequired) {
PalManageWeb web = new PalManageWeb(me);
- if ("relation".equals(type) || "awsorg".equals(type)) {// 关联类型限定只读
- readonly = true;
- }
return web.saveCoePalPlManageAttr(methodId, isCreate, key, title, type, ref, value, readonly, groupPath, isValid, scope, bpmFileShow, bpmShapeShow, desc, isRequired);
}
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/method/PalManageWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/method/PalManageWeb.java
index ebcaa0c2..e263ffd5 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/method/PalManageWeb.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/method/PalManageWeb.java
@@ -1148,11 +1148,6 @@ public class PalManageWeb extends ActionWeb {
break;
}
}
- if ((!readonly && updateModel.getReadonly()) || (readonly && !updateModel.getReadonly())) {// 修改了是否只读
- if ("relation".equals(updateModel.getType()) || "awsorg".equals(updateModel.getType())) {// 关联类型限定只读
- return ResponseObject.newWarnResponse("关联类型限定[只读]，不允许修改该项").toString();
- }
- }
if (updateModel != null) {
return saveCoePalPlManageAttr(methodId, false, key, updateModel.getTitle(), updateModel.getType(), updateModel.getRef(), updateModel.getValue(), readonly, updateModel.getGroupPath(), isValid, updateModel.getScope(), updateModel.getBpmFileShow() == null ? false : updateModel.getBpmFileShow(), updateModel.getBpmShapeShow() == null ? false : updateModel.getBpmShapeShow(),updateModel.getDesc()==null ? "" : updateModel.getDesc(),isRequired);
}
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 33822d74..930eecc0 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
@@ -2924,16 +2924,16 @@ public class CoeProcessLevelWeb extends ActionWeb {
}
} else if ("relation".equals(type)) {// 关联pal模型文件、形状
JSONObject refObj = JSONObject.parseObject(attributeModel.getRef());
- event = "readonly='readonly' relationFileId=\"" + fileId + "\" relationShapeId=\"" + shapeId + "\" groupPath=\"" + attributeModel.getGroupPath() + "\" ref=" + refObj + " onclick=\"openRelationDialog($(this), 'saveContent')\"";
- input = "";
+ event = "relationFileId=\"" + fileId + "\" relationShapeId=\"" + shapeId + "\" groupPath=\"" + attributeModel.getGroupPath() + "\" ref=" + refObj + " onclick=\"openRelationDialog($(this), 'saveContent')\"";
+ input = "";
} else if ("awsorg".equals(type)) {// 关联bpm组织架构
JSONObject refObj = JSONObject.parseObject(attributeModel.getRef());
- event = "readonly='readonly' data-value=" + dataArr + " groupPath=\"" + attributeModel.getGroupPath() + "\" ref=" + refObj + " onclick=\"openRelationAwsorgDialog($(this))\"";
+ event = "data-value=" + dataArr + " groupPath=\"" + attributeModel.getGroupPath() + "\" ref=" + refObj + " onclick=\"openRelationAwsorgDialog($(this))\"";
List jsonObjectList = dataArr.toJavaList(JSONObject.class);
String result = jsonObjectList.stream()
.map(jsonObject -> jsonObject.getString("name")) // 将每个JSONObject映射为其name字段的值
.collect(Collectors.joining(","));
- input = "";
+ input = "";
} else if (!readonly && "DateTimePicker".equals(type)) {
input = "" + "";
} else if ("table".equals(type)) {
@@ -11833,7 +11833,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
} else if ("relation".equals(type)) {
JSONObject refObj = JSONObject.parseObject(attributeModel.getRef());
obj.put("ref", refObj);
- obj.put("readonly", fileReadonly);
+ obj.put("readonly", fileReadonly || xmlReadonly);
List list = DesignerShapeRelationCache.getListByAttrId(id, "", property.getPropertyId());
if (list != null && list.size() > 0) {
// 判断是否有重复数据，进行重复过滤
@@ -11878,7 +11878,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
} else if ("awsorg".equals(type)) {
JSONObject refObj = JSONObject.parseObject(attributeModel.getRef());
obj.put("ref", refObj);
- obj.put("readonly", fileReadonly);
+ obj.put("readonly", fileReadonly || xmlReadonly);
List list = DesignerShapeRelationCache.getListByAttrId(id, "", property.getPropertyId());
if (list != null && list.size() > 0) {
List departmentModelList = new ArrayList<>();
diff --git a/com.actionsoft.apps.coe.pal/template/page/main.htm b/com.actionsoft.apps.coe.pal/template/page/main.htm
index 39d51226..db078de6 100644
--- a/com.actionsoft.apps.coe.pal/template/page/main.htm
+++ b/com.actionsoft.apps.coe.pal/template/page/main.htm
@@ -13,4 +13,4 @@
var mainType = "<#mainType>";
var uid = "<#uid>";
var wHref = "./w";
- var jdHref = "./jd";