Merge branch 'dev' of https://github.com/youzan/vant into dev

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.12.8",
+  "version": "0.12.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.12.8",
+  "version": "0.12.9",
   "description": "A Vue.js 2.0 Mobile UI at YouZan",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

packages/index.js

@@ -63,7 +63,7 @@ import TreeSelect from './tree-select';
 import Uploader from './uploader';
 import Waterfall from './waterfall';
 
-const version = '0.12.8';
+const version = '0.12.9';
 const components = [
   Actionsheet,
   AddressEdit,

packages/sku/components/SkuMessages.vue

@@ -54,10 +54,16 @@ export default create({
 
   data() {
     return {
-      messageValues: this.messages.map(() => ({ value: '' }))
+      messageValues: this.resetMessageValues(this.messages)
     };
   },
 
+  watch: {
+    messages(val) {
+      this.messageValues = this.resetMessageValues(val);
+    }
+  },
+
   computed: {
     messagePlaceholderMap() {
       return this.messageConfig.placeholderMap || {};
@@ -65,6 +71,9 @@ export default create({
   },
 
   methods: {
+    resetMessageValues(messages) {
+      return (messages || []).map(() => ({ value: '' }));
+    },
     getType(message) {
       if (+message.multiple === 1) {
         return 'textarea';

packages/vant-css/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.12.8",
+  "version": "0.12.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

packages/vant-css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.12.8",
+  "version": "0.12.10",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",

test/unit/specs/sku.spec.js

@@ -219,15 +219,17 @@ describe('Sku', (done) => {
   });
 
   it('should not render sku group when none_sku is true', (done) => {
-    const newData = Object.assign({}, data);
+    const newSku = {
-    newData.sku.none_sku = true; // eslint-disable-line
+      ...data.sku,
+      none_sku: true
+    };
 
     wrapper = mount(Sku, {
       attachToDocument: true,
       propsData: {
         value: false,
-        sku: newData.sku,
+        sku: newSku,
-        goodsId: newData.goods_id,
+        goodsId: data.goods_id,
         goods: goods
       }
     });
@@ -364,4 +366,35 @@ describe('Sku', (done) => {
       });
     });
   });
+
+  it('should reset values when sku change', (done) => {
+    wrapper = mount(Sku, {
+      attachToDocument: true,
+      propsData: {
+        value: true,
+        sku: data.sku,
+        goodsId: data.goods_id,
+        goods: goods,
+        resetStepperOnHide: true,
+        resetSelectedSkuOnHide: true
+      }
+    });
+
+    const newSku = {
+      ...data.sku,
+      tree: [],
+      list: [],
+      messages: [],
+      none_sku: true
+    };
+
+    wrapper.vm.sku = newSku;
+    const skuMessages = wrapper.find(Sku.SkuMessages)[0];
+
+    wrapper.vm.$nextTick(() => {
+      expect(wrapper.vm.selectedSku).to.be.empty;
+      expect(skuMessages.vm.messageValues).to.be.empty;
+      done();
+    });
+  });
 });