Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
tomleePHP
uni-app
提交
485715f1
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,发现更多精彩内容 >>
提交
485715f1
编写于
3月 30, 2019
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:dcloudio/uni-app into dev
上级
aab2a2d3
bb599a94
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
109 addition
and
104 deletion
+109
-104
packages/uni-mp-weixin/dist/index.js
packages/uni-mp-weixin/dist/index.js
+51
-49
packages/uni-mp-weixin/package.json
packages/uni-mp-weixin/package.json
+1
-1
src/core/runtime/wrapper/create-page.js
src/core/runtime/wrapper/create-page.js
+39
-26
src/core/runtime/wrapper/util.js
src/core/runtime/wrapper/util.js
+18
-28
未找到文件。
packages/uni-mp-weixin/dist/index.js
浏览文件 @
485715f1
...
...
@@ -385,14 +385,21 @@ function wrapper$1 (event) {
return
event
}
function
processEventArgs
(
event
,
args
=
[],
isCustom
)
{
function
processEventArgs
(
event
,
args
=
[],
isCustom
,
methodName
)
{
if
(
isCustom
&&
!
args
.
length
)
{
// 无参数,直接传入 detail 数组
if
(
!
Array
.
isArray
(
event
.
detail
))
{
// 应该是使用了 wxcomponent 原生组件,为了向前兼容,传递原始 event 对象
return
[
event
]
}
return
event
.
detail
}
const
ret
=
[];
args
.
forEach
(
arg
=>
{
if
(
arg
===
'
$event
'
)
{
ret
.
push
(
isCustom
?
event
.
detail
[
0
]
:
event
);
if
(
methodName
===
'
__set_model
'
&&
!
isCustom
)
{
// input v-model value
ret
.
push
(
event
.
target
.
value
);
}
else
{
ret
.
push
(
isCustom
?
event
.
detail
[
0
]
:
event
);
}
}
else
{
ret
.
push
(
arg
);
}
...
...
@@ -404,14 +411,6 @@ function processEventArgs (event, args = [], isCustom) {
const
ONCE
=
'
~
'
;
const
CUSTOM
=
'
^
'
;
function
getTarget
(
obj
,
path
)
{
const
parts
=
path
.
split
(
'
.
'
);
if
(
parts
.
length
===
1
)
{
return
obj
[
parts
[
0
]]
}
return
getTarget
(
obj
[
parts
[
0
]],
parts
.
slice
(
1
).
join
(
'
.
'
))
}
function
handleEvent
(
event
)
{
event
=
wrapper$1
(
event
);
...
...
@@ -435,26 +434,17 @@ function handleEvent (event) {
if
(
eventsArray
&&
eventType
===
type
)
{
eventsArray
.
forEach
(
eventArray
=>
{
const
methodName
=
eventArray
[
0
];
if
(
methodName
===
'
$set
'
)
{
// prop.sync
const
args
=
eventArray
[
1
];
if
(
args
.
length
===
2
)
{
// :title.sync="title"
this
.
$vm
[
args
[
0
]]
=
event
.
detail
[
0
];
}
else
if
(
args
.
length
===
3
)
{
this
.
$vm
.
$set
(
getTarget
(
this
.
$vm
,
args
[
0
]),
args
[
1
],
event
.
detail
[
0
]);
}
}
else
{
const
handler
=
this
.
$vm
[
methodName
];
if
(
!
isFn
(
handler
))
{
throw
new
Error
(
` _vm.
${
methodName
}
is not a function`
)
}
if
(
isOnce
)
{
if
(
handler
.
once
)
{
return
}
handler
.
once
=
true
;
const
handler
=
this
.
$vm
[
methodName
];
if
(
!
isFn
(
handler
))
{
throw
new
Error
(
` _vm.
${
methodName
}
is not a function`
)
}
if
(
isOnce
)
{
if
(
handler
.
once
)
{
return
}
handler
.
apply
(
this
.
$vm
,
processEventArgs
(
event
,
eventArray
[
1
],
isCustom
))
;
handler
.
once
=
true
;
}
handler
.
apply
(
this
.
$vm
,
processEventArgs
(
event
,
eventArray
[
1
],
isCustom
,
methodName
));
});
}
});
...
...
@@ -582,36 +572,48 @@ function createPage (vueOptions) {
VueComponent
=
Vue
.
extend
(
vueOptions
);
}
const
pageOptions
=
{
options
:
{
multipleSlots
:
true
,
addGlobalClass
:
true
},
data
:
getData
(
vueOptions
,
Vue
.
prototype
),
onLoad
(
args
)
{
lifetimes
:
{
// 当页面作为组件时
attached
()
{
this
.
$vm
=
new
VueComponent
({
mpType
:
'
page
'
,
mpInstance
:
this
});
this
.
$vm
=
new
VueComponent
({
mpType
:
'
page
'
,
mpInstance
:
this
});
this
.
$vm
.
__call_hook
(
'
created
'
);
this
.
$vm
.
__call_hook
(
'
onLoad
'
,
args
);
// 开发者可能会在 onLoad 时赋值,提前到 mount 之前
this
.
$vm
.
$mount
();
},
onReady
()
{
this
.
$vm
.
_isMounted
=
true
;
this
.
$vm
.
__call_hook
(
'
mounted
'
);
this
.
$vm
.
__call_hook
(
'
onReady
'
);
},
onUnload
()
{
this
.
$vm
.
__call_hook
(
'
onUnload
'
);
{
this
.
$vm
.
__call_hook
(
'
created
'
);
this
.
$vm
.
$mount
();
},
ready
()
{
this
.
$vm
.
__call_hook
(
'
beforeMount
'
);
this
.
$vm
.
_isMounted
=
true
;
this
.
$vm
.
__call_hook
(
'
mounted
'
);
this
.
$vm
.
__call_hook
(
'
onReady
'
);
},
detached
()
{
this
.
$vm
.
$destroy
();
}
},
__e
:
handleEvent
,
__l
:
handleLink
methods
:
{
// 作为页面时
onLoad
(
args
)
{
this
.
$vm
.
$mp
.
query
=
args
;
// 又要兼容 mpvue
this
.
$vm
.
__call_hook
(
'
onLoad
'
,
args
);
// 开发者可能会在 onLoad 时赋值,提前到 mount 之前
},
onUnload
()
{
this
.
$vm
.
__call_hook
(
'
onUnload
'
);
},
__e
:
handleEvent
,
__l
:
handleLink
}
};
initHooks
(
pageOptions
,
hooks$1
);
initHooks
(
pageOptions
.
methods
,
hooks$1
);
return
Page
(
pageOptions
)
return
Component
(
pageOptions
)
}
function
initVueComponent
(
mpInstace
,
VueComponent
,
extraOptions
=
{})
{
...
...
packages/uni-mp-weixin/package.json
浏览文件 @
485715f1
{
"name"
:
"@dcloudio/uni-mp-weixin"
,
"version"
:
"0.0.9
18
"
,
"version"
:
"0.0.9
22
"
,
"description"
:
"uni-app mp-weixin"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
...
...
src/core/runtime/wrapper/create-page.js
浏览文件 @
485715f1
...
...
@@ -41,39 +41,52 @@ export function createPage (vueOptions) {
VueComponent
=
Vue
.
extend
(
vueOptions
)
}
const
pageOptions
=
{
options
:
{
multipleSlots
:
true
,
addGlobalClass
:
true
},
data
:
getData
(
vueOptions
,
Vue
.
prototype
),
onLoad
(
args
)
{
if
(
__PLATFORM__
===
'
mp-baidu
'
)
{
this
.
$baiduComponentInstances
=
Object
.
create
(
null
)
}
lifetimes
:
{
// 当页面作为组件时
attached
()
{
if
(
__PLATFORM__
===
'
mp-baidu
'
)
{
this
.
$baiduComponentInstances
=
Object
.
create
(
null
)
}
this
.
$vm
=
new
VueComponent
({
mpType
:
'
page
'
,
mpInstance
:
this
})
this
.
$vm
=
new
VueComponent
({
mpType
:
'
page
'
,
mpInstance
:
this
})
this
.
$vm
.
__call_hook
(
'
created
'
)
this
.
$vm
.
__call_hook
(
'
onLoad
'
,
args
)
// 开发者可能会在 onLoad 时赋值,提前到 mount 之前
this
.
$vm
.
$mount
()
},
onReady
()
{
this
.
$vm
.
_isMounted
=
true
this
.
$vm
.
__call_hook
(
'
mounted
'
)
this
.
$vm
.
__call_hook
(
'
onReady
'
)
},
onUnload
()
{
this
.
$vm
.
__call_hook
(
'
onUnload
'
)
if
(
__PLATFORM__
===
'
mp-baidu
'
)
{
// 百度组件不会在页面 unload 时触发 detached
baiduPageDestroy
(
this
.
$vm
)
}
else
{
this
.
$vm
.
__call_hook
(
'
created
'
)
this
.
$vm
.
$mount
()
},
ready
()
{
this
.
$vm
.
__call_hook
(
'
beforeMount
'
)
this
.
$vm
.
_isMounted
=
true
this
.
$vm
.
__call_hook
(
'
mounted
'
)
this
.
$vm
.
__call_hook
(
'
onReady
'
)
},
detached
()
{
this
.
$vm
.
$destroy
()
}
},
__e
:
handleEvent
,
__l
:
handleLink
methods
:
{
// 作为页面时
onLoad
(
args
)
{
this
.
$vm
.
$mp
.
query
=
args
// 又要兼容 mpvue
this
.
$vm
.
__call_hook
(
'
onLoad
'
,
args
)
// 开发者可能会在 onLoad 时赋值,提前到 mount 之前
},
onUnload
()
{
this
.
$vm
.
__call_hook
(
'
onUnload
'
)
if
(
__PLATFORM__
===
'
mp-baidu
'
)
{
// 百度组件不会在页面 unload 时触发 detached
baiduPageDestroy
(
this
.
$vm
)
}
},
__e
:
handleEvent
,
__l
:
handleLink
}
}
initHooks
(
pageOptions
,
hooks
)
initHooks
(
pageOptions
.
methods
,
hooks
)
return
Page
(
pageOptions
)
return
Component
(
pageOptions
)
}
src/core/runtime/wrapper/util.js
浏览文件 @
485715f1
...
...
@@ -128,14 +128,21 @@ function wrapper (event) {
return
event
}
function
processEventArgs
(
event
,
args
=
[],
isCustom
)
{
function
processEventArgs
(
event
,
args
=
[],
isCustom
,
methodName
)
{
if
(
isCustom
&&
!
args
.
length
)
{
// 无参数,直接传入 detail 数组
if
(
!
Array
.
isArray
(
event
.
detail
))
{
// 应该是使用了 wxcomponent 原生组件,为了向前兼容,传递原始 event 对象
return
[
event
]
}
return
event
.
detail
}
const
ret
=
[]
args
.
forEach
(
arg
=>
{
if
(
arg
===
'
$event
'
)
{
ret
.
push
(
isCustom
?
event
.
detail
[
0
]
:
event
)
if
(
methodName
===
'
__set_model
'
&&
!
isCustom
)
{
// input v-model value
ret
.
push
(
event
.
target
.
value
)
}
else
{
ret
.
push
(
isCustom
?
event
.
detail
[
0
]
:
event
)
}
}
else
{
ret
.
push
(
arg
)
}
...
...
@@ -147,14 +154,6 @@ function processEventArgs (event, args = [], isCustom) {
const
ONCE
=
'
~
'
const
CUSTOM
=
'
^
'
function
getTarget
(
obj
,
path
)
{
const
parts
=
path
.
split
(
'
.
'
)
if
(
parts
.
length
===
1
)
{
return
obj
[
parts
[
0
]]
}
return
getTarget
(
obj
[
parts
[
0
]],
parts
.
slice
(
1
).
join
(
'
.
'
))
}
export
function
handleEvent
(
event
)
{
event
=
wrapper
(
event
)
...
...
@@ -178,26 +177,17 @@ export function handleEvent (event) {
if
(
eventsArray
&&
eventType
===
type
)
{
eventsArray
.
forEach
(
eventArray
=>
{
const
methodName
=
eventArray
[
0
]
if
(
methodName
===
'
$set
'
)
{
// prop.sync
const
args
=
eventArray
[
1
]
if
(
args
.
length
===
2
)
{
// :title.sync="title"
this
.
$vm
[
args
[
0
]]
=
event
.
detail
[
0
]
}
else
if
(
args
.
length
===
3
)
{
this
.
$vm
.
$set
(
getTarget
(
this
.
$vm
,
args
[
0
]),
args
[
1
],
event
.
detail
[
0
])
}
}
else
{
const
handler
=
this
.
$vm
[
methodName
]
if
(
!
isFn
(
handler
))
{
throw
new
Error
(
` _vm.
${
methodName
}
is not a function`
)
}
if
(
isOnce
)
{
if
(
handler
.
once
)
{
return
}
handler
.
once
=
true
const
handler
=
this
.
$vm
[
methodName
]
if
(
!
isFn
(
handler
))
{
throw
new
Error
(
` _vm.
${
methodName
}
is not a function`
)
}
if
(
isOnce
)
{
if
(
handler
.
once
)
{
return
}
handler
.
apply
(
this
.
$vm
,
processEventArgs
(
event
,
eventArray
[
1
],
isCustom
))
handler
.
once
=
true
}
handler
.
apply
(
this
.
$vm
,
processEventArgs
(
event
,
eventArray
[
1
],
isCustom
,
methodName
))
})
}
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录