[bugfix] not proxy setData (#1023)

packages/area/index.ts

@@ -139,7 +139,7 @@ VantComponent({
       const province = this.getList('province');
       const city = this.getList('city', code.slice(0, 2));
 
-      this.setData({
+      this.set({
         'columns[0]': province,
         'columns[1]': city
       });
@@ -148,7 +148,7 @@ VantComponent({
         code = city[0].code;
       }
 
-      this.setData({
+      this.set({
         'columns[2]': this.getList('county', code.slice(0, 4)),
         pickerValue: [
           this.getIndex('province', code),

packages/badge/index.ts

@@ -20,7 +20,7 @@ VantComponent({
     },
 
     setActive(active: boolean) {
-      this.setData({ active });
+      this.set({ active });
     }
   }
 });

packages/checkbox-group/index.ts

@@ -8,7 +8,7 @@ VantComponent({
     type: 'descendant',
     linked(target: Weapp.Component) {
       const { value, disabled } = this.data;
-      target.setData({
+      target.set({
         value: value.indexOf(target.data.name) !== -1,
         disabled: disabled || target.data.disabled
       });
@@ -25,14 +25,14 @@ VantComponent({
     value(value) {
       const children = this.getRelationNodes('../checkbox/index');
       children.forEach(child => {
-        child.setData({ value: value.indexOf(child.data.name) !== -1 });
+        child.set({ value: value.indexOf(child.data.name) !== -1 });
       });
     },
 
     disabled(disabled: boolean) {
       const children = this.getRelationNodes('../checkbox/index');
       children.forEach(child => {
-        child.setData({ disabled: disabled || child.data.disabled });
+        child.set({ disabled: disabled || child.data.disabled });
       });
     }
   }

packages/col/index.ts

@@ -30,7 +30,7 @@ VantComponent({
       const padding = `${gutter / 2}px`;
       const style = gutter ? `padding-left: ${padding}; padding-right: ${padding};` : '';
       if (style !== this.data.style) {
-        this.setData({ style });
+        this.set({ style });
       }
     }
   }

packages/collapse-item/index.ts

@@ -63,18 +63,18 @@ VantComponent({
         this.updateStyle(expanded);
       }
 
-      this.setData({ expanded });
+      this.set({ expanded });
     },
 
     updateStyle(expanded) {
       if (expanded) {
         this.getRect('.van-collapse-item__content').then(res => {
-          this.setData({
+          this.set({
             contentHeight: res.height ? res.height + 'px' : null
           });
         });
       } else {
-        this.setData({
+        this.set({
           contentHeight: 0
         });
       }

packages/collapse/index.ts

@@ -5,7 +5,7 @@ VantComponent({
     name: 'collapse-item',
     type: 'descendant',
     linked(child: Weapp.Component) {
-      this.setData({
+      this.set({
         items: [...this.data.items, child]
       }, () => {
         child.updateExpanded();

packages/datetime-picker/index.ts

@@ -90,7 +90,7 @@ VantComponent({
       val = this.correctValue(val);
       const isEqual = val === data.innerValue;
       if (!isEqual) {
-        this.setData({ innerValue: val }, () => {
+        this.set({ innerValue: val }, () => {
           this.updateColumnValue(val);
           this.$emit('input', val);
         });
@@ -273,7 +273,7 @@ VantComponent({
       }
       value = this.correctValue(value);
 
-      this.setData({ innerValue: value }, () => {
+      this.set({ innerValue: value }, () => {
         this.updateColumnValue(value);
         this.$emit('input', value);
         this.$emit('change', this);
@@ -287,7 +287,7 @@ VantComponent({
     setColumnValue(index, value) {
       const { pickerValue, columns } = this.data;
       pickerValue[index] = columns[index].indexOf(value);
-      this.setData({ pickerValue });
+      this.set({ pickerValue });
     },
 
     getColumnValues(index) {
@@ -297,7 +297,7 @@ VantComponent({
     setColumnValues(index, values) {
       const { columns } = this.data;
       columns[index] = values;
-      this.setData({ columns });
+      this.set({ columns });
     },
 
     getValues() {
@@ -307,7 +307,7 @@ VantComponent({
 
     setValues(values) {
       const { columns } = this.data;
-      this.setData({
+      this.set({
         pickerValue: values.map((value, index) => columns[index].indexOf(value))
       });
     },
@@ -341,13 +341,13 @@ VantComponent({
         }
       }
 
-      this.setData({ pickerValue: values });
+      this.set({ pickerValue: values });
     }
   },
 
   created() {
     const innerValue = this.correctValue(this.data.value);
-    this.setData({ innerValue }, () => {
+    this.set({ innerValue }, () => {
       this.updateColumnValue(innerValue);
       this.$emit('input', innerValue);
     });

packages/dialog/dialog.ts

@@ -49,7 +49,7 @@ const Dialog: Dialog = options => {
     delete options.selector;
 
     if (dialog) {
-      dialog.setData({
+      dialog.set({
         onCancel: reject,
         onConfirm: resolve,
         ...options

packages/dialog/index.ts

@@ -67,7 +67,7 @@ VantComponent({
 
     handleAction(action) {
       if (this.data.asyncClose) {
-        this.setData({
+        this.set({
           [`loading.${action}`]: true
         });
       }
@@ -76,13 +76,13 @@ VantComponent({
     },
 
     close() {
-      this.setData({
+      this.set({
         show: false
       });
     },
 
     stopLoading() {
-      this.setData({
+      this.set({
         loading: {
           confirm: false,
           cancel: false

packages/field/index.ts

@@ -80,7 +80,7 @@ VantComponent({
     onInput(event: Weapp.Event) {
       const { value = '' } = event.detail || {};
 
-      this.setData({
+      this.set({
         value,
         showClear: this.getShowClear(value)
       }, () => {
@@ -93,7 +93,7 @@ VantComponent({
       const { value = '', height = 0 } = event.detail || {};
       this.$emit('focus', { value, height });
       this.focused = true;
-      this.setData({
+      this.set({
         showClear: this.getShowClear()
       });
     },
@@ -102,7 +102,7 @@ VantComponent({
       const { value = '', cursor = 0 } = event.detail || {};
       this.$emit('blur', { value, cursor });
       this.focused = false;
-      this.setData({
+      this.set({
         showClear: this.getShowClear()
       });
     },
@@ -119,7 +119,7 @@ VantComponent({
     },
 
     onClear() {
-      this.setData({
+      this.set({
         value: '',
         showClear: this.getShowClear('')
       }, () => {

packages/mixins/basic.ts

@@ -8,7 +8,7 @@ export const basic = Behavior({
         const isIphoneNew = /iPhone11/i.test(model) && screenHeight === 812;
 
         if (isIphoneX || isIphoneNew) {
-          this.setData({
+          this.set({
             isIPhoneX: true
           });
         }

packages/mixins/observer/behavior.ts

@@ -5,11 +5,10 @@ export const behavior = Behavior({
     }
 
     const cache = {};
-    const { setData } = this;
     const { computed } = this.$options();
     const keys = Object.keys(computed);
 
-    const calcComputed = () => {
+    this.calcComputed = () => {
       const needUpdate = {};
       keys.forEach(key => {
         const value = computed[key].call(this);
@@ -21,16 +20,22 @@ export const behavior = Behavior({
 
       return needUpdate;
     };
-
-    Object.defineProperty(this, 'setData', { writable: true });
-
-    this.setData = (data, callback) => {
-      data && setData.call(this, data, callback);
-      setData.call(this, calcComputed());
-    };
   },
 
   attached() {
-    this.setData();
+    this.set();
+  },
+
+  methods: {
+    // set data and set computed data
+    set(data, callback) {
+      if (data) {
+        this.setData(data, callback);
+      }
+
+      if (this.calcComputed) {
+        this.setData(this.calcComputed());
+      }
+    }
   }
 });

packages/mixins/observer/index.ts

@@ -4,6 +4,8 @@ import { observeProps } from './props';
 export function observe(vantOptions, options) {
   const { watch, computed } = vantOptions;
 
+  options.behaviors.push(behavior);
+
   if (watch) {
     const props = options.properties || {};
     Object.keys(watch).forEach(key => {
@@ -21,7 +23,6 @@ export function observe(vantOptions, options) {
   }
 
   if (computed) {
-    options.behaviors.push(behavior);
     options.methods = options.methods || {};
     options.methods.$options = () => vantOptions;
 

packages/mixins/observer/props.ts

@@ -17,7 +17,7 @@ export function observeProps(props) {
         }
         observer.apply(this, arguments);
       }
-      this.setData();
+      this.set();
     };
 
     props[key] = prop;

packages/mixins/transition.ts

@@ -30,14 +30,14 @@ export const transition = function(showDefaultValue) {
         if (value) {
           this.show();
         } else {
-          this.setData({
+          this.set({
             type: 'leave'
           });
         }
       },
 
       show() {
-        this.setData({
+        this.set({
           inited: true,
           display: true,
           type: 'enter'
@@ -46,7 +46,7 @@ export const transition = function(showDefaultValue) {
 
       onAnimationEnd() {
         if (!this.data.show) {
-          this.setData({
+          this.set({
             display: false
           });
         }

packages/notice-bar/index.ts

@@ -60,13 +60,13 @@ VantComponent({
 
   watch: {
     text() {
-      this.setData({}, this.init);
+      this.set({}, this.init);
     }
   },
 
   created() {
     if (this.data.mode) {
-      this.setData({
+      this.set({
         hasRightIcon: true
       });
     }
@@ -83,7 +83,7 @@ VantComponent({
         if (!rect || !rect.width) {
           return;
         }
-        this.setData({
+        this.set({
           width: rect.width
         });
 
@@ -109,7 +109,7 @@ VantComponent({
               timeingFunction: 'linear'
             });
 
-            this.setData({
+            this.set({
               elapse,
               wrapWidth,
               animation,
@@ -128,11 +128,11 @@ VantComponent({
       } = this.data;
       resetAnimation.translateX(wrapWidth).step();
       const animationData = animation.translateX(-(elapse * speed) / 1000).step();
-      this.setData({
+      this.set({
         animationData: resetAnimation.export()
       });
       setTimeout(() => {
-        this.setData({
+        this.set({
           animationData: animationData.export()
         });
       }, 100);
@@ -141,7 +141,7 @@ VantComponent({
         this.scroll();
       }, elapse);
 
-      this.setData({
+      this.set({
         timer
       });
     },
@@ -149,7 +149,7 @@ VantComponent({
     onClickIcon() {
       const { timer } = this.data;
       timer && clearTimeout(timer);
-      this.setData({
+      this.set({
         show: false,
         timer: null
       });

packages/notify/index.ts

@@ -23,7 +23,7 @@ VantComponent({
       const { duration } = this.data;
 
       clearTimeout(this.timer);
-      this.setData({
+      this.set({
         show: true
       });
 
@@ -36,7 +36,7 @@ VantComponent({
 
     hide() {
       clearTimeout(this.timer);
-      this.setData({
+      this.set({
         show: false
       });
     }

packages/notify/notify.ts

@@ -28,7 +28,7 @@ export default function Notify(options: NotifyOptions = {}) {
   delete options.selector;
 
   if (notify) {
-    notify.setData(options);
+    notify.set(options);
     notify.show();
   } else {
     console.warn('未找到 van-notify 节点，请确认 selector 及 context 是否正确');

packages/progress/index.ts

@@ -60,13 +60,13 @@ VantComponent({
 
     getWidth() {
       this.getRect('.van-progress').then(rect => {
-        this.setData({
+        this.set({
           progressWidth: rect.width
         });
       });
 
       this.getRect('.van-progress__pivot').then(rect => {
-        this.setData({
+        this.set({
           pivotWidth: rect.width || 0
         });
       });

packages/radio-group/index.ts

@@ -8,7 +8,7 @@ VantComponent({
     type: 'descendant',
     linked(target: Weapp.Component) {
       const { value, disabled } = this.data;
-      target.setData({
+      target.set({
         value: value,
         disabled: disabled || target.data.disabled
       });
@@ -24,14 +24,14 @@ VantComponent({
     value(value) {
       const children = this.getRelationNodes('../radio/index');
       children.forEach(child => {
-        child.setData({ value });
+        child.set({ value });
       });
     },
 
     disabled(disabled: boolean) {
       const children = this.getRelationNodes('../radio/index');
       children.forEach(child => {
-        child.setData({ disabled: disabled || child.data.disabled });
+        child.set({ disabled: disabled || child.data.disabled });
       });
     }
   }

packages/rate/index.ts

@@ -47,7 +47,7 @@ VantComponent({
   watch: {
     value(value) {
       if (value !== this.data.innerValue) {
-        this.setData({ innerValue: value });
+        this.set({ innerValue: value });
       }
     }
   },
@@ -64,7 +64,7 @@ VantComponent({
       const { data } = this;
       const { index } = event.currentTarget.dataset;
       if (!data.disabled && !data.readonly) {
-        this.setData({ innerValue: index + 1 });
+        this.set({ innerValue: index + 1 });
         this.$emit('input', index + 1);
         this.$emit('change', index + 1);
       }

packages/row/index.ts

@@ -33,7 +33,7 @@ VantComponent({
         ? `margin-right: ${margin}; margin-left: ${margin};`
         : '';
 
-      this.setData({ style });
+      this.set({ style });
       this.getRelationNodes('../col/index').forEach(col => {
         col.setGutter(this.data.gutter);
       });

packages/search/index.ts

@@ -27,12 +27,12 @@ VantComponent({
 
   methods: {
     onChange(event: Weapp.Event) {
-      this.setData({ value: event.detail });
+      this.set({ value: event.detail });
       this.$emit('change', event.detail);
     },
 
     onCancel() {
-      this.setData({ value: '' });
+      this.set({ value: '' });
       this.$emit('cancel');
       this.$emit('change', '');
     },

packages/slider/index.ts

@@ -73,7 +73,7 @@ VantComponent({
     updateValue(value, end) {
       value = this.format(value);
 
-      this.setData({
+      this.set({
         value,
         barStyle: `width: ${value}%; height: ${this.data.barHeight};`
       });

packages/stepper/index.ts

@@ -44,14 +44,14 @@ VantComponent({
 
   watch: {
     value(value) {
-      this.setData({
+      this.set({
         value: this.range(value)
       });
     }
   },
 
   created() {
-    this.setData({
+    this.set({
       value: this.range(this.data.value)
     });
   },
@@ -94,7 +94,7 @@ VantComponent({
     },
 
     triggerInput(value) {
-      this.setData({ value });
+      this.set({ value });
       this.$emit('change', value);
     }
   }

packages/steps/index.ts

@@ -31,7 +31,7 @@ VantComponent({
       steps.forEach((step, index) => {
         step.status = this.getStatus(index);
       });
-      this.setData({ steps });
+      this.set({ steps });
     },
 
     getStatus(index) {

packages/swipe-cell/index.ts

@@ -51,7 +51,7 @@ VantComponent({
     },
 
     close() {
-      this.setData({ offset: 0 });
+      this.set({ offset: 0 });
     },
 
     resetSwipeStatus() {
@@ -60,7 +60,7 @@ VantComponent({
     },
 
     swipeMove(offset = 0) {
-      this.setData({ offset });
+      this.set({ offset });
       offset && (this.swiping = true);
       !offset && (this.opened = false);
     },
@@ -85,7 +85,7 @@ VantComponent({
         return;
       }
 
-      this.setData({ draging: true });
+      this.set({ draging: true });
       this.touchStart(event);
 
       if (this.opened) {
@@ -119,7 +119,7 @@ VantComponent({
         return;
       }
 
-      this.setData({ draging: false });
+      this.set({ draging: false });
       if (this.swiping) {
         this.swipeLeaveTransition(this.data.offset > 0 ? -1 : 1);
       }

packages/switch-cell/index.ts

@@ -17,12 +17,12 @@ VantComponent({
 
   watch: {
     checked(value) {
-      this.setData({ value });
+      this.set({ value });
     }
   },
 
   created() {
-    this.setData({ value: this.data.checked });
+    this.set({ value: this.data.checked });
   },
 
   methods: {

packages/switch/index.ts

@@ -19,7 +19,7 @@ VantComponent({
 
   watch: {
     checked(value) {
-      this.setData({ value });
+      this.set({ value });
     }
   },
 
@@ -38,7 +38,7 @@ VantComponent({
   },
 
   created() {
-    this.setData({ value: this.data.checked });
+    this.set({ value: this.data.checked });
   },
 
   methods: {

packages/tabbar-item/index.ts

@@ -27,7 +27,7 @@ VantComponent({
 
     setActive(active) {
       if (this.data.active !== active) {
-        this.setData({ active });
+        this.set({ active });
       }
     }
   }

packages/tabbar/index.ts

@@ -51,13 +51,13 @@ VantComponent({
 
   watch: {
     active(active) {
-      this.setData({ currentActive: active });
+      this.set({ currentActive: active });
       this.setActiveItem();
     }
   },
 
   created() {
-    this.setData({ currentActive: this.data.active });
+    this.set({ currentActive: this.data.active });
   },
 
   methods: {
@@ -71,7 +71,7 @@ VantComponent({
       const active = this.data.items.indexOf(child);
       if (active !== this.data.currentActive && active !== -1) {
         this.$emit('change', active);
-        this.setData({ currentActive: active });
+        this.set({ currentActive: active });
         this.setActiveItem();
       }
     }

packages/tabs/index.ts

@@ -82,7 +82,7 @@ VantComponent({
 
   watch: {
     swipeThreshold() {
-      this.setData({
+      this.set({
         scrollable: this.child.length > this.data.swipeThreshold
       });
     },
@@ -107,7 +107,7 @@ VantComponent({
   methods: {
     updateTabs(tabs) {
       tabs = tabs || this.data.tabs;
-      this.setData({
+      this.set({
         tabs,
         scrollable: tabs.length > this.data.swipeThreshold
       });
@@ -134,7 +134,7 @@ VantComponent({
     setActive(active: number) {
       if (active !== this.data.active) {
         this.trigger('change', active);
-        this.setData({ active });
+        this.set({ active });
         this.setActiveTab();
       }
     },
@@ -161,7 +161,7 @@ VantComponent({
 
         left += (rect.width - width) / 2;
 
-        this.setData({
+        this.set({
           lineStyle: `
             width: ${width}px;
             background-color: ${color};
@@ -186,7 +186,7 @@ VantComponent({
       this.getRect('.van-tabs__content').then(rect => {
         const { width } = rect;
 
-        this.setData({
+        this.set({
           trackStyle: `
             width: ${width * this.child.length}px;
             transform: translateX(${-1 * active * width}px);
@@ -202,7 +202,7 @@ VantComponent({
 
     setTabsProps(props) {
       this.child.forEach(item => {
-        item.setData(props);
+        item.set(props);
       });
     },
 
@@ -217,11 +217,11 @@ VantComponent({
         }
 
         if (data.active !== item.data.active) {
-          item.setData(data);
+          item.set(data);
         }
       });
 
-      this.setData({}, () => {
+      this.set({}, () => {
         this.setLine();
         this.setTrack();
         this.scrollIntoView();
@@ -243,7 +243,7 @@ VantComponent({
 
         this.getRect('.van-tabs__nav').then(navRect => {
           const navWidth = navRect.width;
-          this.setData({
+          this.set({
             scrollLeft: offsetLeft - (navWidth - tabWidth) / 2
           });
         });
@@ -301,10 +301,10 @@ VantComponent({
           wrapStyle = '';
       }
 
-      // cut down `setData`
+      // cut down `set`
       if (wrapStyle === this.data.wrapStyle) return;
 
-      this.setData({
+      this.set({
         wrapStyle
       });
     },
@@ -334,7 +334,7 @@ VantComponent({
           });
 
           if (position !== this.data.position) {
-            this.setData({
+            this.set({
               position
             }, () => {
               this.setWrapStyle();

packages/toast/index.ts

@@ -26,7 +26,7 @@ VantComponent({
 
   methods: {
     clear() {
-      this.setData({
+      this.set({
         show: false
       });
     },

packages/toast/toast.ts

@@ -69,7 +69,7 @@ const Toast: Toast = (options = {}) => {
   delete options.selector;
 
   queue.push(toast);
-  toast.setData(options);
+  toast.set(options);
   clearTimeout(toast.timer);
 
   if (options.duration > 0) {

packages/tree-select/index.ts

@@ -58,7 +58,7 @@ VantComponent({
     updateSubItems() {
       const selectedItem = this.data.items[this.data.mainActiveIndex] || {};
 
-      this.setData({ subItems: selectedItem.children || [] });
+      this.set({ subItems: selectedItem.children || [] });
 
       this.updateItemHeight();
     },
@@ -70,12 +70,12 @@ VantComponent({
         this.data.subItems.length * ITEM_HEIGHT
       );
 
-      this.setData({ mainHeight: Math.min(maxHeight, this.data.maxHeight) });
+      this.set({ mainHeight: Math.min(maxHeight, this.data.maxHeight) });
     },
 
     // 更新子项列表高度，根据可展示的最大高度和当前子项列表的高度决定
     updateItemHeight() {
-      this.setData({
+      this.set({
         itemHeight: Math.min(
           this.data.subItems.length * ITEM_HEIGHT,
           this.data.maxHeight