diff --git a/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar b/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar index 084f4eba..0b7d3b13 100644 Binary files a/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar and b/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar differ diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java index a90a7db3..337841c3 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java +++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java @@ -1190,9 +1190,9 @@ public class ArisXmlImportRun { for (int i = 0; i < elements.size(); i++) { JSONObject shape = elements.getJSONObject(i); count++; - if (count % (shapeRowCount + 1) == 0) { + if (count % (shapeRowCount+1) == 0) { count = 1; - initY += 130; + initY += 90; // 换行 initX = 0; initX = pageEdge + initX; @@ -1205,14 +1205,14 @@ public class ArisXmlImportRun { } shape.put("dataAttributes", dataAttributes); } - int totalWidth = 240;// 每个节点总宽度,空白+节点+空白 + int totalWidth = 160;// 每个节点总宽度,空白+节点+空白 int totalHeight = 200;// 每个节点总高度,空白+节点+空白 int x = 0; int y = 0; int w = validateJson(shape.getJSONObject("props").getInteger("w")); int h = validateJson(shape.getJSONObject("props").getInteger("h")); - int leftBlankWidth = (totalWidth - w) / 2; - int topBlankHeight = (totalHeight - h) / 2; + int leftBlankWidth = (totalWidth - w)/2; + int topBlankHeight = (totalHeight - h)/2; x = initX + leftBlankWidth; initX = x + w + leftBlankWidth; y = initY + topBlankHeight;