Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
tomleePHP
uni-app
提交
6b0d55e2
U
uni-app
项目概览
tomleePHP
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6b0d55e2
编写于
11月 05, 2019
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(wxs): callMethod
上级
70c13594
变更
7
展开全部
显示空白变更内容
内联
并排
Showing
7 changed file
with
220 addition
and
84 deletion
+220
-84
packages/uni-app-plus/dist/index.v3.js
packages/uni-app-plus/dist/index.v3.js
+158
-73
packages/uni-app-plus/dist/view.umd.js
packages/uni-app-plus/dist/view.umd.js
+12
-4
packages/uni-h5/dist/index.umd.min.js
packages/uni-h5/dist/index.umd.min.js
+1
-1
packages/uni-h5/manifest.json
packages/uni-h5/manifest.json
+20
-4
src/core/view/plugins/wxs/component-descriptor.js
src/core/view/plugins/wxs/component-descriptor.js
+9
-2
src/platforms/app-plus/service/framework/subscribe-handlers/index.js
...ms/app-plus/service/framework/subscribe-handlers/index.js
+4
-0
src/platforms/app-plus/service/framework/subscribe-handlers/on-wxs-invoke-call-method.js
...framework/subscribe-handlers/on-wxs-invoke-call-method.js
+16
-0
未找到文件。
packages/uni-app-plus/dist/index.v3.js
浏览文件 @
6b0d55e2
...
...
@@ -2509,6 +2509,9 @@ var serviceContext = (function () {
return
}
}
if
(
statusBarStyle
===
lastStatusBarStyle
)
{
return
}
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
{
console
.
log
(
`[uni-app] setStatusBarStyle`
,
statusBarStyle
);
}
...
...
@@ -3015,6 +3018,85 @@ var serviceContext = (function () {
return
data
}
const
DEVICE_FREQUENCY
=
200
;
const
NETWORK_TYPES
=
[
'
unknown
'
,
'
none
'
,
'
ethernet
'
,
'
wifi
'
,
'
2g
'
,
'
3g
'
,
'
4g
'
];
const
MAP_ID
=
'
__UNIAPP_MAP
'
;
const
TEMP_PATH_BASE
=
'
_doc/uniapp_temp
'
;
const
TEMP_PATH
=
`
${
TEMP_PATH_BASE
}
_
${
Date
.
now
()}
`
;
/**
* 5+错误对象转换为错误消息
* @param {*} error 5+错误对象
*/
function
toErrMsg
(
error
)
{
var
msg
=
'
base64ToTempFilePath:fail
'
;
if
(
error
&&
error
.
message
)
{
msg
+=
`
${
error
.
message
}
`
;
}
else
if
(
error
)
{
msg
+=
`
${
error
}
`
;
}
return
msg
}
function
base64ToTempFilePath
({
base64Data
,
x
,
y
,
width
,
height
,
destWidth
,
destHeight
,
canvasId
,
fileType
,
quality
}
=
{},
callbackId
)
{
var
id
=
Date
.
now
();
var
bitmap
=
new
plus
.
nativeObj
.
Bitmap
(
`bitmap
${
id
}
`
);
bitmap
.
loadBase64Data
(
base64Data
,
function
()
{
var
formats
=
[
'
jpg
'
,
'
png
'
];
var
format
=
String
(
fileType
).
toLowerCase
();
if
(
formats
.
indexOf
(
format
)
<
0
)
{
format
=
'
png
'
;
}
/**
* 保存配置
*/
var
saveOption
=
{
overwrite
:
true
,
quality
:
typeof
quality
===
'
number
'
?
quality
*
100
:
100
,
format
};
/**
* 保存文件路径
*/
var
tempFilePath
=
`
${
TEMP_PATH
}
/canvas/
${
id
}
.
${
format
}
`
;
bitmap
.
save
(
tempFilePath
,
saveOption
,
function
()
{
clear
();
invoke
(
callbackId
,
{
tempFilePath
,
errMsg
:
'
base64ToTempFilePath:ok
'
});
},
function
(
error
)
{
clear
();
invoke
(
callbackId
,
{
errMsg
:
toErrMsg
(
error
)
});
});
},
function
(
error
)
{
clear
();
invoke
(
callbackId
,
{
errMsg
:
toErrMsg
(
error
)
});
});
function
clear
()
{
bitmap
.
clear
();
}
}
function
operateMapPlayer
(
mapId
,
pageVm
,
type
,
data
)
{
const
pageId
=
pageVm
.
$page
.
id
;
UniServiceJSBridge
.
publishHandler
(
pageId
+
'
-map-
'
+
mapId
,
{
...
...
@@ -3219,14 +3301,6 @@ var serviceContext = (function () {
:
operateVideoPlayer
(
videoId
,
pageVm
,
type
,
data
);
}
const
DEVICE_FREQUENCY
=
200
;
const
NETWORK_TYPES
=
[
'
unknown
'
,
'
none
'
,
'
ethernet
'
,
'
wifi
'
,
'
2g
'
,
'
3g
'
,
'
4g
'
];
const
MAP_ID
=
'
__UNIAPP_MAP
'
;
const
TEMP_PATH_BASE
=
'
_doc/uniapp_temp
'
;
const
TEMP_PATH
=
`
${
TEMP_PATH_BASE
}
_
${
Date
.
now
()}
`
;
let
watchAccelerationId
=
false
;
let
isWatchAcceleration
=
false
;
...
...
@@ -6699,7 +6773,7 @@ var serviceContext = (function () {
}
unsubscribe
(
WEBVIEW_READY
,
onWebviewRecoveryReady
);
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
{
console
.
log
(
`UNIAPP[webview][
${
this
.
id
}
]:onWebviewRecoveryReady ready`
);
console
.
log
(
`UNIAPP[webview][
${
id
}
]:onWebviewRecoveryReady ready`
);
}
// 恢复目标页面
pageId
=
parseInt
(
pageId
);
...
...
@@ -6721,6 +6795,31 @@ var serviceContext = (function () {
});
}
function
onWebviewPopGesture
(
webview
)
{
webview
.
addEventListener
(
'
popGesture
'
,
e
=>
{
if
(
e
.
type
===
'
start
'
)
{
// 设置下一个页面的 statusBarStyle
const
pages
=
getCurrentPages
();
const
page
=
pages
[
pages
.
length
-
2
];
const
statusBarStyle
=
page
&&
page
.
$page
.
meta
.
statusBarStyle
;
statusBarStyle
&&
setStatusBarStyle
(
statusBarStyle
);
}
else
if
(
e
.
type
===
'
end
'
&&
!
e
.
result
)
{
// 拖拽未完成,设置为当前状态栏前景色
setStatusBarStyle
();
}
else
if
(
e
.
type
===
'
end
'
&&
e
.
result
)
{
const
pages
=
getCurrentPages
();
const
page
=
pages
[
pages
.
length
-
1
];
page
&&
page
.
$remove
();
setStatusBarStyle
();
UniServiceJSBridge
.
emit
(
'
onAppRoute
'
,
{
type
:
'
navigateBack
'
});
}
});
}
let
preloadWebview
;
let
id
=
2
;
...
...
@@ -6791,6 +6890,7 @@ var serviceContext = (function () {
if
(
plus
.
os
.
name
===
'
iOS
'
)
{
!
webview
.
nvue
&&
onWebviewRecovery
(
webview
,
routeOptions
);
onWebviewPopGesture
(
webview
);
}
on
(
webview
.
id
+
'
.startPullDownRefresh
'
,
()
=>
{
...
...
@@ -7785,12 +7885,13 @@ var serviceContext = (function () {
var
api
=
/*#__PURE__*/
Object
.
freeze
({
startPullDownRefresh
:
startPullDownRefresh
,
stopPullDownRefresh
:
stopPullDownRefresh
,
previewImage
:
previewImage
$1
,
getImageInfo
:
getImageInfo
$1
,
createAudioInstance
:
createAudioInstance
,
destroyAudioInstance
:
destroyAudioInstance
,
setAudioState
:
setAudioState
,
getAudioState
:
getAudioState
,
operateAudio
:
operateAudio
,
base64ToTempFilePath
:
base64ToTempFilePath
,
operateMapPlayer
:
operateMapPlayer$2
,
operateVideoPlayer
:
operateVideoPlayer$2
,
enableAccelerometer
:
enableAccelerometer
,
...
...
@@ -7847,12 +7948,12 @@ var serviceContext = (function () {
chooseImage
:
chooseImage$1
,
chooseVideo
:
chooseVideo$1
,
compressImage
:
compressImage
,
getImageInfo
:
getImageInfo$1
,
getMusicPlayerState
:
getMusicPlayerState
,
operateMusicPlayer
:
operateMusicPlayer
,
setBackgroundAudioState
:
setBackgroundAudioState
,
operateBackgroundAudio
:
operateBackgroundAudio
,
getBackgroundAudioState
:
getBackgroundAudioState
,
previewImage
:
previewImage$1
,
operateRecorder
:
operateRecorder
,
saveImageToPhotosAlbum
:
saveImageToPhotosAlbum
,
saveVideoToPhotosAlbum
:
saveVideoToPhotosAlbum
,
...
...
@@ -8500,10 +8601,6 @@ var serviceContext = (function () {
return
[
0
,
0
,
0
,
255
]
}
function
TextMetrics
(
width
)
{
this
.
width
=
width
;
}
function
Pattern
(
image
,
repetition
)
{
this
.
image
=
image
;
this
.
repetition
=
repetition
;
...
...
@@ -8528,14 +8625,6 @@ var serviceContext = (function () {
'
setTextBaseline
'
,
'
setLineDash
'
];
var
tempCanvas
;
function
getTempCanvas
()
{
if
(
!
tempCanvas
)
{
tempCanvas
=
document
.
createElement
(
'
canvas
'
);
}
return
tempCanvas
}
class
CanvasContext
{
constructor
(
id
,
pageId
)
{
this
.
id
=
id
;
...
...
@@ -8590,11 +8679,9 @@ var serviceContext = (function () {
return
new
Pattern
(
image
,
repetition
)
}
}
measureText
(
text
)
{
var
c2d
=
getTempCanvas
().
getContext
(
'
2d
'
);
c2d
.
font
=
this
.
state
.
font
;
return
new
TextMetrics
(
c2d
.
measureText
(
text
).
width
||
0
)
}
// TODO
// measureText (text) {
// }
save
()
{
this
.
actions
.
push
({
method
:
'
save
'
,
...
...
@@ -9013,10 +9100,6 @@ var serviceContext = (function () {
}
}
const
{
invokeCallbackHandler
:
invoke$1
}
=
UniServiceJSBridge
;
function
canvasGetImageData$1
({
canvasId
,
x
,
...
...
@@ -9026,7 +9109,7 @@ var serviceContext = (function () {
},
callbackId
)
{
var
pageId
=
getCurrentPageId
();
if
(
!
pageId
)
{
invoke
$1
(
callbackId
,
{
invoke
(
callbackId
,
{
errMsg
:
'
canvasGetImageData:fail
'
});
return
...
...
@@ -9036,7 +9119,7 @@ var serviceContext = (function () {
if
(
imgData
&&
imgData
.
length
)
{
data
.
data
=
new
Uint8ClampedArray
(
imgData
);
}
invoke
$1
(
callbackId
,
data
);
invoke
(
callbackId
,
data
);
});
operateCanvas
(
canvasId
,
pageId
,
'
getImageData
'
,
{
x
,
...
...
@@ -9057,13 +9140,13 @@ var serviceContext = (function () {
},
callbackId
)
{
var
pageId
=
getCurrentPageId
();
if
(
!
pageId
)
{
invoke
$1
(
callbackId
,
{
invoke
(
callbackId
,
{
errMsg
:
'
canvasPutImageData:fail
'
});
return
}
var
cId
=
canvasEventCallbacks
.
push
(
function
(
data
)
{
invoke
$1
(
callbackId
,
data
);
invoke
(
callbackId
,
data
);
});
operateCanvas
(
canvasId
,
pageId
,
'
putImageData
'
,
{
data
:
[...
data
],
...
...
@@ -9088,53 +9171,33 @@ var serviceContext = (function () {
},
callbackId
)
{
var
pageId
=
getCurrentPageId
();
if
(
!
pageId
)
{
invoke
$1
(
callbackId
,
{
invoke
(
callbackId
,
{
errMsg
:
'
canvasToTempFilePath:fail
'
});
return
}
const
cId
=
canvasEventCallbacks
.
push
(
function
({
data
,
width
,
height
base64
})
{
if
(
!
data
||
!
data
.
length
)
{
invoke$1
(
callbackId
,
{
errMsg
:
'
canvasToTempFilePath:fail
'
});
return
}
let
imgData
;
try
{
imgData
=
new
ImageData
(
new
Uint8ClampedArray
(
data
),
width
,
height
);
}
catch
(
error
)
{
invoke$1
(
callbackId
,
{
if
(
!
base64
||
!
base64
.
length
)
{
invoke
(
callbackId
,
{
errMsg
:
'
canvasToTempFilePath:fail
'
});
return
}
const
canvas
=
getTempCanvas
();
canvas
.
width
=
width
;
canvas
.
height
=
height
;
const
c2d
=
canvas
.
getContext
(
'
2d
'
);
c2d
.
putImageData
(
imgData
,
0
,
0
);
let
base64
=
canvas
.
toDataURL
(
'
image/png
'
);
const
img
=
new
Image
();
img
.
onload
=
function
()
{
if
(
fileType
===
'
jpeg
'
)
{
c2d
.
fillStyle
=
'
#fff
'
;
c2d
.
fillRect
(
0
,
0
,
width
,
width
);
}
c2d
.
drawImage
(
img
,
0
,
0
);
base64
=
canvas
.
toDataURL
(
`image/
${
fileType
}
`
,
qualit
);
invoke$1
(
callbackId
,
{
errMsg
:
'
canvasToTempFilePath:ok
'
,
tempFilePath
:
base64
});
};
img
.
src
=
base64
;
invokeMethod
(
'
base64ToTempFilePath
'
,
{
base64Data
:
base64
,
x
,
y
,
width
,
height
,
destWidth
,
destHeight
,
canvasId
,
fileType
,
qualit
},
callbackId
);
});
operateCanvas
(
canvasId
,
pageId
,
'
get
ImageData
'
,
{
operateCanvas
(
canvasId
,
pageId
,
'
get
DataUrl
'
,
{
x
,
y
,
width
,
...
...
@@ -9142,6 +9205,8 @@ var serviceContext = (function () {
destWidth
,
destHeight
,
hidpi
:
false
,
fileType
,
qualit
,
callbackId
:
cId
});
}
...
...
@@ -10744,6 +10809,23 @@ var serviceContext = (function () {
}
}
function
onWxsInvokeCallMethod
({
cid
,
method
,
args
},
pageId
)
{
pageId
=
parseInt
(
pageId
);
const
page
=
getCurrentPages
(
true
).
find
(
page
=>
page
.
$page
.
id
===
pageId
);
if
(
!
page
)
{
return
console
.
error
(
`Page[
${
pageId
}
] not found`
)
}
const
vm
=
page
.
$vm
.
_$vd
.
getVm
(
cid
);
if
(
!
vm
)
{
return
console
.
error
(
`vm[
${
cid
}
] not found`
)
}
vm
[
method
]
&&
vm
[
method
](
args
);
}
function
initSubscribeHandlers
()
{
const
{
on
,
...
...
@@ -10774,8 +10856,11 @@ var serviceContext = (function () {
on
(
'
api.
'
+
WEB_INVOKE_APPSERVICE$1
,
function
(
data
,
webviewIds
)
{
emit
(
'
onWebInvokeAppService
'
,
data
,
webviewIds
);
});
on
(
'
onWebInvokeAppService
'
,
onWebInvokeAppService
);
subscribe
(
'
onWxsInvokeCallMethod
'
,
onWxsInvokeCallMethod
);
subscribe
(
VD_SYNC
,
onVdSync
);
subscribe
(
VD_SYNC_CALLBACK
,
onVdSyncCallback
);
...
...
packages/uni-app-plus/dist/view.umd.js
浏览文件 @
6b0d55e2
...
...
@@ -13431,7 +13431,7 @@ function pageMounted() {
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return createComponentDescriptor; });
/* WEBPACK VAR INJECTION */(function(
UniViewJSBridge,
global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return createComponentDescriptor; });
/* harmony import */ var uni_shared__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
...
...
@@ -13602,8 +13602,16 @@ function () {
key: "callMethod",
value: function callMethod(funcName) {
var args = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
// TODO 需跨平台
return this.$vm[funcName] && this.$vm[funcName](JSON.parse(JSON.stringify(args))), this;
if (this.$vm[funcName]) {
this.$vm[funcName](JSON.parse(JSON.stringify(args)));
} else if (this.$vm._$id) {
UniViewJSBridge.publishHandler('onWxsInvokeCallMethod', {
cid: this.$vm._$id,
method: funcName,
args: args
});
}
}
}, {
key: "requestAnimationFrame",
...
...
@@ -13644,7 +13652,7 @@ function createComponentDescriptor(vm) {
return vm.$el.__wxsComponentDescriptor;
}
}
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(56)))
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(
4), __webpack_require__(
56)))
/***/ }),
/* 68 */
...
...
packages/uni-h5/dist/index.umd.min.js
浏览文件 @
6b0d55e2
此差异已折叠。
点击以展开。
packages/uni-h5/manifest.json
浏览文件 @
6b0d55e2
...
...
@@ -740,8 +740,12 @@
]
],
"createCanvasContext"
:
[
"/platforms/h5/service/api/context/canvas.js"
,
"/core/service/api/context/canvas.js"
,
[
[
"/platforms/h5/service/api/context/canvas.js"
,
"base64ToTempFilePath"
],
[
"/core/helpers/protocol/context/context.js"
,
"createCanvasContext"
...
...
@@ -749,8 +753,12 @@
]
],
"canvasToTempFilePath"
:
[
"/platforms/h5/service/api/context/canvas.js"
,
"/core/service/api/context/canvas.js"
,
[
[
"/platforms/h5/service/api/context/canvas.js"
,
"base64ToTempFilePath"
],
[
"/core/helpers/protocol/context/canvas.js"
,
"canvasToTempFilePath"
...
...
@@ -758,8 +766,12 @@
]
],
"canvasPutImageData"
:
[
"/platforms/h5/service/api/context/canvas.js"
,
"/core/service/api/context/canvas.js"
,
[
[
"/platforms/h5/service/api/context/canvas.js"
,
"base64ToTempFilePath"
],
[
"/core/helpers/protocol/context/canvas.js"
,
"canvasPutImageData"
...
...
@@ -767,8 +779,12 @@
]
],
"canvasGetImageData"
:
[
"/platforms/h5/service/api/context/canvas.js"
,
"/core/service/api/context/canvas.js"
,
[
[
"/platforms/h5/service/api/context/canvas.js"
,
"base64ToTempFilePath"
],
[
"/core/helpers/protocol/context/canvas.js"
,
"canvasGetImageData"
...
...
src/core/view/plugins/wxs/component-descriptor.js
浏览文件 @
6b0d55e2
...
...
@@ -128,8 +128,15 @@ class ComponentDescriptor {
}
callMethod
(
funcName
,
args
=
{})
{
// TODO 需跨平台
return
(
this
.
$vm
[
funcName
]
&&
this
.
$vm
[
funcName
](
JSON
.
parse
(
JSON
.
stringify
(
args
))),
this
)
if
(
this
.
$vm
[
funcName
])
{
this
.
$vm
[
funcName
](
JSON
.
parse
(
JSON
.
stringify
(
args
)))
}
else
if
(
this
.
$vm
.
_$id
)
{
UniViewJSBridge
.
publishHandler
(
'
onWxsInvokeCallMethod
'
,
{
cid
:
this
.
$vm
.
_$id
,
method
:
funcName
,
args
})
}
}
requestAnimationFrame
(
callback
)
{
...
...
src/platforms/app-plus/service/framework/subscribe-handlers/index.js
浏览文件 @
6b0d55e2
...
...
@@ -19,6 +19,7 @@ import onVdSyncCallback from './on-vd-sync-callback'
import
onInvokeApi
from
'
./on-invoke-api
'
import
onWebInvokeAppService
from
'
./on-web-invoke-app-service
'
import
onWxsInvokeCallMethod
from
'
./on-wxs-invoke-call-method
'
export
function
initSubscribeHandlers
()
{
const
{
...
...
@@ -50,8 +51,11 @@ export function initSubscribeHandlers () {
on
(
'
api.
'
+
WEB_INVOKE_APPSERVICE
,
function
(
data
,
webviewIds
)
{
emit
(
'
onWebInvokeAppService
'
,
data
,
webviewIds
)
})
on
(
'
onWebInvokeAppService
'
,
onWebInvokeAppService
)
subscribe
(
'
onWxsInvokeCallMethod
'
,
onWxsInvokeCallMethod
)
subscribe
(
VD_SYNC
,
onVdSync
)
subscribe
(
VD_SYNC_CALLBACK
,
onVdSyncCallback
)
...
...
src/platforms/app-plus/service/framework/subscribe-handlers/on-wxs-invoke-call-method.js
0 → 100644
浏览文件 @
6b0d55e2
export
default
function
onWxsInvokeCallMethod
({
cid
,
method
,
args
},
pageId
)
{
pageId
=
parseInt
(
pageId
)
const
page
=
getCurrentPages
(
true
).
find
(
page
=>
page
.
$page
.
id
===
pageId
)
if
(
!
page
)
{
return
console
.
error
(
`Page[
${
pageId
}
] not found`
)
}
const
vm
=
page
.
$vm
.
_$vd
.
getVm
(
cid
)
if
(
!
vm
)
{
return
console
.
error
(
`vm[
${
cid
}
] not found`
)
}
vm
[
method
]
&&
vm
[
method
](
args
)
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录