Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
anyefeiyu
uni-app
提交
04f0825c
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,发现更多精彩内容 >>
提交
04f0825c
编写于
11月 14, 2019
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:dcloudio/uni-app into dev
上级
ac14b511
f456e034
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
75 addition
and
42 deletion
+75
-42
packages/uni-app-plus/dist/index.js
packages/uni-app-plus/dist/index.js
+7
-5
packages/uni-mp-alipay/dist/index.js
packages/uni-mp-alipay/dist/index.js
+4
-3
packages/uni-mp-baidu/dist/index.js
packages/uni-mp-baidu/dist/index.js
+33
-17
packages/uni-mp-qq/dist/index.js
packages/uni-mp-qq/dist/index.js
+7
-5
packages/uni-mp-toutiao/dist/index.js
packages/uni-mp-toutiao/dist/index.js
+7
-5
packages/uni-mp-weixin/dist/index.js
packages/uni-mp-weixin/dist/index.js
+14
-5
src/platforms/mp-alipay/runtime/wrapper/util.js
src/platforms/mp-alipay/runtime/wrapper/util.js
+3
-2
未找到文件。
packages/uni-app-plus/dist/index.js
浏览文件 @
04f0825c
...
...
@@ -245,7 +245,7 @@ function isSyncApi (name) {
}
function
isCallbackApi
(
name
)
{
return
CALLBACK_API_RE
.
test
(
name
)
return
CALLBACK_API_RE
.
test
(
name
)
&&
name
!==
'
onPush
'
}
function
handlePromise
(
promise
)
{
...
...
@@ -1287,11 +1287,13 @@ function parseBaseComponent (vueComponentOptions, {
}
=
{})
{
let
[
VueComponent
,
vueOptions
]
=
initVueComponent
(
Vue
,
vueComponentOptions
);
const
options
=
{
multipleSlots
:
true
,
addGlobalClass
:
true
};
const
componentOptions
=
{
options
:
{
multipleSlots
:
true
,
addGlobalClass
:
true
},
options
,
data
:
initData
(
vueOptions
,
Vue
.
prototype
),
behaviors
:
initBehaviors
(
vueOptions
,
initBehavior
),
properties
:
initProperties
(
vueOptions
.
props
,
false
,
vueOptions
.
__file
),
...
...
packages/uni-mp-alipay/dist/index.js
浏览文件 @
04f0825c
...
...
@@ -245,7 +245,7 @@ function isSyncApi (name) {
}
function
isCallbackApi
(
name
)
{
return
CALLBACK_API_RE
.
test
(
name
)
return
CALLBACK_API_RE
.
test
(
name
)
&&
name
!==
'
onPush
'
}
function
handlePromise
(
promise
)
{
...
...
@@ -1665,9 +1665,10 @@ const customizeRE = /:/g;
const
customize
=
cached
((
str
)
=>
{
return
camelize
(
str
.
replace
(
customizeRE
,
'
-
'
))
});
});
const
isComponent2
=
my
.
canIUse
(
'
component2
'
);
// 钉钉小程序是 component2 模式
const
isComponent2
=
my
.
dd
||
my
.
canIUse
(
'
component2
'
);
const
mocks
=
[
'
$id
'
];
...
...
packages/uni-mp-baidu/dist/index.js
浏览文件 @
04f0825c
...
...
@@ -245,7 +245,7 @@ function isSyncApi (name) {
}
function
isCallbackApi
(
name
)
{
return
CALLBACK_API_RE
.
test
(
name
)
return
CALLBACK_API_RE
.
test
(
name
)
&&
name
!==
'
onPush
'
}
function
handlePromise
(
promise
)
{
...
...
@@ -1420,11 +1420,13 @@ function parseBaseComponent (vueComponentOptions, {
}
=
{})
{
let
[
VueComponent
,
vueOptions
]
=
initVueComponent
(
Vue
,
vueComponentOptions
);
const
options
=
{
multipleSlots
:
true
,
addGlobalClass
:
true
};
const
componentOptions
=
{
options
:
{
multipleSlots
:
true
,
addGlobalClass
:
true
},
options
,
data
:
initData
(
vueOptions
,
Vue
.
prototype
),
behaviors
:
initBehaviors
(
vueOptions
,
initBehavior
),
properties
:
initProperties
(
vueOptions
.
props
,
false
,
vueOptions
.
__file
),
...
...
@@ -1505,23 +1507,29 @@ function parseComponent (vueOptions) {
const
componentOptions
=
parseBaseComponent
(
vueOptions
,
{
isPage
,
initRelation
});
});
// 关于百度小程序新生命周期(2.0)的说明(组件作为页面时):
// lifetimes:attached --> methods:onShow --> methods:onLoad --> methods:onReady
// 这里在新生命周期强制将onShow挪到onLoad之后触发,另外一处修改在page-parser.js
const
oldAttached
=
componentOptions
.
lifetimes
.
attached
;
componentOptions
.
lifetimes
.
attached
=
function
attached
()
{
oldAttached
.
call
(
this
);
if
(
isPage
.
call
(
this
))
{
// 百度 onLoad 在 attached 之前触发
// 百度 当组件作为页面时 pageinstancce 不是原来组件的 instance
this
.
pageinstance
.
$vm
=
this
.
$vm
;
if
(
hasOwn
(
this
.
pageinstance
,
'
_$args
'
))
{
this
.
$vm
.
$mp
.
query
=
this
.
pageinstance
.
_$args
;
this
.
$vm
.
__call_hook
(
'
onLoad
'
,
this
.
pageinstance
.
_$args
);
this
.
$vm
.
__call_hook
(
'
onLoad
'
,
this
.
pageinstance
.
_$args
);
this
.
$vm
.
__call_hook
(
'
onShow
'
);
delete
this
.
pageinstance
.
_$args
;
}
// TODO 3.105.17以下基础库内百度 Component 作为页面时,methods 中的 onShow 不触发
!
newLifecycle
&&
this
.
$vm
.
__call_hook
(
'
onShow
'
);
}
else
{
// 百度小程序组件不触发methods内的onReady
if
(
this
.
$vm
)
{
this
.
$vm
.
_isMounted
=
true
;
this
.
$vm
.
__call_hook
(
'
mounted
'
);
}
}
};
...
...
@@ -1588,13 +1596,21 @@ function parsePage (vuePageOptions) {
initRelation
});
const
newLifecycle
=
swan
.
canIUse
(
'
lifecycle-2-0
'
);
// 纠正百度小程序新生命周期(2.0)methods:onShow在methods:onLoad之前触发的问题
if
(
newLifecycle
)
{
delete
pageOptions
.
methods
.
onShow
;
}
pageOptions
.
methods
.
onLoad
=
function
onLoad
(
args
)
{
// 百度 onLoad 在 attached 之前触发,先存储 args, 在 attached 里边触发 onLoad
if
(
this
.
$vm
)
{
this
.
$vm
.
$mp
.
query
=
args
;
this
.
$vm
.
__call_hook
(
'
onLoad
'
,
args
);
}
else
{
this
.
pageinstance
.
_$args
=
args
;
if
(
this
.
$vm
)
{
this
.
$vm
.
$mp
.
query
=
args
;
this
.
$vm
.
__call_hook
(
'
onLoad
'
,
args
);
this
.
$vm
.
__call_hook
(
'
onShow
'
);
}
else
{
this
.
pageinstance
.
_$args
=
args
;
}
};
...
...
packages/uni-mp-qq/dist/index.js
浏览文件 @
04f0825c
...
...
@@ -245,7 +245,7 @@ function isSyncApi (name) {
}
function
isCallbackApi
(
name
)
{
return
CALLBACK_API_RE
.
test
(
name
)
return
CALLBACK_API_RE
.
test
(
name
)
&&
name
!==
'
onPush
'
}
function
handlePromise
(
promise
)
{
...
...
@@ -1334,11 +1334,13 @@ function parseBaseComponent (vueComponentOptions, {
}
=
{})
{
let
[
VueComponent
,
vueOptions
]
=
initVueComponent
(
Vue
,
vueComponentOptions
);
const
options
=
{
multipleSlots
:
true
,
addGlobalClass
:
true
};
const
componentOptions
=
{
options
:
{
multipleSlots
:
true
,
addGlobalClass
:
true
},
options
,
data
:
initData
(
vueOptions
,
Vue
.
prototype
),
behaviors
:
initBehaviors
(
vueOptions
,
initBehavior
),
properties
:
initProperties
(
vueOptions
.
props
,
false
,
vueOptions
.
__file
),
...
...
packages/uni-mp-toutiao/dist/index.js
浏览文件 @
04f0825c
...
...
@@ -245,7 +245,7 @@ function isSyncApi (name) {
}
function
isCallbackApi
(
name
)
{
return
CALLBACK_API_RE
.
test
(
name
)
return
CALLBACK_API_RE
.
test
(
name
)
&&
name
!==
'
onPush
'
}
function
handlePromise
(
promise
)
{
...
...
@@ -1511,11 +1511,13 @@ function parseBaseComponent (vueComponentOptions, {
}
=
{})
{
let
[
VueComponent
,
vueOptions
]
=
initVueComponent
(
Vue
,
vueComponentOptions
);
const
options
=
{
multipleSlots
:
true
,
addGlobalClass
:
true
};
const
componentOptions
=
{
options
:
{
multipleSlots
:
true
,
addGlobalClass
:
true
},
options
,
data
:
initData
(
vueOptions
,
Vue
.
prototype
),
behaviors
:
initBehaviors
(
vueOptions
,
initBehavior
),
properties
:
initProperties
(
vueOptions
.
props
,
false
,
vueOptions
.
__file
),
...
...
packages/uni-mp-weixin/dist/index.js
浏览文件 @
04f0825c
...
...
@@ -245,7 +245,7 @@ function isSyncApi (name) {
}
function
isCallbackApi
(
name
)
{
return
CALLBACK_API_RE
.
test
(
name
)
return
CALLBACK_API_RE
.
test
(
name
)
&&
name
!==
'
onPush
'
}
function
handlePromise
(
promise
)
{
...
...
@@ -1275,11 +1275,20 @@ function parseBaseComponent (vueComponentOptions, {
}
=
{})
{
let
[
VueComponent
,
vueOptions
]
=
initVueComponent
(
Vue
,
vueComponentOptions
);
const
options
=
{
multipleSlots
:
true
,
addGlobalClass
:
true
};
{
// 微信multipleSlots 部分情况有 bug,导致内容顺序错乱 如 u-list,提供覆盖选项
if
(
vueOptions
[
'
mp-weixin
'
]
&&
vueOptions
[
'
mp-weixin
'
][
'
options
'
])
{
Object
.
assign
(
options
,
vueOptions
[
'
mp-weixin
'
][
'
options
'
]);
}
}
const
componentOptions
=
{
options
:
{
multipleSlots
:
true
,
addGlobalClass
:
true
},
options
,
data
:
initData
(
vueOptions
,
Vue
.
prototype
),
behaviors
:
initBehaviors
(
vueOptions
,
initBehavior
),
properties
:
initProperties
(
vueOptions
.
props
,
false
,
vueOptions
.
__file
),
...
...
src/platforms/mp-alipay/runtime/wrapper/util.js
浏览文件 @
04f0825c
...
...
@@ -14,9 +14,10 @@ const customizeRE = /:/g
const
customize
=
cached
((
str
)
=>
{
return
camelize
(
str
.
replace
(
customizeRE
,
'
-
'
))
})
})
export
const
isComponent2
=
my
.
canIUse
(
'
component2
'
)
// 钉钉小程序是 component2 模式
export
const
isComponent2
=
my
.
dd
||
my
.
canIUse
(
'
component2
'
)
export
const
mocks
=
[
'
$id
'
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录