Commit 2db8d964a7b693a57e962e21b27b100bba37ed42
1 parent
6ed4189b
Exists in
master
fix a bug about xlsx active tab calc
Showing
2 changed files
with
9 additions
and
6 deletions
Show diff stats
src/main/java/com/taover/easyexcel/analysis/v07/workbook/WorkbookAnalyserImpl.java
| 1 | package com.taover.easyexcel.analysis.v07.workbook; | 1 | package com.taover.easyexcel.analysis.v07.workbook; |
| 2 | 2 | ||
| 3 | +import java.io.BufferedReader; | ||
| 3 | import java.io.IOException; | 4 | import java.io.IOException; |
| 4 | import java.io.InputStream; | 5 | import java.io.InputStream; |
| 6 | +import java.io.InputStreamReader; | ||
| 7 | +import java.io.StringReader; | ||
| 5 | import java.util.ArrayList; | 8 | import java.util.ArrayList; |
| 6 | import java.util.List; | 9 | import java.util.List; |
| 7 | 10 | ||
| @@ -12,6 +15,7 @@ import org.w3c.dom.Document; | @@ -12,6 +15,7 @@ import org.w3c.dom.Document; | ||
| 12 | import org.w3c.dom.NamedNodeMap; | 15 | import org.w3c.dom.NamedNodeMap; |
| 13 | import org.w3c.dom.Node; | 16 | import org.w3c.dom.Node; |
| 14 | import org.w3c.dom.NodeList; | 17 | import org.w3c.dom.NodeList; |
| 18 | +import org.xml.sax.InputSource; | ||
| 15 | import org.xml.sax.SAXException; | 19 | import org.xml.sax.SAXException; |
| 16 | 20 | ||
| 17 | import com.taover.easyexcel.analysis.v07.metadata.WorkbookSheet; | 21 | import com.taover.easyexcel.analysis.v07.metadata.WorkbookSheet; |
| @@ -81,7 +85,7 @@ public class WorkbookAnalyserImpl implements WorkbookAnalyser { | @@ -81,7 +85,7 @@ public class WorkbookAnalyserImpl implements WorkbookAnalyser { | ||
| 81 | ++hiddenSheetNum; | 85 | ++hiddenSheetNum; |
| 82 | } | 86 | } |
| 83 | } | 87 | } |
| 84 | - this.activeTabIndex = hiddenSheetNum + activeTab - 1; | 88 | + this.activeTabIndex = hiddenSheetNum + activeTab; |
| 85 | } | 89 | } |
| 86 | } | 90 | } |
| 87 | 91 | ||
| @@ -129,6 +133,5 @@ public class WorkbookAnalyserImpl implements WorkbookAnalyser { | @@ -129,6 +133,5 @@ public class WorkbookAnalyserImpl implements WorkbookAnalyser { | ||
| 129 | return false; | 133 | return false; |
| 130 | } | 134 | } |
| 131 | return this.sheetList.get(sheetIndex).getState().equals(ATTR_STATE_V_HIDDEN); | 135 | return this.sheetList.get(sheetIndex).getState().equals(ATTR_STATE_V_HIDDEN); |
| 132 | - } | ||
| 133 | - | 136 | + } |
| 134 | } | 137 | } |
src/test/java/com/taover/easyexcel/test/demo/read/ReadTest.java
| @@ -280,12 +280,12 @@ public class ReadTest { | @@ -280,12 +280,12 @@ public class ReadTest { | ||
| 280 | for(String item: sonFileNameArr) { | 280 | for(String item: sonFileNameArr) { |
| 281 | try { | 281 | try { |
| 282 | LOGGER.info("======文件名称："+item+"======"); | 282 | LOGGER.info("======文件名称："+item+"======"); |
| 283 | - Map<Integer, List<Map<Integer, Object>>> listMap = EasyExcel.read(dirStr+item).headRowNumber(0).readHiddenRow(false).doReadAllSyncForMap(); | 283 | + List<Object> listMap = EasyExcel.read(dirStr+item).headRowNumber(0).readHiddenRow(false).doReadSelectedSync(); |
| 284 | // for (Map<Integer, String> data : listMap) { | 284 | // for (Map<Integer, String> data : listMap) { |
| 285 | // // 返回每条数据的键值对 表示所在的列 和所在列的值 | 285 | // // 返回每条数据的键值对 表示所在的列 和所在列的值 |
| 286 | // //LOGGER.info(">{}", JSON.toJSONString(data)); | 286 | // //LOGGER.info(">{}", JSON.toJSONString(data)); |
| 287 | // } | 287 | // } |
| 288 | - LOGGER.info(">SUCCESS{}", JSON.toJSONString(listMap)); | 288 | + LOGGER.info(">{}", JSON.toJSONString(listMap)); |
| 289 | }catch (Exception e) { | 289 | }catch (Exception e) { |
| 290 | e.printStackTrace(); | 290 | e.printStackTrace(); |
| 291 | } | 291 | } |
| @@ -304,6 +304,6 @@ public class ReadTest { | @@ -304,6 +304,6 @@ public class ReadTest { | ||
| 304 | 304 | ||
| 305 | public static void main(String args[]) { | 305 | public static void main(String args[]) { |
| 306 | ReadTest rt = new ReadTest(); | 306 | ReadTest rt = new ReadTest(); |
| 307 | - rt.synchronousRead(); | 307 | + rt.readTestSynchronousRead(); |
| 308 | } | 308 | } |
| 309 | } | 309 | } |