test: 修复单测

antvis · Nov 7, 2024 · 8906b31 · 8906b31
1 parent 4287833
commit 8906b31
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 5 deletions.
diff --git a/packages/s2-core/__tests__/spreadsheet/__snapshots__/theme-spec.ts.snap b/packages/s2-core/__tests__/spreadsheet/__snapshots__/theme-spec.ts.snap
@@ -563,13 +563,17 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#3471F9",
+    "horizontalBorderColorOpacity": 0.2,
     "horizontalBorderWidth": 2,
     "shadowColors": Object {
       "left": "rgba(0,0,0,0.1)",
       "right": "rgba(0,0,0,0)",
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#5286FA",
+    "verticalBorderColorOpacity": 0.25,
     "verticalBorderWidth": 2,
   },
 }
@@ -1138,13 +1142,17 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#7899ff",
+    "horizontalBorderColorOpacity": 0.2,
     "horizontalBorderWidth": 2,
     "shadowColors": Object {
       "left": "rgba(0,0,0,0.1)",
       "right": "rgba(0,0,0,0)",
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#7899ff",
+    "verticalBorderColorOpacity": 0.25,
     "verticalBorderWidth": 2,
   },
 }
@@ -1713,13 +1721,17 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#326EF4",
+    "horizontalBorderColorOpacity": 0.2,
     "horizontalBorderWidth": 2,
     "shadowColors": Object {
       "left": "rgba(0,0,0,0.1)",
       "right": "rgba(0,0,0,0)",
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#326EF4",
+    "verticalBorderColorOpacity": 0.25,
     "verticalBorderWidth": 2,
   },
 }
@@ -2288,13 +2300,17 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#BAC1CC",
+    "horizontalBorderColorOpacity": 0.2,
     "horizontalBorderWidth": 2,
     "shadowColors": Object {
       "left": "rgba(0,0,0,0.1)",
       "right": "rgba(0,0,0,0)",
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#BAC1CC",
+    "verticalBorderColorOpacity": 0.25,
     "verticalBorderWidth": 2,
   },
 }
@@ -2863,13 +2879,17 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#326EF4",
+    "horizontalBorderColorOpacity": 0.2,
     "horizontalBorderWidth": 2,
     "shadowColors": Object {
       "left": "rgba(0,0,0,0.1)",
       "right": "rgba(0,0,0,0)",
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#326EF4",
+    "verticalBorderColorOpacity": 0.25,
     "verticalBorderWidth": 2,
   },
 }
@@ -3438,13 +3458,17 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#326EF4",
+    "horizontalBorderColorOpacity": 0.2,
     "horizontalBorderWidth": 2,
     "shadowColors": Object {
       "left": "rgba(0,0,0,0.1)",
       "right": "rgba(0,0,0,0)",
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#326EF4",
+    "verticalBorderColorOpacity": 0.25,
     "verticalBorderWidth": 2,
   },
 }

diff --git a/...-components/__tests__/unit/components/config/theme-panel/__snapshots__/utils-spec.ts.snap b/...-components/__tests__/unit/components/config/theme-panel/__snapshots__/utils-spec.ts.snap
@@ -563,6 +563,7 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#5184F6",
     "horizontalBorderColorOpacity": 1,
     "horizontalBorderWidth": 2,
     "shadowColors": Object {
@@ -571,6 +572,7 @@ Object {
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#5184F6",
     "verticalBorderColorOpacity": 1,
     "verticalBorderWidth": 2,
   },
@@ -1140,13 +1142,17 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#326EF4",
+    "horizontalBorderColorOpacity": 0.2,
     "horizontalBorderWidth": 2,
     "shadowColors": Object {
       "left": "rgba(0,0,0,0.1)",
       "right": "rgba(0,0,0,0)",
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#5184F6",
+    "verticalBorderColorOpacity": 0.25,
     "verticalBorderWidth": 2,
   },
 }
@@ -1715,13 +1721,17 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#396",
+    "horizontalBorderColorOpacity": 0.2,
     "horizontalBorderWidth": 2,
     "shadowColors": Object {
       "left": "rgba(0,0,0,0.1)",
       "right": "rgba(0,0,0,0)",
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#52A87D",
+    "verticalBorderColorOpacity": 0.25,
     "verticalBorderWidth": 2,
   },
 }
@@ -2290,13 +2300,17 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#326EF4",
+    "horizontalBorderColorOpacity": 0.2,
     "horizontalBorderWidth": 2,
     "shadowColors": Object {
       "left": "rgba(0,0,0,0.1)",
       "right": "rgba(0,0,0,0)",
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#326EF4",
+    "verticalBorderColorOpacity": 0.25,
     "verticalBorderWidth": 2,
   },
 }
@@ -2865,13 +2879,17 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#326EF4",
+    "horizontalBorderColorOpacity": 0.2,
     "horizontalBorderWidth": 2,
     "shadowColors": Object {
       "left": "rgba(0,0,0,0.1)",
       "right": "rgba(0,0,0,0)",
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#5184F6",
+    "verticalBorderColorOpacity": 0.25,
     "verticalBorderWidth": 2,
   },
 }
@@ -3440,13 +3458,17 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#B6C0D7",
+    "horizontalBorderColorOpacity": 0.2,
     "horizontalBorderWidth": 2,
     "shadowColors": Object {
       "left": "rgba(0,0,0,0.1)",
       "right": "rgba(0,0,0,0)",
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#B6C0D7",
+    "verticalBorderColorOpacity": 0.25,
     "verticalBorderWidth": 2,
   },
 }
@@ -4016,13 +4038,17 @@ Object {
   },
   "splitLine": Object {
     "borderDash": Array [],
+    "horizontalBorderColor": "#326EF4",
+    "horizontalBorderColorOpacity": 0.2,
     "horizontalBorderWidth": 0,
     "shadowColors": Object {
       "left": "rgba(0,0,0,0.1)",
       "right": "rgba(0,0,0,0)",
     },
     "shadowWidth": 8,
     "showShadow": true,
+    "verticalBorderColor": "#5184F6",
+    "verticalBorderColorOpacity": 0.25,
     "verticalBorderWidth": 0,
   },
 }

diff --git a/s2-site/docs/api/general/S2Theme.zh.md b/s2-site/docs/api/general/S2Theme.zh.md
@@ -113,11 +113,11 @@ s2.setTheme({
 
 | 参数                         | 说明                                                      | 类型                                   | 默认值                                                   | 必选 |
 | ---------------------------- | --------------------------------------------------------- | -------------------------------------- | -------------------------------------------------------- | ---- |
-| horizontalBorderColor        | 水平分割线颜色                                            | `string`                               | -                                                        |      |
-| horizontalBorderColorOpacity | 水平分割线颜色透明度                                      | `number`                               |  -                                                      |      |
+| horizontalBorderColor        | 水平分割线颜色                                            | `string`                               | `basicColors[12]`                                                        |      |
+| horizontalBorderColorOpacity | 水平分割线颜色透明度                                      | `number`                               |  0.2                                                      |      |
 | horizontalBorderWidth        | 水平分割线宽度                                            | `number`                               | 2                                                        |      |
-| verticalBorderColor          | 垂直分割线颜色                                            | `string`                               | -                                                        |      |
-| verticalBorderColorOpacity   | 垂直分割线颜色透明度                                      | `number`                               | -                                                    |      |
+| verticalBorderColor          | 垂直分割线颜色                                            | `string`                               | `basicColors[11]`                                                        |      |
+| verticalBorderColorOpacity   | 垂直分割线颜色透明度                                      | `number`                               | 0.25                                                    |      |
 | verticalBorderWidth          | 垂直分割线宽度                                            | `number`                               | 2                                                        |      |
 | showShadow                   | 分割线是否显示外阴影（行列冻结情况下）                    | `boolean`                              | `true`                                                   |      |
 | shadowWidth                  | 阴影宽度                                                  | `number`                               | 8                                                       |      |

diff --git a/s2-site/docs/manual/migration-v2.zh.md b/s2-site/docs/manual/migration-v2.zh.md
@@ -946,7 +946,7 @@ s2.on(S2Event.GLOBAL_LINK_FIELD_JUMP, (data) => {
 
 #### 分割线主题配置默认值变更
 
-分割线的 `颜色` 和 `透明度` 默认值移除，默认和所在区域对应的单元格保持一致。
+分割线的 `颜色` 和 `透明度` 在没有默认值的情况下，默认和所在区域对应的单元格边框保持一致。
 
 ```diff
 splitLine: {