From bc88948e6e33726abd1b93fd88e0249ed9788902 Mon Sep 17 00:00:00 2001 From: zzs Date: Fri, 7 Mar 2025 15:14:38 +0800 Subject: [PATCH] feat: bookmark replace --- .../java/com/wmyun/farmwork/word/core/BookmarkExec.java | 9 +++++---- .../com/wmyun/farmwork/word/core/model/BookmarkInfo.java | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/BookmarkExec.java b/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/BookmarkExec.java index 049209f..d38e4d1 100644 --- a/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/BookmarkExec.java +++ b/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/BookmarkExec.java @@ -114,11 +114,11 @@ public class BookmarkExec { for (BookmarkInfo info : set) { queryBookmarkIdx(paragraph, info); - } - - BigInteger numID = paragraph.getNumID(); - if (numID != null) { + BigInteger numID = paragraph.getNumID(); + if (numID != null) { + info.setListMark(true); + } } return new ArrayList<>(set); @@ -176,6 +176,7 @@ public class BookmarkExec { } } + // 特殊处理书签结尾在段末尾的请情况,此时通过run的前一个节点获取不到end if (!foundEnd) { info.setEndIdx(runs.size()); } diff --git a/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/model/BookmarkInfo.java b/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/model/BookmarkInfo.java index c1c6fe9..58113b2 100644 --- a/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/model/BookmarkInfo.java +++ b/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/model/BookmarkInfo.java @@ -27,6 +27,9 @@ public class BookmarkInfo { // 中止run idx private int endIdx; + // 是否是列表 + private boolean listMark; + public BookmarkInfo(String bookmarkName, String bookmarkId) { this.bookmarkName = bookmarkName; this.bookmarkId = bookmarkId;