open
/
open-dbtool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、Excel优化

Browse Source 
Former-commit-id: 0b89bf711c336bc3af3548ce99aa69b582f2f449
master
王兵 5 years ago
parent fffcdcf9b6
commit bf62fde1d6
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File

24
src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java
Unescape View File

@ -101,20 +101,8 @@ public class XmlManager {
for (int j = 0; j < tables.getLength(); j++) { for (int j = 0; j < tables.getLength(); j++) {
Element tableElement = (Element) tables.item(j); Element tableElement = (Element) tables.item(j);
Table table = new Table(); 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"); NodeList fields = tableElement.getElementsByTagName("field");
if (fields.getLength() > 0) { if (fields.getLength() > 0) {
for (int k = 0; k < fields.getLength(); k++) { for (int k = 0; k < fields.getLength(); k++) {
Element fieldElement = (Element) fields.item(k); Element fieldElement = (Element) fields.item(k);
@ -132,6 +120,18 @@ public class XmlManager {
table.putField(field); 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); module.putTable(table);
} }
} }

6
src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java
Unescape View File

@ -560,7 +560,7 @@ public class WExcel<T> implements Serializable, Cloneable {
sheet.setColumnWidth(j + offset, (4 + column.getCellWidth()) * 256); sheet.setColumnWidth(j + offset, (4 + column.getCellWidth()) * 256);
if (column.getCellList() != null){ 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(); DataValidationHelper helper = sheet.getDataValidationHelper();
DataValidationConstraint constraint = helper.createExplicitListConstraint(column.getCellList()); DataValidationConstraint constraint = helper.createExplicitListConstraint(column.getCellList());
DataValidation dataValidation = helper.createValidation(constraint, cellRangeAddressList); DataValidation dataValidation = helper.createValidation(constraint, cellRangeAddressList);
@ -574,7 +574,7 @@ public class WExcel<T> implements Serializable, Cloneable {
dataValidation.setEmptyCellAllowed(true); dataValidation.setEmptyCellAllowed(true);
dataValidation.setShowPromptBox(true); dataValidation.setShowPromptBox(true);
dataValidation.createPromptBox("提示", "只能选择下拉框里面的数据"); dataValidation.createPromptBox("提示", "请选择下拉框里面的数据");
sheet.addValidationData(dataValidation); sheet.addValidationData(dataValidation);
} }
} }
@ -599,7 +599,7 @@ public class WExcel<T> implements Serializable, Cloneable {
// 添加错误信息详细说明 // 添加错误信息详细说明
Cell errsCell = row.createCell(1); Cell errsCell = row.createCell(1);
errsCell.setCellStyle(new ErrorCellStyle(workbook).getStyle()); errsCell.setCellStyle(new ErrorCellStyle(workbook).getStyle());
String join = String.join(";", errorList); String join = String.join("\n", errorList);
errsCell.setCellValue(new XSSFRichTextString(join)); errsCell.setCellValue(new XSSFRichTextString(join));
} else { } else {
// 添加结果 // 添加结果

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.