vant 2.12.52 → 2.12.54

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.52';
+var version = '2.12.54';
 exports.version = version;
 
 function install(Vue) {

package/lib/popover/index.js

@@ -72,13 +72,18 @@ var _default2 = createComponent({
   },
   beforeDestroy: function beforeDestroy() {
     if (this.popper) {
+      if (!_utils.isServer) {
+        window.removeEventListener('animationend', this.updateLocation);
+        window.removeEventListener('transitionend', this.updateLocation);
+      }
+
       this.popper.destroy();
       this.popper = null;
     }
   },
   methods: {
     createPopper: function createPopper() {
-      return (0, _popperjs.createPopper)(this.$refs.wrapper, this.$refs.popover.$el, {
+      var popper = (0, _popperjs.createPopper)(this.$refs.wrapper, this.$refs.popover.$el, {
         placement: this.placement,
         modifiers: [{
           name: 'computeStyles',
@@ -92,6 +97,13 @@ var _default2 = createComponent({
           }
         })]
       });
+
+      if (!_utils.isServer) {
+        window.addEventListener('animationend', this.updateLocation);
+        window.addEventListener('transitionend', this.updateLocation);
+      }
+
+      return popper;
     },
     updateLocation: function updateLocation() {
       var _this = this;

package/lib/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/lib/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/lib/sku/Sku.js

@@ -424,10 +424,18 @@ var _default2 = 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];
+              }
             }
           }
         });
@@ -722,7 +730,8 @@ var _default2 = createComponent({
             "skuKeyStr": skuTreeItem.k_id + '',
             "selectedProp": selectedProp,
             "skuEventBus": skuEventBus,
-            "multiple": skuTreeItem.is_multiple
+            "multiple": skuTreeItem.is_multiple,
+            "disabled": skuValue.text_status === 0
           }
         });
       })]);

package/lib/sku/components/SkuRowPropItem.js

@@ -18,7 +18,8 @@ var _default = createComponent({
     skuKeyStr: String,
     skuEventBus: Object,
     selectedProp: Object,
-    multiple: Boolean
+    multiple: Boolean,
+    disabled: Boolean
   },
   computed: {
     choosed: function choosed() {
@@ -35,6 +36,7 @@ var _default = createComponent({
   },
   methods: {
     onSelect: function onSelect() {
+      if (this.disabled) return;
       this.skuEventBus.$emit('sku:propSelect', (0, _extends2.default)({}, this.skuValue, {
         skuKeyStr: this.skuKeyStr,
         multiple: this.multiple
@@ -46,6 +48,8 @@ var _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

package/lib/vant.js

@@ -17553,13 +17553,18 @@ var popover_createNamespace = Object(create["a" /* createNamespace */])('popover
   },
   beforeDestroy: function beforeDestroy() {
     if (this.popper) {
+      if (!utils["h" /* isServer */]) {
+        window.removeEventListener('animationend', this.updateLocation);
+        window.removeEventListener('transitionend', this.updateLocation);
+      }
+
       this.popper.destroy();
       this.popper = null;
     }
   },
   methods: {
     createPopper: function createPopper() {
-      return esm_createPopper(this.$refs.wrapper, this.$refs.popover.$el, {
+      var popper = esm_createPopper(this.$refs.wrapper, this.$refs.popover.$el, {
         placement: this.placement,
         modifiers: [{
           name: 'computeStyles',
@@ -17573,6 +17578,13 @@ var popover_createNamespace = Object(create["a" /* createNamespace */])('popover
           }
         })]
       });
+
+      if (!utils["h" /* isServer */]) {
+        window.addEventListener('animationend', this.updateLocation);
+        window.addEventListener('transitionend', this.updateLocation);
+      }
+
+      return popper;
     },
     updateLocation: function updateLocation() {
       var _this = this;
@@ -19400,7 +19412,8 @@ var SkuRowPropItem_createNamespace = Object(create["a" /* createNamespace */])('
     skuKeyStr: String,
     skuEventBus: Object,
     selectedProp: Object,
-    multiple: Boolean
+    multiple: Boolean,
+    disabled: Boolean
   },
   computed: {
     choosed: function choosed() {
@@ -19417,6 +19430,7 @@ var SkuRowPropItem_createNamespace = Object(create["a" /* createNamespace */])('
   },
   methods: {
     onSelect: function onSelect() {
+      if (this.disabled) return;
       this.skuEventBus.$emit('sku:propSelect', _extends({}, this.skuValue, {
         skuKeyStr: this.skuKeyStr,
         multiple: this.multiple
@@ -19428,6 +19442,8 @@ var SkuRowPropItem_createNamespace = Object(create["a" /* createNamespace */])('
     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
@@ -21443,10 +21459,18 @@ var Sku_QUOTA_LIMIT = LIMIT_TYPE.QUOTA_LIMIT;
                 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];
+              }
             }
           }
         });
@@ -21742,7 +21766,8 @@ var Sku_QUOTA_LIMIT = LIMIT_TYPE.QUOTA_LIMIT;
             "skuKeyStr": skuTreeItem.k_id + '',
             "selectedProp": selectedProp,
             "skuEventBus": skuEventBus,
-            "multiple": skuTreeItem.is_multiple
+            "multiple": skuTreeItem.is_multiple,
+            "disabled": skuValue.text_status === 0
           }
         });
       })]);
@@ -23180,7 +23205,7 @@ TreeSelect.props = {
 
 
 
-var version = '2.12.52';
+var version = '2.12.54';
 
 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];