Merge branch 'master' into feat_DataCell_link

.github/workflows/auto-release.yml

@@ -40,7 +40,7 @@ jobs:
                 "title": "🚑 开始自动发布 🚑",
                 "text": "🔗 请点击链接查看详情",
                 "messageUrl": "https://github.com/antvis/S2/actions/workflows/auto-release.yml",
-                "picUrl": "https://gw.alipayobjects.com/zos/antfincdn/JxgObjrPo/dde3c2cf-ce2f-45ab-90a7-9f5cce889227.png"
+                "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*gt5-RZDjt3IAAAAAAAAAAAAADmJ7AQ/original"
               }
             }
 
@@ -72,6 +72,6 @@ jobs:
                 "title": "🚨 自动发布失败",
                 "text": "🔗 请点击链接查看具体原因, 及时修复, 尝试点击右上角 [Re-run all jobs] 重试, 或手动发布 🚑",
                 "messageUrl": "https://github.com/antvis/S2/actions/workflows/auto-release.yml",
-                "picUrl": "https://gw.alipayobjects.com/zos/antfincdn/JxgObjrPo/dde3c2cf-ce2f-45ab-90a7-9f5cce889227.png"
+                "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*PRSkSqsE_vYAAAAAAAAAAAAADmJ7AQ/original"
               }
             }

.github/workflows/issue-labeled.yml

@@ -108,13 +108,13 @@ jobs:
             Hello, @${{ github.vent.issue.user.login }}, your feature request has been accepted after our repeated discussion. We will schedule the development. However, it could not be supported in the short term since limited time, please pay attention to the follow-up release logs. Of course, looking forward for your PR!
 
       - name: Rejected
-        if: github.event.label.name == '❌ rejected'
+        if: github.event.label.name == '❌ won''t support'
         uses: actions-cool/issues-helper@main
         with:
           actions: 'create-comment,close-issue'
           token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.issue.number }}
           body: |
-            你好 @${{ github.event.issue.user.login }}，经过我们的反复讨论, 你的需求过于定制化，不适合直接添加到 S2 中, 你可以通过 S2 提供的自定义能力自行实现，感谢你的理解。
+            你好 @${{ github.event.issue.user.login }}，经过我们的反复讨论, 你的需求过于定制化，不适合直接添加到 S2 中, S2 作为开源框架，只会进行通用能力的增强和自定义接口的开放。你可以通过 S2 提供的自定义能力自行实现，感谢你的理解。
 
-            Hello, @${{ github.event.issue.user.login }}, your feature request is too customized to be directly implemented in S2 after our repeated discussion, you could implement it by yourself through the customization capabilities provided by S2. Thanks so much for your understanding.
+            Hello, @${{ github.event.issue.user.login }}, After our repeated discussions, your needs are too customized and not suitable for implementing directly to S2. As an open source framework, S2 will only enhance general capabilities and open custom interfaces. You can implement it yourself through the customization capabilities provided by S2, thank you for your understanding.

.github/workflows/prerelease-notify.yml

@@ -19,9 +19,11 @@ jobs:
       - name: Pre Release Notify
         uses: visiky/dingtalk-release-notify@main
         with:
-          DING_TALK_TOKEN: ${{ secrets.DING_TALK_ACCESS_TOKEN }}
+          DING_TALK_TOKEN: |
+            ${{ secrets.DING_TALK_ACCESS_TOKEN }}
+            ${{ secrets.DING_TALK_GROUP_TOKEN }}
           notify_title: '🎉 {release_tag} 发布 🎉'
           notify_body: '## { title } <hr /> ![preview](https://gw.alipayobjects.com/zos/antfincdn/ISzgBCtgR/2c5c4aaa-4f40-46f7-8f6b-427fa9ff07bb.png) <hr /> { body } <hr />'
-          notify_footer: '> 前往 [**AntV/S2 Releases**]({ release_url }) 查看完整信息.'
+          notify_footer: '> 该版本为测试版, 请谨慎使用, 前往 [**AntV/S2 Releases**]({ release_url }) 查看完整更新日志.'
           at_all: false
           enable_prerelease: true

.github/workflows/release-notify.yml

@@ -20,6 +20,6 @@ jobs:
             ${{ secrets.DING_TALK_PUBLIC_TOKEN }}
           notify_title: '🎉 S2 新版本发布啦 🎉'
           notify_body: '## { title } <hr /> ![preview](https://gw.alipayobjects.com/zos/antfincdn/ISzgBCtgR/2c5c4aaa-4f40-46f7-8f6b-427fa9ff07bb.png) <hr /> 看看有哪些更新吧 <hr />'
-          notify_footer: '> 前往 [**AntV/S2 Releases**](https://github.com/antvis/S2/releases/latest) 查看完整信息.'
+          notify_footer: '> 前往 [**AntV/S2 Releases**](https://github.com/antvis/S2/releases/latest) 查看完整更新日志.'
           at_all: false
           enable_prerelease: false

.github/workflows/release-success.yml

@@ -45,7 +45,7 @@ jobs:
       # 使用官方的 github cli 便捷的创建 pr
       - name: Create PR
         run: |
-          gh pr create --title "chore: 🤖 更新 changelog 文件" --body "🤖 由 [[🚀 After the release is successful](https://github.com/antvis/S2/blob/master/.github/workflows/release-success.yml)] action 自动创建."
+          gh pr create --title "chore: 🤖 更新 changelog 文件" --body "![preview](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*Eel8Rp5jlAkAAAAAAAAAAAAADmJ7AQ/original) <br/> 🤖 由 [[🚀 After the release is successful](https://github.com/antvis/S2/blob/master/.github/workflows/release-success.yml)] action 自动创建."
         env:
           GITHUB_TOKEN: ${{ secrets.JINKE_GITHUB_TOKEN }}
 
@@ -59,10 +59,10 @@ jobs:
             {
               "msgtype": "link",
               "link": {
-                "title": "📢 开始自动部署官网 📢 ",
+                "title": "📢 开始自动部署旧版官网(https://s2.antv.vision) 📢 ",
                 "text": "🔗 请点击链接查看详情",
                 "messageUrl": "https://github.com/antvis/S2/actions/workflows/release-success.yml",
-                "picUrl": "https://gw.alipayobjects.com/zos/antfincdn/JxgObjrPo/dde3c2cf-ce2f-45ab-90a7-9f5cce889227.png"
+                "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*gt5-RZDjt3IAAAAAAAAAAAAADmJ7AQ/original"
               }
             }
 
@@ -85,9 +85,9 @@ jobs:
             {
               "msgtype": "link",
               "link": {
-                "title": "🚨 官网部署失败",
+                "title": "🚨 旧版官网部署失败",
                 "text": "🔗 请点击链接查看具体原因, 尝试点击右上角 [Re-run all jobs] 重试, 或者手动部署 🚑",
                 "messageUrl": "https://github.com/antvis/S2/actions/workflows/release-success.yml",
-                "picUrl": "https://gw.alipayobjects.com/zos/antfincdn/JxgObjrPo/dde3c2cf-ce2f-45ab-90a7-9f5cce889227.png"
+                "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*PRSkSqsE_vYAAAAAAAAAAAAADmJ7AQ/original"
               }
             }

.github/workflows/site-build-notify.yml

@@ -19,7 +19,7 @@ jobs:
                 "title": "✅ 旧官网(https://s2.antv.vision) 部署成功",
                 "text": "点击访问 https://s2.antv.vision/",
                 "messageUrl": "https://s2.antv.vision/",
-                "picUrl": "https://gw.alipayobjects.com/zos/antfincdn/JxgObjrPo/dde3c2cf-ce2f-45ab-90a7-9f5cce889227.png"
+                "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*Eel8Rp5jlAkAAAAAAAAAAAAADmJ7AQ/original"
               }
             }
 
@@ -35,6 +35,6 @@ jobs:
                 "title": "📢 请发布值班手动部署新官网 (https://s2.antv.antgroup.com) 📢",
                 "text": "点击查看部署教程",
                 "messageUrl": "https://yuque.antfin-inc.com/spreadsheet/garqs6/hednl5#RfuD9",
-                "picUrl": "https://gw.alipayobjects.com/zos/antfincdn/JxgObjrPo/dde3c2cf-ce2f-45ab-90a7-9f5cce889227.png"
+                "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*RXmkQrNYxqoAAAAAAAAAAAAADmJ7AQ/original"
               }
             }

.github/workflows/sync-notify.yml

@@ -43,6 +43,6 @@ jobs:
                 "title": "🚨 🔁 同步 Changelog 失败",
                 "text": "🔗 请点击链接查看具体原因, 点击右上角 [Re-run all jobs] 手动同步 🚑",
                 "messageUrl": "https://github.com/antvis/S2/actions/workflows/sync-site-lock-changelog-with-pr.yml",
-                "picUrl": "https://gw.alipayobjects.com/zos/antfincdn/ISzgBCtgR/2c5c4aaa-4f40-46f7-8f6b-427fa9ff07bb.png"
+                "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*RXmkQrNYxqoAAAAAAAAAAAAADmJ7AQ/original"
               }
             }

.npmrc

@@ -1 +1 @@
-registry=https://registry.npmmirror.com/
+registry=https://registry.npmjs.org/

CONTRIBUTING.en-US.md

@@ -55,6 +55,10 @@ npm i -g yarn
 1. `yarn bootstrap`: Installation dependency.
 2. `yarn site:bootstrap`: Install site related dependencies.
 3. `yarn site:start`: Starts the local `S2` website.
-4. `yarn core:start`:  Debug and test.
-5. `yarn build`: Builds `S2`, outputs are`umd`, `esm` and `lib` directories.
-6. `yarn test`:  Run unit tests.
+4. `yarn core:start`:  Debug and test local `@antv/s2`（Based on jest-electron）.
+5. `yarn react:start` Debug and test local `@antv/s2-react` (Based on jest-electron).
+6. `yarn vue:start` Debug and test local `@antv/s2-vue` (Based on jest-electron).
+7. `yarn react:playground` Starts the local `@antv/s2-react` playground (Based on vite).
+8. `yarn vue:playground` Starts the local `@antv/s2-vue` playground (Based on vite).
+9. `yarn build`: Builds `@antv/s2` and `@antv/s2-react` and `@antv/s2-vue` , outputs are `umd`, `esm` and `lib` directories.
+10. `yarn test`:  Run unit tests.

CONTRIBUTING.md

@@ -54,8 +54,10 @@ npm i -g yarn
 1. `yarn bootstrap` 安装依赖
 2. `yarn site:bootstrap` 安装网站相关依赖
 3. `yarn site:start` 启动本地的 `S2` 网站
-4. `yarn core:start` 可视化的方式调试核心层测试 (基于 jest-electron)
-5. `yarn react:start` 可视化的方式调试组件层测试 (基于 jest-electron)
-6. `yarn react:playground` 启动本地的组件层demo (基于 vite)
-7. `yarn build` 构建 `@antv/s2` 和 `@antv/s2-react` 两个包, 分别输出 `umd`, `esm` 和 `lib` 目录
-8. `yarn test` 运行单元格测试
+4. `yarn core:start` 可视化的方式调试核心层 `@antv/s2` (基于 jest-electron)
+5. `yarn react:start` 可视化的方式调试组件层 `@antv/s2-react` (基于 jest-electron)
+6. `yarn vue:start` 可视化的方式调试组件层 `@antv/s2-vue` (基于 jest-electron)
+7. `yarn react:playground` 启动本地的组件层 `@antv/s2-react` demo (基于 vite)
+8. `yarn vue:playground` 启动本地的组件层 `@antv/s2-vue` demo (基于 vite)
+9. `yarn build` 构建 `@antv/s2` 和 `@antv/s2-react` 和 `@antv/s2-vue` 三个包, 分别输出 `umd`, `esm` 和 `lib` 目录
+10. `yarn test` 运行单元格测试

packages/s2-core/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [@antv/s2-v1.43.0](https://github.com/antvis/S2/compare/@antv/s2-v1.42.0...@antv/s2-v1.43.0) (2023-03-10)
+
+
+### Bug Fixes
+
+* **interaction:** 修复行头滚动刷选范围判断错误 ([#2101](https://github.com/antvis/S2/issues/2101)) ([8e38fb0](https://github.com/antvis/S2/commit/8e38fb0df6123360d2bd835cf80bcf72898a80b9))
+
+
+### Features
+
+* 在 shape 中添加文本的原始值 ([#2109](https://github.com/antvis/S2/issues/2109)) ([4d81e72](https://github.com/antvis/S2/commit/4d81e72440d797fd7a06179794c342f009fc39c3))
+* 增加自定义merged-cell ([534cc15](https://github.com/antvis/S2/commit/534cc15da9f766f95be3c622e65e45d8796ff020))
+
 # [@antv/s2-v1.42.0](https://github.com/antvis/S2/compare/@antv/s2-v1.41.1...@antv/s2-v1.42.0) (2023-02-24)
 
 

packages/s2-core/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@antv/s2",
-  "version": "1.42.0",
+  "version": "1.43.0",
   "main": "lib/index.js",
   "unpkg": "dist/index.min.js",
   "module": "esm/index.js",

packages/s2-react/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@antv/s2-react-v1.37.1](https://github.com/antvis/S2/compare/@antv/s2-react-v1.37.0...@antv/s2-react-v1.37.1) (2023-03-10)
+
+
+### Bug Fixes
+
+* **interaction:** 修复行头滚动刷选范围判断错误 ([#2101](https://github.com/antvis/S2/issues/2101)) ([8e38fb0](https://github.com/antvis/S2/commit/8e38fb0df6123360d2bd835cf80bcf72898a80b9))
+
 # [@antv/s2-react-v1.37.0](https://github.com/antvis/S2/compare/@antv/s2-react-v1.36.0...@antv/s2-react-v1.37.0) (2023-02-24)
 
 

packages/s2-react/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@antv/s2-react",
-  "version": "1.37.0",
+  "version": "1.37.1",
   "main": "lib/index.js",
   "unpkg": "dist/index.min.js",
   "module": "esm/index.js",

s2-site/docs/api/components/header.en.md

@@ -20,7 +20,7 @@ The table header, located at the top of the table container, functions as a cont
     description: '表头描述',
     exportCfg: { open: true }, // 开启导出功能
     advancedSortCfg: { open: true }, // 开启高级排序功能
-    switcherCfg: { open: true }, // 开启指标切换功能
+    switcherCfg: { open: true }, // 开启维度切换功能
     extra: <button> 插入内容 </button>, //自定义 ReactNode
   }}
 />

s2-site/docs/api/components/header.zh.md

@@ -18,7 +18,7 @@ order: 4
     description: '表头描述',
     exportCfg: { open: true }, // 开启导出功能
     advancedSortCfg: { open: true }, // 开启高级排序功能
-    switcherCfg: { open: true }, // 开启指标切换功能
+    switcherCfg: { open: true }, // 开启维度切换功能
     extra: <button> 插入内容 </button>, //自定义 ReactNode
   }}
 />

s2-site/docs/api/components/switcher.zh.md

@@ -23,7 +23,7 @@ order: 3
 
 ## SwitcherField
 
-行列头以及指标值得配置描述对象
+行列头以及指标值的配置描述对象
 
 | 属性 | 说明 | 类型 | 默认值 | 必选 |
 | -- | -- | -- | -- | -- |

s2-site/docs/common/header.zh.md

@@ -14,4 +14,4 @@ order: 0
 | extra           | 自定义表头右侧操作区   |  `React.ReactNode`         | -       |      |
 | advancedSortCfg | 配置高级排序         | [AdvancedSortCfgProps](/docs/api/components/advanced-sort) | `{open: false}` |      |
 | exportCfg       | 配置导出             | [ExportCfgProps](/docs/api/components/export)  | `{open: false}` |      |
-| switcherCfg       | 配置指标切换             | [SwitcherCfgProps](/docs/api/components/switcher#switchercfgprops)  | `{open: false}` |      |
+| switcherCfg       | 配置维度切换             | [SwitcherCfgProps](/docs/api/components/switcher#switchercfgprops)  | `{open: false}` |      |