Merge branch 'main' into feature/ut-refactor

Author: alaahong

.github/workflows/ci-docs.yml

@@ -21,56 +21,25 @@ on:
   pull_request:
     paths:
       - 'website/**'
-      - '**/*.md'
 
 jobs:
-  lint-and-build:
+  build-and-lint:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Install markdownlint-cli2
-        run: npm install -g markdownlint-cli2
-
-      - name: Run markdownlint
-        id: lint
-        run: |
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
-            CHANGED_MD=$(git diff --name-only origin/${{ github.event.pull_request.base.ref }}...${{ github.event.pull_request.head.ref }} | grep -E '\.md$' || true)
-          else
-            CHANGED_MD=$(git diff-tree --no-commit-id --name-only -r ${{ github.sha }} | grep -E '\.md$' || true)
-          fi
-          if [ -n "$CHANGED_MD" ]; then
-            markdownlint-cli2 "$CHANGED_MD" --config website/.markdownlint-cli2.jsonc > lint-result.txt || true
-            if [ -s lint-result.txt ]; then
-              echo "Lint failed."
-              # Output non-compliant file contents to comment-body.txt
-              for file in $CHANGED_MD; do
-                echo "\n---\n**$file Content:**\n" >> comment-body.txt
-                echo '\n```markdown' >> comment-body.txt
-                cat "$file" >> comment-body.txt
-                echo '\n```' >> comment-body.txt
-              done
-              echo "\n---\n**Lint Results:**\n" >> comment-body.txt
-              cat lint-result.txt >> comment-body.txt
-              exit 1
-            fi
-          else
-            echo "No markdown files changed, skipping lint."
-          fi
-
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
           version: 8
           run_install: false
 
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
       - name: Enable corepack
         working-directory: website
         run: npm i -g --force corepack && corepack enable
@@ -82,3 +51,9 @@ jobs:
       - name: Build website
         working-directory: website
         run: pnpm build
+
+      - name: Lint markdown files
+        uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e
+        with:
+          globs: 'website/**/*.md'
+          config: 'website/.markdownlint-cli2.jsonc'

fesod/src/main/java/org/apache/fesod/sheet/metadata/csv/CsvCellStyle.java

@@ -19,17 +19,20 @@
 
 package org.apache.fesod.sheet.metadata.csv;
 
+import java.util.EnumMap;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.fesod.sheet.metadata.data.DataFormatData;
 import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.CellPropertyType;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Color;
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.util.CellUtil;
 
 /**
  * csv cell style
@@ -279,4 +282,12 @@ public void setShrinkToFit(boolean shrinkToFit) {}
     public boolean getShrinkToFit() {
         return false;
     }
+
+    @Override
+    public EnumMap<CellPropertyType, Object> getFormatProperties() {
+        return CellUtil.getFormatProperties(this);
+    }
+
+    @Override
+    public void invalidateCachedProperties() {}
 }

fesod/src/main/java/org/apache/fesod/sheet/write/metadata/fill/AnalysisCell.java

@@ -20,7 +20,6 @@
 package org.apache.fesod.sheet.write.metadata.fill;
 
 import java.util.List;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.fesod.sheet.enums.WriteTemplateAnalysisCellTypeEnum;
@@ -32,7 +31,6 @@
  **/
 @Getter
 @Setter
-@EqualsAndHashCode
 public class AnalysisCell {
     private int columnIndex;
     private int rowIndex;

pom.xml

@@ -53,7 +53,7 @@
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <maven.test.skip>true</maven.test.skip>
         <commons-csv.version>1.11.0</commons-csv.version>
-        <poi.version>5.4.1</poi.version>
+        <poi.version>5.5.1</poi.version>
         <ehcache.version>3.9.11</ehcache.version>
         <commons-io.version>2.16.1</commons-io.version>
         <slf4j-api.version>1.7.36</slf4j-api.version>

website/docs/migration/from-fastexcel.md

@@ -44,6 +44,7 @@ Replace your existing dependency with Apache Fesod (Incubating):
 | **Apache Fesod (Incubating)** ✅ | org.apache.fesod | fesod | 1.3.0+ |
 
 **Maven:**
+
 ```xml
 <dependency>
     <groupId>org.apache.fesod</groupId>
@@ -53,6 +54,7 @@ Replace your existing dependency with Apache Fesod (Incubating):
 ```
 
 **Gradle:**
+
 ```gradle
 implementation 'org.apache.fesod:fesod:1.3.0'
 ```
@@ -101,23 +103,27 @@ Replace deprecated entry point classes with FesodSheet.
 Utilize the deprecated alias classes for a phased migration approach.
 
 **Phase 1: Dependency Update Only**
+
 - Update Maven/Gradle dependency to Apache Fesod (Incubating)
 - Keep using FastExcel classes (now deprecated aliases)
 - Update package imports only
 - Run comprehensive tests to verify compatibility
 
 **Phase 2: Class Name Migration**
+
 - Progressively replace deprecated classes with FesodSheet
 - Use IDE refactoring tools for bulk renaming
 - Migrate module by module or feature by feature
 - Maintain thorough test coverage throughout
 
 **Phase 3: Cleanup**
+
 - Remove all references to deprecated classes
 - Resolve deprecation warnings
 - Update documentation and code comments
 
 **Benefits:**
+
 - Lower risk through incremental changes
 - Easier rollback if issues arise
 - Minimal disruption to ongoing development

website/i18n/en/docusaurus-plugin-content-docs/current.json

@@ -26,5 +26,9 @@
   "sidebar.docs.category.fesod-sheet": {
     "message": "Fesod Sheet",
     "description": "The label for category fesod-sheet in sidebar docs"
+  },
+  "sidebar.docs.category.migration": {
+    "message": "Migration",
+    "description": "The label for category migration in sidebar docs"
   }
 }

website/i18n/zh-cn/docusaurus-plugin-content-docs/current.json

@@ -26,5 +26,9 @@
   "sidebar.docs.category.fesod-sheet": {
     "message": "Fesod Sheet",
     "description": "The label for category fesod-sheet in sidebar docs"
+  },
+  "sidebar.docs.category.migration": {
+    "message": "迁移",
+    "description": "The label for category migration in sidebar docs"
   }
 }

website/i18n/zh-cn/docusaurus-plugin-content-docs/current/migration/from-fastexcel.md

@@ -44,6 +44,7 @@ keywords: [fesod, 迁移, fastexcel, apache, excel, 升级]
 | **Apache Fesod (Incubating)** ✅    | org.apache.fesod | fesod      | 1.3.0+ |
 
 **Maven 配置:**
+
 ```xml
 <dependency>
     <groupId>org.apache.fesod</groupId>
@@ -53,6 +54,7 @@ keywords: [fesod, 迁移, fastexcel, apache, excel, 升级]
 ```
 
 **Gradle 配置:**
+
 ```gradle
 implementation 'org.apache.fesod:fesod:1.3.0'
 ```
@@ -101,23 +103,27 @@ implementation 'org.apache.fesod:fesod:1.3.0'
 利用已废弃的别名类进行分阶段迁移。
 
 **阶段 1: 仅更新依赖**
+
 - 将 Maven/Gradle 依赖更新为 Apache Fesod (Incubating)
 - 继续使用 FastExcel 类(现为已废弃的别名)
 - 仅更新包导入
 - 运行全面测试以验证兼容性
 
 **阶段 2: 类名迁移**
+
 - 逐步将已废弃的类替换为 FesodSheet
 - 使用 IDE 重构工具进行批量重命名
 - 逐个模块或逐个功能进行迁移
 - 在整个过程中保持全面的测试覆盖
 
 **阶段 3: 清理**
+
 - 删除所有对已废弃类的引用
 - 解决废弃警告
 - 更新文档和代码注释
 
 **优势:**
+
 - 通过增量更改降低风险
 - 如果出现问题更容易回滚
 - 对正在进行的开发影响最小