From bf62fde1d6c5001811f7640cb5bdb4e229dd970e Mon Sep 17 00:00:00 2001 From: wangbing Date: Thu, 27 Feb 2020 00:52:00 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81Excel=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 0b89bf711c336bc3af3548ce99aa69b582f2f449 --- .../dbtool/javafx/manger/XmlManager.java | 24 +++++++++---------- .../SpringBoot/java/frame/excel/WExcel.java | 6 ++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java index 6bee96a7..7e1e209c 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java @@ -101,20 +101,8 @@ public class XmlManager { for (int j = 0; j < tables.getLength(); j++) { Element tableElement = (Element) tables.item(j); Table table = new Table(); - table.setdBhandle(module); - table.setTableName(tableElement.getAttribute("tableName")); - table.setTableComment(tableElement.getAttribute("tableComment")); - table.setCreate(getBoolean(tableElement.getAttribute("create"))); - table.setDelete(getBoolean(tableElement.getAttribute("delete"))); - table.setUpdate(getBoolean(tableElement.getAttribute("update"))); - table.setFind(getBoolean(tableElement.getAttribute("find"))); - table.setGet(getBoolean(tableElement.getAttribute("get"))); - table.setSearch(getBoolean(tableElement.getAttribute("search"))); - table.setHtml(getBoolean(tableElement.getAttribute("html"))); - table.setSys(getBoolean(tableElement.getAttribute("sys"))); NodeList fields = tableElement.getElementsByTagName("field"); - if (fields.getLength() > 0) { for (int k = 0; k < fields.getLength(); k++) { Element fieldElement = (Element) fields.item(k); @@ -132,6 +120,18 @@ public class XmlManager { table.putField(field); } } + table.setdBhandle(module); + table.setTableName(tableElement.getAttribute("tableName")); + table.setTableComment(tableElement.getAttribute("tableComment")); + table.setCreate(getBoolean(tableElement.getAttribute("create"))); + table.setDelete(getBoolean(tableElement.getAttribute("delete"))); + table.setUpdate(getBoolean(tableElement.getAttribute("update"))); + table.setFind(getBoolean(tableElement.getAttribute("find"))); + table.setGet(getBoolean(tableElement.getAttribute("get"))); + table.setSearch(getBoolean(tableElement.getAttribute("search"))); + table.setHtml(getBoolean(tableElement.getAttribute("html"))); + table.setSys(getBoolean(tableElement.getAttribute("sys"))); + module.putTable(table); } } diff --git a/src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java b/src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java index 98ececb2..3ffc24df 100644 --- a/src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java +++ b/src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java @@ -560,7 +560,7 @@ public class WExcel implements Serializable, Cloneable { sheet.setColumnWidth(j + offset, (4 + column.getCellWidth()) * 256); if (column.getCellList() != null){ - CellRangeAddressList cellRangeAddressList = new CellRangeAddressList(1, 65535, j, j); + CellRangeAddressList cellRangeAddressList = new CellRangeAddressList(1, 65535, j+offset, j+offset); DataValidationHelper helper = sheet.getDataValidationHelper(); DataValidationConstraint constraint = helper.createExplicitListConstraint(column.getCellList()); DataValidation dataValidation = helper.createValidation(constraint, cellRangeAddressList); @@ -574,7 +574,7 @@ public class WExcel implements Serializable, Cloneable { dataValidation.setEmptyCellAllowed(true); dataValidation.setShowPromptBox(true); - dataValidation.createPromptBox("提示", "只能选择下拉框里面的数据"); + dataValidation.createPromptBox("提示", "请选择下拉框里面的数据"); sheet.addValidationData(dataValidation); } } @@ -599,7 +599,7 @@ public class WExcel implements Serializable, Cloneable { // 添加错误信息详细说明 Cell errsCell = row.createCell(1); errsCell.setCellStyle(new ErrorCellStyle(workbook).getStyle()); - String join = String.join(";", errorList); + String join = String.join("\n", errorList); errsCell.setCellValue(new XSSFRichTextString(join)); } else { // 添加结果