Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
genary
uni-app
提交
d71b0941
U
uni-app
项目概览
genary
/
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,发现更多精彩内容 >>
提交
d71b0941
编写于
6月 17, 2019
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:dcloudio/uni-app into dev
上级
bc958ad3
9c0091f8
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
75 addition
and
16 deletion
+75
-16
packages/uni-mp-baidu/dist/index.js
packages/uni-mp-baidu/dist/index.js
+1
-1
packages/uni-mp-baidu/package.json
packages/uni-mp-baidu/package.json
+1
-1
src/core/service/plugins/index.js
src/core/service/plugins/index.js
+7
-1
src/core/service/plugins/lifecycle.js
src/core/service/plugins/lifecycle.js
+57
-0
src/core/service/plugins/util.js
src/core/service/plugins/util.js
+8
-12
src/platforms/mp-baidu/runtime/wrapper/util.js
src/platforms/mp-baidu/runtime/wrapper/util.js
+1
-1
未找到文件。
packages/uni-mp-baidu/dist/index.js
浏览文件 @
d71b0941
...
...
@@ -1130,7 +1130,7 @@ function handleLink (event) {
vueOptions
.
parent
=
parentVm
;
}
const
mocks$1
=
[
'
nodeId
'
];
const
mocks$1
=
[
'
nodeId
'
,
'
componentName
'
];
function
isPage$1
()
{
return
!
this
.
ownerId
...
...
packages/uni-mp-baidu/package.json
浏览文件 @
d71b0941
{
"name"
:
"@dcloudio/uni-mp-baidu"
,
"version"
:
"0.0.84
4
"
,
"version"
:
"0.0.84
5
"
,
"description"
:
"uni-app mp-baidu"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
...
...
src/core/service/plugins/index.js
浏览文件 @
d71b0941
...
...
@@ -16,6 +16,10 @@ import {
createPageMixin
}
from
'
./page
'
import
{
lifecycleMixin
}
from
'
./lifecycle
'
import
{
getTabBarScrollPosition
}
from
'
./app/router-guard
'
...
...
@@ -56,6 +60,8 @@ export default {
install
(
Vue
,
{
routes
}
=
{})
{
lifecycleMixin
(
Vue
)
const
minId
=
getMinId
(
routes
)
const
router
=
new
VueRouter
({
id
:
minId
,
...
...
src/core/service/plugins/lifecycle.js
0 → 100644
浏览文件 @
d71b0941
/* @flow */
const
LIFECYCLE_HOOKS
=
[
// App
'
onLaunch
'
,
'
onShow
'
,
'
onHide
'
,
'
onUniNViewMessage
'
,
'
onError
'
,
// Page
'
onLoad
'
,
// 'onShow',
'
onReady
'
,
// 'onHide',
'
onUnload
'
,
'
onPullDownRefresh
'
,
'
onReachBottom
'
,
'
onTabItemTap
'
,
'
onShareAppMessage
'
,
'
onResize
'
,
'
onPageScroll
'
,
'
onNavigationBarButtonTap
'
,
'
onBackPress
'
,
'
onNavigationBarSearchInputChanged
'
,
'
onNavigationBarSearchInputConfirmed
'
,
'
onNavigationBarSearchInputClicked
'
,
// Component
// 'onReady', // 兼容旧版本,应该移除该事件
'
onPageShow
'
,
'
onPageHide
'
,
'
onPageResize
'
]
export
function
lifecycleMixin
(
Vue
)
{
// fixed vue-class-component
const
oldExtend
=
Vue
.
extend
Vue
.
extend
=
function
(
extendOptions
)
{
extendOptions
=
extendOptions
||
{}
const
methods
=
extendOptions
.
methods
if
(
methods
)
{
Object
.
keys
(
methods
).
forEach
(
methodName
=>
{
if
(
LIFECYCLE_HOOKS
.
indexOf
(
methodName
)
!==
-
1
)
{
extendOptions
[
methodName
]
=
methods
[
methodName
]
delete
methods
[
methodName
]
}
})
}
return
oldExtend
.
call
(
this
,
extendOptions
)
}
const
strategies
=
Vue
.
config
.
optionMergeStrategies
const
mergeHook
=
strategies
.
created
LIFECYCLE_HOOKS
.
forEach
(
hook
=>
{
strategies
[
hook
]
=
mergeHook
})
}
src/core/service/plugins/util.js
浏览文件 @
d71b0941
import
{
isFn
}
from
'
uni-shared
'
function
callHook
(
vm
,
hook
,
params
)
{
return
isFn
(
vm
.
$options
[
hook
])
&&
vm
.
$options
[
hook
].
apply
(
vm
,
params
)
return
vm
.
__call_hook
(
hook
,
params
)
}
export
function
callAppHook
(
vm
,
hook
,
...
params
)
{
...
...
src/platforms/mp-baidu/runtime/wrapper/util.js
浏览文件 @
d71b0941
export
const
mocks
=
[
'
nodeId
'
]
export
const
mocks
=
[
'
nodeId
'
,
'
componentName
'
]
export
function
isPage
()
{
return
!
this
.
ownerId
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录