From aa10af98177401d4a22e96ac0dcccd85ddfcdac1 Mon Sep 17 00:00:00 2001 From: qiang Date: Wed, 4 Mar 2020 11:43:48 +0800 Subject: [PATCH] build runtime --- packages/uni-app-plus/dist/index.js | 3 +- packages/uni-mp-alipay/dist/index.js | 157 +++++++++++++++----------- packages/uni-mp-baidu/dist/index.js | 3 +- packages/uni-mp-qq/dist/index.js | 5 +- packages/uni-mp-toutiao/dist/index.js | 3 +- packages/uni-mp-weixin/dist/index.js | 5 +- 6 files changed, 101 insertions(+), 75 deletions(-) diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js index c0631e1b2..7aa090e08 100644 --- a/packages/uni-app-plus/dist/index.js +++ b/packages/uni-app-plus/dist/index.js @@ -1314,7 +1314,8 @@ function parseBaseComponent (vueComponentOptions, { const options = { multipleSlots: true, - addGlobalClass: true + addGlobalClass: true, + ...(vueOptions.options || {}) }; const componentOptions = { diff --git a/packages/uni-mp-alipay/dist/index.js b/packages/uni-mp-alipay/dist/index.js index 1511db271..ede7974ea 100644 --- a/packages/uni-mp-alipay/dist/index.js +++ b/packages/uni-mp-alipay/dist/index.js @@ -442,19 +442,32 @@ const protocols = { // 需要做转换的 API 列表 if (!fromArgs.header) { // 默认增加 header 参数，方便格式化 content-type fromArgs.header = {}; } + const headers = { + 'content-type': 'application/json' + }; + Object.keys(fromArgs.header).forEach(key => { + headers[key.toLocaleLowerCase()] = fromArgs.header[key]; + }); return { header (header = {}, toArgs) { - const headers = { - 'content-type': 'application/json' - }; - Object.keys(header).forEach(key => { - headers[key.toLocaleLowerCase()] = header[key]; - }); return { name: 'headers', value: headers } }, + data (data) { + // 钉钉在content-type为application/json时，不会自动序列化 + if (my.dd && headers['content-type'].indexOf('application/json') === 0) { + return { + name: 'data', + value: JSON.stringify(data) + } + } + return { + name: 'data', + value: data + } + }, method: 'method', // TODO 支付宝小程序仅支持 get,post responseType: false } @@ -551,12 +564,12 @@ const protocols = { // 需要做转换的 API 列表 returnValue: { apFilePath: 'tempFilePath' } - }, - chooseVideo: { - // 支付宝小程序文档中未找到（仅在getSetting处提及），但实际可用 - returnValue: { - apFilePath: 'tempFilePath' - } + }, + chooseVideo: { + // 支付宝小程序文档中未找到（仅在getSetting处提及），但实际可用 + returnValue: { + apFilePath: 'tempFilePath' + } }, connectSocket: { args: { @@ -640,22 +653,22 @@ const protocols = { // 需要做转换的 API 列表 }, scanCode: { name: 'scan', - args (fromArgs) { - if (fromArgs.scanType === 'qrCode') { - fromArgs.type = 'qr'; + args (fromArgs) { + if (fromArgs.scanType === 'qrCode') { + fromArgs.type = 'qr'; + return { + onlyFromCamera: 'hideAlbum' + } + } else if (fromArgs.scanType === 'barCode') { + fromArgs.type = 'bar'; return { - onlyFromCamera: 'hideAlbum' - } - } else if (fromArgs.scanType === 'barCode') { - fromArgs.type = 'bar'; + onlyFromCamera: 'hideAlbum' + } + } else { return { - onlyFromCamera: 'hideAlbum' - } - } else { - return { - scanType: false, - onlyFromCamera: 'hideAlbum' - } + scanType: false, + onlyFromCamera: 'hideAlbum' + } } }, returnValue: { @@ -686,8 +699,16 @@ const protocols = { // 需要做转换的 API 列表 } }, getUserInfo: { - name: 'getAuthUserInfo', + name: my.canIUse('getOpenUserInfo') ? 'getOpenUserInfo' : 'getAuthUserInfo', returnValue (result) { + if (my.canIUse('getOpenUserInfo')) { + let response = {}; + try { + response = JSON.parse(result.response).response; + } catch (e) {} + result.nickName = response.nickName; + result.avatar = response.avatar; + } result.userInfo = { nickName: result.nickName, avatarUrl: result.avatar @@ -706,18 +727,18 @@ const protocols = { // 需要做转换的 API 列表 item.uuid = item.serviceId; }); } - }, - createBLEConnection: { - name: 'connectBLEDevice', - args: { - timeout: false - } - }, - closeBLEConnection: { - name: 'disconnectBLEDevice' - }, - onBLEConnectionStateChange: { - name: 'onBLEConnectionStateChanged' + }, + createBLEConnection: { + name: 'connectBLEDevice', + args: { + timeout: false + } + }, + closeBLEConnection: { + name: 'disconnectBLEDevice' + }, + onBLEConnectionStateChange: { + name: 'onBLEConnectionStateChanged' }, makePhoneCall: { args: { @@ -749,35 +770,35 @@ const protocols = { // 需要做转换的 API 列表 returnValue: { brightness: 'value' } - }, - showShareMenu: { - name: 'showSharePanel' - }, - hideHomeButton: { - name: 'hideBackHome' - }, - saveImageToPhotosAlbum: { - name: 'saveImage', - args: { - filePath: 'url' - } - }, - saveVideoToPhotosAlbum: { - args: { - filePath: 'src' - } - }, - chooseAddress: { - name: 'getAddress', - returnValue (result) { - let info = result.result || {}; - result.userName = info.fullname; - result.provinceName = info.prov; - result.cityName = info.city; - result.detailInfo = info.address; - result.telNumber = info.mobilePhone; - result.errMsg = result.resultStatus; - } + }, + showShareMenu: { + name: 'showSharePanel' + }, + hideHomeButton: { + name: 'hideBackHome' + }, + saveImageToPhotosAlbum: { + name: 'saveImage', + args: { + filePath: 'url' + } + }, + saveVideoToPhotosAlbum: { + args: { + filePath: 'src' + } + }, + chooseAddress: { + name: 'getAddress', + returnValue (result) { + let info = result.result || {}; + result.userName = info.fullname; + result.provinceName = info.prov; + result.cityName = info.city; + result.detailInfo = info.address; + result.telNumber = info.mobilePhone; + result.errMsg = result.resultStatus; + } } }; diff --git a/packages/uni-mp-baidu/dist/index.js b/packages/uni-mp-baidu/dist/index.js index 8a0c8464a..ca718f756 100644 --- a/packages/uni-mp-baidu/dist/index.js +++ b/packages/uni-mp-baidu/dist/index.js @@ -1448,7 +1448,8 @@ function parseBaseComponent (vueComponentOptions, { const options = { multipleSlots: true, - addGlobalClass: true + addGlobalClass: true, + ...(vueOptions.options || {}) }; const componentOptions = { diff --git a/packages/uni-mp-qq/dist/index.js b/packages/uni-mp-qq/dist/index.js index 5e8389121..9ed02a0ec 100644 --- a/packages/uni-mp-qq/dist/index.js +++ b/packages/uni-mp-qq/dist/index.js @@ -1366,10 +1366,11 @@ function parseBaseComponent (vueComponentOptions, { const options = { multipleSlots: true, - addGlobalClass: true + addGlobalClass: true, + ...(vueOptions.options || {}) }; - { + { // 微信 multipleSlots 部分情况有 bug，导致内容顺序错乱 如 u-list，提供覆盖选项 if (vueOptions['mp-weixin'] && vueOptions['mp-weixin']['options']) { Object.assign(options, vueOptions['mp-weixin']['options']); diff --git a/packages/uni-mp-toutiao/dist/index.js b/packages/uni-mp-toutiao/dist/index.js index 7a9b2565a..f0458258b 100644 --- a/packages/uni-mp-toutiao/dist/index.js +++ b/packages/uni-mp-toutiao/dist/index.js @@ -1538,7 +1538,8 @@ function parseBaseComponent (vueComponentOptions, { const options = { multipleSlots: true, - addGlobalClass: true + addGlobalClass: true, + ...(vueOptions.options || {}) }; const componentOptions = { diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js index 2aac3bf6d..d59bed555 100644 --- a/packages/uni-mp-weixin/dist/index.js +++ b/packages/uni-mp-weixin/dist/index.js @@ -1319,10 +1319,11 @@ function parseBaseComponent (vueComponentOptions, { const options = { multipleSlots: true, - addGlobalClass: true + addGlobalClass: true, + ...(vueOptions.options || {}) }; - { + { // 微信 multipleSlots 部分情况有 bug，导致内容顺序错乱 如 u-list，提供覆盖选项 if (vueOptions['mp-weixin'] && vueOptions['mp-weixin']['options']) { Object.assign(options, vueOptions['mp-weixin']['options']); -- GitLab