From e2e453845376d6e64fde09081d582f366910cc1a Mon Sep 17 00:00:00 2001 From: rex Date: Fri, 8 May 2020 14:31:59 +0800 Subject: [PATCH] build: compile 1.3.0 --- dist/action-sheet/index.js | 110 ++-- dist/area/index.js | 418 +++++++------- dist/button/index.js | 122 ++--- dist/button/index.wxml | 15 +- dist/calendar/components/header/index.js | 24 +- dist/calendar/components/month/index.js | 293 +++++----- dist/calendar/index.js | 537 +++++++++--------- dist/calendar/utils.d.ts | 10 +- dist/calendar/utils.js | 114 ++-- dist/card/index.js | 88 +-- dist/cell-group/index.js | 14 +- dist/cell-group/index.json | 2 +- dist/cell/index.js | 64 +-- dist/cell/index.json | 2 +- dist/checkbox-group/index.js | 60 +-- dist/checkbox/index.js | 134 +++-- dist/circle/index.js | 280 +++++----- dist/col/index.js | 42 +- dist/collapse-item/index.js | 170 +++--- dist/collapse/index.js | 73 ++- dist/common/component.js | 176 +++--- dist/common/index.wxss | 2 +- dist/common/style/normalize.wxss | 1 + dist/common/utils.d.ts | 2 +- dist/common/version.d.ts | 1 + dist/common/version.js | 27 + dist/count-down/index.js | 181 ++++--- dist/count-down/utils.js | 86 ++- dist/datetime-picker/index.js | 570 ++++++++++---------- dist/dialog/dialog.js | 98 ++-- dist/dialog/index.js | 204 +++---- dist/dialog/index.wxml | 2 +- dist/divider/index.js | 60 +-- dist/divider/index.json | 2 +- dist/dropdown-item/index.js | 201 +++---- dist/dropdown-menu/index.js | 218 ++++---- dist/dropdown-menu/index.json | 2 +- dist/field/index.js | 208 ++++--- dist/field/index.json | 2 +- dist/field/index.wxml | 2 +- dist/field/props.js | 112 ++-- dist/goods-action-button/index.js | 64 +-- dist/goods-action-icon/index.js | 30 +- dist/goods-action/index.js | 20 +- dist/grid-item/index.js | 122 ++--- dist/grid/index.js | 96 ++-- dist/icon/index.js | 46 +- dist/image/index.js | 180 +++---- dist/index-anchor/index.js | 50 +- dist/index-bar/index.js | 444 +++++++-------- dist/info/index.js | 10 +- dist/info/index.wxss | 2 +- dist/loading/index.js | 24 +- dist/loading/index.json | 2 +- dist/mixins/basic.js | 49 +- dist/mixins/button.js | 26 +- dist/mixins/link.js | 28 +- dist/mixins/open-type.js | 44 +- dist/mixins/page-scroll.js | 47 +- dist/mixins/touch.js | 61 +-- dist/mixins/transition.d.ts | 2 +- dist/mixins/transition.js | 224 ++++---- dist/nav-bar/index.js | 110 ++-- dist/notice-bar/index.js | 240 +++++---- dist/notice-bar/index.json | 2 +- dist/notify/index.js | 108 ++-- dist/notify/notify.js | 70 +-- dist/overlay/index.js | 36 +- dist/panel/index.js | 14 +- dist/picker-column/index.js | 218 ++++---- dist/picker-column/index.json | 2 +- dist/picker/index.js | 268 ++++----- dist/picker/shared.js | 38 +- dist/popup/index.js | 150 +++--- dist/progress/index.js | 46 +- dist/radio-group/index.js | 58 +- dist/radio/index.js | 86 +-- dist/rate/index.js | 153 +++--- dist/row/index.js | 68 +-- dist/search/index.js | 143 ++--- dist/sidebar-item/index.js | 55 +- dist/sidebar/index.js | 70 +-- dist/skeleton/index.js | 84 +-- dist/skeleton/index.json | 2 +- dist/slider/index.js | 189 ++++--- dist/slider/index.wxml | 3 +- dist/slider/index.wxs | 20 + dist/stepper/index.js | 345 ++++++------ dist/stepper/index.json | 2 +- dist/steps/index.js | 54 +- dist/sticky/index.js | 188 ++++--- dist/submit-bar/index.js | 108 ++-- dist/submit-bar/index.wxml | 4 +- dist/submit-bar/index.wxss | 2 +- dist/swipe-cell/index.js | 229 ++++---- dist/switch/index.js | 88 +-- dist/tab/index.js | 106 ++-- dist/tab/index.json | 2 +- dist/tabbar-item/index.js | 86 +-- dist/tabbar/index.js | 112 ++-- dist/tabs/index.js | 522 +++++++++--------- dist/tabs/index.wxss | 2 +- dist/tag/index.js | 34 +- dist/toast/index.js | 50 +- dist/toast/toast.js | 92 ++-- dist/transition/index.js | 18 +- dist/transition/index.json | 2 +- dist/tree-select/index.js | 118 ++-- dist/uploader/index.js | 307 ++++++----- dist/uploader/index.wxml | 6 +- dist/uploader/shared.js | 48 +- dist/uploader/utils.d.ts | 53 +- dist/uploader/utils.js | 108 ++-- lib/action-sheet/index.js | 120 ++--- lib/area/index.js | 465 ++++++++-------- lib/button/index.js | 132 ++--- lib/button/index.wxml | 15 +- lib/calendar/components/header/index.js | 30 +- lib/calendar/components/month/index.js | 309 ++++++----- lib/calendar/index.js | 582 ++++++++++---------- lib/card/index.js | 96 ++-- lib/cell-group/index.js | 20 +- lib/cell-group/index.json | 2 +- lib/cell/index.js | 72 +-- lib/cell/index.json | 2 +- lib/checkbox-group/index.js | 74 +-- lib/checkbox/index.js | 147 ++--- lib/circle/index.js | 312 ++++++----- lib/col/index.js | 48 +- lib/collapse-item/index.js | 194 ++++--- lib/collapse/index.js | 81 +-- lib/common/component.js | 198 +++---- lib/common/index.wxss | 2 +- lib/common/style/normalize.wxss | 1 + lib/common/version.js | 30 ++ lib/count-down/index.js | 193 ++++--- lib/count-down/utils.js | 97 ++-- lib/datetime-picker/index.js | 658 ++++++++++++----------- lib/dialog/dialog.js | 115 ++-- lib/dialog/index.js | 214 ++++---- lib/dialog/index.wxml | 2 +- lib/divider/index.js | 66 +-- lib/divider/index.json | 2 +- lib/dropdown-item/index.js | 214 ++++---- lib/dropdown-menu/index.js | 241 +++++---- lib/dropdown-menu/index.json | 2 +- lib/field/index.js | 244 +++++---- lib/field/index.json | 2 +- lib/field/index.wxml | 2 +- lib/field/props.js | 116 ++-- lib/goods-action-button/index.js | 77 +-- lib/goods-action-icon/index.js | 42 +- lib/goods-action/index.js | 26 +- lib/grid-item/index.js | 142 ++--- lib/grid/index.js | 104 ++-- lib/icon/index.js | 52 +- lib/image/index.js | 195 +++---- lib/index-anchor/index.js | 58 +- lib/index-bar/index.js | 508 +++++++++-------- lib/info/index.js | 16 +- lib/info/index.wxss | 2 +- lib/loading/index.js | 30 +- lib/loading/index.json | 2 +- lib/mixins/basic.js | 63 +-- lib/mixins/button.js | 30 +- lib/mixins/link.js | 36 +- lib/mixins/open-type.js | 48 +- lib/mixins/page-scroll.js | 59 +- lib/mixins/touch.js | 65 +-- lib/mixins/transition.js | 280 +++++----- lib/nav-bar/index.js | 118 ++-- lib/notice-bar/index.js | 258 ++++----- lib/notice-bar/index.json | 2 +- lib/notify/index.js | 120 +++-- lib/notify/notify.js | 88 +-- lib/overlay/index.js | 42 +- lib/panel/index.js | 20 +- lib/picker-column/index.js | 236 ++++---- lib/picker-column/index.json | 2 +- lib/picker/index.js | 318 +++++------ lib/picker/shared.js | 42 +- lib/popup/index.js | 160 +++--- lib/progress/index.js | 54 +- lib/radio-group/index.js | 72 +-- lib/radio/index.js | 95 ++-- lib/rate/index.js | 184 ++++--- lib/row/index.js | 76 +-- lib/search/index.js | 151 +++--- lib/sidebar-item/index.js | 63 ++- lib/sidebar/index.js | 78 +-- lib/skeleton/index.js | 90 ++-- lib/skeleton/index.json | 2 +- lib/slider/index.js | 210 ++++---- lib/slider/index.wxml | 3 +- lib/slider/index.wxs | 20 + lib/stepper/index.js | 379 ++++++------- lib/stepper/index.json | 2 +- lib/steps/index.js | 62 +-- lib/sticky/index.js | 210 ++++---- lib/submit-bar/index.js | 116 ++-- lib/submit-bar/index.wxml | 4 +- lib/submit-bar/index.wxss | 2 +- lib/swipe-cell/index.js | 283 +++++----- lib/switch/index.js | 102 ++-- lib/tab/index.js | 112 ++-- lib/tab/index.json | 2 +- lib/tabbar-item/index.js | 92 ++-- lib/tabbar/index.js | 122 +++-- lib/tabs/index.js | 591 ++++++++++---------- lib/tabs/index.wxss | 2 +- lib/tag/index.js | 40 +- lib/toast/index.js | 56 +- lib/toast/toast.js | 121 +++-- lib/transition/index.js | 26 +- lib/transition/index.json | 2 +- lib/tree-select/index.js | 127 ++--- lib/uploader/index.js | 358 +++++++----- lib/uploader/index.wxml | 6 +- lib/uploader/shared.js | 52 +- lib/uploader/utils.js | 110 ++-- 220 files changed, 12317 insertions(+), 11320 deletions(-) create mode 100644 dist/common/style/normalize.wxss create mode 100644 dist/common/version.d.ts create mode 100644 dist/common/version.js create mode 100644 dist/slider/index.wxs create mode 100644 lib/common/style/normalize.wxss create mode 100644 lib/common/version.js create mode 100644 lib/slider/index.wxs diff --git a/dist/action-sheet/index.js b/dist/action-sheet/index.js index 30444810..f3f6d0f6 100644 --- a/dist/action-sheet/index.js +++ b/dist/action-sheet/index.js @@ -2,61 +2,61 @@ import { VantComponent } from '../common/component'; import { button } from '../mixins/button'; import { openType } from '../mixins/open-type'; VantComponent({ - mixins: [button, openType], - props: { - show: Boolean, - title: String, - cancelText: String, - description: String, - round: { - type: Boolean, - value: true - }, - zIndex: { - type: Number, - value: 100 - }, - actions: { - type: Array, - value: [] - }, - overlay: { - type: Boolean, - value: true - }, - closeOnClickOverlay: { - type: Boolean, - value: true - }, - closeOnClickAction: { - type: Boolean, - value: true - }, - safeAreaInsetBottom: { - type: Boolean, - value: true - } + mixins: [button, openType], + props: { + show: Boolean, + title: String, + cancelText: String, + description: String, + round: { + type: Boolean, + value: true, }, - methods: { - onSelect(event) { - const { index } = event.currentTarget.dataset; - const item = this.data.actions[index]; - if (item && !item.disabled && !item.loading) { - this.$emit('select', item); - if (this.data.closeOnClickAction) { - this.onClose(); - } - } - }, - onCancel() { - this.$emit('cancel'); - }, - onClose() { - this.$emit('close'); - }, - onClickOverlay() { - this.$emit('click-overlay'); - this.onClose(); + zIndex: { + type: Number, + value: 100, + }, + actions: { + type: Array, + value: [], + }, + overlay: { + type: Boolean, + value: true, + }, + closeOnClickOverlay: { + type: Boolean, + value: true, + }, + closeOnClickAction: { + type: Boolean, + value: true, + }, + safeAreaInsetBottom: { + type: Boolean, + value: true, + }, + }, + methods: { + onSelect(event) { + const { index } = event.currentTarget.dataset; + const item = this.data.actions[index]; + if (item && !item.disabled && !item.loading) { + this.$emit('select', item); + if (this.data.closeOnClickAction) { + this.onClose(); } - } + } + }, + onCancel() { + this.$emit('cancel'); + }, + onClose() { + this.$emit('close'); + }, + onClickOverlay() { + this.$emit('click-overlay'); + this.onClose(); + }, + }, }); diff --git a/dist/area/index.js b/dist/area/index.js index e17234c9..e7fc8a35 100644 --- a/dist/area/index.js +++ b/dist/area/index.js @@ -2,209 +2,223 @@ import { VantComponent } from '../common/component'; import { pickerProps } from '../picker/shared'; const COLUMNSPLACEHOLDERCODE = '000000'; VantComponent({ - classes: ['active-class', 'toolbar-class', 'column-class'], - props: Object.assign(Object.assign({}, pickerProps), { value: { - type: String, - observer(value) { - this.code = value; - this.setValues(); - }, - }, areaList: { - type: Object, - value: {}, - observer: 'setValues' - }, columnsNum: { - type: null, - value: 3, - observer(value) { - this.setData({ - displayColumns: this.data.columns.slice(0, +value) - }); - } - }, columnsPlaceholder: { - type: Array, - observer(val) { - this.setData({ - typeToColumnsPlaceholder: { - province: val[0] || '', - city: val[1] || '', - county: val[2] || '', - } - }); - } - } }), - data: { - columns: [{ values: [] }, { values: [] }, { values: [] }], - displayColumns: [{ values: [] }, { values: [] }, { values: [] }], - typeToColumnsPlaceholder: {} + classes: ['active-class', 'toolbar-class', 'column-class'], + props: Object.assign(Object.assign({}, pickerProps), { + value: { + type: String, + observer(value) { + this.code = value; + this.setValues(); + }, }, - mounted() { - setTimeout(() => { - this.setValues(); - }, 0); + areaList: { + type: Object, + value: {}, + observer: 'setValues', }, - methods: { - getPicker() { - if (this.picker == null) { - this.picker = this.selectComponent('.van-area__picker'); - } - return this.picker; - }, - onCancel(event) { - this.emit('cancel', event.detail); - }, - onConfirm(event) { - const { index } = event.detail; - let { value } = event.detail; - value = this.parseOutputValues(value); - this.emit('confirm', { value, index }); - }, - emit(type, detail) { - detail.values = detail.value; - delete detail.value; - this.$emit(type, detail); - }, - // parse output columns data - parseOutputValues(values) { - const { columnsPlaceholder } = this.data; - return values.map((value, index) => { - // save undefined value - if (!value) - return value; - value = JSON.parse(JSON.stringify(value)); - if (!value.code || value.name === columnsPlaceholder[index]) { - value.code = ''; - value.name = ''; - } - return value; - }); - }, - onChange(event) { - const { index, picker, value } = event.detail; - this.code = value[index].code; - this.setValues().then(() => { - this.$emit('change', { - picker, - values: this.parseOutputValues(picker.getValues()), - index - }); - }); - }, - getConfig(type) { - const { areaList } = this.data; - return (areaList && areaList[`${type}_list`]) || {}; - }, - getList(type, code) { - const { typeToColumnsPlaceholder } = this.data; - let result = []; - if (type !== 'province' && !code) { - return result; - } - const list = this.getConfig(type); - result = Object.keys(list).map(code => ({ - code, - name: list[code] - })); - if (code) { - // oversea code - if (code[0] === '9' && type === 'city') { - code = '9'; - } - result = result.filter(item => item.code.indexOf(code) === 0); - } - if (typeToColumnsPlaceholder[type] && result.length) { - // set columns placeholder - const codeFill = type === 'province' ? '' : type === 'city' ? COLUMNSPLACEHOLDERCODE.slice(2, 4) : COLUMNSPLACEHOLDERCODE.slice(4, 6); - result.unshift({ - code: `${code}${codeFill}`, - name: typeToColumnsPlaceholder[type] - }); - } - return result; - }, - getIndex(type, code) { - let compareNum = type === 'province' ? 2 : type === 'city' ? 4 : 6; - const list = this.getList(type, code.slice(0, compareNum - 2)); - // oversea code - if (code[0] === '9' && type === 'province') { - compareNum = 1; - } - 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() { - const county = this.getConfig('county'); - let { code } = this; - if (!code) { - if (this.data.columnsPlaceholder.length) { - code = COLUMNSPLACEHOLDERCODE; - } - else if (Object.keys(county)[0]) { - code = Object.keys(county)[0]; - } - else { - code = ''; - } - } - const province = this.getList('province'); - const city = this.getList('city', code.slice(0, 2)); - const picker = this.getPicker(); - if (!picker) { - return; - } - const stack = []; - stack.push(picker.setColumnValues(0, province, false)); - stack.push(picker.setColumnValues(1, city, false)); - if (city.length && code.slice(2, 4) === '00') { - [{ code }] = city; - } - stack.push(picker.setColumnValues(2, this.getList('county', code.slice(0, 4)), false)); - return Promise.all(stack) - .catch(() => { }) - .then(() => picker.setIndexes([ - this.getIndex('province', code), - this.getIndex('city', code), - this.getIndex('county', code) - ])) - .catch(() => { }); - }, - getValues() { - const picker = this.getPicker(); - return picker ? picker.getValues().filter(value => !!value) : []; - }, - getDetail() { - const values = this.getValues(); - const area = { - code: '', - country: '', - province: '', - city: '', - county: '' - }; - if (!values.length) { - return area; - } - const names = values.map((item) => item.name); - area.code = values[values.length - 1].code; - if (area.code[0] === '9') { - area.country = names[1] || ''; - area.province = names[2] || ''; - } - else { - area.province = names[0] || ''; - area.city = names[1] || ''; - area.county = names[2] || ''; - } - return area; - }, - reset(code) { - this.code = code || ''; - return this.setValues(); + columnsNum: { + type: null, + value: 3, + observer(value) { + this.setData({ + displayColumns: this.data.columns.slice(0, +value), + }); + }, + }, + columnsPlaceholder: { + type: Array, + observer(val) { + this.setData({ + typeToColumnsPlaceholder: { + province: val[0] || '', + city: val[1] || '', + county: val[2] || '', + }, + }); + }, + }, + }), + data: { + columns: [{ values: [] }, { values: [] }, { values: [] }], + displayColumns: [{ values: [] }, { values: [] }, { values: [] }], + typeToColumnsPlaceholder: {}, + }, + mounted() { + setTimeout(() => { + this.setValues(); + }, 0); + }, + methods: { + getPicker() { + if (this.picker == null) { + this.picker = this.selectComponent('.van-area__picker'); + } + return this.picker; + }, + onCancel(event) { + this.emit('cancel', event.detail); + }, + onConfirm(event) { + const { index } = event.detail; + let { value } = event.detail; + value = this.parseOutputValues(value); + this.emit('confirm', { value, index }); + }, + emit(type, detail) { + detail.values = detail.value; + delete detail.value; + this.$emit(type, detail); + }, + // parse output columns data + parseOutputValues(values) { + const { columnsPlaceholder } = this.data; + return values.map((value, index) => { + // save undefined value + if (!value) return value; + value = JSON.parse(JSON.stringify(value)); + if (!value.code || value.name === columnsPlaceholder[index]) { + value.code = ''; + value.name = ''; } - } + return value; + }); + }, + onChange(event) { + const { index, picker, value } = event.detail; + this.code = value[index].code; + this.setValues().then(() => { + this.$emit('change', { + picker, + values: this.parseOutputValues(picker.getValues()), + index, + }); + }); + }, + getConfig(type) { + const { areaList } = this.data; + return (areaList && areaList[`${type}_list`]) || {}; + }, + getList(type, code) { + const { typeToColumnsPlaceholder } = this.data; + let result = []; + if (type !== 'province' && !code) { + return result; + } + const list = this.getConfig(type); + result = Object.keys(list).map((code) => ({ + code, + name: list[code], + })); + if (code) { + // oversea code + if (code[0] === '9' && type === 'city') { + code = '9'; + } + result = result.filter((item) => item.code.indexOf(code) === 0); + } + if (typeToColumnsPlaceholder[type] && result.length) { + // set columns placeholder + const codeFill = + type === 'province' + ? '' + : type === 'city' + ? COLUMNSPLACEHOLDERCODE.slice(2, 4) + : COLUMNSPLACEHOLDERCODE.slice(4, 6); + result.unshift({ + code: `${code}${codeFill}`, + name: typeToColumnsPlaceholder[type], + }); + } + return result; + }, + getIndex(type, code) { + let compareNum = type === 'province' ? 2 : type === 'city' ? 4 : 6; + const list = this.getList(type, code.slice(0, compareNum - 2)); + // oversea code + if (code[0] === '9' && type === 'province') { + compareNum = 1; + } + 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() { + const county = this.getConfig('county'); + let { code } = this; + if (!code) { + if (this.data.columnsPlaceholder.length) { + code = COLUMNSPLACEHOLDERCODE; + } else if (Object.keys(county)[0]) { + code = Object.keys(county)[0]; + } else { + code = ''; + } + } + const province = this.getList('province'); + const city = this.getList('city', code.slice(0, 2)); + const picker = this.getPicker(); + if (!picker) { + return; + } + const stack = []; + stack.push(picker.setColumnValues(0, province, false)); + stack.push(picker.setColumnValues(1, city, false)); + if (city.length && code.slice(2, 4) === '00') { + [{ code }] = city; + } + stack.push( + picker.setColumnValues( + 2, + this.getList('county', code.slice(0, 4)), + false + ) + ); + return Promise.all(stack) + .catch(() => {}) + .then(() => + picker.setIndexes([ + this.getIndex('province', code), + this.getIndex('city', code), + this.getIndex('county', code), + ]) + ) + .catch(() => {}); + }, + getValues() { + const picker = this.getPicker(); + return picker ? picker.getValues().filter((value) => !!value) : []; + }, + getDetail() { + const values = this.getValues(); + const area = { + code: '', + country: '', + province: '', + city: '', + county: '', + }; + if (!values.length) { + return area; + } + const names = values.map((item) => item.name); + area.code = values[values.length - 1].code; + if (area.code[0] === '9') { + area.country = names[1] || ''; + area.province = names[2] || ''; + } else { + area.province = names[0] || ''; + area.city = names[1] || ''; + area.county = names[2] || ''; + } + return area; + }, + reset(code) { + this.code = code || ''; + return this.setValues(); + }, + }, }); diff --git a/dist/button/index.js b/dist/button/index.js index 599aa98c..1a40f2b3 100644 --- a/dist/button/index.js +++ b/dist/button/index.js @@ -2,68 +2,68 @@ import { VantComponent } from '../common/component'; import { button } from '../mixins/button'; import { openType } from '../mixins/open-type'; VantComponent({ - mixins: [button, openType], - classes: ['hover-class', 'loading-class'], - data: { - baseStyle: '' + mixins: [button, openType], + classes: ['hover-class', 'loading-class'], + data: { + baseStyle: '', + }, + props: { + icon: String, + plain: Boolean, + block: Boolean, + round: Boolean, + square: Boolean, + loading: Boolean, + hairline: Boolean, + disabled: Boolean, + loadingText: String, + customStyle: String, + loadingType: { + type: String, + value: 'circular', }, - props: { - icon: String, - plain: Boolean, - block: Boolean, - round: Boolean, - square: Boolean, - loading: Boolean, - hairline: Boolean, - disabled: Boolean, - loadingText: String, - customStyle: String, - loadingType: { - type: String, - value: 'circular' - }, - type: { - type: String, - value: 'default' - }, - size: { - type: String, - value: 'normal' - }, - loadingSize: { - type: String, - value: '20px' - }, - color: { - type: String, - observer(color) { - let style = ''; - if (color) { - style += `color: ${this.data.plain ? color : 'white'};`; - if (!this.data.plain) { - // Use background instead of backgroundColor to make linear-gradient work - style += `background: ${color};`; - } - // hide border when color is linear-gradient - if (color.indexOf('gradient') !== -1) { - style += 'border: 0;'; - } - else { - style += `border-color: ${color};`; - } - } - if (style !== this.data.baseStyle) { - this.setData({ baseStyle: style }); - } - } + type: { + type: String, + value: 'default', + }, + dataset: null, + size: { + type: String, + value: 'normal', + }, + loadingSize: { + type: String, + value: '20px', + }, + color: { + type: String, + observer(color) { + let style = ''; + if (color) { + style += `color: ${this.data.plain ? color : 'white'};`; + if (!this.data.plain) { + // Use background instead of backgroundColor to make linear-gradient work + style += `background: ${color};`; + } + // hide border when color is linear-gradient + if (color.indexOf('gradient') !== -1) { + style += 'border: 0;'; + } else { + style += `border-color: ${color};`; + } } + if (style !== this.data.baseStyle) { + this.setData({ baseStyle: style }); + } + }, }, - methods: { - onClick() { - if (!this.data.loading) { - this.$emit('click'); - } - }, - noop() { } - } + }, + methods: { + onClick() { + if (!this.data.loading) { + this.$emit('click'); + } + }, + noop() {}, + }, }); diff --git a/dist/button/index.wxml b/dist/button/index.wxml index 09bef324..65a5c3e3 100644 --- a/dist/button/index.wxml +++ b/dist/button/index.wxml @@ -2,11 +2,12 @@