Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
anyefeiyu
uni-app
提交
b20b1709
U
uni-app
项目概览
anyefeiyu
/
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,发现更多精彩内容 >>
提交
b20b1709
编写于
4月 14, 2020
作者:
fxy060608
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/dcloudio/uni-app
into dev-quickapp
上级
e3ac2abf
87b52f83
变更
11
展开全部
隐藏空白更改
内联
并排
Showing
11 changed file
with
61 addition
and
40 deletion
+61
-40
packages/uni-app-plus/dist/index.v3.js
packages/uni-app-plus/dist/index.v3.js
+14
-7
packages/uni-cli-shared/lib/index.js
packages/uni-cli-shared/lib/index.js
+6
-4
packages/uni-h5/dist/index.css
packages/uni-h5/dist/index.css
+1
-1
packages/uni-h5/dist/index.umd.min.js
packages/uni-h5/dist/index.umd.min.js
+1
-1
packages/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js
packages/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js
+1
-1
src/core/helpers/patch.js
src/core/helpers/patch.js
+5
-4
src/core/runtime/wrapper/util.js
src/core/runtime/wrapper/util.js
+17
-13
src/platforms/app-plus/service/api/device/bluetooth.js
src/platforms/app-plus/service/api/device/bluetooth.js
+0
-2
src/platforms/app-plus/service/api/media/choose-image.js
src/platforms/app-plus/service/api/media/choose-image.js
+2
-1
src/platforms/app-plus/service/framework/plugins/vdom-sync.js
...platforms/app-plus/service/framework/plugins/vdom-sync.js
+5
-4
src/platforms/mp-alipay/runtime/wrapper/util.js
src/platforms/mp-alipay/runtime/wrapper/util.js
+9
-2
未找到文件。
packages/uni-app-plus/dist/index.v3.js
浏览文件 @
b20b1709
...
...
@@ -4037,7 +4037,6 @@ var serviceContext = (function () {
var
onBluetoothAdapterStateChange
;
var
onBluetoothDeviceFound
;
var
onBLEConnectionStateChange
;
var
onBLEConnectionStateChanged
;
var
onBLECharacteristicValueChange
;
function
openBluetoothAdapter
(
data
,
callbackId
)
{
...
...
@@ -4072,7 +4071,6 @@ var serviceContext = (function () {
function
createBLEConnection
(
data
,
callbackId
)
{
onBLEConnectionStateChange
=
onBLEConnectionStateChange
||
bluetoothOn
(
'
onBLEConnectionStateChange
'
);
onBLEConnectionStateChanged
=
onBLEConnectionStateChanged
||
bluetoothOn
(
'
onBLEConnectionStateChanged
'
);
bluetoothExec
(
'
createBLEConnection
'
,
callbackId
,
data
);
}
...
...
@@ -5925,7 +5923,8 @@ var serviceContext = (function () {
const
camera
=
plus
.
camera
.
getCamera
();
camera
.
captureImage
(
e
=>
invokeChooseImage
(
callbackId
,
'
ok
'
,
sizeType
,
[
e
]),
e
=>
invokeChooseImage
(
callbackId
,
'
fail
'
,
1
),
{
filename
:
TEMP_PATH
+
'
/camera/
'
filename
:
TEMP_PATH
+
'
/camera/
'
,
resolution
:
'
high
'
});
};
const
openAlbum
=
function
(
callbackId
,
sizeType
,
count
)
{
...
...
@@ -13016,6 +13015,17 @@ var serviceContext = (function () {
};
}
/**
* mpvue event
*/
function
wrapperMPEvent
(
event
)
{
event
.
mp
=
Object
.
assign
({
'
@warning
'
:
'
mp is deprecated
'
},
event
);
event
.
_processed
=
true
;
return
event
}
const
isAndroid
=
plus
.
os
.
name
.
toLowerCase
()
===
'
android
'
;
const
FOCUS_TIMEOUT
=
isAndroid
?
300
:
700
;
const
HIDE_TIMEOUT
=
isAndroid
?
800
:
300
;
...
...
@@ -13105,10 +13115,7 @@ var serviceContext = (function () {
parseTargets
(
event
);
event
.
preventDefault
=
noop
;
event
.
stopPropagation
=
noop
;
event
.
mp
=
event
;
return
Object
.
assign
({
mp
:
event
// mpvue
},
event
)
return
wrapperMPEvent
(
event
)
}
const
handleVdData
=
{
...
...
packages/uni-cli-shared/lib/index.js
浏览文件 @
b20b1709
...
...
@@ -22,7 +22,7 @@ const {
}
=
require
(
'
./pages
'
)
const
{
md5
,
md5
,
hasOwn
,
hasModule
,
hashify
,
...
...
@@ -56,12 +56,13 @@ const {
htmlPreprocessOptions
,
nvueJsPreprocessOptions
,
nvueCssPreprocessOptions
,
nvueHtmlPreprocessOptions
nvueHtmlPreprocessOptions
,
getPlatformGlobal
}
=
require
(
'
./platform
'
)
module
.
exports
=
{
md5
,
tags
,
tags
,
hasOwn
,
getJson
,
parseJson
,
...
...
@@ -104,5 +105,6 @@ module.exports = {
htmlPreprocessOptions
,
nvueJsPreprocessOptions
,
nvueCssPreprocessOptions
,
nvueHtmlPreprocessOptions
nvueHtmlPreprocessOptions
,
getPlatformGlobal
}
packages/uni-h5/dist/index.css
浏览文件 @
b20b1709
此差异已折叠。
点击以展开。
packages/uni-h5/dist/index.umd.min.js
浏览文件 @
b20b1709
此差异已折叠。
点击以展开。
packages/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js
浏览文件 @
b20b1709
此差异已折叠。
点击以展开。
src/core/helpers/patch.js
浏览文件 @
b20b1709
...
...
@@ -6,10 +6,11 @@ import {
* mpvue event
*/
export
function
wrapperMPEvent
(
event
)
{
return
Object
.
assign
({
mp
:
event
,
_processed
:
true
event
.
mp
=
Object
.
assign
({
'
@warning
'
:
'
mp is deprecated
'
},
event
)
event
.
_processed
=
true
return
event
}
/**
* app-plus titleNView
...
...
@@ -48,4 +49,4 @@ export function mergeTitleNView (navigationBar, titleNView) {
}
}
return
navigationBar
}
}
src/core/runtime/wrapper/util.js
浏览文件 @
b20b1709
...
...
@@ -291,6 +291,10 @@ function wrapper (event) {
event
.
detail
=
{}
}
if
(
!
(
'
markerId
'
in
event
.
detail
)
&&
'
markerId
'
in
event
)
{
event
.
detail
.
markerId
=
event
.
markerId
}
if
(
__PLATFORM__
===
'
mp-baidu
'
)
{
// mp-baidu,checked=>value
if
(
isPlainObject
(
event
.
detail
)
&&
...
...
@@ -485,18 +489,18 @@ export function handleEvent (event) {
handlerCtx
.
$parent
.
$parent
)
{
// mp-weixin,mp-toutiao 抽象节点模拟 scoped slots
handlerCtx
=
handlerCtx
.
$parent
.
$parent
}
if
(
methodName
===
'
$emit
'
)
{
handlerCtx
.
$emit
.
apply
(
handlerCtx
,
processEventArgs
(
this
.
$vm
,
event
,
eventArray
[
1
],
eventArray
[
2
],
isCustom
,
methodName
))
return
}
if
(
methodName
===
'
$emit
'
)
{
handlerCtx
.
$emit
.
apply
(
handlerCtx
,
processEventArgs
(
this
.
$vm
,
event
,
eventArray
[
1
],
eventArray
[
2
],
isCustom
,
methodName
))
return
}
const
handler
=
handlerCtx
[
methodName
]
if
(
!
isFn
(
handler
))
{
...
...
@@ -528,4 +532,4 @@ export function handleEvent (event) {
)
{
return
ret
[
0
]
}
}
}
src/platforms/app-plus/service/api/device/bluetooth.js
浏览文件 @
b20b1709
...
...
@@ -54,7 +54,6 @@ function bluetoothOn (method, beforeSuccess) {
var
onBluetoothAdapterStateChange
var
onBluetoothDeviceFound
var
onBLEConnectionStateChange
var
onBLEConnectionStateChanged
var
onBLECharacteristicValueChange
export
function
openBluetoothAdapter
(
data
,
callbackId
)
{
...
...
@@ -89,7 +88,6 @@ export function getConnectedBluetoothDevices (data, callbackId) {
export
function
createBLEConnection
(
data
,
callbackId
)
{
onBLEConnectionStateChange
=
onBLEConnectionStateChange
||
bluetoothOn
(
'
onBLEConnectionStateChange
'
)
onBLEConnectionStateChanged
=
onBLEConnectionStateChanged
||
bluetoothOn
(
'
onBLEConnectionStateChanged
'
)
bluetoothExec
(
'
createBLEConnection
'
,
callbackId
,
data
)
}
...
...
src/platforms/app-plus/service/api/media/choose-image.js
浏览文件 @
b20b1709
...
...
@@ -97,7 +97,8 @@ const openCamera = function (callbackId, sizeType) {
const
camera
=
plus
.
camera
.
getCamera
()
camera
.
captureImage
(
e
=>
invokeChooseImage
(
callbackId
,
'
ok
'
,
sizeType
,
[
e
]),
e
=>
invokeChooseImage
(
callbackId
,
'
fail
'
,
1
),
{
filename
:
TEMP_PATH
+
'
/camera/
'
filename
:
TEMP_PATH
+
'
/camera/
'
,
resolution
:
'
high
'
})
}
const
openAlbum
=
function
(
callbackId
,
sizeType
,
count
)
{
...
...
src/platforms/app-plus/service/framework/plugins/vdom-sync.js
浏览文件 @
b20b1709
...
...
@@ -3,6 +3,10 @@ import {
noop
}
from
'
uni-shared
'
import
{
wrapperMPEvent
}
from
'
uni-helpers/patch
'
import
{
VD_SYNC
,
UI_EVENT
,
...
...
@@ -55,10 +59,7 @@ function wrapperEvent (event) {
parseTargets
(
event
)
event
.
preventDefault
=
noop
event
.
stopPropagation
=
noop
event
.
mp
=
event
return
Object
.
assign
({
mp
:
event
// mpvue
},
event
)
return
wrapperMPEvent
(
event
)
}
const
handleVdData
=
{
...
...
src/platforms/mp-alipay/runtime/wrapper/util.js
浏览文件 @
b20b1709
import
{
isFn
,
cached
,
camelize
camelize
,
hasOwn
}
from
'
uni-shared
'
import
{
...
...
@@ -58,6 +59,12 @@ export function initSpecialMethods (mpInstance) {
specialMethods
.
forEach
(
method
=>
{
if
(
isFn
(
mpInstance
.
$vm
[
method
]))
{
mpInstance
[
method
]
=
function
(
event
)
{
if
(
!
hasOwn
(
event
,
'
detail
'
))
{
event
.
detail
=
{}
}
if
(
!
(
'
markerId
'
in
event
.
detail
)
&&
'
markerId
'
in
event
)
{
event
.
detail
.
markerId
=
event
.
markerId
}
// TODO normalizeEvent
mpInstance
.
$vm
[
method
](
event
)
}
...
...
@@ -179,4 +186,4 @@ export const handleLink = (function () {
// 支付宝通过 didMount 来实现,先子后父,故等父 ready 之后,统一初始化
(
this
.
_$childVues
||
(
this
.
_$childVues
=
[])).
unshift
(
detail
)
}
})()
})()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录