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 de42c33e..f3a1ef48 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/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index a41f167e..cf9a5ff7 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 @@ -2666,25 +2666,40 @@ public class CoeProcessLevelWeb extends ActionWeb { input = "" + ""; }else if ("table".equals(type)){ - JSONObject table = JSON.parseObject(jsonValue); - int subTableSize = 0; - if (null != table){ - JSONArray subTable = table.getJSONArray("table"); - if (null != subTable){ - subTableSize = subTable.size(); - } - } - String tableInput = subTableSize > 1 ? "请查看" : "请输入"; + + //判断如果table不为准确json格式,则手动输入 + boolean falgtrue = getJSONType(jsonValue); String attrRef = attributeModel.getRef(); JSONObject refValue = JSON.parseObject(attrRef); String tableTitle = attributeModel.getTitle(); - input = "" - + "" - + "" - + " " - + "" - + ""; + if (falgtrue == true) { + JSONObject table = JSON.parseObject(jsonValue); + int subTableSize = 0; + if (null != table) { + JSONArray subTable = table.getJSONArray("table"); + if (null != subTable) { + subTableSize = subTable.size(); + } + } + String tableInput = subTableSize > 1 ? "请查看" : "请输入"; + + input = "" + + "" + + "" + + " " + + "" + + ""; + + } else { + input = "" + + "" + + "" + + " " + + "" + + ""; + } + } else { if (readonly) { @@ -2700,6 +2715,25 @@ public class CoeProcessLevelWeb extends ActionWeb { return map; } + + /** + * 判断是否为json格式 + * @param str + * @return + */ + public static boolean getJSONType(String str) { + boolean result = false; + if (StringUtils.isNotBlank(str)) { + str = str.trim(); + if (str.startsWith("{") && str.endsWith("}")) { + result = true; + } else if (str.startsWith("[") && str.endsWith("]")) { + result = true; + } + } + return result; + } + /** * 获取资产库节点的 json * diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js index 70e1998d..e993d941 100644 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js @@ -447,8 +447,8 @@ function openDialog(obj) { for ( let i = 1; i < dialogTable.length; i++) { let str = '