From c0db43fc8821edfc455a0ec7ec1e4300f37be2a7 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Tue, 11 May 2021 15:24:04 +0800
Subject: [PATCH] feat(open-type): support getUserProfile (#4203)

* chore(open-type): merge open type mixin into button mixin

* chore(button): shorten open type method names

* feat(open-type): support getUserProfile
---
 example/project.config.json             |  7 +++--
 packages/action-sheet/index.ts          | 19 ++++++++++----
 packages/action-sheet/index.wxml        | 16 ++++++------
 packages/button/index.ts                | 20 ++++++++++-----
 packages/button/index.wxml              | 16 ++++++------
 packages/cell/index.wxml                |  1 +
 packages/common/version.ts              |  4 +++
 packages/definitions/index.ts           |  2 +-
 packages/dialog/index.ts                |  5 ++--
 packages/dialog/index.wxml              | 24 ++++++++---------
 packages/goods-action-button/index.ts   |  3 +--
 packages/goods-action-button/index.wxml | 12 ++++-----
 packages/goods-action-icon/index.ts     |  3 +--
 packages/goods-action-icon/index.wxml   | 12 ++++-----
 packages/image/index.ts                 |  3 +--
 packages/mixins/button.ts               | 34 +++++++++++++++++++++++++
 packages/mixins/open-type.ts            | 33 ------------------------
 17 files changed, 117 insertions(+), 97 deletions(-)
 delete mode 100644 packages/mixins/open-type.ts

diff --git a/example/project.config.json b/example/project.config.json
index cd039eb6..187e5f0f 100644
--- a/example/project.config.json
+++ b/example/project.config.json
@@ -21,24 +21,27 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
-    "useMultiFrameRuntime": false,
+    "useMultiFrameRuntime": true,
     "useApiHook": true,
+    "useApiHostProcess": false,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
+    "enableEngineNative": false,
     "bundle": false,
     "useIsolateContext": true,
     "useCompilerModule": true,
     "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
     "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "cloudfunctionRoot": "functions/",
-  "libVersion": "2.3.0",
+  "libVersion": "2.3.2",
   "appid": "wx1c01b35002d3ba14",
   "projectname": "vant-weapp",
   "debugOptions": {
diff --git a/packages/action-sheet/index.ts b/packages/action-sheet/index.ts
index a539e980..4fa3583e 100644
--- a/packages/action-sheet/index.ts
+++ b/packages/action-sheet/index.ts
@@ -1,9 +1,8 @@
 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,
@@ -42,13 +41,23 @@ VantComponent({
   methods: {
     onSelect(event: WechatMiniprogram.TouchEvent) {
       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);
+            },
+          });
+        }
       }
     },
 
diff --git a/packages/action-sheet/index.wxml b/packages/action-sheet/index.wxml
index c2bebcac..24d24ac6 100644
--- a/packages/action-sheet/index.wxml
+++ b/packages/action-sheet/index.wxml
@@ -27,18 +27,18 @@
     <button
       wx:for="{{ actions }}"
       wx:key="index"
-      open-type="{{ item.openType }}"
+      open-type="{{ item.disabled || item.loading || canIUseGetUserProfile ? '' : item.openType }}"
       style="{{ item.color ? 'color: ' + item.color : '' }}"
       class="{{ utils.bem('action-sheet__item', { disabled: item.disabled || item.loading }) }} {{ item.className || '' }}"
       hover-class="van-action-sheet__item--hover"
       data-index="{{ index }}"
-      bind:tap="onSelect"
-      bindgetuserinfo="bindGetUserInfo"
-      bindcontact="bindContact"
-      bindgetphonenumber="bindGetPhoneNumber"
-      binderror="bindError"
-      bindlaunchapp="bindLaunchApp"
-      bindopensetting="bindOpenSetting"
+      bindtap="{{ item.disabled || item.loading ? '' : 'onSelect' }}"
+      bindgetuserinfo="onGetUserInfo"
+      bindcontact="onContact"
+      bindgetphonenumber="onGetPhoneNumber"
+      binderror="onError"
+      bindlaunchapp="onLaunchApp"
+      bindopensetting="onOpenSetting"
       lang="{{ lang }}"
       session-from="{{ sessionFrom }}"
       send-message-title="{{ sendMessageTitle }}"
diff --git a/packages/button/index.ts b/packages/button/index.ts
index 9c60e75d..ed2275a9 100644
--- a/packages/button/index.ts
+++ b/packages/button/index.ts
@@ -1,9 +1,8 @@
 import { VantComponent } from '../common/component';
 import { button } from '../mixins/button';
-import { openType } from '../mixins/open-type';
 import { canIUseFormFieldButton } from '../common/version';
 
-const mixins = [button, openType];
+const mixins = [button];
 if (canIUseFormFieldButton()) {
   mixins.push('wx://form-field-button');
 }
@@ -54,12 +53,19 @@ VantComponent({
   },
 
   methods: {
-    onClick() {
-      if (!this.data.loading) {
-        this.$emit('click');
+    onClick(event: WechatMiniprogram.TouchEvent) {
+      this.$emit('click', event);
+
+      const { canIUseGetUserProfile, openType, getUserProfileDesc } = this.data;
+
+      if (openType === 'getUserInfo' && canIUseGetUserProfile) {
+        wx.getUserProfile({
+          desc: getUserProfileDesc || '  ',
+          complete: (userProfile) => {
+            this.$emit('getuserinfo', userProfile);
+          },
+        });
       }
     },
-
-    noop() {},
   },
 });
diff --git a/packages/button/index.wxml b/packages/button/index.wxml
index e4cec8ae..d2417d28 100644
--- a/packages/button/index.wxml
+++ b/packages/button/index.wxml
@@ -9,7 +9,7 @@
   lang="{{ lang }}"
   form-type="{{ formType }}"
   style="{{ computed.rootStyle({ plain, color, customStyle }) }}"
-  open-type="{{ disabled ? '' : openType }}"
+  open-type="{{ disabled || loading || canIUseGetUserProfile ? '' : openType }}"
   business-id="{{ businessId }}"
   session-from="{{ sessionFrom }}"
   send-message-title="{{ sendMessageTitle }}"
@@ -18,13 +18,13 @@
   show-message-card="{{ showMessageCard }}"
   app-parameter="{{ appParameter }}"
   aria-label="{{ ariaLabel }}"
-  bindtap="{{ !disabled ? 'onClick' : 'noop' }}"
-  bindgetuserinfo="bindGetUserInfo"
-  bindcontact="bindContact"
-  bindgetphonenumber="bindGetPhoneNumber"
-  binderror="bindError"
-  bindlaunchapp="bindLaunchApp"
-  bindopensetting="bindOpenSetting"
+  bindtap="{{ disabled || loading ? '' : 'onClick' }}"
+  bindgetuserinfo="onGetUserInfo"
+  bindcontact="onContact"
+  bindgetphonenumber="onGetPhoneNumber"
+  binderror="onError"
+  bindlaunchapp="onLaunchApp"
+  bindopensetting="onOpenSetting"
 >
   <block wx:if="{{ loading }}">
     <van-loading
diff --git a/packages/cell/index.wxml b/packages/cell/index.wxml
index 7d7d746d..8387c3c8 100644
--- a/packages/cell/index.wxml
+++ b/packages/cell/index.wxml
@@ -20,6 +20,7 @@
     style="{{ computed.titleStyle({ titleWidth, titleStyle }) }}"
     class="van-cell__title title-class"
   >
+
     <block wx:if="{{ title }}">{{ title }}</block>
     <slot wx:else name="title" />
 
diff --git a/packages/common/version.ts b/packages/common/version.ts
index 01311b7a..0432c332 100644
--- a/packages/common/version.ts
+++ b/packages/common/version.ts
@@ -56,3 +56,7 @@ export function canIUseNextTick() {
 export function canIUseCanvas2d() {
   return gte('2.9.0');
 }
+
+export function canIUseGetUserProfile() {
+  return !!wx.getUserProfile;
+}
diff --git a/packages/definitions/index.ts b/packages/definitions/index.ts
index 873a1da9..2c5c0150 100644
--- a/packages/definitions/index.ts
+++ b/packages/definitions/index.ts
@@ -37,7 +37,7 @@ export type VantComponentOptions<
       Data & {
         name: string;
         value: any;
-      },
+      } & Record<string, any>,
       Props,
       Methods
     > &
diff --git a/packages/dialog/index.ts b/packages/dialog/index.ts
index feaa562d..fecb363c 100644
--- a/packages/dialog/index.ts
+++ b/packages/dialog/index.ts
@@ -1,12 +1,11 @@
 import { VantComponent } from '../common/component';
 import { button } from '../mixins/button';
-import { openType } from '../mixins/open-type';
 import { GRAY, RED } from '../common/color';
 import { toPromise } from '../common/utils';
 import type { Action } from './dialog';
 
 VantComponent({
-  mixins: [button, openType],
+  mixins: [button],
 
   props: {
     show: {
@@ -75,7 +74,7 @@ VantComponent({
     callback: ((() => {}) as unknown) as (
       action: string,
       context: WechatMiniprogram.Component.TrivialInstance
-    ) => {},
+    ) => void,
   },
 
   methods: {
diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml
index fd13bc9a..f49dee40 100644
--- a/packages/dialog/index.wxml
+++ b/packages/dialog/index.wxml
@@ -58,12 +58,12 @@
       app-parameter="{{ appParameter }}"
 
       bind:click="onConfirm"
-      bindgetuserinfo="bindGetUserInfo"
-      bindcontact="bindContact"
-      bindgetphonenumber="bindGetPhoneNumber"
-      binderror="bindError"
-      bindlaunchapp="bindLaunchApp"
-      bindopensetting="bindOpenSetting"
+      bindgetuserinfo="onGetUserInfo"
+      bindcontact="onContact"
+      bindgetphonenumber="onGetPhoneNumber"
+      binderror="onError"
+      bindlaunchapp="onLaunchApp"
+      bindopensetting="onOpenSetting"
     >
       {{ confirmButtonText }}
     </van-goods-action-button>
@@ -100,12 +100,12 @@
       app-parameter="{{ appParameter }}"
 
       bind:click="onConfirm"
-      bindgetuserinfo="bindGetUserInfo"
-      bindcontact="bindContact"
-      bindgetphonenumber="bindGetPhoneNumber"
-      binderror="bindError"
-      bindlaunchapp="bindLaunchApp"
-      bindopensetting="bindOpenSetting"
+      bindgetuserinfo="onGetUserInfo"
+      bindcontact="onContact"
+      bindgetphonenumber="onGetPhoneNumber"
+      binderror="onError"
+      bindlaunchapp="onLaunchApp"
+      bindopensetting="onOpenSetting"
     >
       {{ confirmButtonText }}
     </van-button>
diff --git a/packages/goods-action-button/index.ts b/packages/goods-action-button/index.ts
index 883ab99e..5f5c1d6d 100644
--- a/packages/goods-action-button/index.ts
+++ b/packages/goods-action-button/index.ts
@@ -2,10 +2,9 @@ import { VantComponent } from '../common/component';
 import { useParent } from '../common/relation';
 import { button } from '../mixins/button';
 import { link } from '../mixins/link';
-import { openType } from '../mixins/open-type';
 
 VantComponent({
-  mixins: [link, button, openType],
+  mixins: [link, button],
 
   relation: useParent('goods-action'),
 
diff --git a/packages/goods-action-button/index.wxml b/packages/goods-action-button/index.wxml
index 3912cedb..4505f212 100644
--- a/packages/goods-action-button/index.wxml
+++ b/packages/goods-action-button/index.wxml
@@ -18,12 +18,12 @@
   show-message-card="{{ showMessageCard }}"
   send-message-title="{{ sendMessageTitle }}"
   bind:click="onClick"
-  binderror="bindError"
-  bindcontact="bindContact"
-  bindopensetting="bindOpenSetting"
-  bindgetuserinfo="bindGetUserInfo"
-  bindgetphonenumber="bindGetPhoneNumber"
-  bindlaunchapp="bindLaunchApp"
+  binderror="onError"
+  bindcontact="onContact"
+  bindopensetting="onOpenSetting"
+  bindgetuserinfo="onGetUserInfo"
+  bindgetphonenumber="onGetPhoneNumber"
+  bindlaunchapp="onLaunchApp"
 >
   {{ text }}
   <slot></slot>
diff --git a/packages/goods-action-icon/index.ts b/packages/goods-action-icon/index.ts
index 89dcfa9a..65feadfa 100644
--- a/packages/goods-action-icon/index.ts
+++ b/packages/goods-action-icon/index.ts
@@ -1,12 +1,11 @@
 import { VantComponent } from '../common/component';
 import { button } from '../mixins/button';
 import { link } from '../mixins/link';
-import { openType } from '../mixins/open-type';
 
 VantComponent({
   classes: ['icon-class', 'text-class'],
 
-  mixins: [link, button, openType],
+  mixins: [link, button],
 
   props: {
     text: String,
diff --git a/packages/goods-action-icon/index.wxml b/packages/goods-action-icon/index.wxml
index 1983cae4..65b7ced3 100644
--- a/packages/goods-action-icon/index.wxml
+++ b/packages/goods-action-icon/index.wxml
@@ -15,12 +15,12 @@
   show-message-card="{{ showMessageCard }}"
   send-message-title="{{ sendMessageTitle }}"
   bind:click="onClick"
-  binderror="bindError"
-  bindcontact="bindContact"
-  bindopensetting="bindOpenSetting"
-  bindgetuserinfo="bindGetUserInfo"
-  bindgetphonenumber="bindGetPhoneNumber"
-  bindlaunchapp="bindLaunchApp"
+  binderror="onError"
+  bindcontact="onContact"
+  bindopensetting="onOpenSetting"
+  bindgetuserinfo="onGetUserInfo"
+  bindgetphonenumber="onGetPhoneNumber"
+  bindlaunchapp="onLaunchApp"
 >
   <van-icon
     wx:if="{{ icon }}"
diff --git a/packages/image/index.ts b/packages/image/index.ts
index 476902a6..14766b3e 100644
--- a/packages/image/index.ts
+++ b/packages/image/index.ts
@@ -1,9 +1,8 @@
 import { VantComponent } from '../common/component';
 import { button } from '../mixins/button';
-import { openType } from '../mixins/open-type';
 
 VantComponent({
-  mixins: [button, openType],
+  mixins: [button],
 
   classes: ['custom-class', 'loading-class', 'error-class', 'image-class'],
 
diff --git a/packages/mixins/button.ts b/packages/mixins/button.ts
index 4e1050bf..a0c7dd68 100644
--- a/packages/mixins/button.ts
+++ b/packages/mixins/button.ts
@@ -1,3 +1,5 @@
+import { canIUseGetUserProfile } from '../common/version';
+
 export const button = Behavior({
   externalClasses: ['hover-class'],
 
@@ -12,5 +14,37 @@ export const button = Behavior({
     showMessageCard: Boolean,
     appParameter: String,
     ariaLabel: String,
+    openType: String,
+    getUserProfileDesc: String,
+  },
+
+  data: {
+    canIUseGetUserProfile: canIUseGetUserProfile(),
+  },
+
+  methods: {
+    onGetUserInfo(event: WechatMiniprogram.ButtonGetUserInfo) {
+      this.triggerEvent('getuserinfo', event.detail);
+    },
+
+    onContact(event: WechatMiniprogram.ButtonContact) {
+      this.triggerEvent('contact', event.detail);
+    },
+
+    onGetPhoneNumber(event: WechatMiniprogram.ButtonGetPhoneNumber) {
+      this.triggerEvent('getphonenumber', event.detail);
+    },
+
+    onError(event: WechatMiniprogram.ButtonError) {
+      this.triggerEvent('error', event.detail);
+    },
+
+    onLaunchApp(event: WechatMiniprogram.ButtonLaunchApp) {
+      this.triggerEvent('launchapp', event.detail);
+    },
+
+    onOpenSetting(event: WechatMiniprogram.ButtonOpenSetting) {
+      this.triggerEvent('opensetting', event.detail);
+    },
   },
 });
diff --git a/packages/mixins/open-type.ts b/packages/mixins/open-type.ts
deleted file mode 100644
index 0c0fa510..00000000
--- a/packages/mixins/open-type.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// @ts-nocheck
-
-export const openType = Behavior({
-  properties: {
-    openType: String,
-  },
-
-  methods: {
-    bindGetUserInfo(event: WechatMiniprogram.ButtonGetUserInfo) {
-      this.$emit('getuserinfo', event.detail);
-    },
-
-    bindContact(event: WechatMiniprogram.ButtonContact) {
-      this.$emit('contact', event.detail);
-    },
-
-    bindGetPhoneNumber(event: WechatMiniprogram.ButtonGetPhoneNumber) {
-      this.$emit('getphonenumber', event.detail);
-    },
-
-    bindError(event: WechatMiniprogram.ButtonError) {
-      this.$emit('error', event.detail);
-    },
-
-    bindLaunchApp(event: WechatMiniprogram.ButtonLaunchApp) {
-      this.$emit('launchapp', event.detail);
-    },
-
-    bindOpenSetting(event: WechatMiniprogram.ButtonOpenSetting) {
-      this.$emit('opensetting', event.detail);
-    },
-  },
-});