Skip to content

U
uni-app

梦里逆天 / uni-app
与 Fork 源项目一致

Fork自 DCloud / uni-app

通知 22
Star 0
Fork 0
U
uni-app

体验新版 GitCode，发现更多精彩内容 >>

提交 32f99d02 编写于 作者: fxy060608's avatar fxy060608
浏览文件
操作

feat(v3): mp runtime

上级 a0fe152b
隐藏空白更改
内联 并排
Showing with 811 addition and 543 deletion
packages/uni-app-plus/dist/index.v3.js
浏览文件 @ 32f99d02
...@@ -123,9 +123,9 @@ var serviceContext = (function () { ...@@ -123,9 +123,9 @@ var serviceContext = (function () {
'onBeaconUpdate', 'onBeaconUpdate',
'getBeacons', 'getBeacons',
'startBeaconDiscovery', 'startBeaconDiscovery',
'stopBeaconDiscovery', 'stopBeaconDiscovery',
'checkIsSupportSoterAuthentication', 'checkIsSupportSoterAuthentication',
'checkIsSoterEnrolledInDevice', 'checkIsSoterEnrolledInDevice',
'startSoterAuthentication' 'startSoterAuthentication'
]; ];
...@@ -206,9 +206,9 @@ var serviceContext = (function () { ...@@ -206,9 +206,9 @@ var serviceContext = (function () {
'onPush', 'onPush',
'offPush', 'offPush',
'requireNativePlugin', 'requireNativePlugin',
'upx2px', 'upx2px',
'restoreGlobal', 'restoreGlobal',
'getSubNVueById', 'getSubNVueById',
'getCurrentSubNVue' 'getCurrentSubNVue'
]; ];
...@@ -257,7 +257,7 @@ var serviceContext = (function () { ...@@ -257,7 +257,7 @@ var serviceContext = (function () {
return hasOwnProperty.call(obj, key) return hasOwnProperty.call(obj, key)
} }
function noop () {} function noop () { }
function toRawType (val) { function toRawType (val) {
return _toString.call(val).slice(8, -1) return _toString.call(val).slice(8, -1)
...@@ -330,6 +330,45 @@ var serviceContext = (function () { ...@@ -330,6 +330,45 @@ var serviceContext = (function () {
return res return res
} }
let id = 0;
const callbacks = {};
function warp (fn) {
return function (options = {}) {
const callbackId = String(id++);
callbacks[callbackId] = {
success: options.success,
fail: options.fail,
complete: options.complete
};
const data = Object.assign({}, options);
delete data.success;
delete data.fail;
delete data.complete;
const res = fn.bind(this)(data, callbackId);
if (res) {
invoke(callbackId, res);
}
}
}
function invoke (callbackId, res) {
const callback = callbacks[callbackId] || {};
delete callbacks[callbackId];
const errMsg = res.errMsg || '';
if (new RegExp('\\:\\s*fail').test(errMsg)) {
callback.fail && callback.fail(res);
} else {
callback.success && callback.success(res);
}
callback.complete && callback.complete(res);
}
const callback = {
warp,
invoke
};
/** /**
* 框架内 try-catch * 框架内 try-catch
*/ */
...@@ -2575,7 +2614,7 @@ var serviceContext = (function () { ...@@ -2575,7 +2614,7 @@ var serviceContext = (function () {
return args return args
} }
function invoke (...args) { function invoke$1 (...args) {
return UniServiceJSBridge.invokeCallbackHandler(...args) return UniServiceJSBridge.invokeCallbackHandler(...args)
} }
...@@ -3202,19 +3241,19 @@ var serviceContext = (function () { ...@@ -3202,19 +3241,19 @@ var serviceContext = (function () {
bitmap.save(tempFilePath, saveOption, function () { bitmap.save(tempFilePath, saveOption, function () {
clear(); clear();
invoke(callbackId, { invoke$1(callbackId, {
tempFilePath, tempFilePath,
errMsg: 'base64ToTempFilePath:ok' errMsg: 'base64ToTempFilePath:ok'
}); });
}, function (error) { }, function (error) {
clear(); clear();
invoke(callbackId, { invoke$1(callbackId, {
errMsg: toErrMsg(error) errMsg: toErrMsg(error)
}); });
}); });
}, function (error) { }, function (error) {
clear(); clear();
invoke(callbackId, { invoke$1(callbackId, {
errMsg: toErrMsg(error) errMsg: toErrMsg(error)
}); });
}); });
...@@ -3673,16 +3712,16 @@ var serviceContext = (function () { ...@@ -3673,16 +3712,16 @@ var serviceContext = (function () {
contact.addresses = [defaultAddress, homeAddress, companyAddress]; contact.addresses = [defaultAddress, homeAddress, companyAddress];
contact.save(() => { contact.save(() => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'addPhoneContact:ok' errMsg: 'addPhoneContact:ok'
}); });
}, (e) => { }, (e) => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'addPhoneContact:fail' errMsg: 'addPhoneContact:fail'
}); });
}); });
}, (e) => { }, (e) => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'addPhoneContact:fail' errMsg: 'addPhoneContact:fail'
}); });
}); });
...@@ -3706,14 +3745,14 @@ var serviceContext = (function () { ...@@ -3706,14 +3745,14 @@ var serviceContext = (function () {
if (typeof beforeSuccess === 'function') { if (typeof beforeSuccess === 'function') {
beforeSuccess(data); beforeSuccess(data);
} }
invoke(callbackId, Object.assign({}, data, { invoke$1(callbackId, Object.assign({}, data, {
errMsg: `${method}:ok`, errMsg: `${method}:ok`,
code: undefined, code: undefined,
message: undefined message: undefined
})); }));
}, },
fail (error = {}) { fail (error = {}) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: `${method}:fail ${error.message || ''}`, errMsg: `${method}:fail ${error.message || ''}`,
errCode: error.code || 0 errCode: error.code || 0
}); });
...@@ -3854,12 +3893,12 @@ var serviceContext = (function () { ...@@ -3854,12 +3893,12 @@ var serviceContext = (function () {
const clipboard = requireNativePlugin('clipboard'); const clipboard = requireNativePlugin('clipboard');
clipboard.getString(ret => { clipboard.getString(ret => {
if (ret.result === 'success') { if (ret.result === 'success') {
invoke(callbackId, { invoke$1(callbackId, {
data: ret.data, data: ret.data,
errMsg: 'getClipboardData:ok' errMsg: 'getClipboardData:ok'
}); });
} else { } else {
invoke(callbackId, { invoke$1(callbackId, {
data: ret.result, data: ret.result,
errMsg: 'getClipboardData:fail' errMsg: 'getClipboardData:fail'
}); });
...@@ -3954,13 +3993,13 @@ var serviceContext = (function () { ...@@ -3954,13 +3993,13 @@ var serviceContext = (function () {
function getBeacons (params, callbackId) { function getBeacons (params, callbackId) {
plus.ibeacon.getBeacons({ plus.ibeacon.getBeacons({
success: (result) => { success: (result) => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getBeacons:ok', errMsg: 'getBeacons:ok',
beacons: result.beacons beacons: result.beacons
}); });
}, },
fail: (error) => { fail: (error) => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getBeacons:fail:' + error.message errMsg: 'getBeacons:fail:' + error.message
}); });
} }
...@@ -3975,13 +4014,13 @@ var serviceContext = (function () { ...@@ -3975,13 +4014,13 @@ var serviceContext = (function () {
uuids, uuids,
ignoreBluetoothAvailable, ignoreBluetoothAvailable,
success: (result) => { success: (result) => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'startBeaconDiscovery:ok', errMsg: 'startBeaconDiscovery:ok',
beacons: result.beacons beacons: result.beacons
}); });
}, },
fail: (error) => { fail: (error) => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'startBeaconDiscovery:fail:' + error.message errMsg: 'startBeaconDiscovery:fail:' + error.message
}); });
} }
...@@ -3991,12 +4030,12 @@ var serviceContext = (function () { ...@@ -3991,12 +4030,12 @@ var serviceContext = (function () {
function stopBeaconDiscovery (params, callbackId) { function stopBeaconDiscovery (params, callbackId) {
plus.ibeacon.stopBeaconDiscovery({ plus.ibeacon.stopBeaconDiscovery({
success: (result) => { success: (result) => {
invoke(callbackId, Object.assign(result, { invoke$1(callbackId, Object.assign(result, {
errMsg: 'stopBeaconDiscovery:ok' errMsg: 'stopBeaconDiscovery:ok'
})); }));
}, },
fail: (error) => { fail: (error) => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'stopBeaconDiscovery:fail:' + error.message errMsg: 'stopBeaconDiscovery:fail:' + error.message
}); });
} }
...@@ -4035,7 +4074,7 @@ var serviceContext = (function () { ...@@ -4035,7 +4074,7 @@ var serviceContext = (function () {
const S_CLASS = 'sc'; const S_CLASS = 'sc';
const callbacks = {}; const callbacks$1 = {};
const WEB_INVOKE_APPSERVICE = 'WEB_INVOKE_APPSERVICE'; const WEB_INVOKE_APPSERVICE = 'WEB_INVOKE_APPSERVICE';
// 简单处理 view 层与 service 层的通知系统 // 简单处理 view 层与 service 层的通知系统
/** /**
...@@ -4047,11 +4086,11 @@ var serviceContext = (function () { ...@@ -4047,11 +4086,11 @@ var serviceContext = (function () {
publish(WEB_INVOKE_APPSERVICE, args.data, args.webviewIds); publish(WEB_INVOKE_APPSERVICE, args.data, args.webviewIds);
return true return true
} }
const callback = callbacks[type]; const callback = callbacks$1[type];
if (callback) { if (callback) {
callback(args); callback(args);
if (!callback.keepAlive) { if (!callback.keepAlive) {
delete callbacks[type]; delete callbacks$1[type];
} }
return true return true
} }
...@@ -4061,11 +4100,11 @@ var serviceContext = (function () { ...@@ -4061,11 +4100,11 @@ var serviceContext = (function () {
* 注册 view 层通知 service 层事件处理 * 注册 view 层通知 service 层事件处理
*/ */
function registerPlusMessage (type, callback, keepAlive = true) { function registerPlusMessage (type, callback, keepAlive = true) {
if (callbacks[type]) { if (callbacks$1[type]) {
return console.warn(`${type} 已注册:` + (callbacks[type].toString())) return console.warn(`${type} 已注册:` + (callbacks$1[type].toString()))
} }
callback.keepAlive = !!keepAlive; callback.keepAlive = !!keepAlive;
callbacks[type] = callback; callbacks$1[type] = callback;
} }
const SCAN_ID = '__UNIAPP_SCAN'; const SCAN_ID = '__UNIAPP_SCAN';
...@@ -4197,7 +4236,7 @@ var serviceContext = (function () { ...@@ -4197,7 +4236,7 @@ var serviceContext = (function () {
}); });
webview.addEventListener('close', () => { webview.addEventListener('close', () => {
if (result) { if (result) {
invoke(callbackId, { invoke$1(callbackId, {
result: result.code, result: result.code,
scanType: SCAN_MAPS[result.type] || '', scanType: SCAN_MAPS[result.type] || '',
charSet: 'utf8', charSet: 'utf8',
...@@ -4205,7 +4244,7 @@ var serviceContext = (function () { ...@@ -4205,7 +4244,7 @@ var serviceContext = (function () {
errMsg: 'scanCode:ok' errMsg: 'scanCode:ok'
}); });
} else { } else {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'scanCode:fail cancel' errMsg: 'scanCode:fail cancel'
}); });
} }
...@@ -4252,7 +4291,7 @@ var serviceContext = (function () { ...@@ -4252,7 +4291,7 @@ var serviceContext = (function () {
let channel; let channel;
let globalEvent; let globalEvent;
const callbacks$1 = {}; const callbacks$2 = {};
function onPlusMessage (res) { function onPlusMessage (res) {
const message = res.data && res.data.__message; const message = res.data && res.data.__message;
...@@ -4260,10 +4299,10 @@ var serviceContext = (function () { ...@@ -4260,10 +4299,10 @@ var serviceContext = (function () {
return return
} }
const pageId = message.__page; const pageId = message.__page;
const callback = callbacks$1[pageId]; const callback = callbacks$2[pageId];
callback && callback(message); callback && callback(message);
if (!message.keep) { if (!message.keep) {
delete callbacks$1[pageId]; delete callbacks$2[pageId];
} }
} }
...@@ -4280,7 +4319,7 @@ var serviceContext = (function () { ...@@ -4280,7 +4319,7 @@ var serviceContext = (function () {
} else { } else {
window.__plusMessage = onPlusMessage; window.__plusMessage = onPlusMessage;
} }
callbacks$1[pageId] = callback; callbacks$2[pageId] = callback;
} }
class Page { class Page {
...@@ -4422,7 +4461,7 @@ var serviceContext = (function () { ...@@ -4422,7 +4461,7 @@ var serviceContext = (function () {
if (isDark) { if (isDark) {
plus.navigator.setStatusBarStyle('dark'); plus.navigator.setStatusBarStyle('dark');
} }
invoke(callbackId, result || { invoke$1(callbackId, result || {
errMsg: 'scanCode:fail cancel' errMsg: 'scanCode:fail cancel'
}); });
} }
...@@ -4583,7 +4622,7 @@ var serviceContext = (function () { ...@@ -4583,7 +4622,7 @@ var serviceContext = (function () {
} }
plus.fingerprint.authenticate(() => { plus.fingerprint.authenticate(() => {
plus.nativeUI.closeWaiting(); plus.nativeUI.closeWaiting();
invoke(callbackId, { invoke$1(callbackId, {
authMode: realAuthMode, authMode: realAuthMode,
errCode: 0, errCode: 0,
errMsg: 'startSoterAuthentication:ok' errMsg: 'startSoterAuthentication:ok'
...@@ -4601,7 +4640,7 @@ var serviceContext = (function () { ...@@ -4601,7 +4640,7 @@ var serviceContext = (function () {
case e.AUTHENTICATE_OVERLIMIT: case e.AUTHENTICATE_OVERLIMIT:
// 微信小程序在第一次重试次数超限时安卓IOS返回不一致，安卓端会返回次数超过限制（errCode: 90010），IOS端会返回认证失败（errCode: 90009）。APP-IOS实际运行时不会次数超限，超过指定次数之后会弹出输入密码的界面 // 微信小程序在第一次重试次数超限时安卓IOS返回不一致，安卓端会返回次数超过限制（errCode: 90010），IOS端会返回认证失败（errCode: 90009）。APP-IOS实际运行时不会次数超限，超过指定次数之后会弹出输入密码的界面
plus.nativeUI.closeWaiting(); plus.nativeUI.closeWaiting();
invoke(callbackId, { invoke$1(callbackId, {
authMode: realAuthMode, authMode: realAuthMode,
errCode: 90010, errCode: 90010,
errMsg: 'startSoterAuthentication:fail authenticate freeze. please try again later' errMsg: 'startSoterAuthentication:fail authenticate freeze. please try again later'
...@@ -4609,7 +4648,7 @@ var serviceContext = (function () { ...@@ -4609,7 +4648,7 @@ var serviceContext = (function () {
break break
case e.CANCEL: case e.CANCEL:
plus.nativeUI.closeWaiting(); plus.nativeUI.closeWaiting();
invoke(callbackId, { invoke$1(callbackId, {
authMode: realAuthMode, authMode: realAuthMode,
errCode: 90008, errCode: 90008,
errMsg: 'startSoterAuthentication:fail cancel' errMsg: 'startSoterAuthentication:fail cancel'
...@@ -4617,7 +4656,7 @@ var serviceContext = (function () { ...@@ -4617,7 +4656,7 @@ var serviceContext = (function () {
break break
default: default:
plus.nativeUI.closeWaiting(); plus.nativeUI.closeWaiting();
invoke(callbackId, { invoke$1(callbackId, {
authMode: realAuthMode, authMode: realAuthMode,
errCode: 90007, errCode: 90007,
errMsg: 'startSoterAuthentication:fail' errMsg: 'startSoterAuthentication:fail'
...@@ -4633,7 +4672,7 @@ var serviceContext = (function () { ...@@ -4633,7 +4672,7 @@ var serviceContext = (function () {
message: authContent message: authContent
}, (e) => { }, (e) => {
if (e.type === 'success' && e.code === 0) { if (e.type === 'success' && e.code === 0) {
invoke(callbackId, { invoke$1(callbackId, {
authMode: realAuthMode, authMode: realAuthMode,
errCode: 0, errCode: 0,
errMsg: 'startSoterAuthentication:ok' errMsg: 'startSoterAuthentication:ok'
...@@ -4641,28 +4680,28 @@ var serviceContext = (function () { ...@@ -4641,28 +4680,28 @@ var serviceContext = (function () {
} else { } else {
switch (e.code) { switch (e.code) {
case 4: case 4:
invoke(callbackId, { invoke$1(callbackId, {
authMode: realAuthMode, authMode: realAuthMode,
errCode: 90009, errCode: 90009,
errMsg: 'startSoterAuthentication:fail' errMsg: 'startSoterAuthentication:fail'
}); });
break break
case 5: case 5:
invoke(callbackId, { invoke$1(callbackId, {
authMode: realAuthMode, authMode: realAuthMode,
errCode: 90010, errCode: 90010,
errMsg: 'startSoterAuthentication:fail authenticate freeze. please try again later' errMsg: 'startSoterAuthentication:fail authenticate freeze. please try again later'
}); });
break break
case 6: case 6:
invoke(callbackId, { invoke$1(callbackId, {
authMode: realAuthMode, authMode: realAuthMode,
errCode: 90008, errCode: 90008,
errMsg: 'startSoterAuthentication:fail cancel' errMsg: 'startSoterAuthentication:fail cancel'
}); });
break break
default: default:
invoke(callbackId, { invoke$1(callbackId, {
authMode: realAuthMode, authMode: realAuthMode,
errCode: 90007, errCode: 90007,
errMsg: 'startSoterAuthentication:fail' errMsg: 'startSoterAuthentication:fail'
...@@ -4971,23 +5010,23 @@ var serviceContext = (function () { ...@@ -4971,23 +5010,23 @@ var serviceContext = (function () {
getSavedFileDir(dir => { getSavedFileDir(dir => {
entry.copyTo(dir, fileName, () => { // 复制临时文件 FileEntry，为了避免把相册里的文件删除，使用 copy，微信中是要删除临时文件的 entry.copyTo(dir, fileName, () => { // 复制临时文件 FileEntry，为了避免把相册里的文件删除，使用 copy，微信中是要删除临时文件的
const savedFilePath = SAVE_PATH + '/' + fileName; const savedFilePath = SAVE_PATH + '/' + fileName;
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'saveFile:ok', errMsg: 'saveFile:ok',
savedFilePath savedFilePath
}); });
}, err => { }, err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'saveFile:fail 保存文件[' + tempFilePath + errMsg: 'saveFile:fail 保存文件[' + tempFilePath +
'] copyTo 失败:' + err.message '] copyTo 失败:' + err.message
}); });
}); });
}, message => { }, message => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'saveFile:fail ' + message errMsg: 'saveFile:fail ' + message
}); });
}); });
}, err => { }, err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'saveFile:fail 文件[' + tempFilePath + ']读取失败' + err.message errMsg: 'saveFile:fail 文件[' + tempFilePath + ']读取失败' + err.message
}); });
}); });
...@@ -5013,30 +5052,30 @@ var serviceContext = (function () { ...@@ -5013,30 +5052,30 @@ var serviceContext = (function () {
size: meta.size size: meta.size
}); });
if (fileList.length === entries.length) { if (fileList.length === entries.length) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getSavedFileList:ok', errMsg: 'getSavedFileList:ok',
fileList fileList
}); });
} }
}, error => { }, error => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getSavedFileList:fail ' + error.message errMsg: 'getSavedFileList:fail ' + error.message
}); });
}, false); }, false);
}); });
} else { } else {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getSavedFileList:ok', errMsg: 'getSavedFileList:ok',
fileList fileList
}); });
} }
}, error => { }, error => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getSavedFileList:fail ' + error.message errMsg: 'getSavedFileList:fail ' + error.message
}); });
}); });
}, message => { }, message => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getSavedFileList:fail ' + message errMsg: 'getSavedFileList:fail ' + message
}); });
}); });
...@@ -5049,20 +5088,20 @@ var serviceContext = (function () { ...@@ -5049,20 +5088,20 @@ var serviceContext = (function () {
// TODO 计算文件摘要 // TODO 计算文件摘要
plus.io.resolveLocalFileSystemURL(getRealPath$1(filePath), entry => { plus.io.resolveLocalFileSystemURL(getRealPath$1(filePath), entry => {
entry.getMetadata(meta => { entry.getMetadata(meta => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getFileInfo:ok', errMsg: 'getFileInfo:ok',
size: meta.size, size: meta.size,
digestAlgorithm: '' digestAlgorithm: ''
}); });
}, err => { }, err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getFileInfo:fail 文件[' + errMsg: 'getFileInfo:fail 文件[' +
filePath + filePath +
'] getMetadata 失败:' + err.message '] getMetadata 失败:' + err.message
}); });
}); });
}, err => { }, err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getFileInfo:fail 文件[' + filePath + ']读取失败:' + err.message errMsg: 'getFileInfo:fail 文件[' + filePath + ']读取失败:' + err.message
}); });
}); });
...@@ -5073,18 +5112,18 @@ var serviceContext = (function () { ...@@ -5073,18 +5112,18 @@ var serviceContext = (function () {
} = {}, callbackId) { } = {}, callbackId) {
plus.io.resolveLocalFileSystemURL(getRealPath$1(filePath), entry => { plus.io.resolveLocalFileSystemURL(getRealPath$1(filePath), entry => {
entry.getMetadata(meta => { entry.getMetadata(meta => {
invoke(callbackId, { invoke$1(callbackId, {
createTime: meta.modificationTime.getTime(), createTime: meta.modificationTime.getTime(),
size: meta.size, size: meta.size,
errMsg: 'getSavedFileInfo:ok' errMsg: 'getSavedFileInfo:ok'
}); });
}, error => { }, error => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getSavedFileInfo:fail ' + error.message errMsg: 'getSavedFileInfo:fail ' + error.message
}); });
}, false); }, false);
}, () => { }, () => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getSavedFileInfo:fail file not find' errMsg: 'getSavedFileInfo:fail file not find'
}); });
}); });
...@@ -5095,16 +5134,16 @@ var serviceContext = (function () { ...@@ -5095,16 +5134,16 @@ var serviceContext = (function () {
} = {}, callbackId) { } = {}, callbackId) {
plus.io.resolveLocalFileSystemURL(getRealPath$1(filePath), entry => { plus.io.resolveLocalFileSystemURL(getRealPath$1(filePath), entry => {
entry.remove(() => { entry.remove(() => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'removeSavedFile:ok' errMsg: 'removeSavedFile:ok'
}); });
}, err => { }, err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'removeSavedFile:fail 文件[' + filePath + ']删除失败:' + err.message errMsg: 'removeSavedFile:fail 文件[' + filePath + ']删除失败:' + err.message
}); });
}); });
}, () => { }, () => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'removeSavedFile:fail file not find' errMsg: 'removeSavedFile:fail file not find'
}); });
}); });
...@@ -5116,11 +5155,11 @@ var serviceContext = (function () { ...@@ -5116,11 +5155,11 @@ var serviceContext = (function () {
} = {}, callbackId) { } = {}, callbackId) {
plus.io.resolveLocalFileSystemURL(getRealPath$1(filePath), entry => { plus.io.resolveLocalFileSystemURL(getRealPath$1(filePath), entry => {
plus.runtime.openFile(getRealPath$1(filePath)); plus.runtime.openFile(getRealPath$1(filePath));
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'openDocument:ok' errMsg: 'openDocument:ok'
}); });
}, err => { }, err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'openDocument:fail 文件[' + filePath + ']读取失败:' + err.message errMsg: 'openDocument:fail 文件[' + filePath + ']读取失败:' + err.message
}); });
}); });
...@@ -5186,7 +5225,7 @@ var serviceContext = (function () { ...@@ -5186,7 +5225,7 @@ var serviceContext = (function () {
webview.addEventListener('close', () => { webview.addEventListener('close', () => {
if (result) { if (result) {
invoke(callbackId, { invoke$1(callbackId, {
name: result.poiname, name: result.poiname,
address: result.poiaddress, address: result.poiaddress,
latitude: result.latlng.lat, latitude: result.latlng.lat,
...@@ -5195,7 +5234,7 @@ var serviceContext = (function () { ...@@ -5195,7 +5234,7 @@ var serviceContext = (function () {
}); });
} else { } else {
consumePlusMessage(MESSAGE_TYPE$1); consumePlusMessage(MESSAGE_TYPE$1);
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'chooseLocation:fail cancel' errMsg: 'chooseLocation:fail cancel'
}); });
} }
...@@ -5250,7 +5289,7 @@ var serviceContext = (function () { ...@@ -5250,7 +5289,7 @@ var serviceContext = (function () {
plus.navigator.setStatusBarStyle('dark'); plus.navigator.setStatusBarStyle('dark');
} }
invoke(callbackId, result || { invoke$1(callbackId, result || {
errMsg: 'chooseLocation:fail cancel' errMsg: 'chooseLocation:fail cancel'
}); });
} }
...@@ -5309,7 +5348,7 @@ var serviceContext = (function () { ...@@ -5309,7 +5348,7 @@ var serviceContext = (function () {
} }
} }
invoke(callbackId, { invoke$1(callbackId, {
type, type,
altitude: coords.altitude || 0, altitude: coords.altitude || 0,
latitude: coords.latitude, latitude: coords.latitude,
...@@ -5337,7 +5376,7 @@ var serviceContext = (function () { ...@@ -5337,7 +5376,7 @@ var serviceContext = (function () {
return return
} }
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getLocation:fail ' + e.message errMsg: 'getLocation:fail ' + e.message
}); });
}, { }, {
...@@ -5431,12 +5470,12 @@ var serviceContext = (function () { ...@@ -5431,12 +5470,12 @@ var serviceContext = (function () {
filename: '_doc/audio/', filename: '_doc/audio/',
format: 'aac' format: 'aac'
}, (res) => { }, (res) => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'startRecord:ok', errMsg: 'startRecord:ok',
tempFilePath: res tempFilePath: res
}); });
}, (res) => { }, (res) => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'startRecord:fail' errMsg: 'startRecord:fail'
}); });
}); });
...@@ -5472,7 +5511,7 @@ var serviceContext = (function () { ...@@ -5472,7 +5511,7 @@ var serviceContext = (function () {
player = false; player = false;
playerFilePath = false; playerFilePath = false;
playerStatus = false; playerStatus = false;
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'playVoice:ok' errMsg: 'playVoice:ok'
}); });
}); });
...@@ -5491,7 +5530,7 @@ var serviceContext = (function () { ...@@ -5491,7 +5530,7 @@ var serviceContext = (function () {
player = false; player = false;
playerFilePath = false; playerFilePath = false;
playerStatus = false; playerStatus = false;
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'playVoice:ok' errMsg: 'playVoice:ok'
}); });
}); });
...@@ -5538,7 +5577,7 @@ var serviceContext = (function () { ...@@ -5538,7 +5577,7 @@ var serviceContext = (function () {
const invokeChooseImage = function (callbackId, type, sizeType, tempFilePaths = []) { const invokeChooseImage = function (callbackId, type, sizeType, tempFilePaths = []) {
if (!tempFilePaths.length) { if (!tempFilePaths.length) {
invoke(callbackId, { invoke$1(callbackId, {
code: sizeType, code: sizeType,
errMsg: `chooseImage:${type}` errMsg: `chooseImage:${type}`
}); });
...@@ -5594,14 +5633,14 @@ var serviceContext = (function () { ...@@ -5594,14 +5633,14 @@ var serviceContext = (function () {
}, Promise.resolve()) }, Promise.resolve())
.then(() => { .then(() => {
plus.nativeUI.closeWaiting(); plus.nativeUI.closeWaiting();
invoke(callbackId, { invoke$1(callbackId, {
errMsg: `chooseImage:${type}`, errMsg: `chooseImage:${type}`,
tempFilePaths, tempFilePaths,
tempFiles tempFiles
}); });
}).catch(() => { }).catch(() => {
plus.nativeUI.closeWaiting(); plus.nativeUI.closeWaiting();
invoke(callbackId, { invoke$1(callbackId, {
errMsg: `chooseImage:${type}` errMsg: `chooseImage:${type}`
}); });
}); });
...@@ -5677,7 +5716,7 @@ var serviceContext = (function () { ...@@ -5677,7 +5716,7 @@ var serviceContext = (function () {
}; };
if (type !== 'ok') { if (type !== 'ok') {
invoke(callbackId, callbackResult); invoke$1(callbackId, callbackResult);
return return
} }
...@@ -5688,13 +5727,13 @@ var serviceContext = (function () { ...@@ -5688,13 +5727,13 @@ var serviceContext = (function () {
callbackResult.duration = videoInfo.duration; callbackResult.duration = videoInfo.duration;
callbackResult.width = videoInfo.width; callbackResult.width = videoInfo.width;
callbackResult.height = videoInfo.height; callbackResult.height = videoInfo.height;
invoke(callbackId, callbackResult); invoke$1(callbackId, callbackResult);
}, },
fail () { fail () {
invoke(callbackId, callbackResult); invoke$1(callbackId, callbackResult);
}, },
complete () { complete () {
invoke(callbackId, callbackResult); invoke$1(callbackId, callbackResult);
} }
}); });
}; };
...@@ -5766,12 +5805,12 @@ var serviceContext = (function () { ...@@ -5766,12 +5805,12 @@ var serviceContext = (function () {
dst, dst,
quality quality
}, () => { }, () => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: `compressImage:ok`, errMsg: `compressImage:ok`,
tempFilePath: dst tempFilePath: dst
}); });
}, () => { }, () => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: `compressImage:fail` errMsg: `compressImage:fail`
}); });
}); });
...@@ -5784,13 +5823,13 @@ var serviceContext = (function () { ...@@ -5784,13 +5823,13 @@ var serviceContext = (function () {
plus.io.getImageInfo({ plus.io.getImageInfo({
src, src,
success (imageInfo) { success (imageInfo) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getImageInfo:ok', errMsg: 'getImageInfo:ok',
...imageInfo ...imageInfo
}); });
}, },
fail () { fail () {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getImageInfo:fail' errMsg: 'getImageInfo:fail'
}); });
} }
...@@ -5948,11 +5987,11 @@ var serviceContext = (function () { ...@@ -5948,11 +5987,11 @@ var serviceContext = (function () {
filePath filePath
} = {}, callbackId) { } = {}, callbackId) {
plus.gallery.save(getRealPath$1(filePath), e => { plus.gallery.save(getRealPath$1(filePath), e => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'saveImageToPhotosAlbum:ok' errMsg: 'saveImageToPhotosAlbum:ok'
}); });
}, e => { }, e => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'saveImageToPhotosAlbum:fail' errMsg: 'saveImageToPhotosAlbum:fail'
}); });
}); });
...@@ -5962,11 +6001,11 @@ var serviceContext = (function () { ...@@ -5962,11 +6001,11 @@ var serviceContext = (function () {
filePath filePath
} = {}, callbackId) { } = {}, callbackId) {
plus.gallery.save(getRealPath$1(filePath), e => { plus.gallery.save(getRealPath$1(filePath), e => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'saveVideoToPhotosAlbum:ok' errMsg: 'saveVideoToPhotosAlbum:ok'
}); });
}, e => { }, e => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'saveVideoToPhotosAlbum:fail' errMsg: 'saveVideoToPhotosAlbum:fail'
}); });
}); });
...@@ -6475,11 +6514,11 @@ var serviceContext = (function () { ...@@ -6475,11 +6514,11 @@ var serviceContext = (function () {
if (providers[service]) { if (providers[service]) {
providers[service]((err, provider) => { providers[service]((err, provider) => {
if (err) { if (err) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getProvider:fail:' + err.message errMsg: 'getProvider:fail:' + err.message
}); });
} else { } else {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getProvider:ok', errMsg: 'getProvider:ok',
service, service,
provider provider
...@@ -6487,7 +6526,7 @@ var serviceContext = (function () { ...@@ -6487,7 +6526,7 @@ var serviceContext = (function () {
} }
}); });
} else { } else {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'getProvider:fail:服务[' + service + ']不支持' errMsg: 'getProvider:fail:服务[' + service + ']不支持'
}); });
} }
...@@ -6499,13 +6538,13 @@ var serviceContext = (function () { ...@@ -6499,13 +6538,13 @@ var serviceContext = (function () {
function login () { function login () {
loginServices[provider].login(res => { loginServices[provider].login(res => {
const authResult = res.target.authResult; const authResult = res.target.authResult;
invoke(callbackId, { invoke$1(callbackId, {
code: authResult.code, code: authResult.code,
authResult: authResult, authResult: authResult,
errMsg: 'login:ok' errMsg: 'login:ok'
}); });
}, err => { }, err => {
invoke(callbackId, { invoke$1(callbackId, {
code: err.code, code: err.code,
errMsg: 'login:fail:' + err.message errMsg: 'login:fail:' + err.message
}); });
...@@ -6527,7 +6566,7 @@ var serviceContext = (function () { ...@@ -6527,7 +6566,7 @@ var serviceContext = (function () {
id id
}) => id === provider); }) => id === provider);
if (!loginServices[provider]) { if (!loginServices[provider]) {
invoke(callbackId, { invoke$1(callbackId, {
code: '', code: '',
errMsg: 'login:fail:登录服务[' + provider + ']不存在' errMsg: 'login:fail:登录服务[' + provider + ']不存在'
}); });
...@@ -6535,7 +6574,7 @@ var serviceContext = (function () { ...@@ -6535,7 +6574,7 @@ var serviceContext = (function () {
loginByService(provider, callbackId); loginByService(provider, callbackId);
} }
}, err => { }, err => {
invoke(callbackId, { invoke$1(callbackId, {
code: err.code, code: err.code,
errMsg: 'login:fail:' + err.message errMsg: 'login:fail:' + err.message
}); });
...@@ -6547,7 +6586,7 @@ var serviceContext = (function () { ...@@ -6547,7 +6586,7 @@ var serviceContext = (function () {
const provider = params.provider || 'weixin'; const provider = params.provider || 'weixin';
const loginService = loginServices[provider]; const loginService = loginServices[provider];
if (!loginService || !loginService.authResult) { if (!loginService || !loginService.authResult) {
return invoke(callbackId, { return invoke$1(callbackId, {
errMsg: 'operateWXData:fail:请先调用 uni.login' errMsg: 'operateWXData:fail:请先调用 uni.login'
}) })
} }
...@@ -6587,9 +6626,9 @@ var serviceContext = (function () { ...@@ -6587,9 +6626,9 @@ var serviceContext = (function () {
} else { } else {
result.userInfo = userInfo; result.userInfo = userInfo;
} }
invoke(callbackId, result); invoke$1(callbackId, result);
}, err => { }, err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'operateWXData:fail:' + err.message errMsg: 'operateWXData:fail:' + err.message
}); });
}); });
...@@ -6617,21 +6656,21 @@ var serviceContext = (function () { ...@@ -6617,21 +6656,21 @@ var serviceContext = (function () {
id id
}) => id === provider); }) => id === provider);
if (!service) { if (!service) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'requestPayment:fail:支付服务[' + provider + ']不存在' errMsg: 'requestPayment:fail:支付服务[' + provider + ']不存在'
}); });
} else { } else {
plus.payment.request(service, params.orderInfo, res => { plus.payment.request(service, params.orderInfo, res => {
res.errMsg = 'requestPayment:ok'; res.errMsg = 'requestPayment:ok';
invoke(callbackId, res); invoke$1(callbackId, res);
}, err => { }, err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'requestPayment:fail:' + err.message errMsg: 'requestPayment:fail:' + err.message
}); });
}); });
} }
}, err => { }, err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'requestPayment:fail:' + err.message errMsg: 'requestPayment:fail:' + err.message
}); });
}); });
...@@ -6778,12 +6817,12 @@ var serviceContext = (function () { ...@@ -6778,12 +6817,12 @@ var serviceContext = (function () {
service.send( service.send(
params, params,
() => { () => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: method + ':ok' errMsg: method + ':ok'
}); });
}, },
err => { err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: method + ':fail:' + err.message errMsg: method + ':fail:' + err.message
}); });
} }
...@@ -6829,14 +6868,14 @@ var serviceContext = (function () { ...@@ -6829,14 +6868,14 @@ var serviceContext = (function () {
goShare(); goShare();
}, },
err => { err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'shareAppMessageDirectly:fail:' + err.message errMsg: 'shareAppMessageDirectly:fail:' + err.message
}); });
} }
); );
}, },
err => { err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'shareAppMessageDirectly:fail:' + err.message errMsg: 'shareAppMessageDirectly:fail:' + err.message
}); });
} }
...@@ -6852,7 +6891,7 @@ var serviceContext = (function () { ...@@ -6852,7 +6891,7 @@ var serviceContext = (function () {
function share (params, callbackId, method = 'share') { function share (params, callbackId, method = 'share') {
params = parseParams(params); params = parseParams(params);
if (typeof params === 'string') { if (typeof params === 'string') {
return invoke(callbackId, { return invoke$1(callbackId, {
errMsg: method + ':fail:' + params errMsg: method + ':fail:' + params
}) })
} }
...@@ -6863,7 +6902,7 @@ var serviceContext = (function () { ...@@ -6863,7 +6902,7 @@ var serviceContext = (function () {
id id
}) => id === provider); }) => id === provider);
if (!service) { if (!service) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: method + ':fail:分享服务[' + provider + ']不存在' errMsg: method + ':fail:分享服务[' + provider + ']不存在'
}); });
} else { } else {
...@@ -6873,7 +6912,7 @@ var serviceContext = (function () { ...@@ -6873,7 +6912,7 @@ var serviceContext = (function () {
service.authorize( service.authorize(
() => sendShareMsg(service, params, callbackId), () => sendShareMsg(service, params, callbackId),
err => { err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: method + ':fail:' + err.message errMsg: method + ':fail:' + err.message
}); });
} }
...@@ -6882,7 +6921,7 @@ var serviceContext = (function () { ...@@ -6882,7 +6921,7 @@ var serviceContext = (function () {
} }
}, },
err => { err => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: method + ':fail:' + err.message errMsg: method + ':fail:' + err.message
}); });
} }
...@@ -7535,7 +7574,7 @@ var serviceContext = (function () { ...@@ -7535,7 +7574,7 @@ var serviceContext = (function () {
let preloadWebview; let preloadWebview;
let id = 2; let id$1 = 2;
const WEBVIEW_LISTENERS = { const WEBVIEW_LISTENERS = {
'pullToRefresh': 'onPullDownRefresh', 'pullToRefresh': 'onPullDownRefresh',
...@@ -7550,7 +7589,7 @@ var serviceContext = (function () { ...@@ -7550,7 +7589,7 @@ var serviceContext = (function () {
function createWebview (path, routeOptions) { function createWebview (path, routeOptions) {
if (routeOptions.meta.isNVue) { if (routeOptions.meta.isNVue) {
const webviewId = id++; const webviewId = id$1++;
const webviewStyle = parseWebviewStyle( const webviewStyle = parseWebviewStyle(
webviewId, webviewId,
path, path,
...@@ -7563,7 +7602,7 @@ var serviceContext = (function () { ...@@ -7563,7 +7602,7 @@ var serviceContext = (function () {
nvue: true nvue: true
}) })
} }
if (id === 2) { // 如果首页非 nvue，则直接返回 Launch Webview if (id$1 === 2) { // 如果首页非 nvue，则直接返回 Launch Webview
return plus.webview.getLaunchWebview() return plus.webview.getLaunchWebview()
} }
const webview = preloadWebview; const webview = preloadWebview;
...@@ -7619,7 +7658,7 @@ var serviceContext = (function () { ...@@ -7619,7 +7658,7 @@ var serviceContext = (function () {
function createPreloadWebview () { function createPreloadWebview () {
if (!preloadWebview || preloadWebview.__uniapp_route) { // 不存在，或已被使用 if (!preloadWebview || preloadWebview.__uniapp_route) { // 不存在，或已被使用
preloadWebview = plus.webview.create(VIEW_WEBVIEW_PATH, String(id++)); preloadWebview = plus.webview.create(VIEW_WEBVIEW_PATH, String(id$1++));
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
console.log(`[uni-app] preloadWebview[${preloadWebview.id}]`); console.log(`[uni-app] preloadWebview[${preloadWebview.id}]`);
} }
...@@ -7841,8 +7880,8 @@ var serviceContext = (function () { ...@@ -7841,8 +7880,8 @@ var serviceContext = (function () {
selectComponent (selector) { selectComponent (selector) {
return this.$vm.selectComponent(selector) return this.$vm.selectComponent(selector)
}, },
selectAllComponent (selector) { selectAllComponents (selector) {
return this.$vm.selectAllComponent(selector) return this.$vm.selectAllComponents(selector)
} }
}; };
...@@ -7889,7 +7928,7 @@ var serviceContext = (function () { ...@@ -7889,7 +7928,7 @@ var serviceContext = (function () {
animationType, animationType,
animationDuration, animationDuration,
() => { () => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'navigateTo:ok' errMsg: 'navigateTo:ok'
}); });
} }
...@@ -7912,7 +7951,7 @@ var serviceContext = (function () { ...@@ -7912,7 +7951,7 @@ var serviceContext = (function () {
query, query,
animationType, animationType,
animationDuration animationDuration
}); }, callbackId);
}, openType === 'appLaunch'); }, openType === 'appLaunch');
} }
...@@ -7937,7 +7976,7 @@ var serviceContext = (function () { ...@@ -7937,7 +7976,7 @@ var serviceContext = (function () {
'none', 'none',
0, 0,
() => { () => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'reLaunch:ok' errMsg: 'reLaunch:ok'
}); });
} }
...@@ -7984,7 +8023,7 @@ var serviceContext = (function () { ...@@ -7984,7 +8023,7 @@ var serviceContext = (function () {
0, 0,
() => { () => {
lastPage && lastPage.$getAppWebview().close('none'); lastPage && lastPage.$getAppWebview().close('none');
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'redirectTo:ok' errMsg: 'redirectTo:ok'
}); });
} }
...@@ -8062,29 +8101,29 @@ var serviceContext = (function () { ...@@ -8062,29 +8101,29 @@ var serviceContext = (function () {
openType: 'switchTab' openType: 'switchTab'
}), 'none', 0, () => { }), 'none', 0, () => {
setStatusBarStyle(); setStatusBarStyle();
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'switchTab:ok' errMsg: 'switchTab:ok'
}); });
}, 70) }, 70)
} }
setStatusBarStyle(); setStatusBarStyle();
return { invoke$1(callbackId, {
errMsg: 'switchTab:ok' errMsg: 'switchTab:ok'
} });
} }
function switchTab$1 ({ function switchTab$1 ({
url, url,
from, from,
openType openType
}) { }, callbackId) {
const path = url.split('?')[0]; const path = url.split('?')[0];
navigate(path, function () { navigate(path, function () {
_switchTab({ _switchTab({
path, path,
from from
}); }, callbackId);
}, openType === 'appLaunch'); }, openType === 'appLaunch');
} }
...@@ -8300,13 +8339,13 @@ var serviceContext = (function () { ...@@ -8300,13 +8339,13 @@ var serviceContext = (function () {
} = {}, callbackId) { } = {}, callbackId) {
plus.nativeUI.confirm(content, (e) => { plus.nativeUI.confirm(content, (e) => {
if (showCancel) { if (showCancel) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'showModal:ok', errMsg: 'showModal:ok',
confirm: e.index === 1, confirm: e.index === 1,
cancel: e.index === 0 || e.index === -1 cancel: e.index === 0 || e.index === -1
}); });
} else { } else {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'showModal:ok', errMsg: 'showModal:ok',
confirm: e.index === 0, confirm: e.index === 0,
cancel: false cancel: false
...@@ -8334,12 +8373,12 @@ var serviceContext = (function () { ...@@ -8334,12 +8373,12 @@ var serviceContext = (function () {
plus.nativeUI.actionSheet(options, (e) => { plus.nativeUI.actionSheet(options, (e) => {
if (e.index > 0) { if (e.index > 0) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'showActionSheet:ok', errMsg: 'showActionSheet:ok',
tapIndex: e.index - 1 tapIndex: e.index - 1
}); });
} else { } else {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'showActionSheet:fail cancel' errMsg: 'showActionSheet:fail cancel'
}); });
} }
...@@ -8481,16 +8520,16 @@ var serviceContext = (function () { ...@@ -8481,16 +8520,16 @@ var serviceContext = (function () {
} }
} }
const callbacks$2 = {}; const callbacks$3 = {};
function createCallbacks (namespace) { function createCallbacks (namespace) {
let scopedCallbacks = callbacks$2[namespace]; let scopedCallbacks = callbacks$3[namespace];
if (!scopedCallbacks) { if (!scopedCallbacks) {
scopedCallbacks = { scopedCallbacks = {
id: 1, id: 1,
callbacks: Object.create(null) callbacks: Object.create(null)
}; };
callbacks$2[namespace] = scopedCallbacks; callbacks$3[namespace] = scopedCallbacks;
} }
return { return {
get (id) { get (id) {
...@@ -8943,9 +8982,9 @@ var serviceContext = (function () { ...@@ -8943,9 +8982,9 @@ var serviceContext = (function () {
'error', 'error',
'waiting' 'waiting'
]; ];
const callbacks$3 = {}; const callbacks$4 = {};
eventNames$1.forEach(name => { eventNames$1.forEach(name => {
callbacks$3[name] = []; callbacks$4[name] = [];
}); });
const props$1 = [ const props$1 = [
...@@ -9009,7 +9048,7 @@ var serviceContext = (function () { ...@@ -9009,7 +9048,7 @@ var serviceContext = (function () {
errMsg, errMsg,
errCode errCode
}) => { }) => {
callbacks$3[state].forEach(callback => { callbacks$4[state].forEach(callback => {
if (typeof callback === 'function') { if (typeof callback === 'function') {
callback(state === 'error' ? { callback(state === 'error' ? {
errMsg, errMsg,
...@@ -9061,7 +9100,7 @@ var serviceContext = (function () { ...@@ -9061,7 +9100,7 @@ var serviceContext = (function () {
eventNames$1.forEach(item => { eventNames$1.forEach(item => {
const name = item[0].toUpperCase() + item.substr(1); const name = item[0].toUpperCase() + item.substr(1);
BackgroundAudioManager.prototype[`on${name}`] = function (callback) { BackgroundAudioManager.prototype[`on${name}`] = function (callback) {
callbacks$3[item].push(callback); callbacks$4[item].push(callback);
}; };
}); });
...@@ -9808,7 +9847,7 @@ var serviceContext = (function () { ...@@ -9808,7 +9847,7 @@ var serviceContext = (function () {
}, callbackId) { }, callbackId) {
var pageId = getCurrentPageId(); var pageId = getCurrentPageId();
if (!pageId) { if (!pageId) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'canvasGetImageData:fail' errMsg: 'canvasGetImageData:fail'
}); });
return return
...@@ -9818,7 +9857,7 @@ var serviceContext = (function () { ...@@ -9818,7 +9857,7 @@ var serviceContext = (function () {
if (imgData && imgData.length) { if (imgData && imgData.length) {
data.data = new Uint8ClampedArray(imgData); data.data = new Uint8ClampedArray(imgData);
} }
invoke(callbackId, data); invoke$1(callbackId, data);
}); });
operateCanvas(canvasId, pageId, 'getImageData', { operateCanvas(canvasId, pageId, 'getImageData', {
x, x,
...@@ -9839,13 +9878,13 @@ var serviceContext = (function () { ...@@ -9839,13 +9878,13 @@ var serviceContext = (function () {
}, callbackId) { }, callbackId) {
var pageId = getCurrentPageId(); var pageId = getCurrentPageId();
if (!pageId) { if (!pageId) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'canvasPutImageData:fail' errMsg: 'canvasPutImageData:fail'
}); });
return return
} }
var cId = canvasEventCallbacks.push(function (data) { var cId = canvasEventCallbacks.push(function (data) {
invoke(callbackId, data); invoke$1(callbackId, data);
}); });
operateCanvas(canvasId, pageId, 'putImageData', { operateCanvas(canvasId, pageId, 'putImageData', {
data: [...data], data: [...data],
...@@ -9870,7 +9909,7 @@ var serviceContext = (function () { ...@@ -9870,7 +9909,7 @@ var serviceContext = (function () {
}, callbackId) { }, callbackId) {
var pageId = getCurrentPageId(); var pageId = getCurrentPageId();
if (!pageId) { if (!pageId) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'canvasToTempFilePath:fail' errMsg: 'canvasToTempFilePath:fail'
}); });
return return
...@@ -9879,7 +9918,7 @@ var serviceContext = (function () { ...@@ -9879,7 +9918,7 @@ var serviceContext = (function () {
base64 base64
}) { }) {
if (!base64 || !base64.length) { if (!base64 || !base64.length) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'canvasToTempFilePath:fail' errMsg: 'canvasToTempFilePath:fail'
}); });
} }
...@@ -9911,6 +9950,7 @@ var serviceContext = (function () { ...@@ -9911,6 +9950,7 @@ var serviceContext = (function () {
} }
var require_context_module_1_6 = /*#__PURE__*/Object.freeze({ var require_context_module_1_6 = /*#__PURE__*/Object.freeze({
CanvasContext: CanvasContext,
createCanvasContext: createCanvasContext$1, createCanvasContext: createCanvasContext$1,
canvasGetImageData: canvasGetImageData$1, canvasGetImageData: canvasGetImageData$1,
canvasPutImageData: canvasPutImageData$1, canvasPutImageData: canvasPutImageData$1,
...@@ -9960,6 +10000,7 @@ var serviceContext = (function () { ...@@ -9960,6 +10000,7 @@ var serviceContext = (function () {
} }
var require_context_module_1_7 = /*#__PURE__*/Object.freeze({ var require_context_module_1_7 = /*#__PURE__*/Object.freeze({
MapContext: MapContext,
createMapContext: createMapContext$1 createMapContext: createMapContext$1
}); });
...@@ -9985,8 +10026,8 @@ var serviceContext = (function () { ...@@ -9985,8 +10026,8 @@ var serviceContext = (function () {
operateVideoPlayer$3(this.id, this.pageVm, 'stop'); operateVideoPlayer$3(this.id, this.pageVm, 'stop');
} }
seek (position) { seek (position) {
operateVideoPlayer$3(this.id, this.pageVm, 'seek', { operateVideoPlayer$3(this.id, this.pageVm, 'seek', {
position position
}); });
} }
sendDanmu (args) { sendDanmu (args) {
...@@ -9996,8 +10037,8 @@ var serviceContext = (function () { ...@@ -9996,8 +10037,8 @@ var serviceContext = (function () {
if (!~RATES.indexOf(rate)) { if (!~RATES.indexOf(rate)) {
rate = 1.0; rate = 1.0;
} }
operateVideoPlayer$3(this.id, this.pageVm, 'playbackRate', { operateVideoPlayer$3(this.id, this.pageVm, 'playbackRate', {
rate rate
}); });
} }
requestFullScreen (args = {}) { requestFullScreen (args = {}) {
...@@ -10022,14 +10063,60 @@ var serviceContext = (function () { ...@@ -10022,14 +10063,60 @@ var serviceContext = (function () {
} }
var require_context_module_1_8 = /*#__PURE__*/Object.freeze({ var require_context_module_1_8 = /*#__PURE__*/Object.freeze({
VideoContext: VideoContext,
createVideoContext: createVideoContext$1 createVideoContext: createVideoContext$1
}); });
const callbacks$4 = []; function operateEditor (componentId, pageId, type, data) {
UniServiceJSBridge.publishHandler(pageId + '-editor-' + componentId, {
componentId,
type,
data
}, pageId);
}
UniServiceJSBridge.subscribe('onEditorMethodCallback', ({
callbackId,
data
}) => {
callback.invoke(callbackId, data);
});
const methods = ['insertDivider', 'insertImage', 'insertText', 'setContents', 'getContents', 'clear', 'removeFormat', 'undo', 'redo'];
class EditorContext {
constructor (id, pageId) {
this.id = id;
this.pageId = pageId;
}
format (name, value) {
operateEditor(this.id, this.pageId, 'format', {
options: {
name,
value
}
});
}
}
methods.forEach(function (method) {
EditorContext.prototype[method] = callback.warp(function (options, callbackId) {
operateEditor(this.id, this.pageId, method, {
options,
callbackId
});
});
});
var require_context_module_1_9 = /*#__PURE__*/Object.freeze({
EditorContext: EditorContext
});
const callbacks$5 = [];
onMethod('onAccelerometerChange', function (res) { onMethod('onAccelerometerChange', function (res) {
callbacks$4.forEach(callbackId => { callbacks$5.forEach(callbackId => {
invoke(callbackId, res); invoke$1(callbackId, res);
}); });
}); });
...@@ -10040,7 +10127,7 @@ var serviceContext = (function () { ...@@ -10040,7 +10127,7 @@ var serviceContext = (function () {
*/ */
function onAccelerometerChange (callbackId) { function onAccelerometerChange (callbackId) {
// TODO 当没有 start 时，添加 on 需要主动 start? // TODO 当没有 start 时，添加 on 需要主动 start?
callbacks$4.push(callbackId); callbacks$5.push(callbackId);
if (!isEnable) { if (!isEnable) {
startAccelerometer(); startAccelerometer();
} }
...@@ -10065,7 +10152,7 @@ var serviceContext = (function () { ...@@ -10065,7 +10152,7 @@ var serviceContext = (function () {
}) })
} }
var require_context_module_1_9 = /*#__PURE__*/Object.freeze({ var require_context_module_1_10 = /*#__PURE__*/Object.freeze({
onAccelerometerChange: onAccelerometerChange, onAccelerometerChange: onAccelerometerChange,
startAccelerometer: startAccelerometer, startAccelerometer: startAccelerometer,
stopAccelerometer: stopAccelerometer stopAccelerometer: stopAccelerometer
...@@ -10075,7 +10162,7 @@ var serviceContext = (function () { ...@@ -10075,7 +10162,7 @@ var serviceContext = (function () {
const callbacks = []; const callbacks = [];
onMethod(method, data => { onMethod(method, data => {
callbacks.forEach(callbackId => { callbacks.forEach(callbackId => {
invoke(callbackId, data); invoke$1(callbackId, data);
}); });
}); });
return function (callbackId) { return function (callbackId) {
...@@ -10088,18 +10175,18 @@ var serviceContext = (function () { ...@@ -10088,18 +10175,18 @@ var serviceContext = (function () {
const onBLEConnectionStateChange$1 = on('onBLEConnectionStateChange'); const onBLEConnectionStateChange$1 = on('onBLEConnectionStateChange');
const onBLECharacteristicValueChange$1 = on('onBLECharacteristicValueChange'); const onBLECharacteristicValueChange$1 = on('onBLECharacteristicValueChange');
var require_context_module_1_10 = /*#__PURE__*/Object.freeze({ var require_context_module_1_11 = /*#__PURE__*/Object.freeze({
onBluetoothDeviceFound: onBluetoothDeviceFound$1, onBluetoothDeviceFound: onBluetoothDeviceFound$1,
onBluetoothAdapterStateChange: onBluetoothAdapterStateChange$1, onBluetoothAdapterStateChange: onBluetoothAdapterStateChange$1,
onBLEConnectionStateChange: onBLEConnectionStateChange$1, onBLEConnectionStateChange: onBLEConnectionStateChange$1,
onBLECharacteristicValueChange: onBLECharacteristicValueChange$1 onBLECharacteristicValueChange: onBLECharacteristicValueChange$1
}); });
const callbacks$5 = []; const callbacks$6 = [];
onMethod('onCompassChange', function (res) { onMethod('onCompassChange', function (res) {
callbacks$5.forEach(callbackId => { callbacks$6.forEach(callbackId => {
invoke(callbackId, res); invoke$1(callbackId, res);
}); });
}); });
...@@ -10110,7 +10197,7 @@ var serviceContext = (function () { ...@@ -10110,7 +10197,7 @@ var serviceContext = (function () {
*/ */
function onCompassChange (callbackId) { function onCompassChange (callbackId) {
// TODO 当没有 start 时，添加 on 需要主动 start? // TODO 当没有 start 时，添加 on 需要主动 start?
callbacks$5.push(callbackId); callbacks$6.push(callbackId);
if (!isEnable$1) { if (!isEnable$1) {
startCompass(); startCompass();
} }
...@@ -10135,29 +10222,29 @@ var serviceContext = (function () { ...@@ -10135,29 +10222,29 @@ var serviceContext = (function () {
}) })
} }
var require_context_module_1_11 = /*#__PURE__*/Object.freeze({ var require_context_module_1_12 = /*#__PURE__*/Object.freeze({
onCompassChange: onCompassChange, onCompassChange: onCompassChange,
startCompass: startCompass, startCompass: startCompass,
stopCompass: stopCompass stopCompass: stopCompass
}); });
const callbacks$6 = []; const callbacks$7 = [];
onMethod('onNetworkStatusChange', res => { onMethod('onNetworkStatusChange', res => {
callbacks$6.forEach(callbackId => { callbacks$7.forEach(callbackId => {
invoke(callbackId, res); invoke$1(callbackId, res);
}); });
}); });
function onNetworkStatusChange (callbackId) { function onNetworkStatusChange (callbackId) {
callbacks$6.push(callbackId); callbacks$7.push(callbackId);
} }
var require_context_module_1_12 = /*#__PURE__*/Object.freeze({ var require_context_module_1_13 = /*#__PURE__*/Object.freeze({
onNetworkStatusChange: onNetworkStatusChange onNetworkStatusChange: onNetworkStatusChange
}); });
const callbacks$7 = { const callbacks$8 = {
pause: [], pause: [],
resume: [], resume: [],
start: [], start: [],
...@@ -10171,7 +10258,7 @@ var serviceContext = (function () { ...@@ -10171,7 +10258,7 @@ var serviceContext = (function () {
const state = res.state; const state = res.state;
delete res.state; delete res.state;
delete res.errMsg; delete res.errMsg;
callbacks$7[state].forEach(callback => { callbacks$8[state].forEach(callback => {
if (typeof callback === 'function') { if (typeof callback === 'function') {
callback(res); callback(res);
} }
...@@ -10179,7 +10266,7 @@ var serviceContext = (function () { ...@@ -10179,7 +10266,7 @@ var serviceContext = (function () {
}); });
} }
onError (callback) { onError (callback) {
callbacks$7.error.push(callback); callbacks$8.error.push(callback);
} }
onFrameRecorded (callback) { onFrameRecorded (callback) {
...@@ -10191,16 +10278,16 @@ var serviceContext = (function () { ...@@ -10191,16 +10278,16 @@ var serviceContext = (function () {
} }
onPause (callback) { onPause (callback) {
callbacks$7.pause.push(callback); callbacks$8.pause.push(callback);
} }
onResume (callback) { onResume (callback) {
callbacks$7.resume.push(callback); callbacks$8.resume.push(callback);
} }
onStart (callback) { onStart (callback) {
callbacks$7.start.push(callback); callbacks$8.start.push(callback);
} }
onStop (callback) { onStop (callback) {
callbacks$7.stop.push(callback); callbacks$8.stop.push(callback);
} }
pause () { pause () {
invokeMethod('operateRecorder', { invokeMethod('operateRecorder', {
...@@ -10230,7 +10317,7 @@ var serviceContext = (function () { ...@@ -10230,7 +10317,7 @@ var serviceContext = (function () {
return recorderManager || (recorderManager = new RecorderManager()) return recorderManager || (recorderManager = new RecorderManager())
} }
var require_context_module_1_13 = /*#__PURE__*/Object.freeze({ var require_context_module_1_14 = /*#__PURE__*/Object.freeze({
getRecorderManager: getRecorderManager getRecorderManager: getRecorderManager
}); });
...@@ -10290,14 +10377,14 @@ var serviceContext = (function () { ...@@ -10290,14 +10377,14 @@ var serviceContext = (function () {
}); });
break break
case 'success': case 'success':
invoke(callbackId, { invoke$1(callbackId, {
tempFilePath, tempFilePath,
statusCode, statusCode,
errMsg: 'request:ok' errMsg: 'request:ok'
}); });
// eslint-disable-next-line no-fallthrough // eslint-disable-next-line no-fallthrough
case 'fail': case 'fail':
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'request:fail ' + errMsg errMsg: 'request:fail ' + errMsg
}); });
// eslint-disable-next-line no-fallthrough // eslint-disable-next-line no-fallthrough
...@@ -10318,7 +10405,7 @@ var serviceContext = (function () { ...@@ -10318,7 +10405,7 @@ var serviceContext = (function () {
return task return task
} }
var require_context_module_1_14 = /*#__PURE__*/Object.freeze({ var require_context_module_1_15 = /*#__PURE__*/Object.freeze({
downloadFile: downloadFile$1 downloadFile: downloadFile$1
}); });
...@@ -10374,7 +10461,7 @@ var serviceContext = (function () { ...@@ -10374,7 +10461,7 @@ var serviceContext = (function () {
delete requestTasks$1[requestTaskId]; delete requestTasks$1[requestTaskId];
switch (state) { switch (state) {
case 'success': case 'success':
invoke(callbackId, formatResponse({ invoke$1(callbackId, formatResponse({
data, data,
statusCode, statusCode,
header, header,
...@@ -10382,7 +10469,7 @@ var serviceContext = (function () { ...@@ -10382,7 +10469,7 @@ var serviceContext = (function () {
}, args)); }, args));
break break
case 'fail': case 'fail':
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'request:fail ' + errMsg errMsg: 'request:fail ' + errMsg
}); });
break break
...@@ -10423,7 +10510,7 @@ var serviceContext = (function () { ...@@ -10423,7 +10510,7 @@ var serviceContext = (function () {
return new RequestTask(requestTaskId) return new RequestTask(requestTaskId)
} }
var require_context_module_1_15 = /*#__PURE__*/Object.freeze({ var require_context_module_1_16 = /*#__PURE__*/Object.freeze({
request: request$1 request: request$1
}); });
...@@ -10501,7 +10588,7 @@ var serviceContext = (function () { ...@@ -10501,7 +10588,7 @@ var serviceContext = (function () {
const socketTasks$1 = Object.create(null); const socketTasks$1 = Object.create(null);
const socketTasksArray = []; const socketTasksArray = [];
const callbacks$8 = Object.create(null); const callbacks$9 = Object.create(null);
onMethod('onSocketTaskStateChange', ({ onMethod('onSocketTaskStateChange', ({
socketTaskId, socketTaskId,
state, state,
...@@ -10522,8 +10609,8 @@ var serviceContext = (function () { ...@@ -10522,8 +10609,8 @@ var serviceContext = (function () {
if (state === 'open') { if (state === 'open') {
socketTask.readyState = socketTask.OPEN; socketTask.readyState = socketTask.OPEN;
} }
if (socketTask === socketTasksArray[0] && callbacks$8[state]) { if (socketTask === socketTasksArray[0] && callbacks$9[state]) {
invoke(callbacks$8[state], state === 'message' ? { invoke$1(callbacks$9[state], state === 'message' ? {
data data
} : {}); } : {});
} }
...@@ -10545,7 +10632,7 @@ var serviceContext = (function () { ...@@ -10545,7 +10632,7 @@ var serviceContext = (function () {
socketTasks$1[socketTaskId] = task; socketTasks$1[socketTaskId] = task;
socketTasksArray.push(task); socketTasksArray.push(task);
setTimeout(() => { setTimeout(() => {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'connectSocket:ok' errMsg: 'connectSocket:ok'
}); });
}, 0); }, 0);
...@@ -10555,7 +10642,7 @@ var serviceContext = (function () { ...@@ -10555,7 +10642,7 @@ var serviceContext = (function () {
function sendSocketMessage$1 (args, callbackId) { function sendSocketMessage$1 (args, callbackId) {
const socketTask = socketTasksArray[0]; const socketTask = socketTasksArray[0];
if (!socketTask || socketTask.readyState !== socketTask.OPEN) { if (!socketTask || socketTask.readyState !== socketTask.OPEN) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'sendSocketMessage:fail WebSocket is not connected' errMsg: 'sendSocketMessage:fail WebSocket is not connected'
}); });
return return
...@@ -10569,7 +10656,7 @@ var serviceContext = (function () { ...@@ -10569,7 +10656,7 @@ var serviceContext = (function () {
function closeSocket$1 (args, callbackId) { function closeSocket$1 (args, callbackId) {
const socketTask = socketTasksArray[0]; const socketTask = socketTasksArray[0];
if (!socketTask) { if (!socketTask) {
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'closeSocket:fail WebSocket is not connected' errMsg: 'closeSocket:fail WebSocket is not connected'
}); });
return return
...@@ -10582,22 +10669,22 @@ var serviceContext = (function () { ...@@ -10582,22 +10669,22 @@ var serviceContext = (function () {
} }
function onSocketOpen (callbackId) { function onSocketOpen (callbackId) {
callbacks$8.open = callbackId; callbacks$9.open = callbackId;
} }
function onSocketError (callbackId) { function onSocketError (callbackId) {
callbacks$8.error = callbackId; callbacks$9.error = callbackId;
} }
function onSocketMessage (callbackId) { function onSocketMessage (callbackId) {
callbacks$8.message = callbackId; callbacks$9.message = callbackId;
} }
function onSocketClose (callbackId) { function onSocketClose (callbackId) {
callbacks$8.close = callbackId; callbacks$9.close = callbackId;
} }
var require_context_module_1_16 = /*#__PURE__*/Object.freeze({ var require_context_module_1_17 = /*#__PURE__*/Object.freeze({
connectSocket: connectSocket$1, connectSocket: connectSocket$1,
sendSocketMessage: sendSocketMessage$1, sendSocketMessage: sendSocketMessage$1,
closeSocket: closeSocket$1, closeSocket: closeSocket$1,
...@@ -10663,14 +10750,14 @@ var serviceContext = (function () { ...@@ -10663,14 +10750,14 @@ var serviceContext = (function () {
}); });
break break
case 'success': case 'success':
invoke(callbackId, { invoke$1(callbackId, {
data, data,
statusCode, statusCode,
errMsg: 'request:ok' errMsg: 'request:ok'
}); });
// eslint-disable-next-line no-fallthrough // eslint-disable-next-line no-fallthrough
case 'fail': case 'fail':
invoke(callbackId, { invoke$1(callbackId, {
errMsg: 'request:fail ' + errMsg errMsg: 'request:fail ' + errMsg
}); });
// eslint-disable-next-line no-fallthrough // eslint-disable-next-line no-fallthrough
...@@ -10691,7 +10778,7 @@ var serviceContext = (function () { ...@@ -10691,7 +10778,7 @@ var serviceContext = (function () {
return task return task
} }
var require_context_module_1_17 = /*#__PURE__*/Object.freeze({ var require_context_module_1_18 = /*#__PURE__*/Object.freeze({
uploadFile: uploadFile$1 uploadFile: uploadFile$1
}); });
...@@ -10800,7 +10887,7 @@ var serviceContext = (function () { ...@@ -10800,7 +10887,7 @@ var serviceContext = (function () {
return res return res
} }
var require_context_module_1_18 = /*#__PURE__*/Object.freeze({ var require_context_module_1_19 = /*#__PURE__*/Object.freeze({
setStorage: setStorage$1, setStorage: setStorage$1,
setStorageSync: setStorageSync$1, setStorageSync: setStorageSync$1,
getStorage: getStorage$1, getStorage: getStorage$1,
...@@ -10891,7 +10978,7 @@ var serviceContext = (function () { ...@@ -10891,7 +10978,7 @@ var serviceContext = (function () {
return new MPAnimation(option) return new MPAnimation(option)
} }
var require_context_module_1_19 = /*#__PURE__*/Object.freeze({ var require_context_module_1_20 = /*#__PURE__*/Object.freeze({
createAnimation: createAnimation createAnimation: createAnimation
}); });
...@@ -10955,10 +11042,25 @@ var serviceContext = (function () { ...@@ -10955,10 +11042,25 @@ var serviceContext = (function () {
return new ServiceIntersectionObserver(getCurrentPageVm('createIntersectionObserver'), options) return new ServiceIntersectionObserver(getCurrentPageVm('createIntersectionObserver'), options)
} }
var require_context_module_1_20 = /*#__PURE__*/Object.freeze({ var require_context_module_1_21 = /*#__PURE__*/Object.freeze({
createIntersectionObserver: createIntersectionObserver createIntersectionObserver: createIntersectionObserver
}); });
const ContextClasss = {
canvas: CanvasContext,
map: MapContext,
video: VideoContext,
editor: EditorContext
};
function convertContext (result) {
if (result.context) {
const { id, name, page } = result.context;
const ContextClass = ContextClasss[name];
result.context = ContextClass && new ContextClass(id, page);
}
}
class NodesRef { class NodesRef {
constructor (selectorQuery, component, selector, single) { constructor (selectorQuery, component, selector, single) {
this._selectorQuery = selectorQuery; this._selectorQuery = selectorQuery;
...@@ -11005,6 +11107,18 @@ var serviceContext = (function () { ...@@ -11005,6 +11107,18 @@ var serviceContext = (function () {
); );
return this._selectorQuery return this._selectorQuery
} }
context (callback) {
this._selectorQuery._push(
this._selector,
this._component,
this._single, {
context: true
},
callback
);
return this._selectorQuery
}
} }
class SelectorQuery { class SelectorQuery {
...@@ -11018,6 +11132,11 @@ var serviceContext = (function () { ...@@ -11018,6 +11132,11 @@ var serviceContext = (function () {
invokeMethod('requestComponentInfo', this._page, this._queue, res => { invokeMethod('requestComponentInfo', this._page, this._queue, res => {
const queueCbs = this._queueCb; const queueCbs = this._queueCb;
res.forEach((result, index) => { res.forEach((result, index) => {
if (Array.isArray(result)) {
result.forEach(convertContext);
} else {
convertContext(result);
}
const queueCb = queueCbs[index]; const queueCb = queueCbs[index];
if (isFn(queueCb)) { if (isFn(queueCb)) {
queueCb.call(this, result); queueCb.call(this, result);
...@@ -11063,23 +11182,23 @@ var serviceContext = (function () { ...@@ -11063,23 +11182,23 @@ var serviceContext = (function () {
return new SelectorQuery(getCurrentPageVm('createSelectorQuery')) return new SelectorQuery(getCurrentPageVm('createSelectorQuery'))
} }
var require_context_module_1_21 = /*#__PURE__*/Object.freeze({ var require_context_module_1_22 = /*#__PURE__*/Object.freeze({
createSelectorQuery: createSelectorQuery createSelectorQuery: createSelectorQuery
}); });
const callbacks$9 = []; const callbacks$a = [];
onMethod('onKeyboardHeightChange', res => { onMethod('onKeyboardHeightChange', res => {
callbacks$9.forEach(callbackId => { callbacks$a.forEach(callbackId => {
invoke(callbackId, res); invoke$1(callbackId, res);
}); });
}); });
function onKeyboardHeightChange (callbackId) { function onKeyboardHeightChange (callbackId) {
callbacks$9.push(callbackId); callbacks$a.push(callbackId);
} }
var require_context_module_1_22 = /*#__PURE__*/Object.freeze({ var require_context_module_1_23 = /*#__PURE__*/Object.freeze({
onKeyboardHeightChange: onKeyboardHeightChange onKeyboardHeightChange: onKeyboardHeightChange
}); });
...@@ -11087,7 +11206,7 @@ var serviceContext = (function () { ...@@ -11087,7 +11206,7 @@ var serviceContext = (function () {
callbackId, callbackId,
data data
}) => { }) => {
invoke(callbackId, data); invoke$1(callbackId, data);
}); });
function loadFontFace$1 (options, callbackId) { function loadFontFace$1 (options, callbackId) {
...@@ -11103,7 +11222,7 @@ var serviceContext = (function () { ...@@ -11103,7 +11222,7 @@ var serviceContext = (function () {
}, pageId); }, pageId);
} }
var require_context_module_1_23 = /*#__PURE__*/Object.freeze({ var require_context_module_1_24 = /*#__PURE__*/Object.freeze({
loadFontFace: loadFontFace$1 loadFontFace: loadFontFace$1
}); });
...@@ -11115,7 +11234,7 @@ var serviceContext = (function () { ...@@ -11115,7 +11234,7 @@ var serviceContext = (function () {
return {} return {}
} }
var require_context_module_1_24 = /*#__PURE__*/Object.freeze({ var require_context_module_1_25 = /*#__PURE__*/Object.freeze({
pageScrollTo: pageScrollTo$1 pageScrollTo: pageScrollTo$1
}); });
...@@ -11139,44 +11258,44 @@ var serviceContext = (function () { ...@@ -11139,44 +11258,44 @@ var serviceContext = (function () {
const hideTabBarRedDot$1 = removeTabBarBadge$1; const hideTabBarRedDot$1 = removeTabBarBadge$1;
const callbacks$a = []; const callbacks$b = [];
onMethod('onTabBarMidButtonTap', res => { onMethod('onTabBarMidButtonTap', res => {
callbacks$a.forEach(callbackId => { callbacks$b.forEach(callbackId => {
invoke(callbackId, res); invoke$1(callbackId, res);
}); });
}); });
function onTabBarMidButtonTap (callbackId) { function onTabBarMidButtonTap (callbackId) {
callbacks$a.push(callbackId); callbacks$b.push(callbackId);
} }
var require_context_module_1_25 = /*#__PURE__*/Object.freeze({ var require_context_module_1_26 = /*#__PURE__*/Object.freeze({
removeTabBarBadge: removeTabBarBadge$1, removeTabBarBadge: removeTabBarBadge$1,
showTabBarRedDot: showTabBarRedDot$1, showTabBarRedDot: showTabBarRedDot$1,
hideTabBarRedDot: hideTabBarRedDot$1, hideTabBarRedDot: hideTabBarRedDot$1,
onTabBarMidButtonTap: onTabBarMidButtonTap onTabBarMidButtonTap: onTabBarMidButtonTap
}); });
const callbacks$b = []; const callbacks$c = [];
onMethod('onViewDidResize', res => { onMethod('onViewDidResize', res => {
callbacks$b.forEach(callbackId => { callbacks$c.forEach(callbackId => {
invoke(callbackId, res); invoke$1(callbackId, res);
}); });
}); });
function onWindowResize (callbackId) { function onWindowResize (callbackId) {
callbacks$b.push(callbackId); callbacks$c.push(callbackId);
} }
function offWindowResize (callbackId) { function offWindowResize (callbackId) {
// TODO 目前 on 和 off 即使传入同一个 function，获取到的 callbackId 也不会一致，导致不能 off 掉指定 // TODO 目前 on 和 off 即使传入同一个 function，获取到的 callbackId 也不会一致，导致不能 off 掉指定
// 后续修复 // 后续修复
// 此处和微信平台一致查询不到去掉最后一个 // 此处和微信平台一致查询不到去掉最后一个
callbacks$b.splice(callbacks$b.indexOf(callbackId), 1); callbacks$c.splice(callbacks$c.indexOf(callbackId), 1);
} }
var require_context_module_1_26 = /*#__PURE__*/Object.freeze({ var require_context_module_1_27 = /*#__PURE__*/Object.freeze({
onWindowResize: onWindowResize, onWindowResize: onWindowResize,
offWindowResize: offWindowResize offWindowResize: offWindowResize
}); });
...@@ -11195,24 +11314,25 @@ var serviceContext = (function () { ...@@ -11195,24 +11314,25 @@ var serviceContext = (function () {
'./context/canvas.js': require_context_module_1_6, './context/canvas.js': require_context_module_1_6,
'./context/create-map-context.js': require_context_module_1_7, './context/create-map-context.js': require_context_module_1_7,
'./context/create-video-context.js': require_context_module_1_8, './context/create-video-context.js': require_context_module_1_8,
'./device/accelerometer.js': require_context_module_1_9, './context/editor.js': require_context_module_1_9,
'./device/bluetooth.js': require_context_module_1_10, './device/accelerometer.js': require_context_module_1_10,
'./device/compass.js': require_context_module_1_11, './device/bluetooth.js': require_context_module_1_11,
'./device/network.js': require_context_module_1_12, './device/compass.js': require_context_module_1_12,
'./media/recorder.js': require_context_module_1_13, './device/network.js': require_context_module_1_13,
'./network/download-file.js': require_context_module_1_14, './media/recorder.js': require_context_module_1_14,
'./network/request.js': require_context_module_1_15, './network/download-file.js': require_context_module_1_15,
'./network/socket.js': require_context_module_1_16, './network/request.js': require_context_module_1_16,
'./network/upload-file.js': require_context_module_1_17, './network/socket.js': require_context_module_1_17,
'./storage/storage.js': require_context_module_1_18, './network/upload-file.js': require_context_module_1_18,
'./ui/create-animation.js': require_context_module_1_19, './storage/storage.js': require_context_module_1_19,
'./ui/create-intersection-observer.js': require_context_module_1_20, './ui/create-animation.js': require_context_module_1_20,
'./ui/create-selector-query.js': require_context_module_1_21, './ui/create-intersection-observer.js': require_context_module_1_21,
'./ui/keyboard.js': require_context_module_1_22, './ui/create-selector-query.js': require_context_module_1_22,
'./ui/load-font-face.js': require_context_module_1_23, './ui/keyboard.js': require_context_module_1_23,
'./ui/page-scroll-to.js': require_context_module_1_24, './ui/load-font-face.js': require_context_module_1_24,
'./ui/tab-bar.js': require_context_module_1_25, './ui/page-scroll-to.js': require_context_module_1_25,
'./ui/window.js': require_context_module_1_26, './ui/tab-bar.js': require_context_module_1_26,
'./ui/window.js': require_context_module_1_27,
}; };
var req = function req(key) { var req = function req(key) {
...@@ -11769,6 +11889,7 @@ var serviceContext = (function () { ...@@ -11769,6 +11889,7 @@ var serviceContext = (function () {
'uni-checkbox-group', 'uni-checkbox-group',
'uni-cover-image', 'uni-cover-image',
'uni-cover-view', 'uni-cover-view',
'uni-editor',
'uni-form', 'uni-form',
'uni-functional-page-navigator', 'uni-functional-page-navigator',
'uni-icon', 'uni-icon',
...@@ -11839,7 +11960,15 @@ var serviceContext = (function () { ...@@ -11839,7 +11960,15 @@ var serviceContext = (function () {
if (selector.indexOf('#') === 0) { if (selector.indexOf('#') === 0) {
const id = selector.substr(1); const id = selector.substr(1);
return function match (vnode) { return function match (vnode) {
return vnode.data && vnode.data.attrs && vnode.data.attrs.id === id // props
if (vnode.componentInstance && vnode.componentInstance.id === id) {
return true
}
// attrs
if (vnode.data && vnode.data.attrs && vnode.data.attrs.id === id) {
return true
}
return false
} }
} else if (selector.indexOf('.') === 0) { } else if (selector.indexOf('.') === 0) {
const clazz = selector.substr(1); const clazz = selector.substr(1);
...@@ -11879,17 +12008,21 @@ var serviceContext = (function () { ...@@ -11879,17 +12008,21 @@ var serviceContext = (function () {
} }
const $children = vm.$children; const $children = vm.$children;
for (let i = 0; i < $children.length; i++) { for (let i = 0; i < $children.length; i++) {
const childVm = querySelectorAll($children[i], matchSelector, ret); querySelectorAll($children[i], matchSelector, ret);
childVm && ret.push(childVm);
} }
return ret
} }
function initPolyfill (Vue) { function initPolyfill (Vue) {
Vue.prototype.createIntersectionObserver = function createIntersectionObserver (options) {
return uni.createIntersectionObserver(this, options)
};
Vue.prototype.selectComponent = function selectComponent (selector) { Vue.prototype.selectComponent = function selectComponent (selector) {
return querySelector(this, parseSelector(selector)) return querySelector(this, parseSelector(selector))
}; };
Vue.prototype.selectAllComponent = function selectAllComponent (selector) { Vue.prototype.selectAllComponents = function selectAllComponents (selector) {
return querySelectorAll(this, parseSelector(selector), []) return querySelectorAll(this, parseSelector(selector), [])
}; };
} }
...@@ -12080,20 +12213,20 @@ var serviceContext = (function () { ...@@ -12080,20 +12213,20 @@ var serviceContext = (function () {
this.initialized = true; this.initialized = true;
this.batchData.push([PAGE_CREATED, [this.pageId, this.pagePath]]); this.batchData.push([PAGE_CREATED, [this.pageId, this.pagePath]]);
} }
this.batchData = this.batchData.filter(data => { const batchData = this.batchData.filter(data => {
if (data[0] === UPDATED_DATA && !Object.keys(data[1][1]).length) { if (data[0] === UPDATED_DATA && !Object.keys(data[1][1]).length) {
return false return false
} }
return true return true
}); });
if (this.batchData.length) { this.batchData.length = 0;
if (batchData.length) {
UniServiceJSBridge.publishHandler(VD_SYNC, { UniServiceJSBridge.publishHandler(VD_SYNC, {
data: this.batchData, data: batchData,
options: { options: {
timestamp: Date.now() timestamp: Date.now()
} }
}, [this.pageId]); }, [this.pageId]);
this.batchData.length = 0;
} }
} }
...@@ -12182,11 +12315,14 @@ var serviceContext = (function () { ...@@ -12182,11 +12315,14 @@ var serviceContext = (function () {
old = oldObj[key]; old = oldObj[key];
if (old !== cur) { if (old !== cur) {
// 全量同步 style (因为 style 可能会动态删除部分样式) // 全量同步 style (因为 style 可能会动态删除部分样式)
// if (key === B_STYLE && isPlainObject(cur) && isPlainObject(old)) { if (key === B_STYLE && isPlainObject(cur) && isPlainObject(old)) {
// const style = diffObject(cur, old) if (Object.keys(cur).length !== Object.keys(old).length) { // 长度不等
// style && setResult(result || (result = Object.create(null)), B_STYLE, style) setResult(result || (result = Object.create(null)), B_STYLE, cur);
// } else } else {
if (key === V_FOR && Array.isArray(cur) && Array.isArray(old)) { const style = diffObject(cur, old, false);
style && setResult(result || (result = Object.create(null)), B_STYLE, style);
}
} else if (key === V_FOR && Array.isArray(cur) && Array.isArray(old)) {
const vFor = diffArray(cur, old); const vFor = diffArray(cur, old);
vFor && setResult(result || (result = Object.create(null)), V_FOR, vFor); vFor && setResult(result || (result = Object.create(null)), V_FOR, vFor);
} else { } else {
...@@ -12327,6 +12463,12 @@ var serviceContext = (function () { ...@@ -12327,6 +12463,12 @@ var serviceContext = (function () {
case V_FOR: case V_FOR:
return setForData.call(this, id, value) return setForData.call(this, id, value)
} }
// TODO 暂时先传递 dataset 至 view 层(理论上不需要)
if (name.indexOf('a-data-') === 0) {
try {
value = JSON.stringify(value);
} catch (e) {}
}
return ((this._$newData[id] || (this._$newData[id] = {}))[name] = value) return ((this._$newData[id] || (this._$newData[id] = {}))[name] = value)
} }
...@@ -12386,7 +12528,10 @@ var serviceContext = (function () { ...@@ -12386,7 +12528,10 @@ var serviceContext = (function () {
// 'onReady', // 兼容旧版本，应该移除该事件 // 'onReady', // 兼容旧版本，应该移除该事件
'onPageShow', 'onPageShow',
'onPageHide', 'onPageHide',
'onPageResize' 'onPageResize',
// 小程序的 created,attached 生命周期(需要在 service 层的 Vue 内核 mounted 时触发,因小程序 created 可以使用 selectComponent)
'onServiceCreated',
'onServiceAttached'
]; ];
function lifecycleMixin (Vue) { function lifecycleMixin (Vue) {
// fixed vue-class-component // fixed vue-class-component
......
packages/uni-app-plus/dist/service.runtime.esm.js
浏览文件 @ 32f99d02
...@@ -1918,7 +1918,10 @@ function flushCallbacks () { ...@@ -1918,7 +1918,10 @@ function flushCallbacks () {
// where microtasks have too high a priority and fire in between supposedly // where microtasks have too high a priority and fire in between supposedly
// sequential events (e.g. #4521, #6690, which have workarounds) // sequential events (e.g. #4521, #6690, which have workarounds)
// or even between bubbling of the same event (#6566). // or even between bubbling of the same event (#6566).
var timerFunc; // fixed by xxxxxx app-plus 平台 Promise 执行顺序不一致,导致各种乱七八糟的 Bug,统一使用 setTimeout
var timerFunc = function () {
setTimeout(flushCallbacks, 0);
};
// The nextTick behavior leverages the microtask queue, which can be accessed // The nextTick behavior leverages the microtask queue, which can be accessed
// via either native Promise.then or MutationObserver. // via either native Promise.then or MutationObserver.
...@@ -1927,48 +1930,50 @@ var timerFunc; ...@@ -1927,48 +1930,50 @@ var timerFunc;
// completely stops working after triggering a few times... so, if native // completely stops working after triggering a few times... so, if native
// Promise is available, we will use it: // Promise is available, we will use it:
/* istanbul ignore next, $flow-disable-line */ /* istanbul ignore next, $flow-disable-line */
if (typeof Promise !== 'undefined' && isNative(Promise) && !isIOS) { // fixed by xxxxxx // if (typeof Promise !== 'undefined' && isNative(Promise)) {
var p = Promise.resolve(); // const p = Promise.resolve()
timerFunc = function () { // timerFunc = () => {
p.then(flushCallbacks); // p.then(flushCallbacks)
// In problematic UIWebViews, Promise.then doesn't completely break, but // // In problematic UIWebViews, Promise.then doesn't completely break, but
// it can get stuck in a weird state where callbacks are pushed into the // // it can get stuck in a weird state where callbacks are pushed into the
// microtask queue but the queue isn't being flushed, until the browser // // microtask queue but the queue isn't being flushed, until the browser
// needs to do some other work, e.g. handle a timer. Therefore we can // // needs to do some other work, e.g. handle a timer. Therefore we can
// "force" the microtask queue to be flushed by adding an empty timer. // // "force" the microtask queue to be flushed by adding an empty timer.
if (isIOS) { setTimeout(noop); } // if (isIOS) setTimeout(noop)
}; // }
} else if (!isIE && typeof MutationObserver !== 'undefined' && ( // isUsingMicroTask = true
isNative(MutationObserver) || // } else if (!isIE && typeof MutationObserver !== 'undefined' && (
// PhantomJS and iOS 7.x // isNative(MutationObserver) ||
MutationObserver.toString() === '[object MutationObserverConstructor]' // // PhantomJS and iOS 7.x
)) { // MutationObserver.toString() === '[object MutationObserverConstructor]'
// Use MutationObserver where native Promise is not available, // )) {
// e.g. PhantomJS, iOS7, Android 4.4 // // Use MutationObserver where native Promise is not available,
// (#6466 MutationObserver is unreliable in IE11) // // e.g. PhantomJS, iOS7, Android 4.4
var counter = 1; // // (#6466 MutationObserver is unreliable in IE11)
var observer = new MutationObserver(flushCallbacks); // let counter = 1
var textNode = document.createTextNode(String(counter)); // const observer = new MutationObserver(flushCallbacks)
observer.observe(textNode, { // const textNode = document.createTextNode(String(counter))
characterData: true // observer.observe(textNode, {
}); // characterData: true
timerFunc = function () { // })
counter = (counter + 1) % 2; // timerFunc = () => {
textNode.data = String(counter); // counter = (counter + 1) % 2
}; // textNode.data = String(counter)
} else if (typeof setImmediate !== 'undefined' && isNative(setImmediate)) { // }
// Fallback to setImmediate. // isUsingMicroTask = true
// Technically it leverages the (macro) task queue, // } else if (typeof setImmediate !== 'undefined' && isNative(setImmediate)) {
// but it is still a better choice than setTimeout. // // Fallback to setImmediate.
timerFunc = function () { // // Technically it leverages the (macro) task queue,
setImmediate(flushCallbacks); // // but it is still a better choice than setTimeout.
}; // timerFunc = () => {
} else { // setImmediate(flushCallbacks)
// Fallback to setTimeout. // }
timerFunc = function () { // } else {
setTimeout(flushCallbacks, 0); // // Fallback to setTimeout.
}; // timerFunc = () => {
} // setTimeout(flushCallbacks, 0)
// }
// }
function nextTick (cb, ctx) { function nextTick (cb, ctx) {
var _resolve; var _resolve;
...@@ -2258,18 +2263,29 @@ function mergeVNodeHook (def, hookKey, hook) { ...@@ -2258,18 +2263,29 @@ function mergeVNodeHook (def, hookKey, hook) {
/* */ /* */
// fixed by xxxxxx (mp properties) // fixed by xxxxxx (mp properties)
function extractPropertiesFromVNodeData(data, Ctor, res) { function extractPropertiesFromVNodeData(data, Ctor, res, context) {
var propOptions = Ctor.options.mpOptions && Ctor.options.mpOptions.properties; var propOptions = Ctor.options.mpOptions && Ctor.options.mpOptions.properties;
if (isUndef(propOptions)) { if (isUndef(propOptions)) {
return res return res
} }
var externalClasses = Ctor.options.mpOptions.externalClasses || [];
var attrs = data.attrs; var attrs = data.attrs;
var props = data.props; var props = data.props;
if (isDef(attrs) || isDef(props)) { if (isDef(attrs) || isDef(props)) {
for (var key in propOptions) { for (var key in propOptions) {
var altKey = hyphenate(key); var altKey = hyphenate(key);
checkProp(res, props, key, altKey, true) || var result = checkProp(res, props, key, altKey, true) ||
checkProp(res, attrs, key, altKey, false); checkProp(res, attrs, key, altKey, false);
// externalClass
if (
result &&
res[key] &&
externalClasses.indexOf(altKey) !== -1 &&
context[camelize(res[key])]
) {
// 赋值 externalClass 真正的值(模板里 externalClass 的值可能是字符串)
res[key] = context[camelize(res[key])];
}
} }
} }
return res return res
...@@ -2278,7 +2294,8 @@ function extractPropertiesFromVNodeData(data, Ctor, res) { ...@@ -2278,7 +2294,8 @@ function extractPropertiesFromVNodeData(data, Ctor, res) {
function extractPropsFromVNodeData ( function extractPropsFromVNodeData (
data, data,
Ctor, Ctor,
tag tag,
context
) { ) {
// we are only extracting raw values here. // we are only extracting raw values here.
// validation and default values are handled in the child // validation and default values are handled in the child
...@@ -2286,7 +2303,7 @@ function extractPropsFromVNodeData ( ...@@ -2286,7 +2303,7 @@ function extractPropsFromVNodeData (
var propOptions = Ctor.options.props; var propOptions = Ctor.options.props;
if (isUndef(propOptions)) { if (isUndef(propOptions)) {
// fixed by xxxxxx // fixed by xxxxxx
return extractPropertiesFromVNodeData(data, Ctor, {}) return extractPropertiesFromVNodeData(data, Ctor, {}, context)
} }
var res = {}; var res = {};
var attrs = data.attrs; var attrs = data.attrs;
...@@ -2315,7 +2332,7 @@ function extractPropsFromVNodeData ( ...@@ -2315,7 +2332,7 @@ function extractPropsFromVNodeData (
} }
} }
// fixed by xxxxxx // fixed by xxxxxx
return extractPropertiesFromVNodeData(data, Ctor, res) return extractPropertiesFromVNodeData(data, Ctor, res, context)
} }
function checkProp ( function checkProp (
...@@ -3158,6 +3175,8 @@ var componentVNodeHooks = { ...@@ -3158,6 +3175,8 @@ var componentVNodeHooks = {
// fixed by xxxxxx // fixed by xxxxxx
componentInstance._isMounted = true; componentInstance._isMounted = true;
if (componentInstance._$vd) {// 延迟 mounted if (componentInstance._$vd) {// 延迟 mounted
callHook(componentInstance, 'onServiceCreated');
callHook(componentInstance, 'onServiceAttached');
componentInstance._$vd.addMountedVm(componentInstance); componentInstance._$vd.addMountedVm(componentInstance);
} else { } else {
callHook(componentInstance, 'mounted'); callHook(componentInstance, 'mounted');
...@@ -3249,7 +3268,7 @@ function createComponent ( ...@@ -3249,7 +3268,7 @@ function createComponent (
} }
// extract props // extract props
var propsData = extractPropsFromVNodeData(data, Ctor, tag); var propsData = extractPropsFromVNodeData(data, Ctor, tag, context);
// functional component // functional component
if (isTrue(Ctor.options.functional)) { if (isTrue(Ctor.options.functional)) {
...@@ -4110,6 +4129,8 @@ function mountComponent ( ...@@ -4110,6 +4129,8 @@ function mountComponent (
// fixed by xxxxxx // fixed by xxxxxx
vm._isMounted = true; vm._isMounted = true;
if (vm._$vd) {// 延迟 mounted 事件 if (vm._$vd) {// 延迟 mounted 事件
callHook(vm, 'onServiceCreated');
callHook(vm, 'onServiceAttached');
vm._$vd.addMountedVm(vm); vm._$vd.addMountedVm(vm);
} else { } else {
callHook(vm, 'mounted'); callHook(vm, 'mounted');
......
packages/uni-mp-weixin/dist/mp.js
浏览文件 @ 32f99d02
...@@ -26,7 +26,7 @@ function hasOwn (obj, key) { ...@@ -26,7 +26,7 @@ function hasOwn (obj, key) {
return hasOwnProperty.call(obj, key) return hasOwnProperty.call(obj, key)
} }
function noop () {} function noop () { }
/** /**
* Create a cached version of a pure function. * Create a cached version of a pure function.
...@@ -49,9 +49,9 @@ const camelize = cached((str) => { ...@@ -49,9 +49,9 @@ const camelize = cached((str) => {
const SOURCE_KEY = '__data__'; const SOURCE_KEY = '__data__';
const COMPONENT_LIFECYCLE = { const COMPONENT_LIFECYCLE = {
'created': 'created', 'created': 'onServiceCreated',
'attached': 'created', 'attached': 'onServiceAttached',
'ready': 'mounted', 'ready': 'mounted',
'moved': 'moved', 'moved': 'moved',
'detached': 'destroyed' 'detached': 'destroyed'
...@@ -147,7 +147,7 @@ function parseLifecycle (mpComponentOptions, vueComponentOptions) { ...@@ -147,7 +147,7 @@ function parseLifecycle (mpComponentOptions, vueComponentOptions) {
(vueComponentOptions[COMPONENT_LIFECYCLE[name]] || (vueComponentOptions[COMPONENT_LIFECYCLE[name]] = [])) (vueComponentOptions[COMPONENT_LIFECYCLE[name]] || (vueComponentOptions[COMPONENT_LIFECYCLE[name]] = []))
.push(mpComponentOptions[name]); .push(mpComponentOptions[name]);
} }
}); });
} }
const mpBehaviors = { const mpBehaviors = {
...@@ -382,6 +382,102 @@ function parseComponent (mpComponentOptions) { ...@@ -382,6 +382,102 @@ function parseComponent (mpComponentOptions) {
return vueComponentOptions return vueComponentOptions
} }
function initRelationHandlers (type, handler, target, ctx) {
if (!handler) {
return
}
const name = `_$${type}Handlers`;
(ctx[name] || (ctx[name] = [])).push(function () {
handler.call(ctx, target);
});
}
function initLinkedHandlers (relation, target, ctx) {
const type = 'linked';
const name = relation.name;
const relationNodes = ctx._$relationNodes || (ctx._$relationNodes = Object.create(null));
(relationNodes[name] || (relationNodes[name] = [])).push(target);
initRelationHandlers(type, relation[type], target, ctx);
}
function initUnlinkedHandlers (relation, target, ctx) {
const type = 'unlinked';
initRelationHandlers(type, relation[type], target, ctx);
}
function findParentRelation (parentVm, target, type) {
const relations = parentVm &&
parentVm.$options.mpOptions &&
parentVm.$options.mpOptions.relations;
if (!relations) {
return []
}
const name = Object.keys(relations).find(name => {
const relation = relations[name];
return relation.target === target && relation.type === type
});
if (!name) {
return []
}
return [relations[name], parentVm]
}
function initParentRelation (vm, childRelation, match) {
const [parentRelation, parentVm] = match(vm, vm.$options.mpOptions.path);
if (!parentRelation) {
return
}
initLinkedHandlers(parentRelation, vm, parentVm);
initLinkedHandlers(childRelation, parentVm, vm);
initUnlinkedHandlers(parentRelation, vm, parentVm);
initUnlinkedHandlers(childRelation, parentVm, vm);
}
function initRelation (relation, vm) {
const type = relation.type;
if (type === 'parent') {
initParentRelation(vm, relation, function matchParent (vm, target) {
return findParentRelation(vm.$parent, target, 'child')
});
} else if (type === 'ancestor') {
initParentRelation(vm, relation, function matchAncestor (vm, target) {
let $parent = vm.$parent;
while ($parent) {
const ret = findParentRelation($parent, target, 'descendant');
if (ret.length) {
return ret
}
$parent = $parent.$parent;
}
return []
});
}
}
function initRelations (vm) {
const {
relations
} = vm.$options.mpOptions || {};
if (!relations) {
return
}
Object.keys(relations).forEach(name => {
initRelation(relations[name], vm);
});
}
function handleRelations (vm, type) {
// TODO 需要移除 relationNodes
const handlers = vm[`_$${type}Handlers`];
if (!handlers) {
return
}
handlers.forEach(handler => handler());
}
const sharedPropertyDefinition = { const sharedPropertyDefinition = {
enumerable: true, enumerable: true,
configurable: true, configurable: true,
...@@ -467,7 +563,12 @@ function validateProp (key, propsOptions, propsData, vm) { ...@@ -467,7 +563,12 @@ function validateProp (key, propsOptions, propsData, vm) {
value = !!value; value = !!value;
} }
const observer = propOptions && propOptions.observer; const observer = propOptions && propOptions.observer;
observer && observe(observer, vm, value); if (observer) {
// 初始化时,异步触发 observer,否则 observer 中无法访问 methods 或其他
setTimeout(function () {
observe(observer, vm, value);
}, 4);
}
return value return value
} }
return getPropertyVal(propsOptions[key]) return getPropertyVal(propsOptions[key])
...@@ -508,7 +609,7 @@ function initProperties (vm, instanceData) { ...@@ -508,7 +609,7 @@ function initProperties (vm, instanceData) {
/* eslint-disable no-self-compare */ /* eslint-disable no-self-compare */
if (newVal === value || (newVal !== newVal && value !== value)) { if (newVal === value || (newVal !== newVal && value !== value)) {
return return
} }
value = newVal; value = newVal;
if (observer) { if (observer) {
observe(observer, vm, newVal, oldVal); observe(observer, vm, newVal, oldVal);
...@@ -589,102 +690,6 @@ function initMethods (vm) { ...@@ -589,102 +690,6 @@ function initMethods (vm) {
vm._$updateProperties = updateProperties; vm._$updateProperties = updateProperties;
} }
function initRelationHandlers (type, handler, target, ctx, handlerCtx) {
if (!handler) {
return
}
const name = `_$${type}Handlers`;
(handlerCtx[name] || (handlerCtx[name] = [])).push(function () {
handler.call(ctx, target);
});
}
function initLinkedHandlers (relation, target, ctx, handlerCtx) {
const type = 'linked';
const name = relation.name;
const relationNodes = ctx._$relationNodes || (ctx._$relationNodes = Object.create(null));
(relationNodes[name] || (relationNodes[name] = [])).push(target);
initRelationHandlers(type, relation[type], target, ctx, handlerCtx);
}
function initUnlinkedHandlers (relation, target, ctx, handlerCtx) {
const type = 'unlinked';
initRelationHandlers(type, relation[type], target, ctx, handlerCtx);
}
function findParentRelation (parentVm, target, type) {
const relations = parentVm &&
parentVm.$options.mpOptions &&
parentVm.$options.mpOptions.relations;
if (!relations) {
return []
}
const name = Object.keys(relations).find(name => {
const relation = relations[name];
return relation.target === target && relation.type === type
});
if (!name) {
return []
}
return [relations[name], parentVm]
}
function initParentRelation (vm, childRelation, match) {
const [parentRelation, parentVm] = match(vm, vm.$options.mpOptions.path);
if (!parentRelation) {
return
}
// 先父后子
initLinkedHandlers(parentRelation, vm, parentVm, vm);
initLinkedHandlers(childRelation, parentVm, vm, vm);
initUnlinkedHandlers(parentRelation, vm, parentVm, vm);
initUnlinkedHandlers(childRelation, parentVm, vm, vm);
}
function initRelation (relation, vm) {
const type = relation.type;
if (type === 'parent') {
initParentRelation(vm, relation, function matchParent (vm, target) {
return findParentRelation(vm.$parent, target, 'child')
});
} else if (type === 'ancestor') {
initParentRelation(vm, relation, function matchAncestor (vm, target) {
let $parent = vm.$parent;
while ($parent) {
const ret = findParentRelation($parent, target, 'descendant');
if (ret.length) {
return ret
}
$parent = $parent.$parent;
}
return []
});
}
}
function initRelations (vm) {
const {
relations
} = vm.$options.mpOptions || {};
if (!relations) {
return
}
Object.keys(relations).forEach(name => {
initRelation(relations[name], vm);
});
}
function handleRelations (vm, type) {
// TODO 需要移除 relationNodes
const handlers = vm[`_$${type}Handlers`];
if (!handlers) {
return
}
handlers.forEach(handler => handler());
}
function handleObservers (vm) { function handleObservers (vm) {
const watch = vm.$options.watch; const watch = vm.$options.watch;
if (!watch) { if (!watch) {
...@@ -705,13 +710,14 @@ function handleObservers (vm) { ...@@ -705,13 +710,14 @@ function handleObservers (vm) {
var polyfill = { var polyfill = {
beforeCreate () { beforeCreate () {
// 取消 development 时的 Proxy,避免小程序组件模板中使用尚未定义的属性告警
this._renderProxy = this;
},
created () { // properties 中可能会访问 methods,故需要在 created 中初始化
initState(this); initState(this);
initMethods(this); initMethods(this);
initRelations(this); initRelations(this);
}, },
created () {
handleRelations(this, 'linked');
},
mounted () { mounted () {
handleObservers(this); handleObservers(this);
}, },
...@@ -749,10 +755,21 @@ function Page (options) { ...@@ -749,10 +755,21 @@ function Page (options) {
global['__wxComponents'][global['__wxRoute']] = pageOptions; global['__wxComponents'][global['__wxRoute']] = pageOptions;
} }
function initRelationsHandler (vueComponentOptions) {
// linked 需要在当前组件 attached 之后再执行
if (!vueComponentOptions['onServiceAttached']) {
vueComponentOptions['onServiceAttached'] = [];
}
vueComponentOptions['onServiceAttached'].push(function onServiceAttached () {
handleRelations(this, 'linked');
});
}
function Component (options) { function Component (options) {
const componentOptions = parseComponent(options); const componentOptions = parseComponent(options);
componentOptions.mixins.unshift(polyfill); componentOptions.mixins.unshift(polyfill);
componentOptions.mpOptions.path = global['__wxRoute']; componentOptions.mpOptions.path = global['__wxRoute'];
initRelationsHandler(componentOptions);
global['__wxComponents'][global['__wxRoute']] = componentOptions; global['__wxComponents'][global['__wxRoute']] = componentOptions;
} }
......
packages/uni-template-compiler/__tests__/compiler-app-plus-extra.service.spec.js
浏览文件 @ 32f99d02
...@@ -5,112 +5,119 @@ function assertCodegen (template, generatedCode, ...args) { ...@@ -5,112 +5,119 @@ function assertCodegen (template, generatedCode, ...args) {
mp: { mp: {
platform: 'app-plus' platform: 'app-plus'
}, },
service: true, service: true,
filterModules: ['swipe'] filterModules: ['swipe']
}) })
expect(compiled.render).toBe(generatedCode) expect(compiled.render).toBe(generatedCode)
} }
/* eslint-disable quotes */ /* eslint-disable quotes */
describe('codegen', () => { describe('codegen', () => {
it('generate block', () => { it('generate block', () => {
assertCodegen( assertCodegen(
'<block v-if="show"></block>', '<block v-if="show"></block>',
`with(this){return (_$s(0,'i',show))?void 0:_e()}` `with(this){return (_$s(0,'i',show))?void 0:_e()}`
) )
assertCodegen( assertCodegen(
'<div><block v-for="item in items"><div></div><div></div></block></div>', '<div><block v-for="item in items"><div></div><div></div></block></div>',
`with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [_c('div',{key:_$s(1,'f',{forIndex:$20,keyIndex:0,key:1+'-0'+$30})}),_c('div',{key:_$s(1,'f',{forIndex:$20,keyIndex:1,key:1+'-1'+$30})})]})],2)}` `with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [_c('div',{key:_$s(1,'f',{forIndex:$20,keyIndex:0,key:1+'-0'+$30})}),_c('div',{key:_$s(1,'f',{forIndex:$20,keyIndex:1,key:1+'-1'+$30})})]})],2)}`
) )
assertCodegen( assertCodegen(
'<div><block v-for="item in items" :key="item.id"><div></div><div></div></block></div>', '<div><block v-for="item in items" :key="item.id"><div></div><div></div></block></div>',
`with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [_c('div',{key:_$s(1,'f',{forIndex:$20,keyIndex:0,key:item.id+'_0'})}),_c('div',{key:_$s(1,'f',{forIndex:$20,keyIndex:1,key:item.id+'_1'})})]})],2)}` `with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [_c('div',{key:_$s(1,'f',{forIndex:$20,keyIndex:0,key:item.id+'_0'})}),_c('div',{key:_$s(1,'f',{forIndex:$20,keyIndex:1,key:item.id+'_1'})})]})],2)}`
) )
assertCodegen( assertCodegen(
'<div><block v-for="(item,index) in list" :key="index"><block><text>{{item}}</text></block></block></div>', '<div><block v-for="(item,index) in list" :key="index"><block><text>{{item}}</text></block></block></div>',
`with(this){return _c('div',[_l((_$s(1,'f',{forItems:list})),function(item,index,$20,$30){return [[_c('text',{key:_$s(("3-"+$30),'a-key',index+'_0'+'_0')},[_v((_$s(("3-"+$30),'t0',_s(item))))])]]})],2)}` `with(this){return _c('div',[_l((_$s(1,'f',{forItems:list})),function(item,index,$20,$30){return [[_c('text',{key:_$s(("3-"+$30),'a-key',index+'_0'+'_0')},[_v((_$s(("3-"+$30),'t0',_s(item))))])]]})],2)}`
) )
}) })
it('generate directive', () => { it('generate directive', () => {
assertCodegen( assertCodegen(
'<p v-custom1:[arg1].modifier="value1" v-custom2></p>', '<p v-custom1:[arg1].modifier="value1" v-custom2></p>',
`with(this){return _c('p',{directives:[{name:"custom1",rawName:"v-custom1:[arg1].modifier",value:(_$s(0,'v-custom1',value1)),expression:"_$s(0,'v-custom1',value1)",arg:_$s(0,'v-custom1-arg',arg1),modifiers:{"modifier":true}},{name:"custom2",rawName:"v-custom2"}],attrs:{"_i":0}})}` `with(this){return _c('p',{directives:[{name:"custom1",rawName:"v-custom1:[arg1].modifier",value:(_$s(0,'v-custom1',value1)),expression:"_$s(0,'v-custom1',value1)",arg:_$s(0,'v-custom1-arg',arg1),modifiers:{"modifier":true}},{name:"custom2",rawName:"v-custom2"}],attrs:{"_i":0}})}`
) )
}) })
it('generate v-for directive', () => { it('generate v-for directive', () => {
assertCodegen( assertCodegen(
'<div><template v-for="item in items"><div></div><div></div></template></div>', '<div><template v-for="item in items"><div></div><div></div></template></div>',
`with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [_c('div',{key:_$s(1,'f',{forIndex:$20,keyIndex:0,key:1+'-0'+$30})}),_c('div',{key:_$s(1,'f',{forIndex:$20,keyIndex:1,key:1+'-1'+$30})})]})],2)}` `with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [_c('div',{key:_$s(1,'f',{forIndex:$20,keyIndex:0,key:1+'-0'+$30})}),_c('div',{key:_$s(1,'f',{forIndex:$20,keyIndex:1,key:1+'-1'+$30})})]})],2)}`
) )
assertCodegen( assertCodegen(
'<div><template v-for="item in items">text</template></div>', '<div><template v-for="item in items">text</template></div>',
`with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return void 0})],2)}` `with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return void 0})],2)}`
) )
assertCodegen( assertCodegen(
'<div><template v-for="item in items">{{text}}</template></div>', '<div><template v-for="item in items">{{text}}</template></div>',
`with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [_v((_$s(("1-"+$30),'t0',_s(text))))]})],2)}` `with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [_v((_$s(("1-"+$30),'t0',_s(text))))]})],2)}`
) )
assertCodegen( assertCodegen(
'<div><template v-for="item in items"><span></span>{{text}}</template></div>', '<div><template v-for="item in items"><span></span>{{text}}</template></div>',
`with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [_c('span',{key:_$s(1,'f',{forIndex:$20,keyIndex:0,key:1+'-0'+$30})}),_v((_$s(("1-"+$30),'t0',_s(text))))]})],2)}` `with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [_c('span',{key:_$s(1,'f',{forIndex:$20,keyIndex:0,key:1+'-0'+$30})}),_v((_$s(("1-"+$30),'t0',_s(text))))]})],2)}`
) )
assertCodegen( assertCodegen(
'<div><template v-for="item in items">a {{text1}} b {{text2}}</template></div>', '<div><template v-for="item in items">a {{text1}} b {{text2}}</template></div>',
`with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [_v((_$s(("1-"+$30),'t0',_s(text1)))+(_$s(("1-"+$30),'t1',_s(text2))))]})],2)}` `with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [_v((_$s(("1-"+$30),'t0',_s(text1)))+(_$s(("1-"+$30),'t1',_s(text2))))]})],2)}`
) )
assertCodegen( assertCodegen(
'<div><template v-for="item in items"><span v-if="item.sub"></span></template></div>', '<div><template v-for="item in items"><span v-if="item.sub"></span></template></div>',
`with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [(_$s(("2-"+$30),'i',item.sub))?_c('span',{key:_$s(1,'f',{forIndex:$20,keyIndex:0,key:1+'-0'+$30})}):_e()]})],2)}` `with(this){return _c('div',[_l((_$s(1,'f',{forItems:items})),function(item,$10,$20,$30){return [(_$s(("2-"+$30),'i',item.sub))?_c('span',{key:_$s(1,'f',{forIndex:$20,keyIndex:0,key:1+'-0'+$30})}):_e()]})],2)}`
) )
}) })
it('generate text with multiple statements', () => { it('generate text with multiple statements', () => {
assertCodegen( assertCodegen(
`<div :id="'a'+b">A{{ d | e | f }}B{{text}}C</div>`, `<div :id="'a'+b">A{{ d | e | f }}B{{text}}C</div>`,
`with(this){return _c('div',{attrs:{"id":_$s(0,'a-id','a'+b),"_i":0}},[_v((_$s(0,'t0',_s(_f("f")(_f("e")(d)))))+(_$s(0,'t1',_s(text))))])}` `with(this){return _c('div',{attrs:{"id":_$s(0,'a-id','a'+b),"_i":0}},[_v((_$s(0,'t0',_s(_f("f")(_f("e")(d)))))+(_$s(0,'t1',_s(text))))])}`
) )
})
it('generate v-slot', () => {
assertCodegen(
'<current-user v-slot="{ user }">{{ user.firstName }}</current-user>',
`with(this){return _c('current-user',{attrs:{"_i":0},scopedSlots:_u([{key:"default",fn:function({ user }, _svm, _si){return [_v((_svm._$s(("0-"+_si),'t0',_s(user.firstName))))]}}])})}`
)
assertCodegen(
'<current-user>ABCD</current-user>',
`with(this){return _c('current-user',{attrs:{"_i":0}},[_v("")])}`
)
assertCodegen(
`<current-user>
<template v-slot:default="{result}">
<view v-for="(item,index) in result.list">{{item.name}}</view>
</template>
</current-user>`,
`with(this){return _c('current-user',{attrs:{"_i":0},scopedSlots:_u([{key:"default",fn:function({result}, _svm, _si){return _l((_svm._$s(("2-"+_si),'f',{forItems:result.list})),function(item,index,$20,$30){return _c('view',{key:_svm._$s(("2-"+_si),'f',{forIndex:$20,key:("2-"+_si)+'-'+$30}),attrs:{"_i":(("2-"+_si)+$30)}},[_v((_svm._$s((("2-"+_si)+$30),'t0',_s(item.name))))])})}}])})}`
)
})
it('generate keep-alive', () => {
assertCodegen(
`<keep-alive exclude="componentWithStatus1"><component is="componentWithStatus"/></keep-alive>`,
`with(this){return _c('keep-alive',{attrs:{"exclude":"componentWithStatus1","_i":0}},[_c("componentWithStatus",{tag:"component",attrs:{"_i":1}})],1)}`
)
assertCodegen(
`<keep-alive :exclude="componentWithStatus1"><component :is="'componentWithStatus'+index"/></keep-alive>`,
`with(this){return _c('keep-alive',{attrs:{"exclude":_$s(0,'a-exclude',componentWithStatus1),"_i":0}},[_c(_$s(1,'is','componentWithStatus'+index),{tag:"component",attrs:{"_i":1}})],1)}`
)
})
it('generate wxs props', () => {
assertCodegen(
'<p :change:prop="swipe.sizeReady" :prop="pos" @touchstart="swipe.touchstart" @touchmove="swipe.touchmove" @touchend="swipe.touchend" @change="change"></p>',
`with(this){return _c('p',{wxsProps:{"change:prop":"pos"},attrs:{"prop":_$s(0,'change:pos',pos),"_i":0},on:{"change":change}})}`
)
})
it('generate staticClass and id', () => {
assertCodegen(
'<view id="aaa" class="bbbb"></view>',
`with(this){return _c('view',{staticClass:_$s(0,'sc',"bbbb"),attrs:{"id":"aaa","_i":0}})}`
)
}) })
it('generate v-slot', () => {
assertCodegen(
'<current-user v-slot="{ user }">{{ user.firstName }}</current-user>',
`with(this){return _c('current-user',{attrs:{"_i":0},scopedSlots:_u([{key:"default",fn:function({ user }, _svm, _si){return [_v((_svm._$s(("0-"+_si),'t0',_s(user.firstName))))]}}])})}`
)
assertCodegen(
'<current-user>ABCD</current-user>',
`with(this){return _c('current-user',{attrs:{"_i":0}},[_v("")])}`
)
assertCodegen(
`<current-user>
<template v-slot:default="{result}">
<view v-for="(item,index) in result.list">{{item.name}}</view>
</template>
</current-user>`,
`with(this){return _c('current-user',{attrs:{"_i":0},scopedSlots:_u([{key:"default",fn:function({result}, _svm, _si){return _l((_svm._$s(("2-"+_si),'f',{forItems:result.list})),function(item,index,$20,$30){return _c('view',{key:_svm._$s(("2-"+_si),'f',{forIndex:$20,key:("2-"+_si)+'-'+$30}),attrs:{"_i":(("2-"+_si)+$30)}},[_v((_svm._$s((("2-"+_si)+$30),'t0',_s(item.name))))])})}}])})}`
)
})
it('generate keep-alive', () => {
assertCodegen(
`<keep-alive exclude="componentWithStatus1"><component is="componentWithStatus"/></keep-alive>`,
`with(this){return _c('keep-alive',{attrs:{"exclude":"componentWithStatus1","_i":0}},[_c("componentWithStatus",{tag:"component",attrs:{"_i":1}})],1)}`
)
assertCodegen(
`<keep-alive :exclude="componentWithStatus1"><component :is="'componentWithStatus'+index"/></keep-alive>`,
`with(this){return _c('keep-alive',{attrs:{"exclude":_$s(0,'a-exclude',componentWithStatus1),"_i":0}},[_c(_$s(1,'is','componentWithStatus'+index),{tag:"component",attrs:{"_i":1}})],1)}`
)
})
it('generate wxs props', () => {
assertCodegen(
'<p :change:prop="swipe.sizeReady" :prop="pos" @touchstart="swipe.touchstart" @touchmove="swipe.touchmove" @touchend="swipe.touchend" @change="change"></p>',
`with(this){return _c('p',{wxsProps:{"change:prop":"pos"},attrs:{"prop":_$s(0,'change:pos',pos),"_i":0},on:{"change":change}})}`
)
})
it('generate staticClass and id', () => {
assertCodegen(
'<view id="aaa" class="bbbb"></view>',
`with(this){return _c('view',{staticClass:_$s(0,'sc',"bbbb"),attrs:{"id":"aaa","_i":0}})}`
)
})
// TODO 后续优化 dataset
// it('generate dataset', () => {
// assertCodegen(
// '<view data-a="1" :data-b="b"></view>',
// `with(this){return _c('view',{attrs:{"data-a":"1","data-b":b,"_i":0}})}`
// )
// })
}) })
/* eslint-enable quotes */ /* eslint-enable quotes */
packages/uni-template-compiler/__tests__/compiler-app-plus-extra.view.spec.js
浏览文件 @ 32f99d02
...@@ -63,5 +63,12 @@ describe('codegen', () => { ...@@ -63,5 +63,12 @@ describe('codegen', () => {
`with(this){return _c('v-uni-view',{wxsProps:{"change:prop":"pos"},attrs:{"change:prop":swipe.sizeReady,"prop":_$gc(0,'change:pos'),"_i":0},on:{"touchstart":function($event){$event = $handleWxsEvent($event);swipe.touchstart($event, $getComponentDescriptor())},"touchmove":function($event){$event = $handleWxsEvent($event);swipe.touchmove($event, $getComponentDescriptor())},"touchend":function($event){$event = $handleWxsEvent($event);swipe.touchend($event, $getComponentDescriptor())},"change":function($event){return $handleViewEvent($event)}}})}` `with(this){return _c('v-uni-view',{wxsProps:{"change:prop":"pos"},attrs:{"change:prop":swipe.sizeReady,"prop":_$gc(0,'change:pos'),"_i":0},on:{"touchstart":function($event){$event = $handleWxsEvent($event);swipe.touchstart($event, $getComponentDescriptor())},"touchmove":function($event){$event = $handleWxsEvent($event);swipe.touchmove($event, $getComponentDescriptor())},"touchend":function($event){$event = $handleWxsEvent($event);swipe.touchend($event, $getComponentDescriptor())},"change":function($event){return $handleViewEvent($event)}}})}`
) )
}) })
// TODO 后续优化dataset
// it('generate dataset', () => {
// assertCodegen(
// '<view data-a="1" :data-b="b"></view>',
// `with(this){return _c('v-uni-view',{attrs:{"_i":0}})}`
// )
// })
}) })
/* eslint-enable quotes */ /* eslint-enable quotes */
packages/uni-template-compiler/__tests__/demo.js
浏览文件 @ 32f99d02
const compiler = require('../lib') const compiler = require('../lib')
const res = compiler.compile( const res = compiler.compile(
` `
<view><van-grid-item v-for="(item,index) in (4)" :key="item"></van-grid-item></view> <view data-a="1" :data-b="b"></view>
`, { `, {
miniprogram: true, miniprogram: true,
resourcePath: '/User/fxy/Documents/test.wxml', resourcePath: '/User/fxy/Documents/test.wxml',
......
packages/uni-template-compiler/lib/app/optimizer.js
浏览文件 @ 32f99d02
...@@ -63,7 +63,16 @@ function markStatic (node) { ...@@ -63,7 +63,16 @@ function markStatic (node) {
const isCustomComponent = isComponent(node.tag) const isCustomComponent = isComponent(node.tag)
if (node.attrs && !isCustomComponent && node.tag !== 'keep-alive') { // 移除静态属性 if (node.attrs && !isCustomComponent && node.tag !== 'keep-alive') { // 移除静态属性
// 保留 id 属性, selectComponent 需要使用 // 保留 id 属性, selectComponent 需要使用
node.attrs = node.attrs.filter(attr => attr.name === 'id' || attr.name === ID || isVar(attr.value)) node.attrs = node.attrs.filter(attr => {
const {
name,
value
} = attr
return name === 'id' ||
name === ID ||
// name.indexOf('data-') === 0 || // TODO dataset
isVar(value)
})
} }
node.children = node.children.filter(child => { // 移除静态文本 node.children = node.children.filter(child => { // 移除静态文本
......
packages/uni-template-compiler/lib/app/parser/base-parser.js
浏览文件 @ 32f99d02
...@@ -57,13 +57,18 @@ function parseDirs (el, genVar, ignoreDirs = []) { ...@@ -57,13 +57,18 @@ function parseDirs (el, genVar, ignoreDirs = []) {
function parseAttrs (el, genVar) { function parseAttrs (el, genVar) {
el.attrs && el.attrs.forEach(attr => { el.attrs && el.attrs.forEach(attr => {
const {
name,
value
} = attr
if ( if (
attr.name !== ID && name !== ID &&
attr.name.indexOf('change:') !== 0 && // wxs change:prop // name.indexOf('data-') !== 0 && // TODO dataset 保留
isVar(attr.value) && name.indexOf('change:') !== 0 && // wxs change:prop
attr.value.indexOf('_$') !== 0 // 已被提前处理过了，如 wxs prop:_$gc(2,'change:prop') isVar(value) &&
value.indexOf('_$') !== 0 // 已被提前处理过了，如 wxs prop:_$gc(2,'change:prop')
) { ) {
attr.value = genVar('a-' + attr.name, attr.value) attr.value = genVar('a-' + name, value)
} }
}) })
} }
......
packages/uni-template-compiler/lib/app/view.js
浏览文件 @ 32f99d02
...@@ -139,6 +139,11 @@ function transformNode (el, parent, state, isScopedSlot) { ...@@ -139,6 +139,11 @@ function transformNode (el, parent, state, isScopedSlot) {
parseWxsProps(el, { parseWxsProps(el, {
isAppView: true isAppView: true
}) })
// if (el.attrs) { // TODO 过滤 dataset
// el.attrs = el.attrs.filter(attr => attr.name.indexOf('data-') !== 0)
// }
parseAttrs(el, genVar) parseAttrs(el, genVar)
parseProps(el, genVar) parseProps(el, genVar)
......
src/core/runtime/mp/constants.js
浏览文件 @ 32f99d02
export const SOURCE_KEY = '__data__' export const SOURCE_KEY = '__data__'
export const COMPONENT_LIFECYCLE = { export const COMPONENT_LIFECYCLE = {
'created': 'created', 'created': 'onServiceCreated',
'attached': 'created', 'attached': 'onServiceAttached',
'ready': 'mounted', 'ready': 'mounted',
'moved': 'moved', 'moved': 'moved',
'detached': 'destroyed' 'detached': 'destroyed'
......
src/core/runtime/mp/index.js
浏览文件 @ 32f99d02
...@@ -8,6 +8,10 @@ import { ...@@ -8,6 +8,10 @@ import {
parseComponent parseComponent
} from './parser/component-parser' } from './parser/component-parser'
import {
handleRelations
} from './polyfill/relations'
import polyfill from './polyfill/index' import polyfill from './polyfill/index'
export * from './wxs' export * from './wxs'
...@@ -23,10 +27,21 @@ export function Page (options) { ...@@ -23,10 +27,21 @@ export function Page (options) {
global['__wxComponents'][global['__wxRoute']] = pageOptions global['__wxComponents'][global['__wxRoute']] = pageOptions
} }
function initRelationsHandler (vueComponentOptions) {
// linked 需要在当前组件 attached 之后再执行
if (!vueComponentOptions['onServiceAttached']) {
vueComponentOptions['onServiceAttached'] = []
}
vueComponentOptions['onServiceAttached'].push(function onServiceAttached () {
handleRelations(this, 'linked')
})
}
export function Component (options) { export function Component (options) {
const componentOptions = parseComponent(options) const componentOptions = parseComponent(options)
componentOptions.mixins.unshift(polyfill) componentOptions.mixins.unshift(polyfill)
componentOptions.mpOptions.path = global['__wxRoute'] componentOptions.mpOptions.path = global['__wxRoute']
initRelationsHandler(componentOptions)
global['__wxComponents'][global['__wxRoute']] = componentOptions global['__wxComponents'][global['__wxRoute']] = componentOptions
} }
......
src/core/runtime/mp/parser/lifecycle-parser.js
浏览文件 @ 32f99d02
...@@ -13,5 +13,5 @@ export function parseLifecycle (mpComponentOptions, vueComponentOptions) { ...@@ -13,5 +13,5 @@ export function parseLifecycle (mpComponentOptions, vueComponentOptions) {
(vueComponentOptions[COMPONENT_LIFECYCLE[name]] || (vueComponentOptions[COMPONENT_LIFECYCLE[name]] = [])) (vueComponentOptions[COMPONENT_LIFECYCLE[name]] || (vueComponentOptions[COMPONENT_LIFECYCLE[name]] = []))
.push(mpComponentOptions[name]) .push(mpComponentOptions[name])
} }
}) })
} }
src/core/runtime/mp/polyfill/index.js
浏览文件 @ 32f99d02
...@@ -13,17 +13,18 @@ import { ...@@ -13,17 +13,18 @@ import {
import { import {
handleObservers handleObservers
} from './observers' } from './observers'
export default { export default {
beforeCreate () { beforeCreate () {
// 取消 development 时的 Proxy,避免小程序组件模板中使用尚未定义的属性告警
this._renderProxy = this
},
created () { // properties 中可能会访问 methods,故需要在 created 中初始化
initState(this) initState(this)
initMethods(this) initMethods(this)
initRelations(this) initRelations(this)
}, },
created () {
handleRelations(this, 'linked')
},
mounted () { mounted () {
handleObservers(this) handleObservers(this)
}, },
......
src/core/runtime/mp/polyfill/relations.js
浏览文件 @ 32f99d02
function initRelationHandlers (type, handler, target, ctx, handlerCtx) { function initRelationHandlers (type, handler, target, ctx) {
if (!handler) { if (!handler) {
return return
} }
const name = `_$${type}Handlers`; const name = `_$${type}Handlers`;
(handlerCtx[name] || (handlerCtx[name] = [])).push(function () { (ctx[name] || (ctx[name] = [])).push(function () {
handler.call(ctx, target) handler.call(ctx, target)
}) })
} }
function initLinkedHandlers (relation, target, ctx, handlerCtx) { function initLinkedHandlers (relation, target, ctx) {
const type = 'linked' const type = 'linked'
const name = relation.name const name = relation.name
const relationNodes = ctx._$relationNodes || (ctx._$relationNodes = Object.create(null)); const relationNodes = ctx._$relationNodes || (ctx._$relationNodes = Object.create(null));
(relationNodes[name] || (relationNodes[name] = [])).push(target) (relationNodes[name] || (relationNodes[name] = [])).push(target)
initRelationHandlers(type, relation[type], target, ctx, handlerCtx) initRelationHandlers(type, relation[type], target, ctx)
} }
function initUnlinkedHandlers (relation, target, ctx, handlerCtx) { function initUnlinkedHandlers (relation, target, ctx) {
const type = 'unlinked' const type = 'unlinked'
initRelationHandlers(type, relation[type], target, ctx, handlerCtx) initRelationHandlers(type, relation[type], target, ctx)
} }
function findParentRelation (parentVm, target, type) { function findParentRelation (parentVm, target, type) {
...@@ -44,12 +44,12 @@ function initParentRelation (vm, childRelation, match) { ...@@ -44,12 +44,12 @@ function initParentRelation (vm, childRelation, match) {
if (!parentRelation) { if (!parentRelation) {
return return
} }
// 先父后子
initLinkedHandlers(parentRelation, vm, parentVm, vm)
initLinkedHandlers(childRelation, parentVm, vm, vm)
initUnlinkedHandlers(parentRelation, vm, parentVm, vm) initLinkedHandlers(parentRelation, vm, parentVm)
initUnlinkedHandlers(childRelation, parentVm, vm, vm) initLinkedHandlers(childRelation, parentVm, vm)
initUnlinkedHandlers(parentRelation, vm, parentVm)
initUnlinkedHandlers(childRelation, parentVm, vm)
} }
function initRelation (relation, vm) { function initRelation (relation, vm) {
......
src/core/runtime/mp/polyfill/state/properties.js
浏览文件 @ 32f99d02
...@@ -43,7 +43,12 @@ function validateProp (key, propsOptions, propsData, vm) { ...@@ -43,7 +43,12 @@ function validateProp (key, propsOptions, propsData, vm) {
value = !!value value = !!value
} }
const observer = propOptions && propOptions.observer const observer = propOptions && propOptions.observer
observer && observe(observer, vm, value) if (observer) {
// 初始化时,异步触发 observer,否则 observer 中无法访问 methods 或其他
setTimeout(function () {
observe(observer, vm, value)
}, 4)
}
return value return value
} }
return getPropertyVal(propsOptions[key]) return getPropertyVal(propsOptions[key])
...@@ -84,7 +89,7 @@ export function initProperties (vm, instanceData) { ...@@ -84,7 +89,7 @@ export function initProperties (vm, instanceData) {
/* eslint-disable no-self-compare */ /* eslint-disable no-self-compare */
if (newVal === value || (newVal !== newVal && value !== value)) { if (newVal === value || (newVal !== newVal && value !== value)) {
return return
} }
value = newVal value = newVal
if (observer) { if (observer) {
observe(observer, vm, newVal, oldVal) observe(observer, vm, newVal, oldVal)
......
src/core/service/plugins/lifecycle.js
浏览文件 @ 32f99d02
...@@ -28,7 +28,10 @@ const LIFECYCLE_HOOKS = [ ...@@ -28,7 +28,10 @@ const LIFECYCLE_HOOKS = [
// 'onReady', // 兼容旧版本，应该移除该事件 // 'onReady', // 兼容旧版本，应该移除该事件
'onPageShow', 'onPageShow',
'onPageHide', 'onPageHide',
'onPageResize' 'onPageResize',
// 小程序的 created,attached 生命周期(需要在 service 层的 Vue 内核 mounted 时触发,因小程序 created 可以使用 selectComponent)
'onServiceCreated',
'onServiceAttached'
] ]
export function lifecycleMixin (Vue) { export function lifecycleMixin (Vue) {
// fixed vue-class-component // fixed vue-class-component
......
src/core/service/plugins/polyfill.js
浏览文件 @ 32f99d02
...@@ -12,7 +12,15 @@ function parseSelector (selector) { ...@@ -12,7 +12,15 @@ function parseSelector (selector) {
if (selector.indexOf('#') === 0) { if (selector.indexOf('#') === 0) {
const id = selector.substr(1) const id = selector.substr(1)
return function match (vnode) { return function match (vnode) {
return vnode.data && vnode.data.attrs && vnode.data.attrs.id === id // props
if (vnode.componentInstance && vnode.componentInstance.id === id) {
return true
}
// attrs
if (vnode.data && vnode.data.attrs && vnode.data.attrs.id === id) {
return true
}
return false
} }
} else if (selector.indexOf('.') === 0) { } else if (selector.indexOf('.') === 0) {
const clazz = selector.substr(1) const clazz = selector.substr(1)
...@@ -52,17 +60,21 @@ function querySelectorAll (vm, matchSelector, ret) { ...@@ -52,17 +60,21 @@ function querySelectorAll (vm, matchSelector, ret) {
} }
const $children = vm.$children const $children = vm.$children
for (let i = 0; i < $children.length; i++) { for (let i = 0; i < $children.length; i++) {
const childVm = querySelectorAll($children[i], matchSelector, ret) querySelectorAll($children[i], matchSelector, ret)
childVm && ret.push(childVm)
} }
return ret
} }
export function initPolyfill (Vue) { export function initPolyfill (Vue) {
Vue.prototype.createIntersectionObserver = function createIntersectionObserver (options) {
return uni.createIntersectionObserver(this, options)
}
Vue.prototype.selectComponent = function selectComponent (selector) { Vue.prototype.selectComponent = function selectComponent (selector) {
return querySelector(this, parseSelector(selector)) return querySelector(this, parseSelector(selector))
} }
Vue.prototype.selectAllComponent = function selectAllComponent (selector) { Vue.prototype.selectAllComponents = function selectAllComponents (selector) {
return querySelectorAll(this, parseSelector(selector), []) return querySelectorAll(this, parseSelector(selector), [])
} }
} }
src/core/view/bridge/subscribe/api/util.js
浏览文件 @ 32f99d02
...@@ -12,7 +12,10 @@ function findVmById (id, vm) { ...@@ -12,7 +12,10 @@ function findVmById (id, vm) {
} }
} }
export function findElm (component, pageVm) { export function findElm (component, pageVm) {
if (!pageVm) {
return console.error(`page is not ready`)
}
if (!component) { if (!component) {
return pageVm.$el return pageVm.$el
} }
......
src/platforms/app-plus/service/framework/page.js
浏览文件 @ 32f99d02
...@@ -95,8 +95,8 @@ export function registerPage ({ ...@@ -95,8 +95,8 @@ export function registerPage ({
selectComponent (selector) { selectComponent (selector) {
return this.$vm.selectComponent(selector) return this.$vm.selectComponent(selector)
}, },
selectAllComponent (selector) { selectAllComponents (selector) {
return this.$vm.selectAllComponent(selector) return this.$vm.selectAllComponents(selector)
} }
} }
......
src/platforms/app-plus/service/framework/plugins/data.js
浏览文件 @ 32f99d02
...@@ -144,6 +144,12 @@ function setData (id, name, value) { ...@@ -144,6 +144,12 @@ function setData (id, name, value) {
case V_FOR: case V_FOR:
return setForData.call(this, id, value) return setForData.call(this, id, value)
} }
// TODO 暂时先传递 dataset 至 view 层(理论上不需要)
if (name.indexOf('a-data-') === 0) {
try {
value = JSON.stringify(value)
} catch (e) {}
}
return ((this._$newData[id] || (this._$newData[id] = {}))[name] = value) return ((this._$newData[id] || (this._$newData[id] = {}))[name] = value)
} }
......
src/platforms/app-plus/service/framework/plugins/diff.js
浏览文件 @ 32f99d02
...@@ -3,7 +3,8 @@ import { ...@@ -3,7 +3,8 @@ import {
} from 'uni-shared' } from 'uni-shared'
import { import {
V_FOR V_FOR,
B_STYLE
} from '../../constants' } from '../../constants'
function setResult (data, k, v) { function setResult (data, k, v) {
...@@ -52,11 +53,14 @@ function diffElmData (newObj, oldObj) { ...@@ -52,11 +53,14 @@ function diffElmData (newObj, oldObj) {
old = oldObj[key] old = oldObj[key]
if (old !== cur) { if (old !== cur) {
// 全量同步 style (因为 style 可能会动态删除部分样式) // 全量同步 style (因为 style 可能会动态删除部分样式)
// if (key === B_STYLE && isPlainObject(cur) && isPlainObject(old)) { if (key === B_STYLE && isPlainObject(cur) && isPlainObject(old)) {
// const style = diffObject(cur, old) if (Object.keys(cur).length !== Object.keys(old).length) { // 长度不等
// style && setResult(result || (result = Object.create(null)), B_STYLE, style) setResult(result || (result = Object.create(null)), B_STYLE, cur)
// } else } else {
if (key === V_FOR && Array.isArray(cur) && Array.isArray(old)) { const style = diffObject(cur, old, false)
style && setResult(result || (result = Object.create(null)), B_STYLE, style)
}
} else if (key === V_FOR && Array.isArray(cur) && Array.isArray(old)) {
const vFor = diffArray(cur, old) const vFor = diffArray(cur, old)
vFor && setResult(result || (result = Object.create(null)), V_FOR, vFor) vFor && setResult(result || (result = Object.create(null)), V_FOR, vFor)
} else { } else {
......
src/platforms/app-plus/service/framework/plugins/vdom-sync.js
浏览文件 @ 32f99d02
...@@ -152,20 +152,20 @@ export class VDomSync { ...@@ -152,20 +152,20 @@ export class VDomSync {
this.initialized = true this.initialized = true
this.batchData.push([PAGE_CREATED, [this.pageId, this.pagePath]]) this.batchData.push([PAGE_CREATED, [this.pageId, this.pagePath]])
} }
this.batchData = this.batchData.filter(data => { const batchData = this.batchData.filter(data => {
if (data[0] === UPDATED_DATA && !Object.keys(data[1][1]).length) { if (data[0] === UPDATED_DATA && !Object.keys(data[1][1]).length) {
return false return false
} }
return true return true
}) })
if (this.batchData.length) { this.batchData.length = 0
if (batchData.length) {
UniServiceJSBridge.publishHandler(VD_SYNC, { UniServiceJSBridge.publishHandler(VD_SYNC, {
data: this.batchData, data: batchData,
options: { options: {
timestamp: Date.now() timestamp: Date.now()
} }
}, [this.pageId]) }, [this.pageId])
this.batchData.length = 0
} }
} }
......
src/platforms/app-plus/view/framework/plugins/data.js
浏览文件 @ 32f99d02
...@@ -34,8 +34,8 @@ const handleData = { ...@@ -34,8 +34,8 @@ const handleData = {
const [pageId, pagePath, pageOptions] = data const [pageId, pagePath, pageOptions] = data
document.title = `${pagePath}[${pageId}]` document.title = `${pagePath}[${pageId}]`
// 设置当前页面伪对象，方便其他地方使用 getCurrentPages 获取当前页面 id，route // 设置当前页面伪对象，方便其他地方使用 getCurrentPages 获取当前页面 id，route
setCurrentPage(pageId, pagePath) setCurrentPage(pageId, pagePath)
// 通知页面创建，根据当前页面配置信息，初始化部分事件 // 通知页面创建，根据当前页面配置信息，初始化部分事件
UniViewJSBridge.subscribeHandler(ON_PAGE_CREATE, pageOptions, pageId) UniViewJSBridge.subscribeHandler(ON_PAGE_CREATE, pageOptions, pageId)
// 初始化当前页面 VueComponent（生成页面样式代码） // 初始化当前页面 VueComponent（生成页面样式代码）
PageVueComponent = getPageVueComponent(pagePath) PageVueComponent = getPageVueComponent(pagePath)
...@@ -103,6 +103,9 @@ function vdSync ({ ...@@ -103,6 +103,9 @@ function vdSync ({
function getData (id, name) { function getData (id, name) {
try { try {
if (name.indexOf('a-data-') === 0) { // TODO 临时方案序列化,反序列化dataset,后续应该将dataset保留在service层
return JSON.parse(this.$r[id][name])
}
return this.$r[id][name] return this.$r[id][name]
} catch (e) { } catch (e) {
console.error(this.$options.__file + `:[${this._$id}]$r[${id}][${name}] is undefined`) console.error(this.$options.__file + `:[${this._$id}]$r[${id}][${name}] is undefined`)
...@@ -124,7 +127,7 @@ function getChangeData (id, name) { ...@@ -124,7 +127,7 @@ function getChangeData (id, name) {
} }
export function initData (Vue) { export function initData (Vue) {
Vue.prototype._$g = getData Vue.prototype._$g = getData
Vue.prototype._$gc = getChangeData Vue.prototype._$gc = getChangeData
UniViewJSBridge.subscribe(VD_SYNC, vdSync) UniViewJSBridge.subscribe(VD_SYNC, vdSync)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或