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 a9885d3d..21498fe8 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/PALRepositoryQueryAPIManager.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java index bdbcc64e..05f85b08 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java @@ -17,6 +17,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.actionsoft.bpms.util.*; import org.apache.commons.collections4.IteratorUtils; import org.apache.commons.lang.StringUtils; @@ -95,11 +96,6 @@ import com.actionsoft.bpms.server.UserContext; import com.actionsoft.bpms.server.fs.DCContext; import com.actionsoft.bpms.server.fs.dc.DCProfileManager; import com.actionsoft.bpms.server.fs.dc.DCUtil; -import com.actionsoft.bpms.util.Base64; -import com.actionsoft.bpms.util.DBSql; -import com.actionsoft.bpms.util.UUIDGener; -import com.actionsoft.bpms.util.UtilFile; -import com.actionsoft.bpms.util.UtilString; import com.actionsoft.exception.AWSException; import com.actionsoft.i18n.I18nRes; import com.actionsoft.sdk.local.SDK; @@ -4327,8 +4323,14 @@ public class PALRepositoryQueryAPIManager { Integer x = props.getInteger("x"); if (null != x && x > maxX) { maxX = x; - maxW = props.getInteger("w"); - maxY = props.getInteger("y"); + } + Integer y = props.getInteger("y"); + if (null != y && y > maxY) { + maxY = y; + } + Integer w = props.getInteger("w"); + if (null != w && w > maxW){ + maxW = w; } } } @@ -4349,6 +4351,7 @@ public class PALRepositoryQueryAPIManager { } elements.put(textShape.getString("id"), textShape); + ConsolePrinter.info("add empty text shape: shapeX: " + props.getIntValue("x") + " shapeY: " + props.getIntValue("y")); } } }