From 74f04c51d70093a9394be55ddd392b8431e6c6dd Mon Sep 17 00:00:00 2001 From: zhongnan Date: Tue, 19 Jan 2021 10:19:37 +0800 Subject: [PATCH] build: compile 1.6.5 --- dist/button/index.wxml | 2 +- dist/button/index.wxs | 4 +- dist/calendar/components/month/index.js | 4 +- dist/calendar/index.js | 6 +- dist/cell/index.wxml | 3 +- dist/cell/index.wxs | 17 +++++ dist/checkbox-group/index.js | 14 ++-- dist/checkbox/index.js | 7 +- dist/circle/index.js | 2 +- dist/col/index.js | 21 +----- dist/col/index.wxml | 3 +- dist/col/index.wxs | 18 +++++ dist/collapse-item/index.js | 7 +- dist/collapse/index.js | 7 +- dist/common/component.d.ts | 9 ++- dist/common/component.js | 75 ++------------------- dist/common/relation.d.ts | 21 ++++++ dist/common/relation.js | 64 ++++++++++++++++++ dist/common/utils.d.ts | 6 ++ dist/common/utils.js | 4 ++ dist/definitions/index.d.ts | 60 ++++++++++------- dist/definitions/weapp.d.ts | 77 ---------------------- dist/definitions/weapp.js | 1 - dist/dialog/index.js | 3 +- dist/divider/index.js | 35 ++-------- dist/divider/index.wxml | 5 +- dist/divider/index.wxs | 18 +++++ dist/dropdown-item/index.js | 28 ++++---- dist/dropdown-menu/index.js | 15 ++--- dist/empty/index.js | 10 --- dist/empty/index.wxml | 3 +- dist/empty/index.wxs | 14 ++++ dist/field/index.js | 10 ++- dist/field/index.wxml | 63 ++---------------- dist/field/index.wxs | 17 ++--- dist/field/index.wxss | 2 +- dist/field/input.wxml | 27 ++++++++ dist/field/props.d.ts | 64 +----------------- dist/field/textarea.wxml | 29 +++++++++ dist/goods-action-button/index.js | 14 ++-- dist/goods-action/index.js | 29 ++------- dist/grid-item/index.js | 9 +-- dist/grid/index.js | 9 +-- dist/icon/index.wxss | 2 +- dist/index-anchor/index.js | 7 +- dist/index-bar/index.js | 15 ++--- dist/loading/index.wxml | 7 +- dist/loading/index.wxs | 22 +++++++ dist/mixins/basic.js | 4 +- dist/mixins/page-scroll.js | 13 ++-- dist/notice-bar/index.wxml | 3 +- dist/notice-bar/index.wxs | 15 +++++ dist/notify/index.js | 3 + dist/notify/index.wxml | 5 +- dist/notify/index.wxs | 22 +++++++ dist/picker-column/index.wxml | 11 ++-- dist/picker-column/index.wxs | 30 ++++++++- dist/picker/index.js | 5 +- dist/picker/index.wxml | 26 ++++---- dist/picker/index.wxs | 42 ++++++++++++ dist/popup/index.wxml | 2 +- dist/popup/index.wxs | 4 +- dist/radio-group/index.js | 12 ++-- dist/radio/index.js | 7 +- dist/row/index.js | 35 +++------- dist/row/index.wxml | 4 +- dist/row/index.wxs | 18 +++++ dist/sidebar-item/index.js | 7 +- dist/sidebar/index.js | 15 ++--- dist/stepper/index.js | 4 +- dist/stepper/index.wxml | 7 +- dist/stepper/index.wxs | 22 +++++++ dist/sticky/index.js | 4 +- dist/sticky/index.wxs | 5 +- dist/swipe-cell/index.js | 6 +- dist/switch/index.js | 33 +++------- dist/switch/index.wxml | 11 +++- dist/switch/index.wxs | 26 ++++++++ dist/tab/index.js | 9 +-- dist/tabbar-item/index.js | 9 ++- dist/tabbar/index.js | 18 ++--- dist/tabs/index.js | 26 ++------ dist/tag/index.wxml | 3 +- dist/tag/index.wxs | 13 ++++ dist/transition/index.wxml | 4 +- dist/transition/index.wxs | 17 +++++ dist/tree-select/index.js | 2 +- dist/uploader/index.js | 2 +- dist/uploader/index.wxml | 9 +-- dist/uploader/index.wxs | 14 ++++ dist/wxs/add-unit.wxs | 2 +- dist/wxs/style.wxs | 4 +- lib/button/index.wxml | 2 +- lib/button/index.wxs | 4 +- lib/calendar/components/month/index.js | 4 +- lib/calendar/index.js | 6 +- lib/cell/index.wxml | 3 +- lib/cell/index.wxs | 17 +++++ lib/checkbox-group/index.js | 14 ++-- lib/checkbox/index.js | 7 +- lib/circle/index.js | 2 +- lib/col/index.js | 21 +----- lib/col/index.wxml | 3 +- lib/col/index.wxs | 18 +++++ lib/collapse-item/index.js | 7 +- lib/collapse/index.js | 7 +- lib/common/component.js | 87 ++----------------------- lib/common/relation.js | 79 ++++++++++++++++++++++ lib/common/utils.js | 7 +- lib/definitions/weapp.js | 2 - lib/dialog/index.js | 3 +- lib/divider/index.js | 35 ++-------- lib/divider/index.wxml | 5 +- lib/divider/index.wxs | 18 +++++ lib/dropdown-item/index.js | 28 ++++---- lib/dropdown-menu/index.js | 15 ++--- lib/empty/index.js | 11 ---- lib/empty/index.wxml | 3 +- lib/empty/index.wxs | 14 ++++ lib/field/index.js | 10 ++- lib/field/index.wxml | 63 ++---------------- lib/field/index.wxs | 17 ++--- lib/field/index.wxss | 2 +- lib/field/input.wxml | 27 ++++++++ lib/field/textarea.wxml | 29 +++++++++ lib/goods-action-button/index.js | 14 ++-- lib/goods-action/index.js | 30 ++------- lib/grid-item/index.js | 9 +-- lib/grid/index.js | 9 +-- lib/icon/index.wxss | 2 +- lib/index-anchor/index.js | 7 +- lib/index-bar/index.js | 15 ++--- lib/loading/index.wxml | 7 +- lib/loading/index.wxs | 22 +++++++ lib/mixins/basic.js | 4 +- lib/mixins/page-scroll.js | 23 ++++--- lib/notice-bar/index.wxml | 3 +- lib/notice-bar/index.wxs | 15 +++++ lib/notify/index.js | 3 + lib/notify/index.wxml | 5 +- lib/notify/index.wxs | 22 +++++++ lib/picker-column/index.wxml | 11 ++-- lib/picker-column/index.wxs | 30 ++++++++- lib/picker/index.js | 8 ++- lib/picker/index.wxml | 26 ++++---- lib/picker/index.wxs | 42 ++++++++++++ lib/popup/index.wxml | 2 +- lib/popup/index.wxs | 4 +- lib/radio-group/index.js | 12 ++-- lib/radio/index.js | 7 +- lib/row/index.js | 35 +++------- lib/row/index.wxml | 4 +- lib/row/index.wxs | 18 +++++ lib/sidebar-item/index.js | 7 +- lib/sidebar/index.js | 15 ++--- lib/stepper/index.js | 4 +- lib/stepper/index.wxml | 7 +- lib/stepper/index.wxs | 22 +++++++ lib/sticky/index.js | 4 +- lib/sticky/index.wxs | 5 +- lib/swipe-cell/index.js | 4 +- lib/switch/index.js | 39 ++++------- lib/switch/index.wxml | 11 +++- lib/switch/index.wxs | 26 ++++++++ lib/tab/index.js | 9 +-- lib/tabbar-item/index.js | 9 ++- lib/tabbar/index.js | 18 ++--- lib/tabs/index.js | 26 ++------ lib/tag/index.wxml | 3 +- lib/tag/index.wxs | 13 ++++ lib/transition/index.wxml | 4 +- lib/transition/index.wxs | 17 +++++ lib/tree-select/index.js | 2 +- lib/uploader/index.js | 2 +- lib/uploader/index.wxml | 9 +-- lib/uploader/index.wxs | 14 ++++ lib/wxs/add-unit.wxs | 2 +- lib/wxs/style.wxs | 4 +- 178 files changed, 1449 insertions(+), 1208 deletions(-) create mode 100644 dist/cell/index.wxs create mode 100644 dist/col/index.wxs create mode 100644 dist/common/relation.d.ts create mode 100644 dist/common/relation.js delete mode 100644 dist/definitions/weapp.d.ts delete mode 100644 dist/definitions/weapp.js create mode 100644 dist/divider/index.wxs create mode 100644 dist/empty/index.wxs create mode 100644 dist/field/input.wxml create mode 100644 dist/field/textarea.wxml create mode 100644 dist/loading/index.wxs create mode 100644 dist/notice-bar/index.wxs create mode 100644 dist/notify/index.wxs create mode 100644 dist/picker/index.wxs create mode 100644 dist/row/index.wxs create mode 100644 dist/stepper/index.wxs create mode 100644 dist/switch/index.wxs create mode 100644 dist/tag/index.wxs create mode 100644 dist/transition/index.wxs create mode 100644 dist/uploader/index.wxs create mode 100644 lib/cell/index.wxs create mode 100644 lib/col/index.wxs create mode 100644 lib/common/relation.js delete mode 100644 lib/definitions/weapp.js create mode 100644 lib/divider/index.wxs create mode 100644 lib/empty/index.wxs create mode 100644 lib/field/input.wxml create mode 100644 lib/field/textarea.wxml create mode 100644 lib/loading/index.wxs create mode 100644 lib/notice-bar/index.wxs create mode 100644 lib/notify/index.wxs create mode 100644 lib/picker/index.wxs create mode 100644 lib/row/index.wxs create mode 100644 lib/stepper/index.wxs create mode 100644 lib/switch/index.wxs create mode 100644 lib/tag/index.wxs create mode 100644 lib/transition/index.wxs create mode 100644 lib/uploader/index.wxs diff --git a/dist/button/index.wxml b/dist/button/index.wxml index 1d7db84c..e4cec8ae 100644 --- a/dist/button/index.wxml +++ b/dist/button/index.wxml @@ -8,7 +8,7 @@ hover-class="van-button--active hover-class" lang="{{ lang }}" form-type="{{ formType }}" - style="{{ computed.rootStyle({ plain, color }) }} {{ customStyle }}" + style="{{ computed.rootStyle({ plain, color, customStyle }) }}" open-type="{{ disabled ? '' : openType }}" business-id="{{ businessId }}" session-from="{{ sessionFrom }}" diff --git a/dist/button/index.wxs b/dist/button/index.wxs index 7bb506a9..8b649fe1 100644 --- a/dist/button/index.wxs +++ b/dist/button/index.wxs @@ -3,7 +3,7 @@ var style = require('../wxs/style.wxs'); function rootStyle(data) { if (!data.color) { - return ''; + return data.customStyle; } var properties = { @@ -18,7 +18,7 @@ function rootStyle(data) { properties['border-color'] = data.color; } - return style(properties); + return style([properties, data.customStyle]); } function loadingColor(data) { diff --git a/dist/calendar/components/month/index.js b/dist/calendar/components/month/index.js index 90f5957c..4c872a98 100644 --- a/dist/calendar/components/month/index.js +++ b/dist/calendar/components/month/index.js @@ -25,13 +25,13 @@ VantComponent({ observer: 'setDays', }, showMark: Boolean, - rowHeight: [Number, String], + rowHeight: null, formatter: { type: null, observer: 'setDays', }, currentDate: { - type: [null, Array], + type: null, observer: 'setDays', }, allowSameDay: Boolean, diff --git a/dist/calendar/index.js b/dist/calendar/index.js index aed6ef83..d7b7f27b 100644 --- a/dist/calendar/index.js +++ b/dist/calendar/index.js @@ -35,7 +35,7 @@ VantComponent({ }, rangePrompt: String, defaultDate: { - type: [Number, Array], + type: null, observer(val) { this.setData({ currentDate: val }); this.scrollIntoView(); @@ -65,7 +65,7 @@ VantComponent({ value: 'bottom', }, rowHeight: { - type: [Number, String], + type: null, value: ROW_HEIGHT, }, round: { @@ -101,7 +101,7 @@ VantComponent({ value: true, }, maxRange: { - type: [Number, String], + type: null, value: null, }, }, diff --git a/dist/cell/index.wxml b/dist/cell/index.wxml index fed768e2..7d7d746d 100644 --- a/dist/cell/index.wxml +++ b/dist/cell/index.wxml @@ -1,4 +1,5 @@ + {{ title }} diff --git a/dist/cell/index.wxs b/dist/cell/index.wxs new file mode 100644 index 00000000..e3500c43 --- /dev/null +++ b/dist/cell/index.wxs @@ -0,0 +1,17 @@ +/* eslint-disable */ +var style = require('../wxs/style.wxs'); +var addUnit = require('../wxs/add-unit.wxs'); + +function titleStyle(data) { + return style([ + { + 'max-width': addUnit(data.titleWidth), + 'min-width': addUnit(data.titleWidth), + }, + data.titleStyle, + ]); +} + +module.exports = { + titleStyle: titleStyle, +}; diff --git a/dist/checkbox-group/index.js b/dist/checkbox-group/index.js index 79489272..1c871558 100644 --- a/dist/checkbox-group/index.js +++ b/dist/checkbox-group/index.js @@ -1,14 +1,10 @@ +import { useChildren } from '../common/relation'; import { VantComponent } from '../common/component'; VantComponent({ field: true, - relation: { - name: 'checkbox', - type: 'descendant', - current: 'checkbox-group', - linked(target) { - this.updateChild(target); - }, - }, + relation: useChildren('checkbox', function (target) { + this.updateChild(target); + }), props: { max: Number, value: { @@ -22,7 +18,7 @@ VantComponent({ }, methods: { updateChildren() { - (this.children || []).forEach((child) => this.updateChild(child)); + this.children.forEach((child) => this.updateChild(child)); }, updateChild(child) { const { value, disabled } = this.data; diff --git a/dist/checkbox/index.js b/dist/checkbox/index.js index 9346d3e3..3d1acd41 100644 --- a/dist/checkbox/index.js +++ b/dist/checkbox/index.js @@ -1,3 +1,4 @@ +import { useParent } from '../common/relation'; import { VantComponent } from '../common/component'; function emit(target, value) { target.$emit('input', value); @@ -5,11 +6,7 @@ function emit(target, value) { } VantComponent({ field: true, - relation: { - name: 'checkbox-group', - type: 'ancestor', - current: 'checkbox', - }, + relation: useParent('checkbox-group'), classes: ['icon-class', 'label-class'], props: { value: Boolean, diff --git a/dist/circle/index.js b/dist/circle/index.js index 28808f69..dd27f52b 100644 --- a/dist/circle/index.js +++ b/dist/circle/index.js @@ -38,7 +38,7 @@ VantComponent({ value: WHITE, }, color: { - type: [String, Object], + type: null, value: BLUE, observer() { this.setHoverColor().then(() => { diff --git a/dist/col/index.js b/dist/col/index.js index 43f0ddef..20f326fb 100644 --- a/dist/col/index.js +++ b/dist/col/index.js @@ -1,26 +1,9 @@ +import { useParent } from '../common/relation'; import { VantComponent } from '../common/component'; VantComponent({ - relation: { - name: 'row', - type: 'ancestor', - current: 'col', - }, + relation: useParent('row'), props: { span: Number, offset: Number, }, - data: { - viewStyle: '', - }, - methods: { - setGutter(gutter) { - const padding = `${gutter / 2}px`; - const viewStyle = gutter - ? `padding-left: ${padding}; padding-right: ${padding};` - : ''; - if (viewStyle !== this.data.viewStyle) { - this.setData({ viewStyle }); - } - }, - }, }); diff --git a/dist/col/index.wxml b/dist/col/index.wxml index 52544f09..975348b6 100644 --- a/dist/col/index.wxml +++ b/dist/col/index.wxml @@ -1,8 +1,9 @@ + diff --git a/dist/col/index.wxs b/dist/col/index.wxs new file mode 100644 index 00000000..507c1cb9 --- /dev/null +++ b/dist/col/index.wxs @@ -0,0 +1,18 @@ +/* eslint-disable */ +var style = require('../wxs/style.wxs'); +var addUnit = require('../wxs/add-unit.wxs'); + +function rootStyle(data) { + if (!data.gutter) { + return ''; + } + + return style({ + 'padding-right': addUnit(data.gutter / 2), + 'padding-left': addUnit(data.gutter / 2), + }); +} + +module.exports = { + rootStyle: rootStyle, +}; diff --git a/dist/collapse-item/index.js b/dist/collapse-item/index.js index 50ddb5e3..c44c27e1 100644 --- a/dist/collapse-item/index.js +++ b/dist/collapse-item/index.js @@ -1,12 +1,9 @@ import { VantComponent } from '../common/component'; +import { useParent } from '../common/relation'; import { setContentAnimate } from './animate'; VantComponent({ classes: ['title-class', 'content-class'], - relation: { - name: 'collapse', - type: 'ancestor', - current: 'collapse-item', - }, + relation: useParent('collapse'), props: { name: null, title: null, diff --git a/dist/collapse/index.js b/dist/collapse/index.js index 33dae31e..60e4611a 100644 --- a/dist/collapse/index.js +++ b/dist/collapse/index.js @@ -1,10 +1,7 @@ import { VantComponent } from '../common/component'; +import { useChildren } from '../common/relation'; VantComponent({ - relation: { - name: 'collapse-item', - type: 'descendant', - current: 'collapse', - }, + relation: useChildren('collapse-item'), props: { value: { type: null, diff --git a/dist/common/component.d.ts b/dist/common/component.d.ts index 307a96cc..6b0a9582 100644 --- a/dist/common/component.d.ts +++ b/dist/common/component.d.ts @@ -1,3 +1,8 @@ -import { VantComponentOptions, CombinedComponentInstance } from '../definitions/index'; -declare function VantComponent(vantOptions?: VantComponentOptions>): void; +/// +import { VantComponentOptions } from '../definitions/index'; +declare function VantComponent< + Data extends WechatMiniprogram.Component.DataOption, + Props extends WechatMiniprogram.Component.PropertyOption, + Methods extends WechatMiniprogram.Component.MethodOption +>(vantOptions: VantComponentOptions): void; export { VantComponent }; diff --git a/dist/common/component.js b/dist/common/component.js index f482f9e3..5530c6f0 100644 --- a/dist/common/component.js +++ b/dist/common/component.js @@ -1,28 +1,4 @@ import { basic } from '../mixins/basic'; -const relationFunctions = { - ancestor: { - linked(parent) { - // @ts-ignore - this.parent = parent; - }, - unlinked() { - // @ts-ignore - this.parent = null; - }, - }, - descendant: { - linked(child) { - // @ts-ignore - this.children = this.children || []; - // @ts-ignore - this.children.push(child); - }, - unlinked(child) { - // @ts-ignore - this.children = (this.children || []).filter((it) => it !== child); - }, - }, -}; function mapKeys(source, target, map) { Object.keys(map).forEach((key) => { if (source[key]) { @@ -30,37 +6,7 @@ function mapKeys(source, target, map) { } }); } -function makeRelation(options, vantOptions, relation) { - const { type, name, linked, unlinked, linkChanged } = relation; - const { beforeCreate, destroyed } = vantOptions; - if (type === 'descendant') { - options.created = function () { - beforeCreate && beforeCreate.bind(this)(); - this.children = this.children || []; - }; - options.detached = function () { - this.children = []; - destroyed && destroyed.bind(this)(); - }; - } - options.relations = Object.assign(options.relations || {}, { - [`../${name}/index`]: { - type, - linked(node) { - relationFunctions[type].linked.bind(this)(node); - linked && linked.bind(this)(node); - }, - linkChanged(node) { - linkChanged && linkChanged.bind(this)(node); - }, - unlinked(node) { - relationFunctions[type].unlinked.bind(this)(node); - unlinked && unlinked.bind(this)(node); - }, - }, - }); -} -function VantComponent(vantOptions = {}) { +function VantComponent(vantOptions) { const options = {}; mapKeys(vantOptions, options, { data: 'data', @@ -70,32 +16,25 @@ function VantComponent(vantOptions = {}) { beforeCreate: 'created', created: 'attached', mounted: 'ready', - relations: 'relations', destroyed: 'detached', classes: 'externalClasses', }); - const { relation } = vantOptions; - if (relation) { - makeRelation(options, vantOptions, relation); - } // add default externalClasses options.externalClasses = options.externalClasses || []; options.externalClasses.push('custom-class'); // add default behaviors options.behaviors = options.behaviors || []; options.behaviors.push(basic); + // add relations + const { relation } = vantOptions; + if (relation) { + options.relations = relation.relations; + options.behaviors.push(relation.mixin); + } // map field to form-field behavior if (vantOptions.field) { options.behaviors.push('wx://form-field'); } - if (options.properties) { - Object.keys(options.properties).forEach((name) => { - if (Array.isArray(options.properties[name])) { - // miniprogram do not allow multi type - options.properties[name] = null; - } - }); - } // add default options options.options = { multipleSlots: true, diff --git a/dist/common/relation.d.ts b/dist/common/relation.d.ts new file mode 100644 index 00000000..be5f2eea --- /dev/null +++ b/dist/common/relation.d.ts @@ -0,0 +1,21 @@ +/// +declare type TrivialInstance = WechatMiniprogram.Component.TrivialInstance; +export declare function useParent( + name: string, + onEffect?: (this: TrivialInstance) => void +): { + relations: { + [x: string]: WechatMiniprogram.Component.RelationOption; + }; + mixin: string; +}; +export declare function useChildren( + name: string, + onEffect?: (this: TrivialInstance, target: TrivialInstance) => void +): { + relations: { + [x: string]: WechatMiniprogram.Component.RelationOption; + }; + mixin: string; +}; +export {}; diff --git a/dist/common/relation.js b/dist/common/relation.js new file mode 100644 index 00000000..99c1a493 --- /dev/null +++ b/dist/common/relation.js @@ -0,0 +1,64 @@ +export function useParent(name, onEffect) { + const path = `../${name}/index`; + return { + relations: { + [path]: { + type: 'ancestor', + linked() { + onEffect && onEffect.call(this); + }, + linkChanged() { + onEffect && onEffect.call(this); + }, + unlinked() { + onEffect && onEffect.call(this); + }, + }, + }, + mixin: Behavior({ + created() { + Object.defineProperty(this, 'parent', { + get: () => this.getRelationNodes(path)[0], + }); + Object.defineProperty(this, 'index', { + // @ts-ignore + get: () => { + var _a, _b; + return (_b = + (_a = this.parent) === null || _a === void 0 + ? void 0 + : _a.children) === null || _b === void 0 + ? void 0 + : _b.indexOf(this); + }, + }); + }, + }), + }; +} +export function useChildren(name, onEffect) { + const path = `../${name}/index`; + return { + relations: { + [path]: { + type: 'descendant', + linked(target) { + onEffect && onEffect.call(this, target); + }, + linkChanged(target) { + onEffect && onEffect.call(this, target); + }, + unlinked(target) { + onEffect && onEffect.call(this, target); + }, + }, + }, + mixin: Behavior({ + created() { + Object.defineProperty(this, 'children', { + get: () => this.getRelationNodes(path) || [], + }); + }, + }), + }; +} diff --git a/dist/common/utils.d.ts b/dist/common/utils.d.ts index b4900da5..1ceccd10 100644 --- a/dist/common/utils.d.ts +++ b/dist/common/utils.d.ts @@ -22,3 +22,9 @@ export declare function groupSetData( export declare function toPromise( promiseLike: Promise | unknown ): Promise; +export declare function getCurrentPage(): T & + WechatMiniprogram.OptionalInterface & + WechatMiniprogram.Page.InstanceProperties & + WechatMiniprogram.Page.InstanceMethods> & + WechatMiniprogram.Page.Data> & + Record; diff --git a/dist/common/utils.js b/dist/common/utils.js index 576a67ed..81351715 100644 --- a/dist/common/utils.js +++ b/dist/common/utils.js @@ -83,3 +83,7 @@ export function toPromise(promiseLike) { } return Promise.resolve(promiseLike); } +export function getCurrentPage() { + const pages = getCurrentPages(); + return pages[pages.length - 1]; +} diff --git a/dist/definitions/index.d.ts b/dist/definitions/index.d.ts index f2e8e0d1..586e7bbd 100644 --- a/dist/definitions/index.d.ts +++ b/dist/definitions/index.d.ts @@ -1,31 +1,43 @@ /// -import { Weapp } from './weapp'; -declare type RecordToAny = { - [K in keyof T]: any; -}; -export declare type CombinedComponentInstance = Methods & - WechatMiniprogram.Component.TrivialInstance & - Weapp.FormField & { - data: Data & RecordToAny; - }; -export interface VantComponentOptions { +interface VantComponentInstance { + parent: WechatMiniprogram.Component.TrivialInstance; + children: WechatMiniprogram.Component.TrivialInstance[]; + index: number; + $emit: ( + name: string, + detail?: unknown, + options?: WechatMiniprogram.Component.TriggerEventOption + ) => void; +} +export declare type VantComponentOptions< + Data extends WechatMiniprogram.Component.DataOption, + Props extends WechatMiniprogram.Component.PropertyOption, + Methods extends WechatMiniprogram.Component.MethodOption +> = { data?: Data; field?: boolean; classes?: string[]; mixins?: string[]; - props?: Props & Weapp.PropertyOption; - relation?: Weapp.RelationOption & { - type: 'ancestor' | 'descendant'; - name: string; - current: string; + props?: Props; + relation?: { + relations: Record; + mixin: string; }; - relations?: { - [componentName: string]: Weapp.RelationOption; - }; - methods?: Methods & Weapp.MethodOption; - beforeCreate?: (this: Instance) => void; - created?: (this: Instance) => void; - mounted?: (this: Instance) => void; - destroyed?: (this: Instance) => void; -} + methods?: Methods; + beforeCreate?: () => void; + created?: () => void; + mounted?: () => void; + destroyed?: () => void; +} & ThisType< + VantComponentInstance & + WechatMiniprogram.Component.Instance< + Data & { + name: string; + value: any; + }, + Props, + Methods + > & + Record +>; export {}; diff --git a/dist/definitions/weapp.d.ts b/dist/definitions/weapp.d.ts deleted file mode 100644 index 9b7ca5a3..00000000 --- a/dist/definitions/weapp.d.ts +++ /dev/null @@ -1,77 +0,0 @@ -/// -export declare namespace Weapp { - export interface FormField { - data: { - name: string; - value: any; - }; - } - /** - * relation定义，miniprogram-api-typings缺少this定义 - */ - export interface RelationOption { - /** 目标组件的相对关系 */ - type: 'parent' | 'child' | 'ancestor' | 'descendant'; - /** 关系生命周期函数，当关系被建立在页面节点树中时触发，触发时机在组件attached生命周期之后 */ - linked?( - this: Instance, - target: WechatMiniprogram.Component.TrivialInstance - ): void; - /** 关系生命周期函数，当关系在页面节点树中发生改变时触发，触发时机在组件moved生命周期之后 */ - linkChanged?( - this: Instance, - target: WechatMiniprogram.Component.TrivialInstance - ): void; - /** 关系生命周期函数，当关系脱离页面节点树时触发，触发时机在组件detached生命周期之后 */ - unlinked?( - this: Instance, - target: WechatMiniprogram.Component.TrivialInstance - ): void; - /** 如果这一项被设置，则它表示关联的目标节点所应具有的behavior，所有拥有这一behavior的组件节点都会被关联 */ - target?: string; - } - /** - * obverser定义，miniprogram-api-typings缺少this定义 - */ - type Observer = ( - this: Instance, - newVal: T, - oldVal: T, - changedPath: Array - ) => void; - /** - * methods定义，miniprogram-api-typings缺少this定义 - */ - export interface MethodOption { - [name: string]: (this: Instance, ...args: any[]) => any; - } - export interface ComputedOption { - [name: string]: (this: Instance) => any; - } - type PropertyType = - | StringConstructor - | NumberConstructor - | BooleanConstructor - | ArrayConstructor - | ObjectConstructor - | FunctionConstructor - | null; - export interface PropertyOption { - [name: string]: - | PropertyType - | PropertyType[] - | { - /** 属性类型 */ - type: PropertyType | PropertyType[]; - /** 属性初始值 */ - value?: any; - /** 属性值被更改时的响应函数 */ - observer?: - | string - | Observer; - /** 属性的类型（可以指定多个） */ - optionalTypes?: PropertyType[]; - }; - } - export {}; -} diff --git a/dist/definitions/weapp.js b/dist/definitions/weapp.js deleted file mode 100644 index cb0ff5c3..00000000 --- a/dist/definitions/weapp.js +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/dist/dialog/index.js b/dist/dialog/index.js index f2e4f386..5388cda5 100644 --- a/dist/dialog/index.js +++ b/dist/dialog/index.js @@ -68,6 +68,7 @@ VantComponent({ confirm: false, cancel: false, }, + callback: () => {}, }, methods: { onConfirm() { @@ -77,7 +78,7 @@ VantComponent({ this.handleAction('cancel'); }, onClickOverlay() { - this.onClose('overlay'); + this.close('overlay'); }, close(action) { this.setData({ show: false }); diff --git a/dist/divider/index.js b/dist/divider/index.js index 96716e6e..e7257408 100644 --- a/dist/divider/index.js +++ b/dist/divider/index.js @@ -1,33 +1,12 @@ import { VantComponent } from '../common/component'; VantComponent({ props: { - dashed: { - type: Boolean, - value: false, - }, - hairline: { - type: Boolean, - value: false, - }, - contentPosition: { - type: String, - value: '', - }, - fontSize: { - type: Number, - value: '', - }, - borderColor: { - type: String, - value: '', - }, - textColor: { - type: String, - value: '', - }, - customStyle: { - type: String, - value: '', - }, + dashed: Boolean, + hairline: Boolean, + contentPosition: String, + fontSize: String, + borderColor: String, + textColor: String, + customStyle: String, }, }); diff --git a/dist/divider/index.wxml b/dist/divider/index.wxml index 412e73f2..f6a5a457 100644 --- a/dist/divider/index.wxml +++ b/dist/divider/index.wxml @@ -1,8 +1,9 @@ + diff --git a/dist/divider/index.wxs b/dist/divider/index.wxs new file mode 100644 index 00000000..215b14f4 --- /dev/null +++ b/dist/divider/index.wxs @@ -0,0 +1,18 @@ +/* eslint-disable */ +var style = require('../wxs/style.wxs'); +var addUnit = require('../wxs/add-unit.wxs'); + +function rootStyle(data) { + return style([ + { + 'border-color': data.borderColor, + color: data.textColor, + 'font-size': addUnit(data.fontSize), + }, + data.customStyle, + ]); +} + +module.exports = { + rootStyle: rootStyle, +}; diff --git a/dist/dropdown-item/index.js b/dist/dropdown-item/index.js index 46588d05..95da1eef 100644 --- a/dist/dropdown-item/index.js +++ b/dist/dropdown-item/index.js @@ -1,14 +1,10 @@ +import { useParent } from '../common/relation'; import { VantComponent } from '../common/component'; VantComponent({ field: true, - relation: { - name: 'dropdown-menu', - type: 'ancestor', - current: 'dropdown-item', - linked() { - this.updateDataFromParent(); - }, - }, + relation: useParent('dropdown-menu', function () { + this.updateDataFromParent(); + }), props: { value: { type: null, @@ -39,7 +35,10 @@ VantComponent({ methods: { rerender() { wx.nextTick(() => { - this.parent && this.parent.updateItemListData(); + var _a; + (_a = this.parent) === null || _a === void 0 + ? void 0 + : _a.updateItemListData(); }); }, updateDataFromParent() { @@ -85,6 +84,7 @@ VantComponent({ } }, toggle(show, options = {}) { + var _a; const { showPopup } = this.data; if (typeof show !== 'boolean') { show = !showPopup; @@ -97,10 +97,12 @@ VantComponent({ showPopup: show, }); if (show) { - this.parent.getChildWrapperStyle().then((wrapperStyle) => { - this.setData({ wrapperStyle, showWrapper: true }); - this.rerender(); - }); + (_a = this.parent) === null || _a === void 0 + ? void 0 + : _a.getChildWrapperStyle().then((wrapperStyle) => { + this.setData({ wrapperStyle, showWrapper: true }); + this.rerender(); + }); } else { this.rerender(); } diff --git a/dist/dropdown-menu/index.js b/dist/dropdown-menu/index.js index bdb884c8..aba11b98 100644 --- a/dist/dropdown-menu/index.js +++ b/dist/dropdown-menu/index.js @@ -1,19 +1,12 @@ import { VantComponent } from '../common/component'; +import { useChildren } from '../common/relation'; import { addUnit, getRect, getSystemInfoSync } from '../common/utils'; let ARRAY = []; VantComponent({ field: true, - relation: { - name: 'dropdown-item', - type: 'descendant', - current: 'dropdown-menu', - linked() { - this.updateItemListData(); - }, - unlinked() { - this.updateItemListData(); - }, - }, + relation: useChildren('dropdown-item', function () { + this.updateItemListData(); + }), props: { activeColor: { type: String, diff --git a/dist/empty/index.js b/dist/empty/index.js index 0fee8a48..32ec1163 100644 --- a/dist/empty/index.js +++ b/dist/empty/index.js @@ -1,5 +1,4 @@ import { VantComponent } from '../common/component'; -const PRESETS = ['error', 'search', 'default', 'network']; VantComponent({ props: { description: String, @@ -8,13 +7,4 @@ VantComponent({ value: 'default', }, }, - created() { - if (PRESETS.indexOf(this.data.image) !== -1) { - this.setData({ - imageUrl: `https://img.yzcdn.cn/vant/empty-image-${this.data.image}.png`, - }); - } else { - this.setData({ imageUrl: this.data.image }); - } - }, }); diff --git a/dist/empty/index.wxml b/dist/empty/index.wxml index b6a2cb3c..9c7b719a 100644 --- a/dist/empty/index.wxml +++ b/dist/empty/index.wxml @@ -1,11 +1,12 @@ + - + diff --git a/dist/empty/index.wxs b/dist/empty/index.wxs new file mode 100644 index 00000000..9696dd47 --- /dev/null +++ b/dist/empty/index.wxs @@ -0,0 +1,14 @@ +/* eslint-disable */ +var PRESETS = ['error', 'search', 'default', 'network']; + +function imageUrl(image) { + if (PRESETS.indexOf(image) !== -1) { + return 'https://img.yzcdn.cn/vant/empty-image-' + image + '.png'; + } + + return image; +} + +module.exports = { + imageUrl: imageUrl, +}; diff --git a/dist/field/index.js b/dist/field/index.js index 154bda12..fd3472dc 100644 --- a/dist/field/index.js +++ b/dist/field/index.js @@ -1,3 +1,4 @@ +import { nextTick } from '../common/utils'; import { VantComponent } from '../common/component'; import { commonProps, inputProps, textareaProps } from './props'; VantComponent({ @@ -17,7 +18,7 @@ VantComponent({ isLink: Boolean, leftIcon: String, rightIcon: String, - autosize: [Boolean, Object], + autosize: null, required: Boolean, iconClass: String, clickable: Boolean, @@ -74,11 +75,14 @@ VantComponent({ onClickIcon() { this.$emit('click-icon'); }, + onClickInput(event) { + this.$emit('click-input', event.detail); + }, onClear() { this.setData({ innerValue: '' }); this.value = ''; this.setShowClear(); - wx.nextTick(() => { + nextTick(() => { this.emitChange(); this.$emit('clear', ''); }); @@ -105,7 +109,7 @@ VantComponent({ }, emitChange() { this.setData({ value: this.value }); - wx.nextTick(() => { + nextTick(() => { this.$emit('input', this.value); this.$emit('change', this.value); }); diff --git a/dist/field/index.wxml b/dist/field/index.wxml index 6254e676..9dc8b666 100644 --- a/dist/field/index.wxml +++ b/dist/field/index.wxml @@ -21,63 +21,12 @@ - - + + + + + + diff --git a/dist/field/props.d.ts b/dist/field/props.d.ts index fa2f0b68..5cd130a1 100644 --- a/dist/field/props.d.ts +++ b/dist/field/props.d.ts @@ -1,62 +1,4 @@ /// -export declare const commonProps: { - value: { - type: StringConstructor; - observer( - this: WechatMiniprogram.Component.TrivialInstance, - value: string - ): void; - }; - placeholder: StringConstructor; - placeholderStyle: StringConstructor; - placeholderClass: StringConstructor; - disabled: BooleanConstructor; - maxlength: { - type: NumberConstructor; - value: number; - }; - cursorSpacing: { - type: NumberConstructor; - value: number; - }; - autoFocus: BooleanConstructor; - focus: BooleanConstructor; - cursor: { - type: NumberConstructor; - value: number; - }; - selectionStart: { - type: NumberConstructor; - value: number; - }; - selectionEnd: { - type: NumberConstructor; - value: number; - }; - adjustPosition: { - type: BooleanConstructor; - value: boolean; - }; - holdKeyboard: BooleanConstructor; -}; -export declare const inputProps: { - type: { - type: StringConstructor; - value: string; - }; - password: BooleanConstructor; - confirmType: StringConstructor; - confirmHold: BooleanConstructor; -}; -export declare const textareaProps: { - autoHeight: BooleanConstructor; - fixed: BooleanConstructor; - showConfirmBar: { - type: BooleanConstructor; - value: boolean; - }; - disableDefaultPadding: { - type: BooleanConstructor; - value: boolean; - }; -}; +export declare const commonProps: WechatMiniprogram.Component.PropertyOption; +export declare const inputProps: WechatMiniprogram.Component.PropertyOption; +export declare const textareaProps: WechatMiniprogram.Component.PropertyOption; diff --git a/dist/field/textarea.wxml b/dist/field/textarea.wxml new file mode 100644 index 00000000..5015a51d --- /dev/null +++ b/dist/field/textarea.wxml @@ -0,0 +1,29 @@ + - + + + + + + diff --git a/lib/field/textarea.wxml b/lib/field/textarea.wxml new file mode 100644 index 00000000..5015a51d --- /dev/null +++ b/lib/field/textarea.wxml @@ -0,0 +1,29 @@ +