vant 2.12.52 → 2.12.54

package/changelog.generated.md

@@ -0,0 +1,12 @@
+### [v2.12.54](https://github.com/vant-ui/vant/compare/v2.12.53...v2.12.54)
+
+`2023-02-11`
+
+**Bug Fixes**
+
+- popover: location update after transition [#11558](https://github.com/vant-ui/vant/issues/11558)
+- Search: @search-left-icon-color invalid & docs update [#11299](https://github.com/vant-ui/vant/issues/11299)
+
+**Document**
+
+- changelog: vant@2.12.53 [#11262](https://github.com/vant-ui/vant/issues/11262)

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.52';
+var version = '2.12.54';
 
 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/popover/index.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import { createPopper as _createPopper, offsetModifier } from '@vant/popperjs';
-import { createNamespace } from '../utils';
+import { createNamespace, isServer } from '../utils';
 import { BORDER_BOTTOM } from '../utils/constant'; // Mixins
 
 import { ClickOutsideMixin } from '../mixins/click-outside'; // Components
@@ -59,13 +59,18 @@ export default createComponent({
   },
   beforeDestroy: function beforeDestroy() {
     if (this.popper) {
+      if (!isServer) {
+        window.removeEventListener('animationend', this.updateLocation);
+        window.removeEventListener('transitionend', this.updateLocation);
+      }
+
       this.popper.destroy();
       this.popper = null;
     }
   },
   methods: {
     createPopper: function createPopper() {
-      return _createPopper(this.$refs.wrapper, this.$refs.popover.$el, {
+      var popper = _createPopper(this.$refs.wrapper, this.$refs.popover.$el, {
         placement: this.placement,
         modifiers: [{
           name: 'computeStyles',
@@ -79,6 +84,13 @@ export default createComponent({
           }
         })]
       });
+
+      if (!isServer) {
+        window.addEventListener('animationend', this.updateLocation);
+        window.addEventListener('transitionend', this.updateLocation);
+      }
+
+      return popper;
     },
     updateLocation: function updateLocation() {
       var _this = this;

package/es/search/index.css

@@ -1 +1 @@
-.van-search{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;box-sizing:border-box;padding:10px 12px;background-color:#fff}.van-search__content{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding-left:12px;background-color:#f7f8fa;border-radius:2px}.van-search__content--round{border-radius:999px}.van-search__label{padding:0 5px;color:#323233;font-size:14px;line-height:34px}.van-search .van-cell{-webkit-box-flex:1;-webkit-flex:1;flex:1;padding:5px 8px 5px 0;background-color:transparent}.van-search .van-cell__left-icon{color:#969799}.van-search--show-action{padding-right:0}.van-search input::-webkit-search-cancel-button,.van-search input::-webkit-search-decoration,.van-search input::-webkit-search-results-button,.van-search input::-webkit-search-results-decoration{display:none}.van-search__action{padding:0 8px;color:#323233;font-size:14px;line-height:34px;cursor:pointer;-webkit-user-select:none;user-select:none}.van-search__action:active{background-color:#f2f3f5}
+.van-search{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;box-sizing:border-box;padding:10px 12px;background-color:#fff}.van-search__content{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding-left:12px;background-color:#f7f8fa;border-radius:2px}.van-search__content--round{border-radius:999px}.van-search__label{padding:0 5px;color:#323233;font-size:14px;line-height:34px}.van-search .van-cell{-webkit-box-flex:1;-webkit-flex:1;flex:1;padding:5px 8px 5px 0;background-color:transparent}.van-search .van-cell .van-field__left-icon{color:#969799}.van-search--show-action{padding-right:0}.van-search input::-webkit-search-cancel-button,.van-search input::-webkit-search-decoration,.van-search input::-webkit-search-results-button,.van-search input::-webkit-search-results-decoration{display:none}.van-search__action{padding:0 8px;color:#323233;font-size:14px;line-height:34px;cursor:pointer;-webkit-user-select:none;user-select:none}.van-search__action:active{background-color:#f2f3f5}

package/es/search/index.less

@@ -31,7 +31,7 @@
     padding: 5px @padding-xs 5px 0;
     background-color: transparent;
 
-    &__left-icon {
+    .van-field__left-icon {
       color: @search-left-icon-color;
     }
   }

package/es/sku/Sku.js

@@ -400,10 +400,18 @@ export default createComponent({
                 k_id = item.k_id;
             var isHasConfigPrice = v.some(function (i) {
               return +i.price !== 0;
-            });
+            }); // 没有加价属性
 
             if (!isHasConfigPrice) {
-              _this3.selectedProp[k_id] = [v[0].id];
+              // 找到第一个不被禁用的属性
+              // 历史如果没有 text_status 字段的，就相当于沿用直接原来的逻辑取第一个属性
+              var firstEnableProp = v.find(function (prop) {
+                return prop.text_status !== 0;
+              });
+
+              if (firstEnableProp) {
+                _this3.selectedProp[k_id] = [firstEnableProp.id];
+              }
             }
           }
         });
@@ -699,7 +707,8 @@ export default createComponent({
             "skuKeyStr": skuTreeItem.k_id + '',
             "selectedProp": selectedProp,
             "skuEventBus": skuEventBus,
-            "multiple": skuTreeItem.is_multiple
+            "multiple": skuTreeItem.is_multiple,
+            "disabled": skuValue.text_status === 0
           }
         });
       })]);

package/es/sku/components/SkuRowPropItem.js

@@ -10,7 +10,8 @@ export default createComponent({
     skuKeyStr: String,
     skuEventBus: Object,
     selectedProp: Object,
-    multiple: Boolean
+    multiple: Boolean,
+    disabled: Boolean
   },
   computed: {
     choosed: function choosed() {
@@ -27,6 +28,7 @@ export default createComponent({
   },
   methods: {
     onSelect: function onSelect() {
+      if (this.disabled) return;
       this.skuEventBus.$emit('sku:propSelect', _extends({}, this.skuValue, {
         skuKeyStr: this.skuKeyStr,
         multiple: this.multiple
@@ -38,6 +40,8 @@ export default createComponent({
     return h("span", {
       "class": ['van-sku-row__item', {
         'van-sku-row__item--active': this.choosed
+      }, {
+        'van-sku-row__item--disabled': this.disabled
       }],
       "on": {
         "click": this.onSelect