vant 2.12.51 → 2.12.53

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

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/uploader/index.js

@@ -423,7 +423,7 @@ var _default2 = createComponent({
     genUpload: function genUpload() {
       var h = this.$createElement;
 
-      if (this.fileList.length >= this.maxCount || !this.showUpload) {
+      if (this.fileList.length >= this.maxCount) {
         return;
       }
 
@@ -462,6 +462,10 @@ var _default2 = createComponent({
       }
 
       return h("div", {
+        "directives": [{
+          name: "show",
+          value: this.showUpload
+        }],
         "class": bem('upload', {
           readonly: this.readonly
         }),

package/lib/vant.js

@@ -19400,7 +19400,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 +19418,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 +19430,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
@@ -20453,7 +20457,7 @@ var uploader_createNamespace = Object(create["a" /* createNamespace */])('upload
     genUpload: function genUpload() {
       var h = this.$createElement;
 
-      if (this.fileList.length >= this.maxCount || !this.showUpload) {
+      if (this.fileList.length >= this.maxCount) {
         return;
       }
 
@@ -20492,6 +20496,10 @@ var uploader_createNamespace = Object(create["a" /* createNamespace */])('upload
       }
 
       return h("div", {
+        "directives": [{
+          name: "show",
+          value: this.showUpload
+        }],
         "class": uploader_bem('upload', {
           readonly: this.readonly
         }),
@@ -21439,10 +21447,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];
+              }
             }
           }
         });
@@ -21738,7 +21754,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
           }
         });
       })]);
@@ -23176,7 +23193,7 @@ TreeSelect.props = {
 
 
 
-var version = '2.12.51';
+var version = '2.12.53';
 
 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];