Browse Source

Merge pull request #1543 in BA/design from ~ZACK/design:9.0release to release/9.0

* commit '03677be8966141d8afa319e0d2c32708da30ec59':
  REPORT-5979 多次导入excel
superman 8 years ago
parent
commit
f57d9b07e7
  1. 1251
      designer/src/com/fr/design/webattr/EditToolBar.java
  2. 6
      designer/src/com/fr/design/webattr/ReportWebWidgetConstants.java

1251
designer/src/com/fr/design/webattr/EditToolBar.java

File diff suppressed because it is too large Load Diff

6
designer/src/com/fr/design/webattr/ReportWebWidgetConstants.java

@ -32,7 +32,7 @@ public class ReportWebWidgetConstants {
public static WidgetOption[] getWriteToolBarInstance() {
return new WidgetOption[]{SUBMIT, VERIFY, EMAIL, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, IMPORTEXCELDATA, SHOWCELLVALUE,
APPENDCOLUMNROW, DELETECOLUMNROW, SETPRINTEROFFSET, WRITEOFFLINEHTML, CUSTOM_BUTTON, WRITESTASH, WRITESTASHCLEAR, IMPORTEXCELDATA_CUSTOMIZED};
APPENDCOLUMNROW, DELETECOLUMNROW, SETPRINTEROFFSET, WRITEOFFLINEHTML, CUSTOM_BUTTON, WRITESTASH, WRITESTASHCLEAR, IMPORTEXCELDATA_CUSTOMIZED, IMPORTEXCEL};
}
public static WidgetOption[] getFormToolBarInstance() {
@ -148,5 +148,7 @@ public class ReportWebWidgetConstants {
// 数据清空
public static final WidgetOption WRITESTASHCLEAR = WidgetOptionFactory
.createByWidgetClass(Inter.getLocText("FR-Engine-Write_Clear"), BaseUtils.readIcon("/com/fr/web/images/edit/clearstash.png"), ClearStashedButton.class);
//Excel导入
public static final WidgetOption IMPORTEXCEL= WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Engine_Excel_Import_Repeat"),
BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelImport.class);
}
Loading…
Cancel
Save