vant 2.13.7 → 2.13.9-beta.0

package/lib/sku/Sku.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 
-var _extends5 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _vue = _interopRequireDefault(require("vue"));
 
@@ -170,7 +170,6 @@ var _default2 = createComponent({
     value: function value(val) {
       this.show = val;
     },
-    skuTree: 'resetSelectedSku',
     initialSku: function initialSku() {
       this.resetStepper();
       this.resetSelectedSku();
@@ -231,11 +230,12 @@ var _default2 = createComponent({
             price: Math.round(this.sku.price * 100),
             stock_num: this.sku.stock_num
           };
-        }
+        } // 更新当前规格属性数据
+
+
+        this.setCurrentSkuProperties(skuComb ? skuComb.id : null);
 
         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);
@@ -267,7 +267,13 @@ var _default2 = createComponent({
       return this.sku.origin_price;
     },
     skuTree: function skuTree() {
-      return this.sku.tree || [];
+      var originTree = this.sku.tree || []; // 避免不必要的重复计算
+
+      if (!originTree.length || !this.skuList.length) {
+        return originTree;
+      }
+
+      return (0, _skuHelper.filterDisabledSkuTree)(originTree, this.skuList, this.selectedSku);
     },
     skuList: function skuList() {
       return this.sku.list || [];
@@ -389,7 +395,16 @@ var _default2 = createComponent({
     resetSelectedSku: function resetSelectedSku() {
       var _this3 = this;
 
-      this.selectedSku = {}; // 重置 selectedSku
+      this.selectedSku = {}; // 检查initialSku中指定的值是否全部被禁用
+
+      var initialSkuDisabled = this.checkInitialSkuDisabled(); // 如果initialSku中的值全部被禁用，直接返回空选择
+
+      if (initialSkuDisabled) {
+        // 重置商品属性
+        this.resetSelectedProp();
+        return;
+      } // 重置 selectedSku
+
 
       this.skuTree.forEach(function (item) {
         _this3.selectedSku[item.k_s] = _constants.UNSELECTED_SKU_VALUE_ID;
@@ -403,7 +418,18 @@ var _default2 = createComponent({
           key: key,
           valueId: valueId
         })) {
-          _this3.selectedSku[key] = valueId;
+          // 检查是否有对应的非禁用SKU
+          var skusWithThisValue = _this3.skuList.filter(function (sku) {
+            return String(sku[key]) === String(valueId);
+          });
+
+          var hasNonDisabledSku = skusWithThisValue.some(function (sku) {
+            return sku.disable_status !== 1;
+          });
+
+          if (hasNonDisabledSku) {
+            _this3.selectedSku[key] = valueId;
+          }
         }
       });
       var skuValues = this.selectedSkuValues;
@@ -416,8 +442,51 @@ var _default2 = createComponent({
             selectedSkuComb: _this3.selectedSkuComb
           });
         });
-      } // 重置商品属性
+      }
+
+      this.resetSelectedProp(); // 抛出重置事件
+
+      this.$emit('sku-reset', {
+        selectedSku: this.selectedSku,
+        selectedProp: this.selectedProp,
+        selectedSkuComb: this.selectedSkuComb
+      });
+      this.centerInitialSku();
+    },
+    // 检查initialSku中指定的值是否全部被禁用
+    checkInitialSkuDisabled: function checkInitialSkuDisabled() {
+      var _this4 = this;
+
+      // 如果没有initialSku或者没有skuList，则不进行检查
+      if ((0, _utils.isEmpty)(this.initialSku) || !this.skuList.length) {
+        return false;
+      } // 只关注 s1 到 s5 的规格键
+
+
+      var skuKeys = ['s1', 's2', 's3', 's4', 's5']; // 获取initialSku中有效的规格项
 
+      var initialSkuKeys = skuKeys.filter(function (key) {
+        return _this4.initialSku[key] !== undefined && _this4.initialSku[key] !== _constants.UNSELECTED_SKU_VALUE_ID && _this4.initialSku[key] !== '';
+      }); // 如果没有有效的规格项，则不进行检查
+
+      if (!initialSkuKeys.length) {
+        return false;
+      } // 查找符合initialSku的所有sku组合
+
+
+      var matchedSkus = this.skuList.filter(function (sku) {
+        return initialSkuKeys.every(function (key) {
+          return String(sku[key]) === String(_this4.initialSku[key]);
+        });
+      }); // 如果没有匹配的sku或者所有匹配的sku都被禁用，则返回true
+
+      return !matchedSkus.length || matchedSkus.every(function (sku) {
+        return sku.disable_status === 1;
+      });
+    },
+    // 重置商品属性
+    resetSelectedProp: function resetSelectedProp() {
+      var _this5 = this;
 
       this.selectedProp = {};
       var _this$initialSku$sele = this.initialSku.selectedProp,
@@ -425,7 +494,7 @@ var _default2 = createComponent({
 
       this.propList.forEach(function (item) {
         if (selectedProp[item.k_id]) {
-          _this3.selectedProp[item.k_id] = selectedProp[item.k_id];
+          _this5.selectedProp[item.k_id] = selectedProp[item.k_id];
         }
       });
 
@@ -449,7 +518,7 @@ var _default2 = createComponent({
               });
 
               if (firstEnableProp) {
-                _this3.selectedProp[k_id] = [firstEnableProp.id];
+                _this5.selectedProp[k_id] = [firstEnableProp.id];
               }
             }
           }
@@ -464,15 +533,7 @@ var _default2 = createComponent({
           selectedProp: this.selectedProp,
           selectedSkuComb: this.selectedSkuComb
         });
-      } // 抛出重置事件
-
-
-      this.$emit('sku-reset', {
-        selectedSku: this.selectedSku,
-        selectedProp: this.selectedProp,
-        selectedSkuComb: this.selectedSkuComb
-      });
-      this.centerInitialSku();
+      }
     },
     getSkuMessages: function getSkuMessages() {
       return this.$refs.skuMessages ? this.$refs.skuMessages.getMessages() : {};
@@ -501,27 +562,39 @@ var _default2 = createComponent({
       return t('selectSku');
     },
     onSelect: function onSelect(skuValue) {
-      var _extends2, _extends3;
+      var _this6 = this;
 
       // 点击已选中的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)); // 切换sku清空当前选择属性数据，触发prop-clear
+      var newSelectedSku = (0, _extends3.default)({}, this.selectedSku);
+
+      if (newSelectedSku[skuValue.skuKeyStr] === skuValue.id) {
+        newSelectedSku[skuValue.skuKeyStr] = _constants.UNSELECTED_SKU_VALUE_ID;
+      } else {
+        newSelectedSku[skuValue.skuKeyStr] = skuValue.id;
+      } // 使用 Vue.set 来确保正确触发响应式更新
+
+
+      this.selectedSku = newSelectedSku; // 切换sku清空当前选择属性数据，触发prop-clear
 
       if (this.isSkuProperties) {
         this.selectedProp = {};
         this.onPropClear();
-      }
+      } // 使用 $nextTick 等待 DOM 更新后再触发事件
 
-      this.$emit('sku-selected', {
-        skuValue: skuValue,
-        selectedSku: this.selectedSku,
-        selectedSkuComb: this.selectedSkuComb
+
+      this.$nextTick(function () {
+        _this6.$emit('sku-selected', {
+          skuValue: skuValue,
+          selectedSku: _this6.selectedSku,
+          selectedSkuComb: _this6.selectedSkuComb
+        });
       });
     },
     onPropClear: function onPropClear() {
       this.$emit('sku-prop-clear');
     },
     onPropSelect: function onPropSelect(propValue) {
-      var _extends4;
+      var _extends2;
 
       var arr = this.selectedProp[propValue.skuKeyStr] || [];
       var pos = arr.indexOf(propValue.id);
@@ -534,7 +607,7 @@ var _default2 = createComponent({
         arr.splice(0, 1, propValue.id);
       }
 
-      this.selectedProp = (0, _extends5.default)({}, this.selectedProp, (_extends4 = {}, _extends4[propValue.skuKeyStr] = arr, _extends4));
+      this.selectedProp = (0, _extends3.default)({}, this.selectedProp, (_extends2 = {}, _extends2[propValue.skuKeyStr] = arr, _extends2));
       this.$emit('sku-prop-selected', {
         propValue: propValue,
         selectedProp: this.selectedProp,
@@ -545,7 +618,7 @@ var _default2 = createComponent({
       this.selectedNum = num;
     },
     onPreviewImage: function onPreviewImage(selectedValue) {
-      var _this4 = this;
+      var _this7 = this;
 
       var imageList = this.imageList;
       var index = 0;
@@ -563,7 +636,7 @@ var _default2 = createComponent({
         indexImage = selectedValue.imgUrl;
       }
 
-      var params = (0, _extends5.default)({}, selectedValue, {
+      var params = (0, _extends3.default)({}, selectedValue, {
         index: index,
         imageList: this.imageList,
         indexImage: indexImage
@@ -578,7 +651,7 @@ var _default2 = createComponent({
         images: this.imageList,
         startPosition: index,
         onClose: function onClose() {
-          _this4.$emit('close-preview', params);
+          _this7.$emit('close-preview', params);
         }
       });
     },
@@ -613,7 +686,7 @@ var _default2 = createComponent({
       }
     },
     onStepperState: function onStepperState(data) {
-      this.stepperError = data.valid ? null : (0, _extends5.default)({}, data, {
+      this.stepperError = data.valid ? null : (0, _extends3.default)({}, data, {
         action: 'plus'
       });
     },
@@ -652,18 +725,18 @@ var _default2 = createComponent({
       this.centerInitialSku();
     },
     centerInitialSku: function centerInitialSku() {
-      var _this5 = this;
+      var _this8 = this;
 
       (this.$refs.skuRows || []).forEach(function (it) {
         var _ref = it.skuRow || {},
             k_s = _ref.k_s;
 
-        it.centerItem(_this5.initialSku[k_s]);
+        it.centerItem(_this8.initialSku[k_s]);
       });
     }
   },
   render: function render() {
-    var _this6 = this;
+    var _this9 = this;
 
     var h = arguments[0];
 
@@ -695,7 +768,7 @@ var _default2 = createComponent({
     };
 
     var slots = function slots(name) {
-      return _this6.slots(name, slotsProps);
+      return _this9.slots(name, slotsProps);
     };
 
     var Header = slots('sku-header') || h(_SkuHeader.default, {
@@ -777,7 +850,7 @@ var _default2 = createComponent({
       },
       "on": {
         "change": function change(event) {
-          _this6.$emit('stepper-change', event);
+          _this9.$emit('stepper-change', event);
         }
       }
     });
@@ -811,9 +884,9 @@ var _default2 = createComponent({
         "opened": this.onOpened
       },
       "model": {
-        value: _this6.show,
+        value: _this9.show,
         callback: function callback($$v) {
-          _this6.show = $$v;
+          _this9.show = $$v;
         }
       }
     }, [Header, h("div", {

package/lib/sku/utils/sku-helper.js

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.default = exports.getSelectedProperties = exports.getSelectedPropValues = exports.isSkuChoosable = exports.getSelectedSkuValues = exports.getSkuComb = exports.isAllSelected = exports.normalizePropList = exports.normalizeSkuTree = void 0;
+exports.default = exports.getSelectedProperties = exports.getSelectedPropValues = exports.filterDisabledSkuTree = exports.isSkuChoosable = exports.getSelectedSkuValues = exports.getSkuComb = exports.isAllSelected = exports.normalizePropList = exports.normalizeSkuTree = void 0;
 
 var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -126,16 +126,136 @@ var isSkuChoosable = function isSkuChoosable(skuList, selectedSku, skuToChoose)
     return skusToCheck.every(function (skuKey) {
       return String(matchedSku[skuKey]) === String(sku[skuKey]);
     });
+  }); // 检查是否有非禁用的SKU可选
+
+  var availableSku = filteredSku.filter(function (sku) {
+    return sku.disable_status !== 1;
   });
-  var stock = filteredSku.reduce(function (total, sku) {
+  var stock = availableSku.reduce(function (total, sku) {
     total += sku.stock_num;
     return total;
   }, 0);
   return stock > 0;
-};
+}; // 根据disable_status字段过滤skuTree
+
 
 exports.isSkuChoosable = isSkuChoosable;
 
+var filterDisabledSkuTree = function filterDisabledSkuTree(skuTree, skuList, selectedSku) {
+  if (selectedSku === void 0) {
+    selectedSku = {};
+  }
+
+  if (!(skuList == null ? void 0 : skuList.length)) {
+    return skuTree;
+  } // 创建规格树的深拷贝，避免修改原始数据
+
+
+  var treeClone = JSON.parse(JSON.stringify(skuTree)); // 对每个规格值，收集所有包含它的SKU
+
+  var specValueToSkus = {}; // 初始化规格值到SKU的映射
+
+  treeClone.forEach(function (treeItem) {
+    var key = treeItem.k_s;
+    treeItem.v.forEach(function (value) {
+      var valueId = value.id;
+      specValueToSkus[key + "-" + valueId] = [];
+    });
+  }); // 收集每个规格值对应的所有SKU
+
+  skuList.forEach(function (item) {
+    for (var i = 1; i <= 5; i++) {
+      var key = "s" + i;
+      var value = item[key];
+
+      if (value && value !== '0') {
+        var mapKey = key + "-" + value;
+
+        if (specValueToSkus[mapKey]) {
+          specValueToSkus[mapKey].push(item);
+        }
+      }
+    }
+  }); // 过滤规格树
+
+  return treeClone.filter(function (treeItem) {
+    var key = treeItem.k_s;
+    var isSelectedSpec = selectedSku[key] && selectedSku[key] !== _constants.UNSELECTED_SKU_VALUE_ID; // 过滤规格值
+
+    treeItem.v = treeItem.v.filter(function (value) {
+      var valueId = value.id;
+      var mapKey = key + "-" + valueId;
+      var relatedSkus = specValueToSkus[mapKey] || []; // 1. 如果所有包含该规格值的SKU都被明确禁用，则过滤掉该规格值
+
+      if (relatedSkus.length > 0) {
+        var allExplicitlyDisabled = relatedSkus.every(function (sku) {
+          return sku.disable_status === 1;
+        });
+
+        if (allExplicitlyDisabled) {
+          return false;
+        }
+      } // 2. 如果是已选中的值，保留它
+
+
+      if (isSelectedSpec && String(valueId) === String(selectedSku[key])) {
+        return true;
+      } // 3. 如果用户已经选择了其他规格，检查组合
+
+
+      var validSelectedEntries = Object.entries(selectedSku).filter(function (_ref) {
+        var selectedKey = _ref[0],
+            val = _ref[1];
+        return val !== _constants.UNSELECTED_SKU_VALUE_ID && selectedKey !== key;
+      } // 排除当前规格
+      );
+
+      if (validSelectedEntries.length > 0) {
+        // 创建当前组合
+        var combinedSelection = {}; // 添加已选规格
+
+        validSelectedEntries.forEach(function (_ref2) {
+          var selectedKey = _ref2[0],
+              val = _ref2[1];
+          combinedSelection[selectedKey] = val;
+        }); // 添加当前正在检查的规格值
+
+        combinedSelection[key] = String(valueId); // 查找满足当前组合的SKU
+
+        var matchingSku = skuList.filter(function (sku) {
+          return Object.entries(combinedSelection).every(function (_ref3) {
+            var selectedKey = _ref3[0],
+                selectedVal = _ref3[1];
+            return String(sku[selectedKey]) === String(selectedVal);
+          });
+        }); // 如果有匹配的SKU，检查它们是否全部被禁用
+
+        if (matchingSku.length > 0) {
+          var allDisabled = matchingSku.every(function (sku) {
+            return sku.disable_status === 1;
+          });
+          return !allDisabled;
+        }
+      } // 默认保留所有规格值
+
+
+      return true;
+    }); // 如果是已选中的规格项，但过滤后没有包含已选值，则隐藏
+
+    if (isSelectedSpec) {
+      var selectedValueExists = treeItem.v.some(function (value) {
+        return String(value.id) === String(selectedSku[key]);
+      });
+      return selectedValueExists;
+    } // 如果该规格项下没有规格值了，则隐藏整个规格项
+
+
+    return treeItem.v.length > 0;
+  });
+};
+
+exports.filterDisabledSkuTree = filterDisabledSkuTree;
+
 var getSelectedPropValues = function getSelectedPropValues(propList, selectedProp) {
   var normalizeProp = normalizePropList(propList);
   return Object.keys(selectedProp).reduce(function (acc, cur) {
@@ -174,6 +294,7 @@ var _default = {
   isAllSelected: isAllSelected,
   isSkuChoosable: isSkuChoosable,
   getSelectedPropValues: getSelectedPropValues,
-  getSelectedProperties: getSelectedProperties
+  getSelectedProperties: getSelectedProperties,
+  filterDisabledSkuTree: filterDisabledSkuTree
 };
 exports.default = _default;