diff --git a/example/pom.xml b/example/pom.xml index e9d0fc86..4612ec05 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -59,7 +59,7 @@ com.github.liaochong myexcel - 4.3.3 + 4.5.2 org.apache.logging.log4j diff --git a/src/main/java/com/github/liaochong/myexcel/core/parser/HtmlTableParser.java b/src/main/java/com/github/liaochong/myexcel/core/parser/HtmlTableParser.java index 9bda35c1..aa0824e8 100644 --- a/src/main/java/com/github/liaochong/myexcel/core/parser/HtmlTableParser.java +++ b/src/main/java/com/github/liaochong/myexcel/core/parser/HtmlTableParser.java @@ -15,6 +15,7 @@ */ package com.github.liaochong.myexcel.core.parser; +import com.github.liaochong.myexcel.core.PromptContainer; import com.github.liaochong.myexcel.core.constant.Constants; import com.github.liaochong.myexcel.core.style.FontStyle; import com.github.liaochong.myexcel.utils.ImageUtil; @@ -233,11 +234,25 @@ private void parseTdOfTr(Tr tr, Element trElement, Map trStyle, this.setColumnWidth(colWidthMap, td); // 批注 this.setComment(tdElement, td); + // 提示 + this.setPrompt(tdElement, td); } tr.tdList = tdList; tr.colWidthMap = colWidthMap; } + private void setPrompt(Element tdElement, Td td) { + String title = tdElement.attr("prompt-title"); + String text = tdElement.attr("prompt-text"); + if (StringUtil.isBlank(title) || StringUtil.isBlank(text)) { + return; + } + PromptContainer promptContainer = new PromptContainer(); + promptContainer.title = title; + promptContainer.text = text; + td.promptContainer = promptContainer; + } + private void setComment(Element tdElement, Td td) { String commentText = tdElement.attr("comment-text"); String author = tdElement.attr("comment-author"); diff --git a/src/test/resources/templates/freemarkerToExcelExample.ftl b/src/test/resources/templates/freemarkerToExcelExample.ftl index c09e260b..d6ec00d3 100644 --- a/src/test/resources/templates/freemarkerToExcelExample.ftl +++ b/src/test/resources/templates/freemarkerToExcelExample.ftl @@ -20,12 +20,12 @@ 3,123.09 2
676878>.~ - 爱新觉罗·玄烨 + 爱新觉罗·玄烨 - 1 - 2 - 3 + 浙江,江西 + 南昌,杭州,宁波 + 上城区,下城区,弋阳,横峰 百度链接