diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
index 01a1a9bd61..3c64a1aae5 100644
--- a/.github/workflows/auto-release.yml
+++ b/.github/workflows/auto-release.yml
@@ -33,29 +33,45 @@ jobs:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: yarn release
- # 内部开发和服务群
+ # # 内部开发和服务群
+ # - name: Release success ding talk official group notify
+ # if: ${{ success() }}
+ # uses: visiky/dingtalk-release-notify@main
+ # with:
+ # DING_TALK_TOKEN: |
+ # ${{ secrets.DING_TALK_ACCESS_TOKEN }}
+ # ${{ secrets.DING_TALK_GROUP_TOKEN }}
+ # notify_title: '🎉 {release_tag} 发布 🎉'
+ # notify_body: '### { title }
{ body }
'
+ # at_all: false
+ # enable_prerelease: ${{ contains(github.ref_name, 'beta') || contains(github.ref_name, 'alpha') }}
+
+ # # 官方对外讨论群, 只推送正式版发布通知
+ # - name: Latest release success ding talk public group notify
+ # if: ${{ success() && contains(github.ref_name, 'latest-release') }}
+ # uses: visiky/dingtalk-release-notify@main
+ # with:
+ # DING_TALK_TOKEN: ${{ secrets.DING_TALK_PUBLIC_TOKEN }}
+ # notify_title: '🎉 {release_tag} 发布 🎉'
+ # notify_body: '### { title }
{ body }
'
+ # at_all: false
+ # enable_prerelease: false
+
- name: Release success ding talk official group notify
if: ${{ success() }}
- uses: visiky/dingtalk-release-notify@main
- with:
- DING_TALK_TOKEN: |
- ${{ secrets.DING_TALK_ACCESS_TOKEN }}
- ${{ secrets.DING_TALK_GROUP_TOKEN }}
- notify_title: '🎉 {release_tag} 发布 🎉'
- notify_body: '### { title }
{ body }
'
- at_all: false
- enable_prerelease: ${{ contains(github.ref_name, 'beta') || contains(github.ref_name, 'alpha') }}
-
- # 官方对外讨论群, 只推送正式版发布通知
- - name: Latest release success ding talk public group notify
- if: ${{ success() && contains(github.ref_name, 'latest-release') }}
- uses: visiky/dingtalk-release-notify@main
+ uses: zcong1993/actions-ding@master
with:
- DING_TALK_TOKEN: ${{ secrets.DING_TALK_PUBLIC_TOKEN }}
- notify_title: '🎉 {release_tag} 发布 🎉'
- notify_body: '### { title }
{ body }
'
- at_all: false
- enable_prerelease: false
+ dingToken: ${{ secrets.DING_TALK_ACCESS_TOKEN }}
+ body: |
+ {
+ "msgtype": "link",
+ "link": {
+ "title": "🎉 自动发布成功",
+ "text": "🔗 点击查看具体详情",
+ "messageUrl": "https://github.com/antvis/S2/releases",
+ "picUrl": "https://gw.alipayobjects.com/zos/antfincdn/ISzgBCtgR/2c5c4aaa-4f40-46f7-8f6b-427fa9ff07bb.png"
+ }
+ }
# 发布失败通知内部开发群
- name: Release failed ding talk dev group notify
diff --git a/packages/s2-core/CHANGELOG.md b/packages/s2-core/CHANGELOG.md
index 5481882e02..795902ebc9 100644
--- a/packages/s2-core/CHANGELOG.md
+++ b/packages/s2-core/CHANGELOG.md
@@ -1,3 +1,22 @@
+# [@antv/s2-v1.2.0](https://github.com/antvis/S2/compare/@antv/s2-v1.1.2...@antv/s2-v1.2.0) (2021-12-06)
+
+
+### Bug Fixes
+
+* **cell:** border width issue ([#859](https://github.com/antvis/S2/issues/859)) ([114e7fc](https://github.com/antvis/S2/commit/114e7fc9b7d37f2512dc17a812d280858b571f61))
+* **export:** export corner bug ([#856](https://github.com/antvis/S2/issues/856)) ([ccbc851](https://github.com/antvis/S2/commit/ccbc85142697d14f6d899899beef1a2fd2a9ec38))
+* fix series resize area ([#858](https://github.com/antvis/S2/issues/858)) ([76407db](https://github.com/antvis/S2/commit/76407db3bf0975f6ad815e0078c4db5a293b6db4))
+* only omit undefined row cell ([#861](https://github.com/antvis/S2/issues/861)) ([9386688](https://github.com/antvis/S2/commit/9386688c14607a260c446c9c18f2d11bf05eb5b6))
+* revert default palette change ([#863](https://github.com/antvis/S2/issues/863)) ([c49fa9f](https://github.com/antvis/S2/commit/c49fa9f86db47783337a06c005df33145418b8e3))
+* the order of multiple selection of cells is wrong ([#857](https://github.com/antvis/S2/issues/857)) ([63d1fcb](https://github.com/antvis/S2/commit/63d1fcb2a5653683e51a36afd280b81b4fc4ed55))
+
+
+### Features
+
+* **resize:** add resize active options, close [#855](https://github.com/antvis/S2/issues/855) ([#864](https://github.com/antvis/S2/issues/864)) ([1ce0951](https://github.com/antvis/S2/commit/1ce0951c20cc28495bf1c062d7c57128c3ef91fb))
+* **tooltip:** enhance tooltip ([#862](https://github.com/antvis/S2/issues/862)) ([9e411b5](https://github.com/antvis/S2/commit/9e411b555ef320b856f67a0fcf0da8971de1c529))
+
+
# [@antv/s2-v1.1.2](https://github.com/antvis/S2/compare/@antv/s2-v1.1.1...@antv/s2-v1.1.2) (2021-11-30)
diff --git a/packages/s2-core/package.json b/packages/s2-core/package.json
index 4c6ab9bcdb..83ae028dd5 100644
--- a/packages/s2-core/package.json
+++ b/packages/s2-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@antv/s2",
- "version": "1.1.2",
+ "version": "1.2.0",
"main": "lib/index.js",
"module": "esm/index.js",
"unpkg": "dist/index.min.js",
diff --git a/packages/s2-react/CHANGELOG.md b/packages/s2-react/CHANGELOG.md
index 941ad25eb5..bcdfa00318 100644
--- a/packages/s2-react/CHANGELOG.md
+++ b/packages/s2-react/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [@antv/s2-react-v1.2.0](https://github.com/antvis/S2/compare/@antv/s2-react-v1.1.1...@antv/s2-react-v1.2.0) (2021-12-06)
+
+
+### Bug Fixes
+
+* **cell:** border width issue ([#859](https://github.com/antvis/S2/issues/859)) ([114e7fc](https://github.com/antvis/S2/commit/114e7fc9b7d37f2512dc17a812d280858b571f61))
+
+
+### Features
+
+* **components:** add switcher header config ([#851](https://github.com/antvis/S2/issues/851)) ([1ced482](https://github.com/antvis/S2/commit/1ced482715ce1d751bb0f40aac9c804d2409e890))
+* **resize:** add resize active options, close [#855](https://github.com/antvis/S2/issues/855) ([#864](https://github.com/antvis/S2/issues/864)) ([1ce0951](https://github.com/antvis/S2/commit/1ce0951c20cc28495bf1c062d7c57128c3ef91fb))
+* **tooltip:** enhance tooltip ([#862](https://github.com/antvis/S2/issues/862)) ([9e411b5](https://github.com/antvis/S2/commit/9e411b555ef320b856f67a0fcf0da8971de1c529))
+
# [@antv/s2-react-v1.1.1](https://github.com/antvis/S2/compare/@antv/s2-react-v1.1.0...@antv/s2-react-v1.1.1) (2021-11-30)
diff --git a/packages/s2-react/package.json b/packages/s2-react/package.json
index 4a4889a86c..ebe84ff4e2 100644
--- a/packages/s2-react/package.json
+++ b/packages/s2-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@antv/s2-react",
- "version": "1.1.1",
+ "version": "1.2.0",
"main": "lib/index.js",
"module": "esm/index.js",
"unpkg": "dist/index.min.js",
diff --git a/s2-site/package.json b/s2-site/package.json
index 7528ac76d6..5dde790b4f 100644
--- a/s2-site/package.json
+++ b/s2-site/package.json
@@ -35,8 +35,8 @@
"dependencies": {
"@antv/g-canvas": "^0.5.12",
"@antv/gatsby-theme-antv": "^1.1.15",
- "@antv/s2": "^1.1.2",
- "@antv/s2-react": "^1.1.1",
+ "@antv/s2": "^1.2.0",
+ "@antv/s2-react": "^1.2.0",
"gatsby": "^2.24.2",
"gh-pages": "^3.1.0",
"lodash": "^4.17.21",
diff --git a/s2-site/yarn.lock b/s2-site/yarn.lock
index 0976cda7b6..d235c5e878 100644
--- a/s2-site/yarn.lock
+++ b/s2-site/yarn.lock
@@ -183,19 +183,19 @@
"@antv/util" "^2.0.9"
tslib "^2.0.3"
-"@antv/s2-react@^1.1.1":
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/@antv/s2-react/-/s2-react-1.1.1.tgz#4a89c1180f2313f891fcd725a7dd7ea017acd5f4"
- integrity sha512-glXqEdgPDrSCXRBSBY/HiHAA4g/LjRK2kssJP6nAQNpbN4Q+UTofZcA6cn5V69BTfvoNN0eMHLL+Ih6Bsj/opQ==
+"@antv/s2-react@^1.2.0":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@antv/s2-react/-/s2-react-1.2.0.tgz#469b2c9759bfe8124e57bb3dee2e996c26ef755a"
+ integrity sha512-/OKx33gVnU836OmGKFLhruiJBXFL9QzM2d8LXlBGSQsP5ZkuOf2a3Ma12IDcBiCK6J4avq+PbrKkYGz40YrZoQ==
dependencies:
classnames "^2.3.1"
lodash "^4.17.21"
react-beautiful-dnd "^13.1.0"
-"@antv/s2@^1.1.2":
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/@antv/s2/-/s2-1.1.2.tgz#8c54ffc840a0231866adb2dd2bed7a6fef8a8090"
- integrity sha512-A4h4BEdq++OLFoWUYSLFEHVy8AhNVti1zPoksCb/8Bo4s+9aiMi1KVt+VLK6R97dASVxtfn3ZqD6ZI4GaYWUwA==
+"@antv/s2@^1.2.0":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@antv/s2/-/s2-1.2.0.tgz#10a17450f510ce4d891715f75340b734b27ca92d"
+ integrity sha512-oBw1YnjmD/oGKlE/1OU+xZKBYCfNqUJD+zU/M2PQKcSQCLFbBwEyRBRqWNIaWD4ZBqV3x+BXkr1dyW4ulXlJ8w==
dependencies:
"@antv/event-emitter" "~0.1.2"
"@antv/g-canvas" "^0.5.12"