From f2699c928b0ea2430e07135d0190d59981638d5c Mon Sep 17 00:00:00 2001 From: nemo-shen Date: Sat, 22 May 2021 17:03:11 +0800 Subject: [PATCH] build: compile v1.6.9-beta.0 --- dist/action-sheet/index.js | 18 ++++++--- dist/action-sheet/index.wxml | 16 ++++---- dist/area/index.js | 17 ++++---- dist/button/index.js | 17 +++++--- dist/button/index.wxml | 16 ++++---- dist/calendar/calendar.wxml | 2 + dist/calendar/components/header/index.js | 22 ++++++++++- dist/calendar/components/month/index.js | 10 ++++- dist/calendar/components/month/index.wxml | 2 +- dist/calendar/components/month/index.wxs | 8 +++- dist/calendar/index.js | 22 ++++++++--- dist/calendar/utils.d.ts | 4 +- dist/cell/index.wxml | 1 + dist/circle/index.js | 10 +++-- dist/common/utils.d.ts | 8 ++-- dist/common/validator.js | 1 + dist/common/version.d.ts | 1 + dist/common/version.js | 3 ++ dist/datetime-picker/index.js | 5 +-- dist/definitions/index.d.ts | 2 +- dist/dialog/dialog.d.ts | 28 ++----------- dist/dialog/index.js | 3 +- dist/dialog/index.wxml | 24 ++++++------ dist/goods-action-button/index.js | 3 +- dist/goods-action-button/index.wxml | 12 +++--- dist/goods-action-icon/index.js | 3 +- dist/goods-action-icon/index.wxml | 12 +++--- dist/icon/index.wxss | 2 +- dist/image/index.js | 3 +- dist/mixins/button.js | 26 ++++++++++++ dist/mixins/open-type.d.ts | 1 - dist/mixins/open-type.js | 26 ------------ dist/notice-bar/index.js | 15 ++++--- dist/notice-bar/index.wxml | 2 +- dist/panel/index.js | 1 - dist/panel/index.wxml | 4 +- dist/panel/index.wxss | 2 +- dist/picker-column/index.wxml | 2 +- dist/radio-group/index.js | 14 +------ dist/radio/index.js | 29 ++++++++++++-- dist/radio/index.wxml | 13 +++--- dist/radio/index.wxs | 33 ++++++++++++++++ dist/rate/index.js | 2 +- dist/toast/toast.d.ts | 46 ++++------------------ lib/action-sheet/index.js | 22 ++++++++--- lib/action-sheet/index.wxml | 16 ++++---- lib/area/index.js | 25 ++++++------ lib/button/index.js | 21 +++++++--- lib/button/index.wxml | 16 ++++---- lib/calendar/calendar.wxml | 2 + lib/calendar/components/header/index.js | 29 +++++++++++++- lib/calendar/components/month/index.js | 10 ++++- lib/calendar/components/month/index.wxml | 2 +- lib/calendar/components/month/index.wxs | 8 +++- lib/calendar/index.js | 48 ++++++++++++++--------- lib/cell/index.wxml | 1 + lib/circle/index.js | 10 +++-- lib/common/validator.js | 1 + lib/common/version.js | 6 ++- lib/datetime-picker/index.js | 20 ++++------ lib/dialog/index.js | 3 +- lib/dialog/index.wxml | 24 ++++++------ lib/goods-action-button/index.js | 3 +- lib/goods-action-button/index.wxml | 12 +++--- lib/goods-action-icon/index.js | 3 +- lib/goods-action-icon/index.wxml | 12 +++--- lib/icon/index.wxss | 2 +- lib/image/index.js | 3 +- lib/mixins/button.js | 26 ++++++++++++ lib/mixins/open-type.js | 29 -------------- lib/mixins/page-scroll.js | 3 +- lib/notice-bar/index.js | 27 ++++++------- lib/notice-bar/index.wxml | 2 +- lib/panel/index.js | 1 - lib/panel/index.wxml | 4 +- lib/panel/index.wxss | 2 +- lib/picker-column/index.wxml | 2 +- lib/radio-group/index.js | 18 +-------- lib/radio/index.js | 31 +++++++++++++-- lib/radio/index.wxml | 13 +++--- lib/radio/index.wxs | 33 ++++++++++++++++ lib/rate/index.js | 4 +- lib/sticky/index.js | 11 +++--- 83 files changed, 581 insertions(+), 415 deletions(-) delete mode 100644 dist/mixins/open-type.d.ts delete mode 100644 dist/mixins/open-type.js create mode 100644 dist/radio/index.wxs delete mode 100644 lib/mixins/open-type.js create mode 100644 lib/radio/index.wxs diff --git a/dist/action-sheet/index.js b/dist/action-sheet/index.js index f3f6d0f6..042a9061 100644 --- a/dist/action-sheet/index.js +++ b/dist/action-sheet/index.js @@ -1,8 +1,7 @@ import { VantComponent } from '../common/component'; import { button } from '../mixins/button'; -import { openType } from '../mixins/open-type'; VantComponent({ - mixins: [button, openType], + mixins: [button], props: { show: Boolean, title: String, @@ -40,12 +39,21 @@ VantComponent({ methods: { onSelect(event) { const { index } = event.currentTarget.dataset; - const item = this.data.actions[index]; - if (item && !item.disabled && !item.loading) { + const { actions, closeOnClickAction, canIUseGetUserProfile } = this.data; + const item = actions[index]; + if (item) { this.$emit('select', item); - if (this.data.closeOnClickAction) { + if (closeOnClickAction) { this.onClose(); } + if (item.openType === 'getUserInfo' && canIUseGetUserProfile) { + wx.getUserProfile({ + desc: item.getUserProfileDesc || ' ', + complete: (userProfile) => { + this.$emit('getuserinfo', userProfile); + }, + }); + } } }, onCancel() { diff --git a/dist/action-sheet/index.wxml b/dist/action-sheet/index.wxml index c2bebcac..b04cc3a3 100644 --- a/dist/action-sheet/index.wxml +++ b/dist/action-sheet/index.wxml @@ -27,18 +27,18 @@