[bugfix] missing options (#624)

dist/area/index.js

@@ -1,154 +1,132 @@
 import { VantComponent } from '../common/component';
-
 VantComponent({
-  props: {
+    props: {
-    value: {
+        title: String,
-      type: String,
+        loading: Boolean,
-      observer(value) {
+        value: {
-        this.code = value;
+            type: String,
-        this.setValues();
+            observer(value) {
-      }
+                this.code = value;
-    },
+                this.setValues();
-    title: String,
+            }
-    loading: Boolean,
+        },
-    itemHeight: {
+        itemHeight: {
-      type: Number,
+            type: Number,
-      value: 44
+            value: 44
-    },
+        },
-    visibleItemCount: {
+        visibleItemCount: {
-      type: Number,
+            type: Number,
-      value: 5
+            value: 5
-    },
+        },
-    columnsNum: {
+        columnsNum: {
-      type: [String, Number],
+            type: [String, Number],
-      value: 3
+            value: 3
-    },
+        },
-    areaList: {
+        areaList: {
-      type: Object,
+            type: Object,
-      value: {},
+            value: {},
-      observer() {
+            observer() {
-        this.setValues();
+                this.setValues();
-      }
+            }
-    }
-  },
-
-  data: {
-    pickerValue: [0, 0, 0],
-    columns: []
-  },
-
-  computed: {
-    displayColumns() {
-      const { columns = [], columnsNum } = this.data;
-      return columns.slice(0, +columnsNum);
-    }
-  },
-
-  methods: {
-    onCancel() {
-      this.triggerEvent('cancel', {
-        values: this.getValues(),
-        indexs: this.getIndexs()
-      });
-    },
-
-    onConfirm() {
-      this.triggerEvent('confirm', {
-        values: this.getValues(),
-        indexs: this.getIndexs()
-      });
-    },
-
-    onChange(event) {
-      const { value } = event.detail;
-      const { pickerValue, displayColumns } = this.data;
-      const index = pickerValue.findIndex((item, index) => item !== value[index]);
-      // 没有变更 或 选中项序号小于0 不处理
-      if (index < 0 || value[index] < 0) {
-        return;
-      }
-
-      const values = displayColumns[index];
-
-      this.code = values[value[index]].code;
-      this.setValues();
-      this.triggerEvent('change', {
-        picker: this,
-        values: this.getValues(),
-        index
-      });
-    },
-
-    getList(type, code) {
-      let result = [];
-      if (type !== 'province' && !code) {
-        return result;
-      }
-
-      const list = this.data.areaList[`${type}_list`] || {};
-      result = Object.keys(list).map(code => ({
-        code,
-        name: list[code]
-      }));
-
-      if (code) {
-        result = result.filter(item => item.code.indexOf(code) === 0);
-      }
-
-      return result;
-    },
-
-    getIndex(type, code) {
-      const compareNum = type === 'province' ? 2 : type === 'city' ? 4 : 6;
-      const list = this.getList(type, code.slice(0, compareNum - 2));
-      code = code.slice(0, compareNum);
-
-      for (let i = 0; i < list.length; i++) {
-        if (list[i].code.slice(0, compareNum) === code) {
-          return i;
         }
-      }
-
-      return 0;
     },
-
+    data: {
-    setValues() {
+        pickerValue: [0, 0, 0],
-      let code = this.code || Object.keys(this.data.areaList.county_list)[0] || '';
+        columns: []
-      const province = this.getList('province');
-      const city = this.getList('city', code.slice(0, 2));
-
-      this.setData({
-        'columns[0]': province,
-        'columns[1]': city
-      });
-
-      if (city.length && code.slice(2, 4) === '00') {
-        code = city[0].code;
-      }
-
-      this.setData({
-        'columns[2]': this.getList('county', code.slice(0, 4)),
-        pickerValue: [
-          this.getIndex('province', code),
-          this.getIndex('city', code),
-          this.getIndex('county', code)
-        ]
-      });
     },
-
+    computed: {
-    getValues() {
+        displayColumns() {
-      const { displayColumns = [], pickerValue = [] } = this.data;
+            const { columns = [], columnsNum } = this.data;
-      return displayColumns.map((option, index) => option[pickerValue[index]]);
+            return columns.slice(0, +columnsNum);
+        }
     },
-
+    methods: {
-    getIndexs() {
+        onCancel() {
-      const { pickerValue, columnsNum } = this.data;
+            this.$emit('cancel', {
-      return pickerValue.slice(0, columnsNum);
+                values: this.getValues(),
-    },
+                indexs: this.getIndexs()
-
+            });
-    reset() {
+        },
-      this.code = '';
+        onConfirm() {
-      this.setValues();
+            this.$emit('confirm', {
+                values: this.getValues(),
+                indexs: this.getIndexs()
+            });
+        },
+        onChange(event) {
+            const { value } = event.detail;
+            const { pickerValue, displayColumns } = this.data;
+            const index = pickerValue.findIndex((item, index) => item !== value[index]);
+            // 没有变更 或 选中项序号小于0 不处理
+            if (index < 0 || value[index] < 0) {
+                return;
+            }
+            const values = displayColumns[index];
+            this.code = values[value[index]].code;
+            this.setValues();
+            this.$emit('change', {
+                picker: this,
+                values: this.getValues(),
+                index
+            });
+        },
+        getList(type, code) {
+            let result = [];
+            if (type !== 'province' && !code) {
+                return result;
+            }
+            const list = this.data.areaList[`${type}_list`] || {};
+            result = Object.keys(list).map(code => ({
+                code,
+                name: list[code]
+            }));
+            if (code) {
+                result = result.filter(item => item.code.indexOf(code) === 0);
+            }
+            return result;
+        },
+        getIndex(type, code) {
+            const compareNum = type === 'province' ? 2 : type === 'city' ? 4 : 6;
+            const list = this.getList(type, code.slice(0, compareNum - 2));
+            code = code.slice(0, compareNum);
+            for (let i = 0; i < list.length; i++) {
+                if (list[i].code.slice(0, compareNum) === code) {
+                    return i;
+                }
+            }
+            return 0;
+        },
+        setValues() {
+            let code = this.code || Object.keys(this.data.areaList.county_list)[0] || '';
+            const province = this.getList('province');
+            const city = this.getList('city', code.slice(0, 2));
+            this.setData({
+                'columns[0]': province,
+                'columns[1]': city
+            });
+            if (city.length && code.slice(2, 4) === '00') {
+                code = city[0].code;
+            }
+            this.setData({
+                'columns[2]': this.getList('county', code.slice(0, 4)),
+                pickerValue: [
+                    this.getIndex('province', code),
+                    this.getIndex('city', code),
+                    this.getIndex('county', code)
+                ]
+            });
+        },
+        getValues() {
+            const { displayColumns = [], pickerValue = [] } = this.data;
+            return displayColumns.map((option, index) => option[pickerValue[index]]);
+        },
+        getIndexs() {
+            const { pickerValue, columnsNum } = this.data;
+            return pickerValue.slice(0, columnsNum);
+        },
+        reset() {
+            this.code = '';
+            this.setValues();
+        }
     }
-  }
 });

dist/card/index.js

@@ -1,24 +1,22 @@
 import { VantComponent } from '../common/component';
-
 VantComponent({
-  classes: [
+    classes: [
-    'thumb-class',
+        'thumb-class',
-    'title-class',
+        'title-class',
-    'price-class',
+        'price-class',
-    'desc-class',
+        'desc-class',
-    'num-class'
+        'num-class'
-  ],
+    ],
-
+    props: {
-  props: {
+        num: String,
-    num: String,
+        desc: String,
-    desc: String,
+        thumb: String,
-    thumb: String,
+        title: String,
-    title: String,
+        price: String,
-    price: String,
+        centered: Boolean,
-    centered: Boolean,
+        currency: {
-    currency: {
+            type: String,
-      type: String,
+            value: '¥'
-      value: '¥'
+        }
     }
-  }
 });

dist/cell-group/index.js

@@ -1,10 +1,9 @@
 import { VantComponent } from '../common/component';
-
 VantComponent({
-  props: {
+    props: {
-    border: {
+        border: {
-      type: Boolean,
+            type: Boolean,
-      value: true
+            value: true
+        }
     }
-  }
 });

dist/cell/index.js

@@ -1,58 +1,53 @@
 import { VantComponent } from '../common/component';
-
 VantComponent({
-  classes: [
+    classes: [
-    'title-class',
+        'title-class',
-    'label-class',
+        'label-class',
-    'value-class'
+        'value-class'
-  ],
+    ],
-
+    props: {
-  props: {
+        title: null,
-    title: null,
+        value: null,
-    value: null,
+        url: String,
-    url: String,
+        icon: String,
-    icon: String,
+        label: String,
-    label: String,
+        center: Boolean,
-    center: Boolean,
+        isLink: Boolean,
-    isLink: Boolean,
+        required: Boolean,
-    required: Boolean,
+        clickable: Boolean,
-    clickable: Boolean,
+        titleWidth: String,
-    titleWidth: String,
+        customStyle: String,
-    customStyle: String,
+        linkType: {
-    linkType: {
+            type: String,
-      type: String,
+            value: 'navigateTo'
-      value: 'navigateTo'
+        },
+        border: {
+            type: Boolean,
+            value: true
+        }
     },
-    border: {
+    computed: {
-      type: Boolean,
+        cellClass() {
-      value: true
+            const { data } = this;
-    }
+            return this.classNames('custom-class', 'van-cell', {
-  },
+                'van-hairline': data.border,
-
+                'van-cell--center': data.center,
-  computed: {
+                'van-cell--required': data.required,
-    cellClass() {
+                'van-cell--clickable': data.isLink || data.clickable
-      const { data } = this;
+            });
-      return this.classNames('custom-class', 'van-cell', {
+        },
-        'van-hairline': data.border,
+        titleStyle() {
-        'van-cell--center': data.center,
+            const { titleWidth } = this.data;
-        'van-cell--required': data.required,
+            return titleWidth ? `max-width: ${titleWidth};min-width: ${titleWidth}` : '';
-        'van-cell--clickable': data.isLink || data.clickable
+        }
-      });
     },
-
+    methods: {
-    titleStyle() {
+        onClick() {
-      const { titleWidth } = this.data;
+            const { url } = this.data;
-      return titleWidth ? `max-width: ${titleWidth};min-width: ${titleWidth}` : '';
+            if (url) {
+                wx[this.data.linkType]({ url });
+            }
+            this.$emit('click');
+        }
     }
-  },
-
-  methods: {
-    onClick() {
-      const { url } = this.data;
-      if (url) {
-        wx[this.data.linkType]({ url });
-      }
-      this.$emit('click');
-    }
-  }
 });

dist/col/index.js

@@ -1,34 +1,33 @@
 import { VantComponent } from '../common/component';
-
 VantComponent({
-  relations: {
+    relations: {
-    '../row/index': {
+        '../row/index': {
-      type: 'ancestor'
+            type: 'ancestor'
+        }
+    },
+    props: {
+        span: Number,
+        offset: Number
+    },
+    data: {
+        style: ''
+    },
+    computed: {
+        classes() {
+            const { span, offset } = this.data;
+            return this.classNames('custom-class', 'van-col', {
+                [`van-col--${span}`]: span,
+                [`van-col--offset-${offset}`]: offset
+            });
+        }
+    },
+    methods: {
+        setGutter(gutter) {
+            const padding = `${gutter / 2}px`;
+            const style = gutter ? `padding-left: ${padding}; padding-right: ${padding};` : '';
+            if (style !== this.data.style) {
+                this.setData({ style });
+            }
+        }
     }
-  },
-
-  props: {
-    span: Number,
-    offset: Number
-  },
-
-  computed: {
-    classes() {
-      const { span, offset } = this.data;
-      return this.classNames('custom-class', 'van-col', {
-        [`van-col--${span}`]: span,
-        [`van-col--offset-${offset}`]: offset
-      });
-    }
-  },
-
-  methods: {
-    setGutter(gutter) {
-      const padding = `${gutter / 2}px`;
-      const style = gutter ? `padding-left: ${padding}; padding-right: ${padding};` : '';
-      if (style !== this.data.style) {
-        this.setData({ style });
-      }
-    }
-  }
 });

dist/common/component.js

@@ -1,47 +1,39 @@
 import { basic } from '../mixins/basic';
 import { observe } from '../mixins/observer/index';
+function mapKeys(source, target, map) {
+    Object.keys(map).forEach(key => {
+        target[map[key]] = source[key];
+    });
+}
 function VantComponent(sfc) {
     const options = {};
-    // map props to properties
+    mapKeys(sfc, options, {
-    if (sfc.props) {
+        data: 'data',
-        options.properties = sfc.props;
+        props: 'properties',
-    }
+        mixins: 'behaviors',
-    // map mixins to behaviors
+        methods: 'methods',
-    if (sfc.mixins) {
+        beforeCreate: 'created',
-        options.behaviors = sfc.mixins;
+        created: 'attached',
-    }
+        mounted: 'ready',
-    // copy methods
+        destroyed: 'detached',
-    if (sfc.methods) {
+        relations: 'relations',
-        options.methods = sfc.methods;
+        classes: 'externalClasses'
-    }
+    });
-    if (sfc.beforeCreate) {
-        options.created = sfc.beforeCreate;
-    }
-    if (sfc.created) {
-        options.attached = sfc.created;
-    }
-    if (sfc.mounted) {
-        options.ready = sfc.mounted;
-    }
-    if (sfc.destroyed) {
-        options.detached = sfc.destroyed;
-    }
-    // map classes to externalClasses
-    options.externalClasses = sfc.classes || [];
     // add default externalClasses
+    options.externalClasses = options.externalClasses || [];
     options.externalClasses.push('custom-class');
     // add default behaviors
-    options.behaviors = sfc.mixins || [];
+    options.behaviors = options.behaviors || [];
     options.behaviors.push(basic);
+    // map field to form-field behavior
+    if (sfc.field) {
+        options.behaviors.push('wx://form-field');
+    }
     // add default options
     options.options = {
         multipleSlots: true,
         addGlobalClass: true
     };
-    // map field to form-field behavior
-    if (sfc.field) {
-        options.behaviors.push('wx://form-field');
-    }
     observe(sfc, options);
     Component(options);
 }

dist/dialog/dialog.js

@@ -1,68 +1,44 @@
 let queue = [];
-
 const Dialog = options => {
-  return new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
-    const pages = getCurrentPages();
+        const pages = getCurrentPages();
-    const ctx = pages[pages.length - 1];
+        const ctx = pages[pages.length - 1];
-
+        const dialog = ctx.selectComponent(options.selector);
-    const dialog = ctx.selectComponent(options.selector);
+        delete options.selector;
-    delete options.selector;
+        if (dialog) {
-
+            dialog.setData(Object.assign({ onCancel: reject, onConfirm: resolve }, options));
-    if (dialog) {
+            queue.push(dialog);
-      dialog.setData({
+        }
-        onCancel: reject,
+    });
-        onConfirm: resolve,
-        ...options
-      });
-      queue.push(dialog);
-    }
-  });
 };
-
 Dialog.defaultOptions = {
-  show: true,
+    show: true,
-  title: '',
+    title: '',
-  message: '',
+    message: '',
-  zIndex: 100,
+    zIndex: 100,
-  overlay: true,
+    overlay: true,
-  asyncClose: false,
+    asyncClose: false,
-  selector: '#van-dialog',
+    selector: '#van-dialog',
-  confirmButtonText: '确认',
+    confirmButtonText: '确认',
-  cancelButtonText: '取消',
+    cancelButtonText: '取消',
-  showConfirmButton: true,
+    showConfirmButton: true,
-  showCancelButton: false,
+    showCancelButton: false,
-  closeOnClickOverlay: false,
+    closeOnClickOverlay: false,
-  confirmButtonOpenType: ''
+    confirmButtonOpenType: ''
 };
-
+Dialog.alert = options => Dialog(Object.assign({}, Dialog.currentOptions, options));
-Dialog.alert = options =>
+Dialog.confirm = options => Dialog(Object.assign({}, Dialog.currentOptions, { showCancelButton: true }, options));
-  Dialog({
-    ...Dialog.currentOptions,
-    ...options
-  });
-
-Dialog.confirm = options =>
-  Dialog({
-    ...Dialog.currentOptions,
-    showCancelButton: true,
-    ...options
-  });
-
 Dialog.close = () => {
-  queue.forEach(dialog => {
+    queue.forEach(dialog => {
-    dialog.close();
+        dialog.close();
-  });
+    });
-  queue = [];
+    queue = [];
 };
-
 Dialog.setDefaultOptions = options => {
-  Object.assign(Dialog.currentOptions, options);
+    Object.assign(Dialog.currentOptions, options);
 };
-
 Dialog.resetDefaultOptions = () => {
-  Dialog.currentOptions = { ...Dialog.defaultOptions };
+    Dialog.currentOptions = Object.assign({}, Dialog.defaultOptions);
 };
-
 Dialog.resetDefaultOptions();
-
 export default Dialog;

dist/dialog/index.js

@@ -1,97 +1,87 @@
 import { VantComponent } from '../common/component';
-
 VantComponent({
-  props: {
+    props: {
-    title: String,
+        title: String,
-    message: String,
+        message: String,
-    useSlot: Boolean,
+        useSlot: Boolean,
-    asyncClose: Boolean,
+        asyncClose: Boolean,
-    showCancelButton: Boolean,
+        showCancelButton: Boolean,
-    confirmButtonOpenType: String,
+        confirmButtonOpenType: String,
-    show: {
+        show: {
-      type: Boolean,
+            type: Boolean,
-      observer(show) {
+            observer(show) {
-        if (!show) {
+                if (!show) {
-          this.setData({
+                    this.setData({
-            loading: {
+                        loading: {
-              confirm: false,
+                            confirm: false,
-              cancel: false
+                            cancel: false
+                        }
+                    });
+                }
             }
-          });
+        },
+        zIndex: {
+            type: Number,
+            value: 100
+        },
+        confirmButtonText: {
+            type: String,
+            value: '确认'
+        },
+        cancelButtonText: {
+            type: String,
+            value: '取消'
+        },
+        showConfirmButton: {
+            type: Boolean,
+            value: true
+        },
+        overlay: {
+            type: Boolean,
+            value: true
+        },
+        closeOnClickOverlay: {
+            type: Boolean,
+            value: false
         }
-      }
     },
-    zIndex: {
+    data: {
-      type: Number,
+        loading: {
-      value: 100
+            confirm: false,
+            cancel: false
+        }
     },
-    confirmButtonText: {
+    methods: {
-      type: String,
+        onConfirm() {
-      value: '确认'
+            this.handleAction('confirm');
-    },
+        },
-    cancelButtonText: {
+        onCancel() {
-      type: String,
+            this.handleAction('cancel');
-      value: '取消'
+        },
-    },
+        onClickOverlay() {
-    showConfirmButton: {
+            this.onClose('overlay');
-      type: Boolean,
+        },
-      value: true
+        handleAction(action) {
-    },
+            if (this.data.asyncClose) {
-    overlay: {
+                this.setData({
-      type: Boolean,
+                    [`loading.${action}`]: true
-      value: true
+                });
-    },
+            }
-    closeOnClickOverlay: {
+            this.onClose(action);
-      type: Boolean,
+        },
-      value: false
+        close() {
+            this.setData({ show: false });
+        },
+        onClose(action) {
+            if (!this.data.asyncClose) {
+                this.close();
+            }
+            this.$emit('close', action);
+            this.$emit(action);
+            const callback = this.data[action === 'confirm' ? 'onConfirm' : 'onCancel'];
+            if (callback) {
+                callback(this);
+            }
+        }
     }
-  },
-
-  data: {
-    loading: {
-      confirm: false,
-      cancel: false
-    }
-  },
-
-  methods: {
-    onConfirm() {
-      this.handleAction('confirm');
-    },
-
-    onCancel() {
-      this.handleAction('cancel');
-    },
-
-    onClickOverlay() {
-      this.onClose('overlay');
-    },
-
-    handleAction(action) {
-      if (this.data.asyncClose) {
-        this.setData({
-          [`loading.${action}`]: true
-        });
-      }
-
-      this.onClose(action);
-    },
-
-    close() {
-      this.setData({ show: false });
-    },
-
-    onClose(action) {
-      if (!this.data.asyncClose) {
-        this.close();
-      }
-      this.$emit('close', action);
-      this.$emit(action);
-
-      const callback = this.data[action === 'confirm' ? 'onConfirm' : 'onCancel'];
-      if (callback) {
-        callback(this);
-      }
-    }
-  }
 });

dist/notice-bar/index.js

@@ -61,7 +61,7 @@ VantComponent({
     timer: null
   },
 
-  attached() {
+  created() {
     if (this.data.mode) {
       this.setData({
         hasRightIcon: true
@@ -69,7 +69,7 @@ VantComponent({
     }
   },
 
-  detached() {
+  destroyed() {
     const { timer } = this.data;
     timer && clearTimeout(timer);
   },

dist/progress/index.js

@@ -52,7 +52,7 @@ VantComponent({
     progressWidth: 0
   },
 
-  ready() {
+  mounted() {
     this.setText();
     this.setPivotStyle();
     this.getWidth();

dist/row/index.js

@@ -20,7 +20,7 @@ VantComponent({
     }
   },
 
-  ready() {
+  mounted() {
     if (this.data.gutter) {
       this.setGutter();
     }

dist/slider/index.js

@@ -28,7 +28,7 @@ VantComponent({
     }
   },
 
-  attached() {
+  created() {
     this.updateValue(this.data.value);
   },
 

dist/stepper/index.js

@@ -31,7 +31,7 @@ VantComponent({
     }
   },
 
-  attached() {
+  created() {
     this.setData({
       value: this.range(this.data.value)
     });

dist/steps/index.js

@@ -21,7 +21,7 @@ VantComponent({
     }
   },
 
-  attached() {
+  created() {
     this.formatSteps();
   },
 

dist/switch-cell/index.js

@@ -20,7 +20,7 @@ VantComponent({
     }
   },
 
-  attached() {
+  created() {
     this.setData({ value: this.data.checked });
   },
 

dist/switch/index.js

@@ -20,7 +20,7 @@ VantComponent({
     }
   },
 
-  attached() {
+  created() {
     this.setData({ value: this.data.checked });
   },
 

dist/tabbar/index.js

@@ -24,7 +24,7 @@ VantComponent({
     currentActive: -1
   },
 
-  attached() {
+  created() {
     this.setData({ currentActive: this.data.active });
   },
 

dist/tabs/index.js

@@ -67,7 +67,7 @@ VantComponent({
     scrollLeft: 0
   },
 
-  ready() {
+  mounted() {
     this.setLine();
     this.scrollIntoView();
   },

packages/area/index.ts

@@ -1,7 +1,14 @@
 import { VantComponent } from '../common/component';
 
+type AreaItem = {
+  name: string;
+  code: string;
+};
+
 VantComponent({
   props: {
+    title: String,
+    loading: Boolean,
     value: {
       type: String,
       observer(value) {
@@ -9,8 +16,6 @@ VantComponent({
         this.setValues();
       }
     },
-    title: String,
-    loading: Boolean,
     itemHeight: {
       type: Number,
       value: 44
@@ -46,20 +51,20 @@ VantComponent({
 
   methods: {
     onCancel() {
-      this.triggerEvent('cancel', {
+      this.$emit('cancel', {
         values: this.getValues(),
         indexs: this.getIndexs()
       });
     },
 
     onConfirm() {
-      this.triggerEvent('confirm', {
+      this.$emit('confirm', {
         values: this.getValues(),
         indexs: this.getIndexs()
       });
     },
 
-    onChange(event) {
+    onChange(event: Weapp.Event) {
       const { value } = event.detail;
       const { pickerValue, displayColumns } = this.data;
       const index = pickerValue.findIndex((item, index) => item !== value[index]);
@@ -72,14 +77,14 @@ VantComponent({
 
       this.code = values[value[index]].code;
       this.setValues();
-      this.triggerEvent('change', {
+      this.$emit('change', {
         picker: this,
         values: this.getValues(),
         index
       });
     },
 
-    getList(type, code) {
+    getList(type: string, code?: string): AreaItem[] {
       let result = [];
       if (type !== 'province' && !code) {
         return result;
@@ -98,7 +103,7 @@ VantComponent({
       return result;
     },
 
-    getIndex(type, code) {
+    getIndex(type: string, code: string): number {
       const compareNum = type === 'province' ? 2 : type === 'city' ? 4 : 6;
       const list = this.getList(type, code.slice(0, compareNum - 2));
       code = code.slice(0, compareNum);

packages/cell/index.ts

@@ -30,7 +30,7 @@ VantComponent({
   },
 
   computed: {
-    cellClass() {
+    cellClass(): string {
       const { data } = this;
       return this.classNames('custom-class', 'van-cell', {
         'van-hairline': data.border,
@@ -40,7 +40,7 @@ VantComponent({
       });
     },
 
-    titleStyle() {
+    titleStyle(): string {
       const { titleWidth } = this.data;
       return titleWidth ? `max-width: ${titleWidth};min-width: ${titleWidth}` : '';
     }

packages/col/index.ts

@@ -12,8 +12,12 @@ VantComponent({
     offset: Number
   },
 
+  data: {
+    style: ''
+  },
+
   computed: {
-    classes() {
+    classes(): string {
       const { span, offset } = this.data;
       return this.classNames('custom-class', 'van-col', {
         [`van-col--${span}`]: span,
@@ -23,7 +27,7 @@ VantComponent({
   },
 
   methods: {
-    setGutter(gutter) {
+    setGutter(gutter: number) {
       const padding = `${gutter / 2}px`;
       const style = gutter ? `padding-left: ${padding}; padding-right: ${padding};` : '';
       if (style !== this.data.style) {

packages/common/component.ts

@@ -5,6 +5,12 @@ import {
   CombinedComponentInstance
 } from '../../types/index';
 
+function mapKeys(source: object, target: object, map: object) {
+  Object.keys(map).forEach(key => {
+    target[map[key]] = source[key];
+  });
+}
+
 function VantComponent<Data, Props, Methods, Computed>(
   sfc: VantComponentOptions<
     Data,
@@ -16,58 +22,38 @@ function VantComponent<Data, Props, Methods, Computed>(
 ): void {
   const options: any = {};
 
-  // map props to properties
+  mapKeys(sfc, options, {
-  if (sfc.props) {
+    data: 'data',
-    options.properties = sfc.props;
+    props: 'properties',
-  }
+    mixins: 'behaviors',
-
+    methods: 'methods',
-  // map mixins to behaviors
+    beforeCreate: 'created',
-  if (sfc.mixins) {
+    created: 'attached',
-    options.behaviors = sfc.mixins;
+    mounted: 'ready',
-  }
+    destroyed: 'detached',
-
+    relations: 'relations',
-  // copy methods
+    classes: 'externalClasses'
-  if (sfc.methods) {
+  });
-    options.methods = sfc.methods;
-  }
-
-  if (sfc.beforeCreate) {
-    options.created = sfc.beforeCreate;
-  }
-
-  if (sfc.created) {
-    options.attached = sfc.created;
-  }
-
-  if (sfc.mounted) {
-    options.ready = sfc.mounted;
-  }
-
-  if (sfc.destroyed) {
-    options.detached = sfc.destroyed;
-  }
-
-  // map classes to externalClasses
-  options.externalClasses = sfc.classes || [];
 
   // add default externalClasses
+  options.externalClasses = options.externalClasses || [];
   options.externalClasses.push('custom-class');
 
   // add default behaviors
-  options.behaviors = sfc.mixins || [];
+  options.behaviors = options.behaviors || [];
   options.behaviors.push(basic);
 
+  // map field to form-field behavior
+  if (sfc.field) {
+    options.behaviors.push('wx://form-field');
+  }
+
   // add default options
   options.options = {
     multipleSlots: true,
     addGlobalClass: true
   };
 
-  // map field to form-field behavior
-  if (sfc.field) {
-    options.behaviors.push('wx://form-field');
-  }
-
   observe(sfc, options);
   Component(options);
 }

packages/dialog/dialog.ts

@@ -1,6 +1,35 @@
 let queue = [];
 
-const Dialog = options => {
+type DialogAction = 'confirm' | 'cancel';
+type DialogOptions = {
+  show?: boolean;
+  title?: string;
+  zIndex?: number;
+  message?: string;
+  overlay?: boolean;
+  selector?: string;
+  asyncClose?: boolean;
+  confirmButtonText?: string;
+  cancelButtonText?: string;
+  showConfirmButton?: boolean;
+  showCancelButton?: boolean;
+  closeOnClickOverlay?: boolean;
+  confirmButtonOpenType?: string;
+}
+
+interface Dialog {
+  (options: DialogOptions): Promise<DialogAction>;
+  alert?: (options: DialogOptions) => Promise<DialogAction>;
+  confirm?: (options: DialogOptions) => Promise<DialogAction>;
+  close?: () => void;
+  install?: () => void;
+  setDefaultOptions?: (options: DialogOptions) => void;
+  resetDefaultOptions?: () => void;
+  defaultOptions?: DialogOptions;
+  currentOptions?: DialogOptions;
+}
+
+const Dialog: Dialog = options => {
   return new Promise((resolve, reject) => {
     const pages = getCurrentPages();
     const ctx = pages[pages.length - 1];

packages/notice-bar/index.js

@@ -61,7 +61,7 @@ VantComponent({
     timer: null
   },
 
-  attached() {
+  created() {
     if (this.data.mode) {
       this.setData({
         hasRightIcon: true
@@ -69,7 +69,7 @@ VantComponent({
     }
   },
 
-  detached() {
+  destroyed() {
     const { timer } = this.data;
     timer && clearTimeout(timer);
   },

packages/progress/index.js

@@ -52,7 +52,7 @@ VantComponent({
     progressWidth: 0
   },
 
-  ready() {
+  mounted() {
     this.setText();
     this.setPivotStyle();
     this.getWidth();

packages/row/index.js

@@ -20,7 +20,7 @@ VantComponent({
     }
   },
 
-  ready() {
+  mounted() {
     if (this.data.gutter) {
       this.setGutter();
     }

packages/slider/index.js

@@ -28,7 +28,7 @@ VantComponent({
     }
   },
 
-  attached() {
+  created() {
     this.updateValue(this.data.value);
   },
 

packages/stepper/index.js

@@ -31,7 +31,7 @@ VantComponent({
     }
   },
 
-  attached() {
+  created() {
     this.setData({
       value: this.range(this.data.value)
     });

packages/steps/index.js

@@ -21,7 +21,7 @@ VantComponent({
     }
   },
 
-  attached() {
+  created() {
     this.formatSteps();
   },
 

packages/switch-cell/index.js

@@ -20,7 +20,7 @@ VantComponent({
     }
   },
 
-  attached() {
+  created() {
     this.setData({ value: this.data.checked });
   },
 

packages/switch/index.js

@@ -20,7 +20,7 @@ VantComponent({
     }
   },
 
-  attached() {
+  created() {
     this.setData({ value: this.data.checked });
   },
 

packages/tabbar/index.js

@@ -24,7 +24,7 @@ VantComponent({
     currentActive: -1
   },
 
-  attached() {
+  created() {
     this.setData({ currentActive: this.data.active });
   },
 

packages/tabs/index.js

@@ -67,7 +67,7 @@ VantComponent({
     scrollLeft: 0
   },
 
-  ready() {
+  mounted() {
     this.setLine();
     this.scrollIntoView();
   },

types/index.d.ts

@@ -14,8 +14,8 @@ type Relations<Instance> = {
   };
 };
 type RecordToAny<T> = { [K in keyof T]: any };
-type Accessors<T> = {
+type RecordToReturn<T> = {
-  [K in keyof T]: (() => T[K])
+  [P in keyof T]: T[P] extends (...args: any[]) => any ? ReturnType<T[P]> : T[P]
 }
 
 export type CombinedComponentInstance<
@@ -27,15 +27,15 @@ export type CombinedComponentInstance<
   LooseObject &
   Weapp.Component &
   ComponentInstance & {
-    data: Data & RecordToAny<Props> & Computed;
+    data: Data & RecordToAny<Props> & RecordToReturn<Computed>;
   };
 
 export type VantComponentOptions<Data, Props, Methods, Computed, Instance> = {
   data?: Data;
-  props?: Props;
+  props?: Props & ThisType<Instance>;
   field?: boolean;
   mixins?: Mixins;
-  computed?: Accessors<Computed> & ThisType<Instance>;
+  computed?: Computed & ThisType<Instance>;
   relations?: Relations<Instance>;
   classes?: ExternalClasses;
   methods?: Methods & ThisType<Instance>;

types/instance.ts

@@ -1,6 +1,7 @@
 import { classNames } from './class-names';
 
 export interface ComponentInstance {
+  triggerEvent: never;
   $emit(name: string, detail?: any): void;
   classNames: classNames;
 }

types/weapp.d.ts

@@ -1,5 +1,11 @@
 declare function Component(options: any): void;
 
+interface wx {
+  [key: string]: any
+}
+
+declare const wx: wx;
+
 declare namespace Weapp {
   interface Component {
     getRelationNodes(selector: string): any[];
@@ -14,6 +20,7 @@ declare namespace Weapp {
 
   interface Event {
     type: string;
+    detail: any;
     timeStamp: number;
     target: Target;
     currentTarget: Target;
@@ -31,8 +38,4 @@ declare namespace Weapp {
     touches: Array<Touch>;
     changedTouches: Array<Touch>;
   }
-
-  interface CustomEvent extends Event {
-    detail: any;
-  }
 }