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 d60e42eb..439b1498 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/output/OutputAPIManager.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutputAPIManager.java index f131d677..8a2bf72c 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutputAPIManager.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutputAPIManager.java @@ -137,7 +137,7 @@ public class OutputAPIManager { DCPluginProfile dcProfile = SDK.getDCAPI().getDCProfile(appProfile.getAppContext().getId(), OutputConst.EXT_APP_DC_OUTPUT); if (dcProfile == null) throw new AWSException("Not Find DCProfile! repositoryName=" + OutputConst.EXT_APP_DC_OUTPUT); - DCContext dcContext = new DCContext(null, dcProfile, appProfile.getAppContext().getId(), wsId, id); + DCContext dcContext = new DCContext(null, dcProfile, appProfile.getAppContext().getId(), wsId, id.trim()); UtilFile file = new UtilFile(dcContext.getPath()); return file; } diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java index 079eff42..a3f9ff99 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java @@ -271,6 +271,8 @@ public class OutputWordUtil { controlShapeId = shape.get("id").toString(); } else if ("I/O_L4".equals(type)) { controlShapeId = shape.get("id").toString(); + } else if("card".equals(type)){ + controlShapeId = shape.get("id").toString(); } } } @@ -281,9 +283,7 @@ public class OutputWordUtil { Map result = new HashMap<>(); result.put("listDef", ""); result.put("content", ""); - if (UtilString.isEmpty(controlShapeId)) { - } PALRepositoryModel repositoryModel = PALRepositoryQueryAPIManager.getInstance().queryPalRepositoryModelByPalId(repositoryId); if (repositoryModel == null) {