From c176dee9a27b729327eae62603edb7c5e53850d2 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 7 Sep 2018 10:32:16 +0800 Subject: [PATCH] [bugfix] Card: currency default value (#525) --- dist/action-sheet/index.js | 14 ++++----- dist/badge-group/index.js | 20 ++++--------- dist/badge/index.js | 16 ++++------- dist/button/index.js | 21 ++++++-------- dist/card/index.js | 14 ++++----- dist/cell-group/index.js | 10 ++----- dist/cell/index.js | 16 ++++------- dist/col/index.js | 14 +++------ dist/common/class-names.js | 29 +++++++++++++++++++ dist/common/create.js | 39 +++++++++++++++++++++++++ dist/common/utils.js | 13 +++++++++ dist/dialog/index.js | 12 ++++---- dist/field/index.js | 40 +++++++++++--------------- dist/icon/index.js | 12 +++----- dist/loading/index.js | 10 ++----- dist/mixins/button.js | 57 +++++++++++++++++++++++++++++++++++++ dist/mixins/touch.js | 22 ++++++++++++++ dist/mixins/transition.js | 54 +++++++++++++++++++++++++++++++++++ dist/nav-bar/index.js | 18 ++++-------- dist/notice-bar/index.js | 38 ++++++++----------------- dist/notice-bar/index.wxml | 2 +- dist/notify/index.js | 12 ++------ dist/overlay/index.js | 10 +++---- dist/panel/index.js | 14 +++------ dist/popup/index.js | 19 +++++-------- dist/progress/index.js | 12 ++------ dist/row/index.js | 20 ++++--------- dist/search/index.js | 25 +++++++--------- dist/slider/index.js | 17 ++++------- dist/stepper/index.js | 23 +++++++-------- dist/steps/index.js | 20 ++++--------- dist/switch-cell/index.js | 12 ++++---- dist/switch/index.js | 16 +++++------ dist/tab/index.js | 14 ++++----- dist/tabbar-item/index.js | 17 ++++------- dist/tabbar/index.js | 16 ++++------- dist/tabs/index.js | 14 ++++----- dist/tag/index.js | 10 ++----- dist/toast/index.js | 12 ++------ dist/toast/toast.js | 2 +- dist/transition/index.js | 15 ++++------ dist/tree-select/index.js | 18 +++++------- dist/tree-select/index.wxss | 2 +- packages/card/index.js | 2 +- 44 files changed, 418 insertions(+), 375 deletions(-) create mode 100644 dist/common/class-names.js create mode 100644 dist/common/create.js create mode 100644 dist/common/utils.js create mode 100644 dist/mixins/button.js create mode 100644 dist/mixins/touch.js create mode 100644 dist/mixins/transition.js diff --git a/dist/action-sheet/index.js b/dist/action-sheet/index.js index 90092106..31bb381c 100644 --- a/dist/action-sheet/index.js +++ b/dist/action-sheet/index.js @@ -1,9 +1,7 @@ -Component({ - options: { - addGlobalClass: true - }, +import { create } from '../common/create'; - properties: { +create({ + props: { show: Boolean, title: String, cancelText: String, @@ -26,16 +24,16 @@ Component({ const { index } = event.currentTarget.dataset; const item = this.data.actions[index]; if (item && !item.disabled && !item.loading) { - this.triggerEvent('select', item); + this.$emit('select', item); } }, onCancel() { - this.triggerEvent('cancel'); + this.$emit('cancel'); }, onClose() { - this.triggerEvent('close'); + this.$emit('close'); } } }); diff --git a/dist/badge-group/index.js b/dist/badge-group/index.js index 7fb2f27d..a50ddfd9 100644 --- a/dist/badge-group/index.js +++ b/dist/badge-group/index.js @@ -1,14 +1,8 @@ -const BADGE_PATH = '../badge/index'; - -Component({ - options: { - addGlobalClass: true - }, - - externalClasses: ['custom-class'], +import { create } from '../common/create'; +create({ relations: { - [BADGE_PATH]: { + '../badge/index': { type: 'descendant', linked(target) { @@ -23,13 +17,11 @@ Component({ } }, - properties: { + props: { active: { type: Number, value: 0, - observer() { - this.setActive(); - } + observer: 'setActive' } }, @@ -53,7 +45,7 @@ Component({ } if (this.currentActive !== -1) { - this.triggerEvent('change', active); + this.$emit('change', active); } this.currentActive = active; diff --git a/dist/badge/index.js b/dist/badge/index.js index 4a27209d..f724a2e6 100644 --- a/dist/badge/index.js +++ b/dist/badge/index.js @@ -1,26 +1,20 @@ -const BADGE_GROUP_PATH = '../badge-group/index'; - -Component({ - options: { - addGlobalClass: true - }, - - externalClasses: ['custom-class'], +import { create } from '../common/create'; +create({ relations: { - [BADGE_GROUP_PATH]: { + '../badge-group/index': { type: 'ancestor' } }, - properties: { + props: { info: Number, title: String }, methods: { onClick() { - const group = this.getRelationNodes(BADGE_GROUP_PATH)[0]; + const group = this.getRelationNodes('../badge-group/index')[0]; if (group) { group.setActive(this); } diff --git a/dist/button/index.js b/dist/button/index.js index 98d38b8f..6596c4a3 100644 --- a/dist/button/index.js +++ b/dist/button/index.js @@ -1,21 +1,16 @@ -import buttonBehaviors from '../behaviors/button'; -import classnames from '../common/classnames'; +import { create } from '../common/create'; +import { classNames } from '../common/class-names'; +import { button } from '../mixins/button'; const booleanProp = { type: Boolean, observer: 'setClasses' }; -Component({ - options: { - addGlobalClass: true - }, +create({ + mixins: [button], - externalClasses: ['custom-class', 'loading-class'], - - behaviors: [buttonBehaviors], - - properties: { + props: { type: { type: String, value: 'default', @@ -40,14 +35,14 @@ Component({ methods: { onClick() { if (!this.data.disabled && !this.data.loading) { - this.triggerEvent('click'); + this.$emit('click'); } }, setClasses() { const { type, size, plain, disabled, loading, square, block } = this.data; this.setData({ - classes: classnames(`van-button--${type}`, `van-button--${size}`, { + classes: classNames(`van-button--${type}`, `van-button--${size}`, { 'van-button--block': block, 'van-button--plain': plain, 'van-button--square': square, diff --git a/dist/card/index.js b/dist/card/index.js index dc1d9964..b5a82b38 100644 --- a/dist/card/index.js +++ b/dist/card/index.js @@ -1,11 +1,7 @@ -Component({ - options: { - multipleSlots: true, - addGlobalClass: true - }, +import { create } from '../common/create'; - externalClasses: [ - 'custom-class', +create({ + classes: [ 'thumb-class', 'title-class', 'price-class', @@ -13,7 +9,7 @@ Component({ 'num-class' ], - properties: { + props: { num: String, desc: String, thumb: String, @@ -22,7 +18,7 @@ Component({ centered: Boolean, currency: { type: String, - default: '¥' + value: '¥' } } }); diff --git a/dist/cell-group/index.js b/dist/cell-group/index.js index 61e9f502..b05225f3 100644 --- a/dist/cell-group/index.js +++ b/dist/cell-group/index.js @@ -1,11 +1,7 @@ -Component({ - options: { - addGlobalClass: true - }, +import { create } from '../common/create'; - externalClasses: ['custom-class'], - - properties: { +create({ + props: { border: { type: Boolean, value: true diff --git a/dist/cell/index.js b/dist/cell/index.js index bbeb0271..cce4c873 100644 --- a/dist/cell/index.js +++ b/dist/cell/index.js @@ -1,6 +1,7 @@ -Component({ - externalClasses: [ - 'custom-class', +import { create } from '../common/create'; + +create({ + classes: [ 'title-class', 'label-class', 'value-class', @@ -8,12 +9,7 @@ Component({ 'right-icon-class' ], - options: { - multipleSlots: true, - addGlobalClass: true - }, - - properties: { + props: { title: null, value: null, url: String, @@ -42,7 +38,7 @@ Component({ if (url) { wx[this.data.linkType]({ url }); } - this.triggerEvent('click'); + this.$emit('click'); } } }); diff --git a/dist/col/index.js b/dist/col/index.js index 49b84ad5..b803361b 100644 --- a/dist/col/index.js +++ b/dist/col/index.js @@ -1,19 +1,13 @@ -const ROW_PATH = '../row/index'; - -Component({ - options: { - addGlobalClass: true - }, - - externalClasses: ['custom-class'], +import { create } from '../common/create'; +create({ relations: { - [ROW_PATH]: { + '../row/index': { type: 'ancestor' } }, - properties: { + props: { span: Number, offset: Number }, diff --git a/dist/common/class-names.js b/dist/common/class-names.js new file mode 100644 index 00000000..7a3a99f1 --- /dev/null +++ b/dist/common/class-names.js @@ -0,0 +1,29 @@ +const hasOwn = {}.hasOwnProperty; + +export function classNames() { + const classes = []; + + for (let i = 0; i < arguments.length; i++) { + const arg = arguments[i]; + if (!arg) continue; + + const argType = typeof arg; + + if (argType === 'string' || argType === 'number') { + classes.push(arg); + } else if (Array.isArray(arg) && arg.length) { + const inner = classNames.apply(null, arg); + if (inner) { + classes.push(inner); + } + } else if (argType === 'object') { + for (const key in arg) { + if (hasOwn.call(arg, key) && arg[key]) { + classes.push(key); + } + } + } + } + + return classes.join(' '); +}; diff --git a/dist/common/create.js b/dist/common/create.js new file mode 100644 index 00000000..5643018e --- /dev/null +++ b/dist/common/create.js @@ -0,0 +1,39 @@ +function $emit() { + this.triggerEvent.apply(this, arguments); +} + +export function create(sfc) { + // map props to properties + if (sfc.props) { + sfc.properties = sfc.props; + delete sfc.props; + } + + // map mixins to behaviors + if (sfc.mixins) { + sfc.behaviors = sfc.mixins; + delete sfc.mixins; + } + + // map field to form-field behavior + if (sfc.field) { + sfc.behaviors = sfc.behaviors || []; + sfc.behaviors.push('wx://form-field'); + } + + // add default options + sfc.options = sfc.options || {}; + sfc.options.multipleSlots = true; + sfc.options.addGlobalClass = true; + + // add default externalClasses + sfc.externalClasses = sfc.classes || []; + sfc.externalClasses.push('custom-class'); + + // add default methods + sfc.methods = sfc.methods || {}; + sfc.methods.$emit = $emit; + + Component(sfc); +}; + diff --git a/dist/common/utils.js b/dist/common/utils.js new file mode 100644 index 00000000..71ddfc64 --- /dev/null +++ b/dist/common/utils.js @@ -0,0 +1,13 @@ +function isDef(value) { + return value !== undefined && value !== null; +} + +function isObj(x) { + const type = typeof x; + return x !== null && (type === 'object' || type === 'function'); +} + +export { + isObj, + isDef +}; diff --git a/dist/dialog/index.js b/dist/dialog/index.js index e6696ffd..76e58ba9 100644 --- a/dist/dialog/index.js +++ b/dist/dialog/index.js @@ -1,9 +1,7 @@ -Component({ - options: { - addGlobalClass: true - }, +import { create } from '../common/create'; - properties: { +create({ + props: { title: String, message: String, useSlot: Boolean, @@ -79,8 +77,8 @@ Component({ if (!this.data.asyncClose) { this.setData({ show: false }); } - this.triggerEvent('close', action); - this.triggerEvent(action); + this.$emit('close', action); + this.$emit(action); } } }); diff --git a/dist/field/index.js b/dist/field/index.js index 268c7303..5932e75e 100644 --- a/dist/field/index.js +++ b/dist/field/index.js @@ -1,16 +1,11 @@ -Component({ - behaviors: ['wx://form-field'], +import { create } from '../common/create'; - externalClasses: [ - 'input-class' - ], +create({ + field: true, - options: { - multipleSlots: true, - addGlobalClass: true - }, + classes: ['input-class'], - properties: { + props: { icon: String, label: String, error: Boolean, @@ -68,8 +63,8 @@ Component({ methods: { onInput(event) { const { value = '' } = event.detail || {}; - this.triggerEvent('input', value); - this.triggerEvent('change', value); + this.$emit('input', value); + this.$emit('change', value); this.setData({ value, showClear: this.getShowClear({ value }) @@ -77,7 +72,7 @@ Component({ }, onFocus(event) { - this.triggerEvent('focus', event); + this.$emit('focus', event); this.setData({ focused: true, showClear: this.getShowClear({ focused: true }) @@ -86,7 +81,7 @@ Component({ onBlur(event) { this.focused = false; - this.triggerEvent('blur', event); + this.$emit('blur', event); this.setData({ focused: false, showClear: this.getShowClear({ focused: false }) @@ -94,16 +89,15 @@ Component({ }, onClickIcon() { - this.triggerEvent('click-icon'); + this.$emit('click-icon'); }, getShowClear(options) { - const { - focused = this.data.focused, - value = this.data.value - } = options; + const { focused = this.data.focused, value = this.data.value } = options; - return this.data.clearable && focused && value !== '' && !this.data.readonly; + return ( + this.data.clearable && focused && value !== '' && !this.data.readonly + ); }, onClear() { @@ -111,12 +105,12 @@ Component({ value: '', showClear: this.getShowClear({ value: '' }) }); - this.triggerEvent('input', ''); - this.triggerEvent('change', ''); + this.$emit('input', ''); + this.$emit('change', ''); }, onConfirm() { - this.triggerEvent('confirm', this.data.value); + this.$emit('confirm', this.data.value); } } }); diff --git a/dist/icon/index.js b/dist/icon/index.js index 2ab03683..ba24cbba 100644 --- a/dist/icon/index.js +++ b/dist/icon/index.js @@ -1,11 +1,7 @@ -Component({ - options: { - addGlobalClass: true - }, +import { create } from '../common/create'; - externalClasses: ['custom-class'], - - properties: { +create({ + props: { info: null, name: String, size: String, @@ -18,7 +14,7 @@ Component({ methods: { onClick() { - this.triggerEvent('click'); + this.$emit('click'); } } }); diff --git a/dist/loading/index.js b/dist/loading/index.js index 85edb5ec..c514f400 100644 --- a/dist/loading/index.js +++ b/dist/loading/index.js @@ -1,11 +1,7 @@ -Component({ - options: { - addGlobalClass: true - }, +import { create } from '../common/create'; - externalClasses: ['custom-class'], - - properties: { +create({ + props: { size: { type: String, value: '30px' diff --git a/dist/mixins/button.js b/dist/mixins/button.js new file mode 100644 index 00000000..1c72f1f8 --- /dev/null +++ b/dist/mixins/button.js @@ -0,0 +1,57 @@ +export const button = Behavior({ + properties: { + loading: Boolean, + // 在自定义组件中，无法与外界的 form 组件联动，暂时不开放 + // formType: String, + openType: String, + appParameter: String, + // 暂时不开放，直接传入无法设置样式 + // hoverClass: { + // type: String, + // value: 'button-hover' + // }, + hoverStopPropagation: Boolean, + hoverStartTime: { + type: Number, + value: 20 + }, + hoverStayTime: { + type: Number, + value: 70 + }, + lang: { + type: String, + value: 'en' + }, + sessionFrom: { + type: String, + value: '' + }, + sendMessageTitle: String, + sendMessagePath: String, + sendMessageImg: String, + showMessageCard: String + }, + + methods: { + bindgetuserinfo(event = {}) { + this.$emit('getuserinfo', event.detail || {}); + }, + + bindcontact(event = {}) { + this.$emit('contact', event.detail || {}); + }, + + bindgetphonenumber(event = {}) { + this.$emit('getphonenumber', event.detail || {}); + }, + + bindopensetting(event = {}) { + this.$emit('opensetting', event.detail || {}); + }, + + binderror(event = {}) { + this.$emit('error', event.detail || {}); + } + } +}); diff --git a/dist/mixins/touch.js b/dist/mixins/touch.js new file mode 100644 index 00000000..ae2cb78e --- /dev/null +++ b/dist/mixins/touch.js @@ -0,0 +1,22 @@ +export const touch = Behavior({ + methods: { + touchStart(event) { + this.direction = ''; + this.deltaX = 0; + this.deltaY = 0; + this.offsetX = 0; + this.offsetY = 0; + this.startX = event.touches[0].clientX; + this.startY = event.touches[0].clientY; + }, + + touchMove(event) { + const touch = event.touches[0]; + this.deltaX = touch.clientX - this.startX; + this.deltaY = touch.clientY - this.startY; + this.offsetX = Math.abs(this.deltaX); + this.offsetY = Math.abs(this.deltaY); + this.direction = this.offsetX > this.offsetY ? 'horizontal' : this.offsetX < this.offsetY ? 'vertical' : ''; + } + } +}); diff --git a/dist/mixins/transition.js b/dist/mixins/transition.js new file mode 100644 index 00000000..e1a5ab87 --- /dev/null +++ b/dist/mixins/transition.js @@ -0,0 +1,54 @@ +export const transition = function(showDefaultValue) { + return Behavior({ + properties: { + customStyle: String, + show: { + value: showDefaultValue, + type: Boolean, + observer(value) { + if (value) { + this.show(); + } else { + this.setData({ + type: 'leave' + }); + } + } + }, + duration: { + type: Number, + value: 300 + } + }, + + data: { + type: '', + inited: false, + display: false + }, + + attached() { + if (this.data.show) { + this.show(); + } + }, + + methods: { + show() { + this.setData({ + inited: true, + display: true, + type: 'enter' + }); + }, + + onAnimationEnd() { + if (!this.data.show) { + this.setData({ + display: false + }); + } + } + } + }); +}; diff --git a/dist/nav-bar/index.js b/dist/nav-bar/index.js index 72ed2a16..6d3b7987 100644 --- a/dist/nav-bar/index.js +++ b/dist/nav-bar/index.js @@ -1,15 +1,9 @@ -Component({ - externalClasses: [ - 'custom-class', - 'title-class' - ], +import { create } from '../common/create'; - options: { - multipleSlots: true, - addGlobalClass: true - }, +create({ + classes: ['title-class'], - properties: { + props: { title: String, leftText: String, rightText: String, @@ -23,11 +17,11 @@ Component({ methods: { onClickLeft() { - this.triggerEvent('click-left'); + this.$emit('click-left'); }, onClickRight() { - this.triggerEvent('click-right'); + this.$emit('click-right'); } } }); diff --git a/dist/notice-bar/index.js b/dist/notice-bar/index.js index 2666c75c..393ee159 100644 --- a/dist/notice-bar/index.js +++ b/dist/notice-bar/index.js @@ -1,20 +1,15 @@ -const VALID_MODE = ['closeable', 'link']; +import { create } from '../common/create'; + const FONT_COLOR = '#f60'; const BG_COLOR = '#fff7cc'; -Component({ - options: { - addGlobalClass: true - }, - - externalClasses: ['custom-class'], - - properties: { +create({ + props: { text: { type: String, value: '', observer() { - this.setData({}, this._init); + this.setData({}, this.init); } }, mode: { @@ -67,8 +62,7 @@ Component({ }, attached() { - const { mode } = this.data; - if (mode && this._checkMode(mode)) { + if (this.data.mode) { this.setData({ hasRightIcon: true }); @@ -81,15 +75,7 @@ Component({ }, methods: { - _checkMode(val) { - const isValidMode = ~VALID_MODE.indexOf(val); - if (!isValidMode) { - console.warn(`mode only accept value of ${VALID_MODE}, now get ${val}.`); - } - return isValidMode; - }, - - _init() { + init() { wx.createSelectorQuery() .in(this) .select('.van-notice-bar__content') @@ -132,7 +118,7 @@ Component({ animation, resetAnimation }, () => { - this._scroll(); + this.scroll(); }); } }) @@ -141,7 +127,7 @@ Component({ .exec(); }, - _scroll() { + scroll() { const { animation, resetAnimation, wrapWidth, elapse, speed } = this.data; @@ -157,7 +143,7 @@ Component({ }, 100); const timer = setTimeout(() => { - this._scroll(); + this.scroll(); }, elapse); this.setData({ @@ -165,7 +151,7 @@ Component({ }); }, - _handleButtonClick() { + onClickIcon() { const { timer } = this.data; timer && clearTimeout(timer); this.setData({ @@ -175,7 +161,7 @@ Component({ }, onClick(event) { - this.triggerEvent('click', event); + this.$emit('click', event); } } }); diff --git a/dist/notice-bar/index.wxml b/dist/notice-bar/index.wxml index 511b6d66..46e81d2c 100644 --- a/dist/notice-bar/index.wxml +++ b/dist/notice-bar/index.wxml @@ -18,7 +18,7 @@ wx:if="{{ mode === 'closeable' }}" class="van-notice-bar__right-icon" name="close" - bind:tap="_handleButtonClick" + bind:tap="onClickIcon" /> { + this.getRelationNodes('../col/index').forEach((col) => { col.setGutter(this.data.gutter); }); } diff --git a/dist/search/index.js b/dist/search/index.js index 50f4a6a4..45467436 100644 --- a/dist/search/index.js +++ b/dist/search/index.js @@ -1,14 +1,11 @@ -Component({ - behaviors: ['wx://form-field'], +import { create } from '../common/create'; - externalClasses: ['custom-class', 'cancel-class'], +create({ + field: true, - options: { - multipleSlots: true, - addGlobalClass: true - }, + classes: ['cancel-class'], - properties: { + props: { focus: Boolean, disabled: Boolean, readonly: Boolean, @@ -27,25 +24,25 @@ Component({ methods: { onChange(event) { - this.triggerEvent('change', event.detail); + this.$emit('change', event.detail); }, onCancel() { this.setData({ value: '' }); - this.triggerEvent('cancel'); - this.triggerEvent('change', ''); + this.$emit('cancel'); + this.$emit('change', ''); }, onSearch() { - this.triggerEvent('search', this.data.value); + this.$emit('search', this.data.value); }, onFocus() { - this.triggerEvent('focus'); + this.$emit('focus'); }, onBlur() { - this.triggerEvent('blur'); + this.$emit('blur'); } } }); diff --git a/dist/slider/index.js b/dist/slider/index.js index 86971d2b..a83387d6 100644 --- a/dist/slider/index.js +++ b/dist/slider/index.js @@ -1,15 +1,10 @@ -import touchBehaviors from '../behaviors/touch'; +import { create } from '../common/create'; +import { touch } from '../mixins/touch'; -Component({ - options: { - addGlobalClass: true - }, +create({ + mixins: [touch], - externalClasses: ['custom-class'], - - behaviors: [touchBehaviors], - - properties: { + props: { disabled: Boolean, max: { type: Number, @@ -86,7 +81,7 @@ Component({ }); if (end) { - this.triggerEvent('change', value); + this.$emit('change', value); } }, diff --git a/dist/stepper/index.js b/dist/stepper/index.js index 35eeb2e0..158f6e0a 100644 --- a/dist/stepper/index.js +++ b/dist/stepper/index.js @@ -1,22 +1,19 @@ +import { create } from '../common/create'; + // Note that the bitwise operators and shift operators operate on 32-bit ints // so in that case, the max safe integer is 2^31-1, or 2147483647 const MAX = 2147483647; -Component({ - behaviors: ['wx://form-field'], +create({ + field: true, - options: { - addGlobalClass: true - }, - - externalClasses: [ - 'custom-class', + classes: [ 'input-class', 'plus-class', 'minus-class' ], - properties: { + props: { integer: Boolean, disabled: Boolean, disableInput: Boolean, @@ -53,20 +50,20 @@ Component({ onChange(type) { if (this[`${type}Disabled`]) { - this.triggerEvent('overlimit', type); + this.$emit('overlimit', type); return; } const diff = type === 'minus' ? -this.data.step : +this.data.step; const value = Math.round((this.data.value + diff) * 100) / 100; this.triggerInput(this.range(value)); - this.triggerEvent(type); + this.$emit(type); }, onBlur(event) { const value = this.range(this.data.value); this.triggerInput(value); - this.triggerEvent('blur', event); + this.$emit('blur', event); }, onMinus() { @@ -79,7 +76,7 @@ Component({ triggerInput(value) { this.setData({ value }); - this.triggerEvent('change', value); + this.$emit('change', value); } } }); diff --git a/dist/steps/index.js b/dist/steps/index.js index e07415ca..29587de4 100644 --- a/dist/steps/index.js +++ b/dist/steps/index.js @@ -1,25 +1,15 @@ -Component({ - options: { - addGlobalClass: true - }, +import { create } from '../common/create'; - externalClasses: [ - 'custom-class' - ], - - properties: { +create({ + props: { icon: String, steps: { type: Array, - observer() { - this.formatSteps(); - } + observer: 'formatSteps' }, active: { type: Number, - observer() { - this.formatSteps(); - } + observer: 'formatSteps' }, direction: { type: String, diff --git a/dist/switch-cell/index.js b/dist/switch-cell/index.js index 7581323d..b6fa11fd 100644 --- a/dist/switch-cell/index.js +++ b/dist/switch-cell/index.js @@ -1,11 +1,9 @@ -Component({ - behaviors: ['wx://form-field'], +import { create } from '../common/create'; - options: { - addGlobalClass: true - }, +create({ + field: true, - properties: { + props: { title: String, border: Boolean, loading: Boolean, @@ -28,7 +26,7 @@ Component({ methods: { onChange(event) { - this.triggerEvent('change', event.detail); + this.$emit('change', event.detail); } } }); diff --git a/dist/switch/index.js b/dist/switch/index.js index e20aa357..07867866 100644 --- a/dist/switch/index.js +++ b/dist/switch/index.js @@ -1,13 +1,11 @@ -Component({ - behaviors: ['wx://form-field'], +import { create } from '../common/create'; - options: { - addGlobalClass: true - }, +create({ + field: true, - externalClasses: ['custom-class', 'node-class'], + classes: ['node-class'], - properties: { + props: { loading: Boolean, disabled: Boolean, checked: { @@ -30,8 +28,8 @@ Component({ onClick() { if (!this.data.disabled && !this.data.loading) { const checked = !this.data.checked; - this.triggerEvent('input', checked); - this.triggerEvent('change', checked); + this.$emit('input', checked); + this.$emit('change', checked); } } } diff --git a/dist/tab/index.js b/dist/tab/index.js index 0f5cdaea..950b4c63 100644 --- a/dist/tab/index.js +++ b/dist/tab/index.js @@ -1,16 +1,12 @@ -const TABS_PATH = '../tabs/index'; +import { create } from '../common/create'; -Component({ - options: { - addGlobalClass: true - }, - - properties: { +create({ + props: { disabled: Boolean, title: { type: String, observer() { - const parent = this.getRelationNodes(TABS_PATH)[0]; + const parent = this.getRelationNodes('../tabs/index')[0]; if (parent) { parent.setLine(); } @@ -19,7 +15,7 @@ Component({ }, relations: { - [TABS_PATH]: { + '../tabs/index': { type: 'ancestor' } }, diff --git a/dist/tabbar-item/index.js b/dist/tabbar-item/index.js index a888b510..ff936043 100644 --- a/dist/tabbar-item/index.js +++ b/dist/tabbar-item/index.js @@ -1,19 +1,14 @@ -const TABBAR_PATH = '../tabbar/index'; +import { create } from '../common/create'; -Component({ - properties: { +create({ + props: { info: null, icon: String, dot: Boolean }, - options: { - multipleSlots: true, - addGlobalClass: true - }, - relations: { - [TABBAR_PATH]: { + '../tabbar/index': { type: 'ancestor' } }, @@ -25,11 +20,11 @@ Component({ methods: { onClick() { - const parent = this.getRelationNodes(TABBAR_PATH)[0]; + const parent = this.getRelationNodes('../tabbar/index')[0]; if (parent) { parent.onChange(this); } - this.triggerEvent('click'); + this.$emit('click'); } } }); diff --git a/dist/tabbar/index.js b/dist/tabbar/index.js index a19c784a..2c765016 100644 --- a/dist/tabbar/index.js +++ b/dist/tabbar/index.js @@ -1,13 +1,7 @@ -const ITEM_PATH = '../tabbar-item/index'; +import { create } from '../common/create'; -Component({ - options: { - addGlobalClass: true - }, - - externalClasses: ['custom-class'], - - properties: { +create({ + props: { active: { type: Number, observer(active) { @@ -35,7 +29,7 @@ Component({ }, relations: { - [ITEM_PATH]: { + '../tabbar-item/index': { type: 'descendant', linked(target) { @@ -63,7 +57,7 @@ Component({ onChange(child) { const active = this.data.items.indexOf(child); if (active !== this.data.currentActive && active !== -1) { - this.triggerEvent('change', active); + this.$emit('change', active); this.setData({ currentActive: active }); this.setActiveItem(); } diff --git a/dist/tabs/index.js b/dist/tabs/index.js index bfa428b8..d1b45b26 100644 --- a/dist/tabs/index.js +++ b/dist/tabs/index.js @@ -1,12 +1,8 @@ -const TAB_PATH = '../tab/index'; - -Component({ - options: { - addGlobalClass: true - }, +import { create } from '../common/create'; +create({ relations: { - [TAB_PATH]: { + '../tab/index': { type: 'descendant', linked(target) { @@ -33,7 +29,7 @@ Component({ } }, - properties: { + props: { color: { type: String, observer: 'setLine' @@ -78,7 +74,7 @@ Component({ methods: { trigger(eventName, index) { - this.triggerEvent(eventName, { + this.$emit(eventName, { index, title: this.data.tabs[index].data.title }); diff --git a/dist/tag/index.js b/dist/tag/index.js index f415cfac..40a74c60 100644 --- a/dist/tag/index.js +++ b/dist/tag/index.js @@ -1,11 +1,7 @@ -Component({ - options: { - addGlobalClass: true - }, +import { create } from '../common/create'; - externalClasses: ['custom-class'], - - properties: { +create({ + props: { type: String, mark: Boolean, plain: Boolean diff --git a/dist/toast/index.js b/dist/toast/index.js index fa0adba4..33aa2369 100644 --- a/dist/toast/index.js +++ b/dist/toast/index.js @@ -1,11 +1,7 @@ -import Toast from './toast'; +import { create } from '../common/create'; -Component({ - options: { - addGlobalClass: true - }, - - properties: { +create({ + props: { show: Boolean, mask: Boolean, message: String, @@ -32,5 +28,3 @@ Component({ } } }); - -export default Toast; diff --git a/dist/toast/toast.js b/dist/toast/toast.js index c72dab44..38c41422 100644 --- a/dist/toast/toast.js +++ b/dist/toast/toast.js @@ -1,4 +1,4 @@ -import { isObj } from '../utils/index'; +import { isObj } from '../common/utils'; const defaultOptions = { type: 'text', diff --git a/dist/transition/index.js b/dist/transition/index.js index afc2cd40..d41bcb2b 100644 --- a/dist/transition/index.js +++ b/dist/transition/index.js @@ -1,15 +1,10 @@ -import transitionBehaviors from '../behaviors/transition'; +import { create } from '../common/create'; +import { transition } from '../mixins/transition'; -Component({ - options: { - addGlobalClass: true - }, +create({ + mixins: [transition(true)], - externalClasses: ['custom-class'], - - behaviors: [transitionBehaviors(true)], - - properties: { + props: { name: { type: String, value: 'fade' diff --git a/dist/tree-select/index.js b/dist/tree-select/index.js index 099c5e7e..63a6643a 100644 --- a/dist/tree-select/index.js +++ b/dist/tree-select/index.js @@ -1,11 +1,9 @@ +import { create } from '../common/create'; + const ITEM_HEIGHT = 44; -Component({ - options: { - addGlobalClass: true - }, - - properties: { +create({ + props: { items: { type: Array, observer() { @@ -16,9 +14,7 @@ Component({ mainActiveIndex: { type: Number, value: 0, - observer() { - this.updateSubItems(); - } + observer: 'updateSubItems' }, activeId: { type: Number, @@ -46,7 +42,7 @@ Component({ const { dataset = {} } = event.currentTarget || {}; - this.triggerEvent('click-item', { ...(dataset.item || {}) }); + this.$emit('click-item', { ...(dataset.item || {}) }); }, // 当一个导航被点击时 @@ -54,7 +50,7 @@ Component({ const { dataset = {} } = event.currentTarget || {}; - this.triggerEvent('click-nav', { index: dataset.index }); + this.$emit('click-nav', { index: dataset.index }); }, // 更新子项列表 diff --git a/dist/tree-select/index.wxss b/dist/tree-select/index.wxss index d857c6d5..8950c130 100644 --- a/dist/tree-select/index.wxss +++ b/dist/tree-select/index.wxss @@ -1 +1 @@ -.van-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.van-multi-ellipsis--l2{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}.van-multi-ellipsis--l3{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical}.van-clearfix::after{content:'';display:table;clear:both}.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom::after,.van-hairline--left::after,.van-hairline--right::after,.van-hairline--surround::after,.van-hairline--top-bottom::after,.van-hairline--top::after,.van-hairline::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5}.van-hairline--top::after{border-top-width:1px}.van-hairline--left::after{border-left-width:1px}.van-hairline--right::after{border-right-width:1px}.van-hairline--bottom::after{border-bottom-width:1px}.van-hairline--top-bottom::after{border-width:1px 0}.van-hairline--surround::after{border-width:1px}.tree-select{-webkit-user-select:none;user-select:none;position:relative;font-size:16px}.tree-select__nav{width:143px;position:absolute;left:0;top:0;bottom:0;overflow:scroll;background-color:#fff;-webkit-overflow-scrolling:touch}.tree-select__nitem{line-height:44px;padding:0 15px;background-color:#fff}.tree-select__nitem--active{background-color:#f8f8f8}.tree-select__content{padding:0 15px;margin-left:143px;overflow:scroll;-webkit-overflow-scrolling:touch}.tree-select__item{position:relative;line-height:44px;padding-left:5px;padding-right:18px}.tree-select__item--active{color:#f44}.tree-select__selected{float:right;position:absolute;right:0;top:0;bottom:0;line-height:inherit} \ No newline at end of file +.van-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.van-multi-ellipsis--l2{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}.van-multi-ellipsis--l3{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical}.tree-select{-webkit-user-select:none;user-select:none;position:relative;font-size:16px}.tree-select__nav{width:143px;position:absolute;left:0;top:0;bottom:0;overflow:scroll;background-color:#fff;-webkit-overflow-scrolling:touch}.tree-select__nitem{line-height:44px;padding:0 15px;background-color:#fff}.tree-select__nitem--active{background-color:#f8f8f8}.tree-select__content{padding:0 15px;margin-left:143px;overflow:scroll;-webkit-overflow-scrolling:touch}.tree-select__item{position:relative;line-height:44px;padding-left:5px;padding-right:18px}.tree-select__item--active{color:#f44}.tree-select__selected{float:right;position:absolute;right:0;top:0;bottom:0;line-height:inherit} \ No newline at end of file diff --git a/packages/card/index.js b/packages/card/index.js index e9057146..b5a82b38 100644 --- a/packages/card/index.js +++ b/packages/card/index.js @@ -18,7 +18,7 @@ create({ centered: Boolean, currency: { type: String, - default: '¥' + value: '¥' } } });