From 347989bcc50e2046d1d92f4e21f290aed3a735d2 Mon Sep 17 00:00:00 2001
From: wny <colonD.wny@gmail.com>
Date: Thu, 22 Mar 2018 15:59:52 +0800
Subject: [PATCH] =?UTF-8?q?[bugfix]=20=E4=BF=AE=E5=A4=8Dsku=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E9=80=BB=E8=BE=91=E4=B8=8Esku?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=80=89=E4=B8=AD=E7=9A=84=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=20(#752)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/sku/Sku.vue                   | 22 +++++++++++++------
 packages/sku/components/SkuRowItem.vue | 16 ++++----------
 packages/sku/constants.js              |  5 ++++-
 packages/sku/utils/skuHelper.js        | 30 ++++++++++++++++++++++----
 4 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/packages/sku/Sku.vue b/packages/sku/Sku.vue
index 2794bd6c2..0da5245e6 100644
--- a/packages/sku/Sku.vue
+++ b/packages/sku/Sku.vue
@@ -113,10 +113,11 @@ import SkuMessages from './components/SkuMessages';
 import SkuActions from './components/SkuActions';
 import {
   isAllSelected,
+  isSkuChoosable,
   getSkuComb,
   getSelectedSkuValues
 } from './utils/skuHelper';
-import { LIMIT_TYPE } from './constants';
+import { LIMIT_TYPE, UNSELECTED_SKU_VALUE_ID } from './constants';
 import create from '../utils/create';
 
 const { QUOTA_LIMIT } = LIMIT_TYPE;
@@ -292,12 +293,19 @@ export default create({
   methods: {
     resetSelectedSku(skuTree) {
       this.selectedSku = {};
+      // 重置selectedSku
       skuTree.forEach(item => {
-        // 只有一个sku规格值时默认选中
-        if (item.v.length === 1) {
-          this.selectedSku[item.k_s] = item.v[0].id;
-        } else {
-          this.selectedSku[item.k_s] = this.initialSku[item.k_s] || '';
+        this.selectedSku[item.k_s] = this.initialSku[item.k_s] || UNSELECTED_SKU_VALUE_ID;
+      });
+      // 只有一个sku规格值时默认选中
+      skuTree.forEach(item => {
+        const key = item.k_s;
+        const valueId = item.v[0].id;
+        if (
+          item.v.length === 1 &&
+          isSkuChoosable(this.sku.list, this.selectedSku, { key, valueId })
+        ) {
+          this.selectedSku[key] = valueId;
         }
       });
     },
@@ -338,7 +346,7 @@ export default create({
       // 点击已选中的sku时则取消选中
       this.selectedSku =
         this.selectedSku[skuValue.skuKeyStr] === skuValue.id
-          ? { ...this.selectedSku, [skuValue.skuKeyStr]: '' }
+          ? { ...this.selectedSku, [skuValue.skuKeyStr]: UNSELECTED_SKU_VALUE_ID }
           : { ...this.selectedSku, [skuValue.skuKeyStr]: skuValue.id };
 
       this.$emit('sku-selected', {
diff --git a/packages/sku/components/SkuRowItem.vue b/packages/sku/components/SkuRowItem.vue
index 96f4e4cd5..ec7a29dde 100644
--- a/packages/sku/components/SkuRowItem.vue
+++ b/packages/sku/components/SkuRowItem.vue
@@ -13,6 +13,7 @@
 
 <script>
 import create from '../../utils/create';
+import { isSkuChoosable } from '../utils/skuHelper';
 
 export default create({
   name: 'sku-row-item',
@@ -31,19 +32,10 @@ export default create({
     },
 
     isChoosable() {
-      const matchedSku = Object.assign({}, this.selectedSku, {
-        [this.skuKeyStr]: this.skuValue.id
+      return isSkuChoosable(this.skuList, this.selectedSku, {
+        key: this.skuKeyStr,
+        valueId: this.skuValue.id
       });
-      const skusToCheck = Object.keys(matchedSku).filter(skuKey => matchedSku[skuKey] !== '');
-      const filteredSku = this.skuList.filter(sku => {
-        return skusToCheck.every(skuKey => {
-          // 后端给的skuValue.id有时候是数字有时候是字符串，全等会匹配不上
-          return matchedSku[skuKey] == sku[skuKey]; // eslint-disable-line
-        });
-      });
-
-      const stock = filteredSku.reduce((total, sku) => (total += sku.stock_num), 0);
-      return stock > 0;
     }
   },
 
diff --git a/packages/sku/constants.js b/packages/sku/constants.js
index 0d83bd7ce..e1de2beca 100644
--- a/packages/sku/constants.js
+++ b/packages/sku/constants.js
@@ -3,6 +3,9 @@ export const LIMIT_TYPE = {
   STOCK_LIMIT: 1
 };
 
+export const UNSELECTED_SKU_VALUE_ID = '';
+
 export default {
-  LIMIT_TYPE
+  LIMIT_TYPE,
+  UNSELECTED_SKU_VALUE_ID
 };
diff --git a/packages/sku/utils/skuHelper.js b/packages/sku/utils/skuHelper.js
index 7387f1394..a5e3eceb6 100644
--- a/packages/sku/utils/skuHelper.js
+++ b/packages/sku/utils/skuHelper.js
@@ -1,3 +1,5 @@
+import { UNSELECTED_SKU_VALUE_ID } from '../constants';
+
 /*
   normalize sku tree
 
@@ -43,7 +45,7 @@ export const normalizeSkuTree = (skuTree) => {
 // 判断是否所有的sku都已经选中
 export const isAllSelected = (skuTree, selectedSku) => {
   // 筛选selectedSku对象中key值不为空的值
-  const selected = Object.keys(selectedSku).filter(skuKeyStr => selectedSku[skuKeyStr]);
+  const selected = Object.keys(selectedSku).filter(skuKeyStr => selectedSku[skuKeyStr] !== UNSELECTED_SKU_VALUE_ID);
   return skuTree.length === selected.length;
 };
 
@@ -64,7 +66,7 @@ export const getSelectedSkuValues = (skuTree, selectedSku) => {
     const skuValues = normalizedTree[skuKeyStr];
     const skuValueId = selectedSku[skuKeyStr];
 
-    if (skuValueId) {
+    if (skuValueId !== UNSELECTED_SKU_VALUE_ID) {
       const skuValue = skuValues.filter(skuValue => skuValue.id === skuValueId)[0];
       skuValue && selectedValues.push(skuValue);
     }
@@ -72,9 +74,29 @@ export const getSelectedSkuValues = (skuTree, selectedSku) => {
   }, []);
 };
 
+// 判断sku是否可选
+export const isSkuChoosable = (skuList, selectedSku, skuToChoose) => {
+  const { key, valueId } = skuToChoose;
+  // 先假设sku已选中，拼入已选中sku对象中
+  const matchedSku = Object.assign({}, selectedSku, {
+    [key]: valueId
+  });
+  // 再判断剩余sku是否全部不可选，若不可选则当前sku不可选中
+  const skusToCheck = Object.keys(matchedSku).filter(skuKey => matchedSku[skuKey] !== UNSELECTED_SKU_VALUE_ID);
+  const filteredSku = skuList.filter(sku => {
+    return skusToCheck.every(skuKey => {
+      return String(matchedSku[skuKey]) === String(sku[skuKey]);
+    });
+  });
+
+  const stock = filteredSku.reduce((total, sku) => (total += sku.stock_num), 0);
+  return stock > 0;
+};
+
 export default {
   normalizeSkuTree,
-  isAllSelected,
   getSkuComb,
-  getSelectedSkuValues
+  getSelectedSkuValues,
+  isAllSelected,
+  isSkuChoosable
 };