Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MuGuiLin
uni-app
提交
7c5338b8
U
uni-app
项目概览
MuGuiLin
/
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,发现更多精彩内容 >>
提交
7c5338b8
编写于
4月 09, 2019
作者:
M
mehaotian
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/dcloudio/uni-app
into dev
上级
cfe3d220
2b14a9b7
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
96 addition
and
35 deletion
+96
-35
packages/uni-app-plus/dist/index.js
packages/uni-app-plus/dist/index.js
+30
-11
packages/uni-app-plus/package.json
packages/uni-app-plus/package.json
+1
-1
packages/uni-mp-weixin/dist/index.js
packages/uni-mp-weixin/dist/index.js
+30
-11
packages/uni-mp-weixin/package.json
packages/uni-mp-weixin/package.json
+1
-1
src/core/runtime/wrapper/util.js
src/core/runtime/wrapper/util.js
+29
-8
src/platforms/mp-weixin/runtime/index.js
src/platforms/mp-weixin/runtime/index.js
+5
-3
未找到文件。
packages/uni-app-plus/dist/index.js
浏览文件 @
7c5338b8
...
...
@@ -270,10 +270,12 @@ const customize = cached((str) => {
});
function
initTriggerEvent
(
mpInstance
)
{
const
oldTriggerEvent
=
mpInstance
.
triggerEvent
;
mpInstance
.
triggerEvent
=
function
(
event
,
...
args
)
{
return
oldTriggerEvent
.
apply
(
mpInstance
,
[
customize
(
event
),
...
args
])
};
if
(
wx
.
canIUse
(
'
nextTick
'
))
{
// 微信旧版本基础库不支持重写triggerEvent
const
oldTriggerEvent
=
mpInstance
.
triggerEvent
;
mpInstance
.
triggerEvent
=
function
(
event
,
...
args
)
{
return
oldTriggerEvent
.
apply
(
mpInstance
,
[
customize
(
event
),
...
args
])
};
}
}
Page
=
function
(
options
=
{})
{
...
...
@@ -412,11 +414,18 @@ function wrapper$1 (event) {
event
.
preventDefault
=
noop
;
event
.
target
=
event
.
target
||
{};
event
.
detail
=
event
.
detail
||
{};
if
(
!
hasOwn
(
event
,
'
detail
'
))
{
event
.
detail
=
{};
}
// TODO 又得兼容 mpvue 的 mp 对象
event
.
mp
=
event
;
event
.
target
=
Object
.
assign
({},
event
.
target
,
event
.
detail
);
if
(
isPlainObject
(
event
.
detail
))
{
event
.
target
=
Object
.
assign
({},
event
.
target
,
event
.
detail
);
}
return
event
}
...
...
@@ -489,11 +498,17 @@ function processEventExtra (vm, extra) {
}
function
processEventArgs
(
vm
,
event
,
args
=
[],
extra
=
[],
isCustom
,
methodName
)
{
if
(
isCustom
&&
!
args
.
length
)
{
// 无参数,直接传入 detail 数组
if
(
!
Array
.
isArray
(
event
.
detail
))
{
// 应该是使用了 wxcomponent 原生组件,为了向前兼容,传递原始 event 对象
return
[
event
]
let
isCustomMPEvent
=
false
;
// wxcomponent 组件,传递原始 event 对象
if
(
isCustom
)
{
// 自定义事件
isCustomMPEvent
=
event
.
currentTarget
&&
event
.
currentTarget
.
dataset
&&
event
.
currentTarget
.
dataset
.
comType
===
'
wx
'
;
if
(
!
args
.
length
)
{
// 无参数,直接传入 event 或 detail 数组
if
(
isCustomMPEvent
)
{
return
[
event
]
}
return
event
.
detail
}
return
event
.
detail
}
const
extraObj
=
processEventExtra
(
vm
,
extra
);
...
...
@@ -504,7 +519,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if
(
methodName
===
'
__set_model
'
&&
!
isCustom
)
{
// input v-model value
ret
.
push
(
event
.
target
.
value
);
}
else
{
ret
.
push
(
isCustom
?
event
.
detail
[
0
]
:
event
);
if
(
isCustom
&&
!
isCustomMPEvent
)
{
ret
.
push
(
event
.
detail
[
0
]);
}
else
{
// wxcomponent 组件或内置组件
ret
.
push
(
event
);
}
}
}
else
{
if
(
typeof
arg
===
'
string
'
&&
hasOwn
(
extraObj
,
arg
))
{
...
...
packages/uni-app-plus/package.json
浏览文件 @
7c5338b8
{
"name"
:
"@dcloudio/uni-app-plus"
,
"version"
:
"0.0.2
09
"
,
"version"
:
"0.0.2
12
"
,
"description"
:
"uni-app app-plus"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
...
...
packages/uni-mp-weixin/dist/index.js
浏览文件 @
7c5338b8
...
...
@@ -297,10 +297,12 @@ const customize = cached((str) => {
});
function
initTriggerEvent
(
mpInstance
)
{
const
oldTriggerEvent
=
mpInstance
.
triggerEvent
;
mpInstance
.
triggerEvent
=
function
(
event
,
...
args
)
{
return
oldTriggerEvent
.
apply
(
mpInstance
,
[
customize
(
event
),
...
args
])
};
if
(
wx
.
canIUse
(
'
nextTick
'
))
{
// 微信旧版本基础库不支持重写triggerEvent
const
oldTriggerEvent
=
mpInstance
.
triggerEvent
;
mpInstance
.
triggerEvent
=
function
(
event
,
...
args
)
{
return
oldTriggerEvent
.
apply
(
mpInstance
,
[
customize
(
event
),
...
args
])
};
}
}
Page
=
function
(
options
=
{})
{
...
...
@@ -439,11 +441,18 @@ function wrapper$1 (event) {
event
.
preventDefault
=
noop
;
event
.
target
=
event
.
target
||
{};
event
.
detail
=
event
.
detail
||
{};
if
(
!
hasOwn
(
event
,
'
detail
'
))
{
event
.
detail
=
{};
}
// TODO 又得兼容 mpvue 的 mp 对象
event
.
mp
=
event
;
event
.
target
=
Object
.
assign
({},
event
.
target
,
event
.
detail
);
if
(
isPlainObject
(
event
.
detail
))
{
event
.
target
=
Object
.
assign
({},
event
.
target
,
event
.
detail
);
}
return
event
}
...
...
@@ -516,11 +525,17 @@ function processEventExtra (vm, extra) {
}
function
processEventArgs
(
vm
,
event
,
args
=
[],
extra
=
[],
isCustom
,
methodName
)
{
if
(
isCustom
&&
!
args
.
length
)
{
// 无参数,直接传入 detail 数组
if
(
!
Array
.
isArray
(
event
.
detail
))
{
// 应该是使用了 wxcomponent 原生组件,为了向前兼容,传递原始 event 对象
return
[
event
]
let
isCustomMPEvent
=
false
;
// wxcomponent 组件,传递原始 event 对象
if
(
isCustom
)
{
// 自定义事件
isCustomMPEvent
=
event
.
currentTarget
&&
event
.
currentTarget
.
dataset
&&
event
.
currentTarget
.
dataset
.
comType
===
'
wx
'
;
if
(
!
args
.
length
)
{
// 无参数,直接传入 event 或 detail 数组
if
(
isCustomMPEvent
)
{
return
[
event
]
}
return
event
.
detail
}
return
event
.
detail
}
const
extraObj
=
processEventExtra
(
vm
,
extra
);
...
...
@@ -531,7 +546,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if
(
methodName
===
'
__set_model
'
&&
!
isCustom
)
{
// input v-model value
ret
.
push
(
event
.
target
.
value
);
}
else
{
ret
.
push
(
isCustom
?
event
.
detail
[
0
]
:
event
);
if
(
isCustom
&&
!
isCustomMPEvent
)
{
ret
.
push
(
event
.
detail
[
0
]);
}
else
{
// wxcomponent 组件或内置组件
ret
.
push
(
event
);
}
}
}
else
{
if
(
typeof
arg
===
'
string
'
&&
hasOwn
(
extraObj
,
arg
))
{
...
...
packages/uni-mp-weixin/package.json
浏览文件 @
7c5338b8
{
"name"
:
"@dcloudio/uni-mp-weixin"
,
"version"
:
"0.0.9
28
"
,
"version"
:
"0.0.9
31
"
,
"description"
:
"uni-app mp-weixin"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
...
...
src/core/runtime/wrapper/util.js
浏览文件 @
7c5338b8
...
...
@@ -114,17 +114,28 @@ function wrapper (event) {
event
.
preventDefault
=
noop
event
.
target
=
event
.
target
||
{}
event
.
detail
=
event
.
detail
||
{}
if
(
!
hasOwn
(
event
,
'
detail
'
))
{
event
.
detail
=
{}
}
if
(
__PLATFORM__
===
'
mp-baidu
'
)
{
// mp-baidu,checked=>value
if
(
hasOwn
(
event
.
detail
,
'
checked
'
)
&&
!
hasOwn
(
event
.
detail
,
'
value
'
))
{
if
(
isPlainObject
(
event
.
detail
)
&&
hasOwn
(
event
.
detail
,
'
checked
'
)
&&
!
hasOwn
(
event
.
detail
,
'
value
'
)
)
{
event
.
detail
.
value
=
event
.
detail
.
checked
}
}
// TODO 又得兼容 mpvue 的 mp 对象
event
.
mp
=
event
event
.
target
=
Object
.
assign
({},
event
.
target
,
event
.
detail
)
if
(
isPlainObject
(
event
.
detail
))
{
event
.
target
=
Object
.
assign
({},
event
.
target
,
event
.
detail
)
}
return
event
}
...
...
@@ -197,11 +208,17 @@ function processEventExtra (vm, extra) {
}
function
processEventArgs
(
vm
,
event
,
args
=
[],
extra
=
[],
isCustom
,
methodName
)
{
if
(
isCustom
&&
!
args
.
length
)
{
// 无参数,直接传入 detail 数组
if
(
!
Array
.
isArray
(
event
.
detail
))
{
// 应该是使用了 wxcomponent 原生组件,为了向前兼容,传递原始 event 对象
return
[
event
]
let
isCustomMPEvent
=
false
// wxcomponent 组件,传递原始 event 对象
if
(
isCustom
)
{
// 自定义事件
isCustomMPEvent
=
event
.
currentTarget
&&
event
.
currentTarget
.
dataset
&&
event
.
currentTarget
.
dataset
.
comType
===
'
wx
'
if
(
!
args
.
length
)
{
// 无参数,直接传入 event 或 detail 数组
if
(
isCustomMPEvent
)
{
return
[
event
]
}
return
event
.
detail
}
return
event
.
detail
}
const
extraObj
=
processEventExtra
(
vm
,
extra
)
...
...
@@ -212,7 +229,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if
(
methodName
===
'
__set_model
'
&&
!
isCustom
)
{
// input v-model value
ret
.
push
(
event
.
target
.
value
)
}
else
{
ret
.
push
(
isCustom
?
event
.
detail
[
0
]
:
event
)
if
(
isCustom
&&
!
isCustomMPEvent
)
{
ret
.
push
(
event
.
detail
[
0
])
}
else
{
// wxcomponent 组件或内置组件
ret
.
push
(
event
)
}
}
}
else
{
if
(
typeof
arg
===
'
string
'
&&
hasOwn
(
extraObj
,
arg
))
{
...
...
src/platforms/mp-weixin/runtime/index.js
浏览文件 @
7c5338b8
...
...
@@ -13,9 +13,11 @@ const customize = cached((str) => {
})
function
initTriggerEvent
(
mpInstance
)
{
const
oldTriggerEvent
=
mpInstance
.
triggerEvent
mpInstance
.
triggerEvent
=
function
(
event
,
...
args
)
{
return
oldTriggerEvent
.
apply
(
mpInstance
,
[
customize
(
event
),
...
args
])
if
(
wx
.
canIUse
(
'
nextTick
'
))
{
// 微信旧版本基础库不支持重写triggerEvent
const
oldTriggerEvent
=
mpInstance
.
triggerEvent
mpInstance
.
triggerEvent
=
function
(
event
,
...
args
)
{
return
oldTriggerEvent
.
apply
(
mpInstance
,
[
customize
(
event
),
...
args
])
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录