Merge pull request #5219 from muzhichu/hotfix/cascader-tabclick

fix(cascader): 修复cascader组件onClickTab事件没有同步activeTab的值导致选择异常的问题
Merge pull request #5213 from Sober-1/feature/calendar_safe_area
2026-07-12 17:21:07 +08:00 · 2023-02-12 16:51:58 +08:00 · 2023-02-12 16:51:41 +08:00 · 2023-02-12 15:52:44 +08:00 · 2023-02-12 15:52:33 +08:00 · 2023-02-12 15:52:22 +08:00
5 changed files with 18 additions and 12 deletions
--- a/dist/calendar/index.wxml
+++ b/dist/calendar/index.wxml
@ -12,6 +12,7 @@
  position="{{ position }}"
  closeable="{{ showTitle || showSubtitle }}"
  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
  bind:enter="onOpen"
  bind:close="onClose"
  bind:after-enter="onOpened"
--- a/lib/calendar/index.wxml
+++ b/lib/calendar/index.wxml
@ -12,6 +12,7 @@
  position="{{ position }}"
  closeable="{{ showTitle || showSubtitle }}"
  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
  bind:enter="onOpen"
  bind:close="onClose"
  bind:after-enter="onOpened"
--- a/packages/calendar/index.wxml
+++ b/packages/calendar/index.wxml
@ -12,6 +12,7 @@
  position="{{ position }}"
  closeable="{{ showTitle || showSubtitle }}"
  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
  bind:enter="onOpen"
  bind:close="onClose"
  bind:after-enter="onOpened"
--- a/packages/cascader/index.ts
+++ b/packages/cascader/index.ts
@ -193,6 +193,9 @@ VantComponent({
    onClickTab(e) {
      const { index: tabIndex, title } = e.detail;
      this.$emit('click-tab', { title, tabIndex });
+      this.setData({
+        activeTab: tabIndex,
+      });
    },
    // 选中
    onSelect(e) {
--- a/yarn.lock
+++ b/yarn.lock
@ -7361,9 +7361,9 @@ htmlparser2@^3.10.0, htmlparser2@^3.9.2:
    readable-stream "^3.1.1"

 http-cache-semantics@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.npmmirror.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==

 http-errors@2.0.0:
  version "2.0.0"
@ -9474,14 +9474,14 @@ minimist@^1.2.0, minimist@^1.2.5:
  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==

 miniprogram-api-typings@^3.1.6, miniprogram-api-typings@^3.2.2:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/miniprogram-api-typings/-/miniprogram-api-typings-3.8.1.tgz#1b8b732bb9035187a935ce622c6d8ad543432eed"
-  integrity sha512-AjuBYxghx3LZeTtWQ48TfDMxoACGRUA+NdPrgl+mPPNgi5g0YXn3sDELNHRw0LcjTxfqhVufwLL65AjwT+W+FQ==
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/miniprogram-api-typings/-/miniprogram-api-typings-3.9.0.tgz#c04a6b7eae5585733b5f8787297f2b9f1b60abac"
+  integrity sha512-QCXHHW9H4XYazb8J9EMiFyaOWHXhBG4oehkQqi+76FJpKKIlpgL0ZkXxzJ2L+6T/c5OxKm7iegovKIQGVkZDLQ==

 miniprogram-ci@^1.6.1:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/miniprogram-ci/-/miniprogram-ci-1.9.3.tgz#08d22a5f16214382734a66b1fe7e099cd44ee1d6"
-  integrity sha512-pPDpRXfbq6QFTwlv3AJNRbCAUtMp910rvNMr4mzi6ozPAwMh0Xgd9xlgBLY7H5woLBbvzWTvir9gLhFpSRMYbA==
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/miniprogram-ci/-/miniprogram-ci-1.9.5.tgz#4424721978f73405b29231f6f641bb89e4f21848"
+  integrity sha512-Fqe8PCc+5VUVOiZAdr2glMZnGz2O5MMYkS+OkT8KKq8WF1AFZLNbIkqmHXQ7/ZvlGgrUW6UpEMKpT5ZfMEF7Mg==
  dependencies:
    "@babel/core" "7.12.3"
    "@babel/generator" "7.17.10"
@ -12682,9 +12682,9 @@ typedarray@^0.0.6:
  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==

 typescript@^4.4.4, typescript@^4.7.4:
-  version "4.8.4"
-  resolved "https://registry.npmmirror.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
-  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==

 uc.micro@^1.0.1, uc.micro@^1.0.5:
  version "1.0.6"
Author	SHA1	Message	Date
landluck	c7f2f45430	Merge pull request #5219 from muzhichu/hotfix/cascader-tabclick fix(cascader): 修复cascader组件onClickTab事件没有同步activeTab的值导致选择异常的问题	2023-02-12 16:51:58 +08:00
landluck	840baf4341	Merge pull request #5213 from Sober-1/feature/calendar_safe_area fix(calendar): 修复calendar组件安全区域传参未传递给popup组件的问题	2023-02-12 16:51:41 +08:00
landluck	66867f6054	Merge pull request #5207 from youzan/dependabot/npm_and_yarn/typescript-4.9.5 build(deps-dev): bump typescript from 4.8.4 to 4.9.5	2023-02-12 15:52:44 +08:00
landluck	357fd0e7e5	Merge pull request #5208 from youzan/dependabot/npm_and_yarn/miniprogram-api-typings-3.9.0 build(deps-dev): bump miniprogram-api-typings from 3.8.1 to 3.9.0	2023-02-12 15:52:33 +08:00
landluck	96923a4c75	Merge pull request #5209 from youzan/dependabot/npm_and_yarn/miniprogram-ci-1.9.5 build(deps-dev): bump miniprogram-ci from 1.9.3 to 1.9.5	2023-02-12 15:52:22 +08:00
landluck	be68dc6868	Merge pull request #5215 from youzan/dependabot/npm_and_yarn/http-cache-semantics-4.1.1 build(deps): bump http-cache-semantics from 4.1.0 to 4.1.1	2023-02-12 15:52:11 +08:00
yongli	92ae4a29c0	fix(cascader): 修复cascader组件onClickTab事件没有同步activeTab的值导致选择异常的问题	2023-02-07 17:16:18 +08:00
dependabot[bot]	183c980bd2	build(deps): bump http-cache-semantics from 4.1.0 to 4.1.1 Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/kornelski/http-cache-semantics/releases) - [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-04 01:53:11 +00:00
李国璞	db79570d98	fix(calendar): 修复calendar组件安全区域传参未传递给popup组件的问题	2023-02-03 11:12:26 +08:00
dependabot[bot]	e38973c969	build(deps-dev): bump miniprogram-ci from 1.9.3 to 1.9.5 Bumps miniprogram-ci from 1.9.3 to 1.9.5. --- updated-dependencies: - dependency-name: miniprogram-ci dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-01 23:10:22 +00:00
dependabot[bot]	f0ee820588	build(deps-dev): bump miniprogram-api-typings from 3.8.1 to 3.9.0 Bumps [miniprogram-api-typings](https://github.com/wechat-miniprogram/api-typings) from 3.8.1 to 3.9.0. - [Release notes](https://github.com/wechat-miniprogram/api-typings/releases) - [Changelog](https://github.com/wechat-miniprogram/api-typings/blob/master/CHANGELOG.md) - [Commits](https://github.com/wechat-miniprogram/api-typings/compare/3.8.1...3.9.0) --- updated-dependencies: - dependency-name: miniprogram-api-typings dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-01 23:09:49 +00:00
dependabot[bot]	b028cd7868	build(deps-dev): bump typescript from 4.8.4 to 4.9.5 Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.8.4 to 4.9.5. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.8.4...v4.9.5) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-01 23:08:24 +00:00