vant 2.13.6 → 2.13.7

package/changelog.generated.md

@@ -0,0 +1,17 @@
+### [v2.13.7](https://github.com/vant-ui/vant/compare/v2.13.2...v2.13.7)
+
+`2025-04-25`
+
+**Document**
+
+- SwitchCell: remove SwitchCell in the form component [#12758](https://github.com/vant-ui/vant/issues/12758)
+- add Rsbuild scaffold [a6983a](https://github.com/vant-ui/vant/commit/a6983a5ca2c6e4d9ff5410ae3cf6bb57a5ef2acc)
+- changelog: vant v2.13.2 [#12373](https://github.com/vant-ui/vant/issues/12373)
+
+**Feature**
+
+- Sku: support sku properties [#13454](https://github.com/vant-ui/vant/issues/13454)
+
+**release**
+
+- 2.13.6 [e2ce4f](https://github.com/vant-ui/vant/commit/e2ce4fc397d8b9e6aa7ea292e9f1871c62517e32)

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.13.2';
+var version = '2.13.7';
 
 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/sku/Sku.js

@@ -30,6 +30,7 @@ export default createComponent({
     lazyLoad: Boolean,
     hideStock: Boolean,
     properties: Array,
+    skuProperties: Array,
     addCartText: String,
     stepperTitle: String,
     getContainer: [String, Function],
@@ -118,7 +119,8 @@ export default createComponent({
       selectedSku: {},
       selectedProp: {},
       selectedNum: 1,
-      show: this.value
+      show: this.value,
+      currentSkuProperties: []
     };
   },
   watch: {
@@ -151,6 +153,9 @@ export default createComponent({
     }
   },
   computed: {
+    isSkuProperties: function isSkuProperties() {
+      return this.skuProperties && this.skuProperties.length;
+    },
     skuGroupClass: function skuGroupClass() {
       return ['van-sku-group-container', {
         'van-sku-group-container--hide-soldout': !this.showSoldoutSku
@@ -193,7 +198,7 @@ export default createComponent({
     selectedSkuComb: function selectedSkuComb() {
       var skuComb = null;
 
-      if (this.isSkuCombSelected) {
+      if (this.isSkuCombSelected || this.isSkuProperties) {
         if (this.hasSku) {
           skuComb = getSkuComb(this.skuList, this.selectedSku);
         } else {
@@ -205,6 +210,8 @@ export default createComponent({
         }
 
         if (skuComb) {
+          // 更新当前规格属性数据
+          this.setCurrentSkuProperties(skuComb.id);
           skuComb.properties = getSelectedProperties(this.propList, this.selectedProp);
           skuComb.property_price = this.selectedPropValues.reduce(function (acc, cur) {
             return acc + (cur.price || 0);
@@ -242,7 +249,7 @@ export default createComponent({
       return this.sku.list || [];
     },
     propList: function propList() {
-      return this.properties || [];
+      return this.isSkuProperties ? this.currentSkuProperties : this.properties || [];
     },
     imageList: function imageList() {
       var imageList = [this.goods.picture];
@@ -332,6 +339,14 @@ export default createComponent({
     this.$emit('after-sku-create', skuEventBus);
   },
   methods: {
+    setCurrentSkuProperties: function setCurrentSkuProperties(id) {
+      var _this$skuProperties;
+
+      var target = ((_this$skuProperties = this.skuProperties) == null ? void 0 : _this$skuProperties.find(function (item) {
+        return item.sku_id === id;
+      })) || {};
+      this.currentSkuProperties = target.properties || [];
+    },
     resetStepper: function resetStepper() {
       var skuStepper = this.$refs.skuStepper;
       var selectedNum = this.initialSku.selectedNum;
@@ -465,13 +480,22 @@ export default createComponent({
       var _extends2, _extends3;
 
       // 点击已选中的sku时则取消选中
-      this.selectedSku = this.selectedSku[skuValue.skuKeyStr] === skuValue.id ? _extends({}, this.selectedSku, (_extends2 = {}, _extends2[skuValue.skuKeyStr] = UNSELECTED_SKU_VALUE_ID, _extends2)) : _extends({}, this.selectedSku, (_extends3 = {}, _extends3[skuValue.skuKeyStr] = skuValue.id, _extends3));
+      this.selectedSku = this.selectedSku[skuValue.skuKeyStr] === skuValue.id ? _extends({}, this.selectedSku, (_extends2 = {}, _extends2[skuValue.skuKeyStr] = UNSELECTED_SKU_VALUE_ID, _extends2)) : _extends({}, this.selectedSku, (_extends3 = {}, _extends3[skuValue.skuKeyStr] = skuValue.id, _extends3)); // 切换sku清空当前选择属性数据，触发prop-clear
+
+      if (this.isSkuProperties) {
+        this.selectedProp = {};
+        this.onPropClear();
+      }
+
       this.$emit('sku-selected', {
         skuValue: skuValue,
         selectedSku: this.selectedSku,
         selectedSkuComb: this.selectedSkuComb
       });
     },
+    onPropClear: function onPropClear() {
+      this.$emit('sku-prop-clear');
+    },
     onPropSelect: function onPropSelect(propValue) {
       var _extends4;
 

package/lib/index.js

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

package/lib/sku/Sku.js

@@ -54,6 +54,7 @@ var _default2 = createComponent({
     lazyLoad: Boolean,
     hideStock: Boolean,
     properties: Array,
+    skuProperties: Array,
     addCartText: String,
     stepperTitle: String,
     getContainer: [String, Function],
@@ -142,7 +143,8 @@ var _default2 = createComponent({
       selectedSku: {},
       selectedProp: {},
       selectedNum: 1,
-      show: this.value
+      show: this.value,
+      currentSkuProperties: []
     };
   },
   watch: {
@@ -175,6 +177,9 @@ var _default2 = createComponent({
     }
   },
   computed: {
+    isSkuProperties: function isSkuProperties() {
+      return this.skuProperties && this.skuProperties.length;
+    },
     skuGroupClass: function skuGroupClass() {
       return ['van-sku-group-container', {
         'van-sku-group-container--hide-soldout': !this.showSoldoutSku
@@ -217,7 +222,7 @@ var _default2 = createComponent({
     selectedSkuComb: function selectedSkuComb() {
       var skuComb = null;
 
-      if (this.isSkuCombSelected) {
+      if (this.isSkuCombSelected || this.isSkuProperties) {
         if (this.hasSku) {
           skuComb = (0, _skuHelper.getSkuComb)(this.skuList, this.selectedSku);
         } else {
@@ -229,6 +234,8 @@ var _default2 = createComponent({
         }
 
         if (skuComb) {
+          // 更新当前规格属性数据
+          this.setCurrentSkuProperties(skuComb.id);
           skuComb.properties = (0, _skuHelper.getSelectedProperties)(this.propList, this.selectedProp);
           skuComb.property_price = this.selectedPropValues.reduce(function (acc, cur) {
             return acc + (cur.price || 0);
@@ -266,7 +273,7 @@ var _default2 = createComponent({
       return this.sku.list || [];
     },
     propList: function propList() {
-      return this.properties || [];
+      return this.isSkuProperties ? this.currentSkuProperties : this.properties || [];
     },
     imageList: function imageList() {
       var imageList = [this.goods.picture];
@@ -356,6 +363,14 @@ var _default2 = createComponent({
     this.$emit('after-sku-create', skuEventBus);
   },
   methods: {
+    setCurrentSkuProperties: function setCurrentSkuProperties(id) {
+      var _this$skuProperties;
+
+      var target = ((_this$skuProperties = this.skuProperties) == null ? void 0 : _this$skuProperties.find(function (item) {
+        return item.sku_id === id;
+      })) || {};
+      this.currentSkuProperties = target.properties || [];
+    },
     resetStepper: function resetStepper() {
       var skuStepper = this.$refs.skuStepper;
       var selectedNum = this.initialSku.selectedNum;
@@ -489,13 +504,22 @@ var _default2 = createComponent({
       var _extends2, _extends3;
 
       // 点击已选中的sku时则取消选中
-      this.selectedSku = this.selectedSku[skuValue.skuKeyStr] === skuValue.id ? (0, _extends5.default)({}, this.selectedSku, (_extends2 = {}, _extends2[skuValue.skuKeyStr] = _constants.UNSELECTED_SKU_VALUE_ID, _extends2)) : (0, _extends5.default)({}, this.selectedSku, (_extends3 = {}, _extends3[skuValue.skuKeyStr] = skuValue.id, _extends3));
+      this.selectedSku = this.selectedSku[skuValue.skuKeyStr] === skuValue.id ? (0, _extends5.default)({}, this.selectedSku, (_extends2 = {}, _extends2[skuValue.skuKeyStr] = _constants.UNSELECTED_SKU_VALUE_ID, _extends2)) : (0, _extends5.default)({}, this.selectedSku, (_extends3 = {}, _extends3[skuValue.skuKeyStr] = skuValue.id, _extends3)); // 切换sku清空当前选择属性数据，触发prop-clear
+
+      if (this.isSkuProperties) {
+        this.selectedProp = {};
+        this.onPropClear();
+      }
+
       this.$emit('sku-selected', {
         skuValue: skuValue,
         selectedSku: this.selectedSku,
         selectedSkuComb: this.selectedSkuComb
       });
     },
+    onPropClear: function onPropClear() {
+      this.$emit('sku-prop-clear');
+    },
     onPropSelect: function onPropSelect(propValue) {
       var _extends4;
 

package/lib/vant.js

@@ -21088,6 +21088,7 @@ var Sku_QUOTA_LIMIT = LIMIT_TYPE.QUOTA_LIMIT;
     lazyLoad: Boolean,
     hideStock: Boolean,
     properties: Array,
+    skuProperties: Array,
     addCartText: String,
     stepperTitle: String,
     getContainer: [String, Function],
@@ -21176,7 +21177,8 @@ var Sku_QUOTA_LIMIT = LIMIT_TYPE.QUOTA_LIMIT;
       selectedSku: {},
       selectedProp: {},
       selectedNum: 1,
-      show: this.value
+      show: this.value,
+      currentSkuProperties: []
     };
   },
   watch: {
@@ -21209,6 +21211,9 @@ var Sku_QUOTA_LIMIT = LIMIT_TYPE.QUOTA_LIMIT;
     }
   },
   computed: {
+    isSkuProperties: function isSkuProperties() {
+      return this.skuProperties && this.skuProperties.length;
+    },
     skuGroupClass: function skuGroupClass() {
       return ['van-sku-group-container', {
         'van-sku-group-container--hide-soldout': !this.showSoldoutSku
@@ -21251,7 +21256,7 @@ var Sku_QUOTA_LIMIT = LIMIT_TYPE.QUOTA_LIMIT;
     selectedSkuComb: function selectedSkuComb() {
       var skuComb = null;
 
-      if (this.isSkuCombSelected) {
+      if (this.isSkuCombSelected || this.isSkuProperties) {
         if (this.hasSku) {
           skuComb = getSkuComb(this.skuList, this.selectedSku);
         } else {
@@ -21263,6 +21268,8 @@ var Sku_QUOTA_LIMIT = LIMIT_TYPE.QUOTA_LIMIT;
         }
 
         if (skuComb) {
+          // 更新当前规格属性数据
+          this.setCurrentSkuProperties(skuComb.id);
           skuComb.properties = sku_helper_getSelectedProperties(this.propList, this.selectedProp);
           skuComb.property_price = this.selectedPropValues.reduce(function (acc, cur) {
             return acc + (cur.price || 0);
@@ -21300,7 +21307,7 @@ var Sku_QUOTA_LIMIT = LIMIT_TYPE.QUOTA_LIMIT;
       return this.sku.list || [];
     },
     propList: function propList() {
-      return this.properties || [];
+      return this.isSkuProperties ? this.currentSkuProperties : this.properties || [];
     },
     imageList: function imageList() {
       var imageList = [this.goods.picture];
@@ -21390,6 +21397,14 @@ var Sku_QUOTA_LIMIT = LIMIT_TYPE.QUOTA_LIMIT;
     this.$emit('after-sku-create', skuEventBus);
   },
   methods: {
+    setCurrentSkuProperties: function setCurrentSkuProperties(id) {
+      var _this$skuProperties;
+
+      var target = ((_this$skuProperties = this.skuProperties) == null ? void 0 : _this$skuProperties.find(function (item) {
+        return item.sku_id === id;
+      })) || {};
+      this.currentSkuProperties = target.properties || [];
+    },
     resetStepper: function resetStepper() {
       var skuStepper = this.$refs.skuStepper;
       var selectedNum = this.initialSku.selectedNum;
@@ -21523,13 +21538,22 @@ var Sku_QUOTA_LIMIT = LIMIT_TYPE.QUOTA_LIMIT;
       var _extends2, _extends3; // 点击已选中的sku时则取消选中
 
 
-      this.selectedSku = this.selectedSku[skuValue.skuKeyStr] === skuValue.id ? _extends({}, this.selectedSku, (_extends2 = {}, _extends2[skuValue.skuKeyStr] = UNSELECTED_SKU_VALUE_ID, _extends2)) : _extends({}, this.selectedSku, (_extends3 = {}, _extends3[skuValue.skuKeyStr] = skuValue.id, _extends3));
+      this.selectedSku = this.selectedSku[skuValue.skuKeyStr] === skuValue.id ? _extends({}, this.selectedSku, (_extends2 = {}, _extends2[skuValue.skuKeyStr] = UNSELECTED_SKU_VALUE_ID, _extends2)) : _extends({}, this.selectedSku, (_extends3 = {}, _extends3[skuValue.skuKeyStr] = skuValue.id, _extends3)); // 切换sku清空当前选择属性数据，触发prop-clear
+
+      if (this.isSkuProperties) {
+        this.selectedProp = {};
+        this.onPropClear();
+      }
+
       this.$emit('sku-selected', {
         skuValue: skuValue,
         selectedSku: this.selectedSku,
         selectedSkuComb: this.selectedSkuComb
       });
     },
+    onPropClear: function onPropClear() {
+      this.$emit('sku-prop-clear');
+    },
     onPropSelect: function onPropSelect(propValue) {
       var _extends4;
 
@@ -23204,7 +23228,7 @@ TreeSelect.props = {
 
 
 
-var version = '2.13.2';
+var version = '2.13.7';
 
 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];