vant 2.12.45 → 2.12.46

package/README.zh-CN.md

@@ -26,9 +26,9 @@
 
 ### 介绍
 
-Vant 是**有赞前端团队**开源的移动端组件库，于 2017 年开源，已持续维护 4 年时间。Vant 对内承载了有赞所有核心业务，对外服务十多万开发者，是业界主流的移动端组件库之一。
+Vant 是一个**轻量、可靠的移动端组件库**，于 2017 年开源。
 
-目前 Vant 官方提供了 [Vue 2 版本](https://vant-contrib.gitee.io/vant/v2)、[Vue 3 版本](https://vant-contrib.gitee.io/vant)和[微信小程序版本](http://vant-contrib.gitee.io/vant-weapp)，并由社区团队维护 [React 版本](https://github.com/mxdi9i7/vant-react)。
+目前 Vant 官方提供了 [Vue 2 版本](https://vant-contrib.gitee.io/vant/v2)、[Vue 3 版本](https://vant-contrib.gitee.io/vant)和[微信小程序版本](http://vant-contrib.gitee.io/vant-weapp)，并由社区团队维护 [React 版本](https://github.com/3lang3/react-vant)和[支付宝小程序版本](https://github.com/ant-move/Vant-Aliapp)。
 
 ## 特性
 

package/changelog.generated.md

@@ -1,17 +1,12 @@
-### [v2.12.45](https://github.com/youzan/vant/compare/v2.12.44...v2.12.45)
+### [v2.12.46](https://github.com/youzan/vant/compare/v2.12.45...v2.12.46)
 
-`2022-03-18`
+`2022-03-30`
 
 **Bug Fixes**
 
-- Sku: 修复特殊情况下 skuTree 为空数组时导致的语法报错问题 [#10390](https://github.com/youzan/vant/issues/10390)
+- TabBar: route matching in special cases [#10447](https://github.com/youzan/vant/issues/10447)
 
 **Document**
 
-- add @formily/vant to README.md and home.md [#10323](https://github.com/youzan/vant/issues/10323)
-- fix [167e99](https://github.com/youzan/vant/commit/167e99cef84b25fdd46929e4fc0324c37c6a135c)
-- changelog: 2.12.44 [b9035d](https://github.com/youzan/vant/commit/b9035d69f0d72aace66e5fb6890a9d0097552de9)
-
-**Feature**
-
-- Dialog: support keyboard events [#10359](https://github.com/youzan/vant/issues/10359)
+- update README [cda29f](https://github.com/youzan/vant/commit/cda29f68fe25e2311fe6992bc077b387468861bc)
+- changelog: 2.12.45 [5c48d2](https://github.com/youzan/vant/commit/5c48d289c1f9422c51578ca654536a9f188e87d0)

package/es/index.js

@@ -87,7 +87,7 @@ import Tag from './tag';
 import Toast from './toast';
 import TreeSelect from './tree-select';
 import Uploader from './uploader';
-var version = '2.12.45';
+var version = '2.12.46';
 
 function install(Vue) {
   var components = [ActionSheet, AddressEdit, AddressList, Area, Badge, Button, Calendar, Card, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, Circle, Col, Collapse, CollapseItem, ContactCard, ContactEdit, ContactList, CountDown, Coupon, CouponCell, CouponList, DatetimePicker, Dialog, Divider, DropdownItem, DropdownMenu, Empty, Field, Form, GoodsAction, GoodsActionButton, GoodsActionIcon, Grid, GridItem, Icon, Image, ImagePreview, IndexAnchor, IndexBar, Info, List, Loading, Locale, NavBar, NoticeBar, Notify, NumberKeyboard, Overlay, Pagination, Panel, PasswordInput, Picker, Popover, Popup, Progress, PullRefresh, Radio, RadioGroup, Rate, Row, Search, ShareSheet, Sidebar, SidebarItem, Skeleton, Sku, Slider, Step, Stepper, Steps, Sticky, SubmitBar, Swipe, SwipeCell, SwipeItem, Switch, SwitchCell, Tab, Tabbar, TabbarItem, Tabs, Tag, Toast, TreeSelect, Uploader];

package/es/tabbar/index.js

@@ -70,7 +70,7 @@ export default createComponent({
       var _this2 = this;
 
       this.children.forEach(function (item, index) {
-        item.nameMatched = (item.name || index) === _this2.value;
+        item.nameMatched = item.name === _this2.value || index === _this2.value;
       });
     },
     triggerChange: function triggerChange(active, afterChange) {

package/es/tabbar-item/index.js

@@ -29,23 +29,25 @@ export default createComponent({
     };
   },
   computed: {
-    routeMatched: function routeMatched() {
-      var to = this.to,
-          $route = this.$route;
+    active: function active() {
+      var routeMode = this.parent.route;
 
-      if (to && $route) {
+      if (routeMode && '$route' in this) {
+        var to = this.to,
+            $route = this.$route;
         var config = isObject(to) ? to : {
           path: to
         };
         return !!$route.matched.find(function (r) {
-          var pathMatched = config.path === r.path;
+          // vue-router 3.x $route.matched[0].path is empty in / and its children paths
+          var path = r.path === '' ? '/' : r.path;
+          var pathMatched = config.path === path;
           var nameMatched = isDef(config.name) && config.name === r.name;
           return pathMatched || nameMatched;
         });
       }
-    },
-    active: function active() {
-      return this.parent.route ? this.routeMatched : this.nameMatched;
+
+      return this.nameMatched;
     }
   },
   methods: {

package/lib/index.js

@@ -361,7 +361,7 @@ exports.TreeSelect = _treeSelect.default;
 var _uploader = _interopRequireDefault(require("./uploader"));
 
 exports.Uploader = _uploader.default;
-var version = '2.12.45';
+var version = '2.12.46';
 exports.version = version;
 
 function install(Vue) {

package/lib/tabbar/index.js

@@ -78,7 +78,7 @@ var _default = createComponent({
       var _this2 = this;
 
       this.children.forEach(function (item, index) {
-        item.nameMatched = (item.name || index) === _this2.value;
+        item.nameMatched = item.name === _this2.value || index === _this2.value;
       });
     },
     triggerChange: function triggerChange(active, afterChange) {

package/lib/tabbar-item/index.js

@@ -41,23 +41,25 @@ var _default = createComponent({
     };
   },
   computed: {
-    routeMatched: function routeMatched() {
-      var to = this.to,
-          $route = this.$route;
+    active: function active() {
+      var routeMode = this.parent.route;
 
-      if (to && $route) {
+      if (routeMode && '$route' in this) {
+        var to = this.to,
+            $route = this.$route;
         var config = (0, _utils.isObject)(to) ? to : {
           path: to
         };
         return !!$route.matched.find(function (r) {
-          var pathMatched = config.path === r.path;
+          // vue-router 3.x $route.matched[0].path is empty in / and its children paths
+          var path = r.path === '' ? '/' : r.path;
+          var pathMatched = config.path === path;
           var nameMatched = (0, _utils.isDef)(config.name) && config.name === r.name;
           return pathMatched || nameMatched;
         });
       }
-    },
-    active: function active() {
-      return this.parent.route ? this.routeMatched : this.nameMatched;
+
+      return this.nameMatched;
     }
   },
   methods: {

package/lib/vant.js

@@ -21863,7 +21863,7 @@ var tabbar_createNamespace = Object(create["a" /* createNamespace */])('tabbar')
       var _this2 = this;
 
       this.children.forEach(function (item, index) {
-        item.nameMatched = (item.name || index) === _this2.value;
+        item.nameMatched = item.name === _this2.value || index === _this2.value;
       });
     },
     triggerChange: function triggerChange(active, afterChange) {
@@ -21944,23 +21944,25 @@ var tabbar_item_createNamespace = Object(create["a" /* createNamespace */])('tab
     };
   },
   computed: {
-    routeMatched: function routeMatched() {
-      var to = this.to,
-          $route = this.$route;
+    active: function active() {
+      var routeMode = this.parent.route;
 
-      if (to && $route) {
+      if (routeMode && '$route' in this) {
+        var to = this.to,
+            $route = this.$route;
         var config = Object(utils["f" /* isObject */])(to) ? to : {
           path: to
         };
         return !!$route.matched.find(function (r) {
-          var pathMatched = config.path === r.path;
+          // vue-router 3.x $route.matched[0].path is empty in / and its children paths
+          var path = r.path === '' ? '/' : r.path;
+          var pathMatched = config.path === path;
           var nameMatched = Object(utils["c" /* isDef */])(config.name) && config.name === r.name;
           return pathMatched || nameMatched;
         });
       }
-    },
-    active: function active() {
-      return this.parent.route ? this.routeMatched : this.nameMatched;
+
+      return this.nameMatched;
     }
   },
   methods: {
@@ -22259,7 +22261,7 @@ TreeSelect.props = {
 
 
 
-var version = '2.12.45';
+var version = '2.12.46';
 
 function install(Vue) {
   var components = [action_sheet, address_edit, address_list, es_area, badge, es_button, calendar, card, cascader, cell, cell_group, es_checkbox, checkbox_group, circle, col, collapse, collapse_item, contact_card, contact_edit, contact_list, count_down, es_coupon, coupon_cell, coupon_list, datetime_picker, dialog, divider, dropdown_item, dropdown_menu, empty, es_field, es_form, goods_action, goods_action_button, goods_action_icon, grid, grid_item, es_icon, es_image, image_preview, index_anchor, index_bar, es_info, es_list, es_loading, locale["a" /* default */], nav_bar, notice_bar, notify, number_keyboard, es_overlay, pagination, panel, password_input, es_picker, popover, popup, es_progress, pull_refresh, es_radio, radio_group, es_rate, row, search, share_sheet, sidebar, sidebar_item, skeleton, es_sku, slider, es_step, stepper, steps, es_sticky, submit_bar, swipe, swipe_cell, swipe_item, es_switch, switch_cell, tab, tabbar, tabbar_item, tabs, es_tag, es_toast, tree_select, uploader];