From f35edf2662545e914f324d9ebd1744e49e7cc197 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 21 Sep 2018 20:17:48 +0800 Subject: [PATCH] [type] getCurrentPages (#626) --- dist/field/index.js | 223 ++++++++---------- dist/icon/index.js | 30 ++- dist/loading/index.js | 27 +-- dist/mixins/basic.js | 44 ++-- dist/mixins/observer/behavior.js | 59 ++--- dist/mixins/observer/index.js | 16 +- dist/mixins/observer/props.js | 39 ++- packages/field/{index.js => index.ts} | 14 +- packages/icon/{index.js => index.ts} | 0 packages/loading/{index.js => index.ts} | 0 packages/mixins/{basic.js => basic.ts} | 2 +- .../observer/{behavior.js => behavior.ts} | 0 .../mixins/observer/{index.js => index.ts} | 0 .../mixins/observer/{props.js => props.ts} | 0 types/weapp.d.ts | 15 +- 15 files changed, 222 insertions(+), 247 deletions(-) rename packages/field/{index.js => index.ts} (93%) rename packages/icon/{index.js => index.ts} (100%) rename packages/loading/{index.js => index.ts} (100%) rename packages/mixins/{basic.js => basic.ts} (92%) rename packages/mixins/observer/{behavior.js => behavior.ts} (100%) rename packages/mixins/observer/{index.js => index.ts} (100%) rename packages/mixins/observer/{props.js => props.ts} (100%) diff --git a/dist/field/index.js b/dist/field/index.js index 0556c795..1a85c860 100644 --- a/dist/field/index.js +++ b/dist/field/index.js @@ -1,127 +1,112 @@ import { VantComponent } from '../common/component'; - VantComponent({ - field: true, - - classes: ['input-class'], - - props: { - icon: String, - label: String, - error: Boolean, - focus: Boolean, - center: Boolean, - isLink: Boolean, - leftIcon: String, - disabled: Boolean, - autosize: Boolean, - readonly: Boolean, - required: Boolean, - iconClass: String, - clearable: Boolean, - inputAlign: String, - customClass: String, - confirmType: String, - errorMessage: String, - placeholder: String, - customStyle: String, - useIconSlot: Boolean, - useButtonSlot: Boolean, - placeholderClass: String, - cursorSpacing: { - type: Number, - value: 50 + field: true, + classes: ['input-class'], + props: { + icon: String, + label: String, + error: Boolean, + focus: Boolean, + center: Boolean, + isLink: Boolean, + leftIcon: String, + disabled: Boolean, + autosize: Boolean, + readonly: Boolean, + required: Boolean, + iconClass: String, + clearable: Boolean, + inputAlign: String, + customClass: String, + confirmType: String, + errorMessage: String, + placeholder: String, + customStyle: String, + useIconSlot: Boolean, + useButtonSlot: Boolean, + placeholderClass: String, + cursorSpacing: { + type: Number, + value: 50 + }, + maxlength: { + type: Number, + value: -1 + }, + value: { + type: null, + value: '' + }, + type: { + type: String, + value: 'text' + }, + border: { + type: Boolean, + value: true + }, + titleWidth: { + type: String, + value: '90px' + } }, - maxlength: { - type: Number, - value: -1 - }, - value: { - type: null, - value: '' - }, - type: { - type: String, - value: 'text' - }, - border: { - type: Boolean, - value: true - }, - titleWidth: { - type: String, - value: '90px' - } - }, - - data: { - focused: false, - showClear: false - }, - - computed: { - inputClass() { - const { data } = this; - return this.classNames('input-class', 'van-field__input', { - 'van-field--error': data.error, - 'van-field__textarea': data.type === 'textarea', - 'van-field__input--disabled': data.disabled, - [`van-field--${data.inputAlign}`]: data.inputAlign - }); - } - }, - - methods: { - onInput(event) { - const { value = '' } = event.detail || {}; - this.$emit('input', value); - this.$emit('change', value); - this.setData({ - value, - showClear: this.getShowClear({ value }) - }); - }, - - onFocus(event) { - this.$emit('focus', event); - this.setData({ - focused: true, - showClear: this.getShowClear({ focused: true }) - }); - }, - - onBlur(event) { - this.focused = false; - this.$emit('blur', event); - this.setData({ + data: { focused: false, - showClear: this.getShowClear({ focused: false }) - }); + showClear: false }, - - onClickIcon() { - this.$emit('click-icon'); + computed: { + inputClass() { + const { data } = this; + return this.classNames('input-class', 'van-field__input', { + 'van-field--error': data.error, + 'van-field__textarea': data.type === 'textarea', + 'van-field__input--disabled': data.disabled, + [`van-field--${data.inputAlign}`]: data.inputAlign + }); + } }, - - getShowClear(options) { - const { focused = this.data.focused, value = this.data.value } = options; - - return ( - this.data.clearable && focused && value !== '' && !this.data.readonly - ); - }, - - onClear() { - this.setData({ - value: '', - showClear: this.getShowClear({ value: '' }) - }); - this.$emit('input', ''); - this.$emit('change', ''); - }, - - onConfirm() { - this.$emit('confirm', this.data.value); + methods: { + onInput(event) { + const { value = '' } = event.detail || {}; + this.$emit('input', value); + this.$emit('change', value); + this.setData({ + value, + showClear: this.getShowClear({ value }) + }); + }, + onFocus() { + this.$emit('focus'); + this.setData({ + focused: true, + showClear: this.getShowClear({ focused: true }) + }); + }, + onBlur() { + this.focused = false; + this.$emit('blur'); + this.setData({ + focused: false, + showClear: this.getShowClear({ focused: false }) + }); + }, + onClickIcon() { + this.$emit('click-icon'); + }, + getShowClear(options) { + const { focused = this.data.focused, value = this.data.value } = options; + return (this.data.clearable && focused && value !== '' && !this.data.readonly); + }, + onClear() { + this.setData({ + value: '', + showClear: this.getShowClear({ value: '' }) + }); + this.$emit('input', ''); + this.$emit('change', ''); + }, + onConfirm() { + this.$emit('confirm', this.data.value); + } } - } }); diff --git a/dist/icon/index.js b/dist/icon/index.js index e239c4b7..a8b14448 100644 --- a/dist/icon/index.js +++ b/dist/icon/index.js @@ -1,20 +1,18 @@ import { VantComponent } from '../common/component'; - VantComponent({ - props: { - info: null, - name: String, - size: String, - color: String, - classPrefix: { - type: String, - value: 'van-icon' + props: { + info: null, + name: String, + size: String, + color: String, + classPrefix: { + type: String, + value: 'van-icon' + } + }, + methods: { + onClick() { + this.$emit('click'); + } } - }, - - methods: { - onClick() { - this.$emit('click'); - } - } }); diff --git a/dist/loading/index.js b/dist/loading/index.js index 889c31f3..942b7a42 100644 --- a/dist/loading/index.js +++ b/dist/loading/index.js @@ -1,18 +1,17 @@ import { VantComponent } from '../common/component'; - VantComponent({ - props: { - size: { - type: String, - value: '30px' - }, - type: { - type: String, - value: 'circular' - }, - color: { - type: String, - value: '#c9c9c9' + props: { + size: { + type: String, + value: '30px' + }, + type: { + type: String, + value: 'circular' + }, + color: { + type: String, + value: '#c9c9c9' + } } - } }); diff --git a/dist/mixins/basic.js b/dist/mixins/basic.js index bad37d45..3b9e5d50 100644 --- a/dist/mixins/basic.js +++ b/dist/mixins/basic.js @@ -1,28 +1,24 @@ import { classNames } from '../common/class-names'; - export const basic = Behavior({ - methods: { - classNames, - - $emit() { - this.triggerEvent.apply(this, arguments); - }, - - getRect(selector, all) { - return new Promise((resolve, reject) => { - wx.createSelectorQuery() - .in(this)[all ? 'selectAll' : 'select'](selector) - .boundingClientRect(rect => { - if (all && Array.isArray(rect) && rect.length) { - resolve(rect); - } - - if (!all && rect) { - resolve(rect); - } - }) - .exec(); - }); + methods: { + classNames, + $emit() { + this.triggerEvent.apply(this, arguments); + }, + getRect(selector, all) { + return new Promise(resolve => { + wx.createSelectorQuery() + .in(this)[all ? 'selectAll' : 'select'](selector) + .boundingClientRect(rect => { + if (all && Array.isArray(rect) && rect.length) { + resolve(rect); + } + if (!all && rect) { + resolve(rect); + } + }) + .exec(); + }); + } } - } }); diff --git a/dist/mixins/observer/behavior.js b/dist/mixins/observer/behavior.js index 9162ef04..d8efcf26 100644 --- a/dist/mixins/observer/behavior.js +++ b/dist/mixins/observer/behavior.js @@ -1,36 +1,29 @@ export const behavior = Behavior({ - created() { - if (!this.$options) { - return; - } - - const cache = {}; - const { setData } = this; - const { computed } = this.$options(); - const keys = Object.keys(computed); - - const calcComputed = () => { - const needUpdate = {}; - keys.forEach(key => { - const value = computed[key].call(this); - - if (cache[key] !== value) { - cache[key] = needUpdate[key] = value; + created() { + if (!this.$options) { + return; } - }); - - 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(); - } + const cache = {}; + const { setData } = this; + const { computed } = this.$options(); + const keys = Object.keys(computed); + const calcComputed = () => { + const needUpdate = {}; + keys.forEach(key => { + const value = computed[key].call(this); + if (cache[key] !== value) { + cache[key] = needUpdate[key] = value; + } + }); + 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(); + } }); diff --git a/dist/mixins/observer/index.js b/dist/mixins/observer/index.js index 55ea4c89..bcffe80f 100644 --- a/dist/mixins/observer/index.js +++ b/dist/mixins/observer/index.js @@ -1,14 +1,12 @@ import { behavior } from './behavior'; import { observeProps } from './props'; - export function observe(sfc, options) { - if (sfc.computed) { - options.behaviors.push(behavior); - options.methods = options.methods || {}; - options.methods.$options = () => sfc; - - if (options.properties) { - observeProps(options.properties); + if (sfc.computed) { + options.behaviors.push(behavior); + options.methods = options.methods || {}; + options.methods.$options = () => sfc; + if (options.properties) { + observeProps(options.properties); + } } - } } diff --git a/dist/mixins/observer/props.js b/dist/mixins/observer/props.js index 9f7923f6..ed74410d 100644 --- a/dist/mixins/observer/props.js +++ b/dist/mixins/observer/props.js @@ -1,25 +1,22 @@ export function observeProps(props) { - if (!props) { - return; - } - - Object.keys(props).forEach(key => { - let prop = props[key]; - if (prop === null || !prop.type) { - prop = { type: prop }; + if (!props) { + return; } - - let { observer } = prop; - prop.observer = function() { - if (observer) { - if (typeof observer === 'string') { - observer = this[observer]; + Object.keys(props).forEach(key => { + let prop = props[key]; + if (prop === null || !prop.type) { + prop = { type: prop }; } - observer.apply(this, arguments); - } - this.setData(); - }; - - props[key] = prop; - }); + let { observer } = prop; + prop.observer = function () { + if (observer) { + if (typeof observer === 'string') { + observer = this[observer]; + } + observer.apply(this, arguments); + } + this.setData(); + }; + props[key] = prop; + }); } diff --git a/packages/field/index.js b/packages/field/index.ts similarity index 93% rename from packages/field/index.js rename to packages/field/index.ts index 0556c795..84842606 100644 --- a/packages/field/index.js +++ b/packages/field/index.ts @@ -60,7 +60,7 @@ VantComponent({ }, computed: { - inputClass() { + inputClass(): string { const { data } = this; return this.classNames('input-class', 'van-field__input', { 'van-field--error': data.error, @@ -72,7 +72,7 @@ VantComponent({ }, methods: { - onInput(event) { + onInput(event: Weapp.Event) { const { value = '' } = event.detail || {}; this.$emit('input', value); this.$emit('change', value); @@ -82,17 +82,17 @@ VantComponent({ }); }, - onFocus(event) { - this.$emit('focus', event); + onFocus() { + this.$emit('focus'); this.setData({ focused: true, showClear: this.getShowClear({ focused: true }) }); }, - onBlur(event) { + onBlur() { this.focused = false; - this.$emit('blur', event); + this.$emit('blur'); this.setData({ focused: false, showClear: this.getShowClear({ focused: false }) @@ -103,7 +103,7 @@ VantComponent({ this.$emit('click-icon'); }, - getShowClear(options) { + getShowClear(options): boolean { const { focused = this.data.focused, value = this.data.value } = options; return ( diff --git a/packages/icon/index.js b/packages/icon/index.ts similarity index 100% rename from packages/icon/index.js rename to packages/icon/index.ts diff --git a/packages/loading/index.js b/packages/loading/index.ts similarity index 100% rename from packages/loading/index.js rename to packages/loading/index.ts diff --git a/packages/mixins/basic.js b/packages/mixins/basic.ts similarity index 92% rename from packages/mixins/basic.js rename to packages/mixins/basic.ts index bad37d45..50ede2fc 100644 --- a/packages/mixins/basic.js +++ b/packages/mixins/basic.ts @@ -9,7 +9,7 @@ export const basic = Behavior({ }, getRect(selector, all) { - return new Promise((resolve, reject) => { + return new Promise(resolve => { wx.createSelectorQuery() .in(this)[all ? 'selectAll' : 'select'](selector) .boundingClientRect(rect => { diff --git a/packages/mixins/observer/behavior.js b/packages/mixins/observer/behavior.ts similarity index 100% rename from packages/mixins/observer/behavior.js rename to packages/mixins/observer/behavior.ts diff --git a/packages/mixins/observer/index.js b/packages/mixins/observer/index.ts similarity index 100% rename from packages/mixins/observer/index.js rename to packages/mixins/observer/index.ts diff --git a/packages/mixins/observer/props.js b/packages/mixins/observer/props.ts similarity index 100% rename from packages/mixins/observer/props.js rename to packages/mixins/observer/props.ts diff --git a/types/weapp.d.ts b/types/weapp.d.ts index cb3403ee..fcd18d6f 100644 --- a/types/weapp.d.ts +++ b/types/weapp.d.ts @@ -1,10 +1,15 @@ -declare function Component(options: any): void; +type BehaviorOptions = { + [key: string]: any & ThisType +}; -interface wx { +type WX = { [key: string]: any } -declare const wx: wx; +declare const wx: WX; +declare function Behavior(options: BehaviorOptions): void; +declare function Component(options: any): void; +declare function getCurrentPages(): Weapp.Page[]; declare namespace Weapp { interface Component { @@ -38,4 +43,8 @@ declare namespace Weapp { touches: Array; changedTouches: Array; } + + interface Page { + selectComponent(selector: string): Component + } }