Merge branch 'master' into feat-pivot-hide-columns

lijinke666 · lijinke666 · commit 5c7fa35f9119 · 2021-12-14T10:08:27.000+08:00
diff --git a/.github/workflows/sync-site-lock-changelog-with-pr.yml b/.github/workflows/sync-site-lock-changelog-with-pr.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: 'latest-release'
+          ref: 'latest'
 
       - name: Use Node.js 16.x
         uses: actions/setup-node@v2
@@ -31,6 +31,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Checkout branch
+        run: |
+          git checkout -b chore-sync
+
       - name: Install dependencies
         run: yarn
 
@@ -41,7 +45,7 @@ jobs:
         run: |
           git add .
           git commit -m "chore: 🤖 auto sync site s2 lock and changelog [skip ci]" --no-verify
-          git push origin latest-release --no-verify
+          git push origin chore-sync --no-verify
 
       # 使用官方的 github cli 便捷的创建 pr
       - name: Create PR
diff --git a/.releaserc.js b/.releaserc.js
@@ -1,6 +1,6 @@
 module.exports = {
   branches: [
-    'latest-release',
+    'latest',
     { name: 'beta', prerelease: true },
     { name: 'alpha', prerelease: true },
     { name: 'next', prerelease: true },
diff --git a/packages/s2-core/CHANGELOG.md b/packages/s2-core/CHANGELOG.md
@@ -1,3 +1,16 @@
+# [@antv/s2-v1.3.0](https://github.com/antvis/S2/compare/@antv/s2-v1.2.0...@antv/s2-v1.3.0) (2021-12-13)
+
+
+### Bug Fixes
+
+* 🐛 solve the issue that the measure does not shown when the type of dimensions are number ([#871](https://github.com/antvis/S2/issues/871)) ([296b50b](https://github.com/antvis/S2/commit/296b50bc0af25032e72a7aee332eccd9b557e72c))
+* 🐛 solve the wrong data after drilling down twice ([#885](https://github.com/antvis/S2/issues/885)) ([e3c8729](https://github.com/antvis/S2/commit/e3c8729d8fd5383fa73349b9937daa7ea58e0301))
+
+
+### Features
+
+* ✨ show the sortIcon when the hideMeasureColumn is set ([#884](https://github.com/antvis/S2/issues/884)) ([de1c46a](https://github.com/antvis/S2/commit/de1c46acb12b257e32aa4cc568312abca873775a))
+
 # [@antv/s2-v1.2.0](https://github.com/antvis/S2/compare/@antv/s2-v1.1.2...@antv/s2-v1.2.0) (2021-12-06)
 
 
diff --git a/packages/s2-core/package.json b/packages/s2-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/s2",
-  "version": "1.2.0",
+  "version": "1.3.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
@@ -1,3 +1,17 @@
+# [@antv/s2-react-v1.3.0](https://github.com/antvis/S2/compare/@antv/s2-react-v1.2.0...@antv/s2-react-v1.3.0) (2021-12-13)
+
+
+### Bug Fixes
+
+* 🐛 solve the wrong data after drilling down twice ([#885](https://github.com/antvis/S2/issues/885)) ([e3c8729](https://github.com/antvis/S2/commit/e3c8729d8fd5383fa73349b9937daa7ea58e0301))
+* **components:** add empty fragment close [#873](https://github.com/antvis/S2/issues/873) ([#878](https://github.com/antvis/S2/issues/878)) ([db98788](https://github.com/antvis/S2/commit/db98788954b74b2781f98568013135c8843725f2))
+* export link problem ([#877](https://github.com/antvis/S2/issues/877)) ([aa8f428](https://github.com/antvis/S2/commit/aa8f428824ce90aa5b6c7177cc5ef4d371a1d847))
+
+
+### Features
+
+* ✨ show the sortIcon when the hideMeasureColumn is set ([#884](https://github.com/antvis/S2/issues/884)) ([de1c46a](https://github.com/antvis/S2/commit/de1c46acb12b257e32aa4cc568312abca873775a))
+
 # [@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)
 
 
diff --git a/packages/s2-react/package.json b/packages/s2-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/s2-react",
-  "version": "1.2.0",
+  "version": "1.3.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
@@ -35,8 +35,8 @@
   "dependencies": {
     "@antv/g-canvas": "^0.5.12",
     "@antv/gatsby-theme-antv": "^1.1.15",
-    "@antv/s2": "^1.2.0",
-    "@antv/s2-react": "^1.2.0",
+    "@antv/s2": "^1.3.0",
+    "@antv/s2-react": "^1.3.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
@@ -183,19 +183,19 @@
     "@antv/util" "^2.0.9"
     tslib "^2.0.3"
 
-"@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==
+"@antv/s2-react@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@antv/s2-react/-/s2-react-1.3.0.tgz#a2f8e19f204162eb7a7b2ad8aaf3b73ecc38e852"
+  integrity sha512-erVACFYrBfxSN3loVM5zj+Dcneh3rZXsOdQJZmo+EWeU/MduvFLOpLtAylEEP7sDvASTGSLacV73nHtytfdC7w==
   dependencies:
     classnames "^2.3.1"
     lodash "^4.17.21"
     react-beautiful-dnd "^13.1.0"
 
-"@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==
+"@antv/s2@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@antv/s2/-/s2-1.3.0.tgz#a6865452986ed3e0ea9028e7a61182fbef9b9703"
+  integrity sha512-QXrM9Lzysb6IoijAAmWMJo2I2yC4BTb+9+pzqSGI7j614gxRKm68INRypQOJ8DJAUKMESKBwHddsctdiyyVgyg==
   dependencies:
     "@antv/event-emitter" "~0.1.2"
     "@antv/g-canvas" "^0.5.12"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@antv/s2",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.3.0",`
`4`	`4`	`"main": "lib/index.js",`
`5`	`5`	`"module": "esm/index.js",`
`6`	`6`	`"unpkg": "dist/index.min.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@antv/s2-react",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.3.0",`
`4`	`4`	`"main": "lib/index.js",`
`5`	`5`	`"module": "esm/index.js",`
`6`	`6`	`"unpkg": "dist/index.min.js",`