Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
61419ab3
U
uni-app
项目概览
DCloud
/
uni-app
2 个月 前同步成功
通知
717
Star
38705
Fork
3642
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
7
列表
看板
标记
里程碑
合并请求
1
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
7
Issue
7
列表
看板
标记
里程碑
合并请求
1
合并请求
1
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
61419ab3
编写于
2月 18, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'alpha'
上级
33861751
bde22ddf
变更
27
展开全部
隐藏空白更改
内联
并排
Showing
27 changed file
with
36 addition
and
34 deletion
+36
-34
lerna.json
lerna.json
+1
-1
packages/uni-app-plus-nvue/package.json
packages/uni-app-plus-nvue/package.json
+1
-1
packages/uni-app-plus/package.json
packages/uni-app-plus/package.json
+1
-1
packages/uni-automator/package.json
packages/uni-automator/package.json
+1
-1
packages/uni-cli-shared/package.json
packages/uni-cli-shared/package.json
+1
-1
packages/uni-h5-ui/package.json
packages/uni-h5-ui/package.json
+1
-1
packages/uni-h5/dist/index.umd.min.js
packages/uni-h5/dist/index.umd.min.js
+1
-1
packages/uni-h5/package.json
packages/uni-h5/package.json
+1
-1
packages/uni-migration/package.json
packages/uni-migration/package.json
+1
-1
packages/uni-mp-alipay/package.json
packages/uni-mp-alipay/package.json
+1
-1
packages/uni-mp-baidu/package.json
packages/uni-mp-baidu/package.json
+1
-1
packages/uni-mp-kuaishou/package.json
packages/uni-mp-kuaishou/package.json
+1
-1
packages/uni-mp-qq/package.json
packages/uni-mp-qq/package.json
+1
-1
packages/uni-mp-toutiao/package.json
packages/uni-mp-toutiao/package.json
+1
-1
packages/uni-mp-vue/package.json
packages/uni-mp-vue/package.json
+1
-1
packages/uni-mp-weixin/package.json
packages/uni-mp-weixin/package.json
+1
-1
packages/uni-quickapp-native/package.json
packages/uni-quickapp-native/package.json
+1
-1
packages/uni-quickapp-webview/package.json
packages/uni-quickapp-webview/package.json
+1
-1
packages/uni-stat/package.json
packages/uni-stat/package.json
+1
-1
packages/uni-template-compiler/package.json
packages/uni-template-compiler/package.json
+1
-1
packages/vue-cli-plugin-hbuilderx/package.json
packages/vue-cli-plugin-hbuilderx/package.json
+1
-1
packages/vue-cli-plugin-uni-optimize/package.json
packages/vue-cli-plugin-uni-optimize/package.json
+1
-1
packages/vue-cli-plugin-uni/package.json
packages/vue-cli-plugin-uni/package.json
+2
-2
packages/webpack-uni-mp-loader/package.json
packages/webpack-uni-mp-loader/package.json
+1
-1
packages/webpack-uni-pages-loader/lib/platforms/mp.js
packages/webpack-uni-pages-loader/lib/platforms/mp.js
+4
-3
packages/webpack-uni-pages-loader/package.json
packages/webpack-uni-pages-loader/package.json
+2
-2
src/core/service/plugins/app/create-app.js
src/core/service/plugins/app/create-app.js
+5
-4
未找到文件。
lerna.json
浏览文件 @
61419ab3
...
...
@@ -12,5 +12,5 @@
"message"
:
"chore(release): publish %s"
}
},
"version"
:
"2.0.0-
alpha-31120210204001
"
"version"
:
"2.0.0-
31220210205002
"
}
packages/uni-app-plus-nvue/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-app-plus-nvue"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app app-plus-nvue"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-app-plus/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-app-plus"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app app-plus"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-automator/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-automator"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app automator"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-cli-shared/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-cli-shared"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-cli-shared"
,
"main"
:
"lib/index.js"
,
"repository"
:
{
...
...
packages/uni-h5-ui/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-h5-ui"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app h5 ui"
,
"main"
:
"dist/index.umd.min.js"
,
"repository"
:
{
...
...
packages/uni-h5/dist/index.umd.min.js
浏览文件 @
61419ab3
此差异已折叠。
点击以展开。
packages/uni-h5/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-h5"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app h5"
,
"main"
:
"dist/index.umd.min.js"
,
"repository"
:
{
...
...
packages/uni-migration/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-migration"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app migration"
,
"main"
:
"lib/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-alipay/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-mp-alipay"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app mp-alipay"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-baidu/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-mp-baidu"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app mp-baidu"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-kuaishou/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-mp-kuaishou"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app mp-kuaishou"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-qq/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-mp-qq"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app mp-qq"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-toutiao/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-mp-toutiao"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app mp-toutiao"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-vue/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-mp-vue"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"@dcloudio/uni-mp-vue"
,
"main"
:
"dist/vue.runtime.esm.js"
,
"module"
:
"dist/vue.runtime.esm.js"
,
...
...
packages/uni-mp-weixin/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-mp-weixin"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app mp-weixin"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-quickapp-native/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-quickapp-native"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app quickapp-native"
,
"main"
:
"dist/vue.prod.js"
,
"repository"
:
{
...
...
packages/uni-quickapp-webview/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-quickapp-webview"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app quickapp-webview"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-stat/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-stat"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
""
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-template-compiler/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/uni-template-compiler"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-template-compiler"
,
"main"
:
"lib/index.js"
,
"repository"
:
{
...
...
packages/vue-cli-plugin-hbuilderx/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/vue-cli-plugin-hbuilderx"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"HBuilderX plugin for vue-cli 3"
,
"main"
:
"index.js"
,
"repository"
:
{
...
...
packages/vue-cli-plugin-uni-optimize/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/vue-cli-plugin-uni-optimize"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app optimize plugin for vue-cli 3"
,
"main"
:
"index.js"
,
"repository"
:
{
...
...
packages/vue-cli-plugin-uni/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/vue-cli-plugin-uni"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app plugin for vue-cli 3"
,
"main"
:
"index.js"
,
"repository"
:
{
...
...
@@ -17,7 +17,7 @@
"author"
:
"fxy060608"
,
"license"
:
"Apache-2.0"
,
"dependencies"
:
{
"@dcloudio/uni-stat"
:
"^2.0.0-
alpha-31120210204001
"
,
"@dcloudio/uni-stat"
:
"^2.0.0-
31220210205002
"
,
"buffer-json"
:
"^2.0.0"
,
"copy-webpack-plugin"
:
"^5.1.1"
,
"cross-env"
:
"^5.2.0"
,
...
...
packages/webpack-uni-mp-loader/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/webpack-uni-mp-loader"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"webpack-uni-mp-loader"
,
"main"
:
"index.js"
,
"repository"
:
{
...
...
packages/webpack-uni-pages-loader/lib/platforms/mp.js
浏览文件 @
61419ab3
...
...
@@ -19,7 +19,7 @@ const {
const
{
hasOwn
,
parseStyle
,
parseStyle
,
trimMPJson
}
=
require
(
'
../util
'
)
...
...
@@ -113,7 +113,8 @@ const platformJson2ProjectJson = {
projectname
:
defaultCopy
,
packOptions
:
defaultCopy
,
debugOptions
:
defaultCopy
,
scripts
:
defaultCopy
scripts
:
defaultCopy
,
cloudbaseRoot
:
defaultCopy
}
function
copyToJson
(
json
,
fromJson
,
options
)
{
...
...
@@ -320,4 +321,4 @@ module.exports = function (pagesJson, manifestJson, project = {}) {
}
}
}
}
}
packages/webpack-uni-pages-loader/package.json
浏览文件 @
61419ab3
{
"name"
:
"@dcloudio/webpack-uni-pages-loader"
,
"version"
:
"2.0.0-
alpha-31120210204001
"
,
"version"
:
"2.0.0-
31220210205002
"
,
"description"
:
"uni-app pages.json loader"
,
"main"
:
"lib/index.js"
,
"repository"
:
{
...
...
@@ -21,7 +21,7 @@
"strip-json-comments"
:
"^2.0.1"
},
"uni-app"
:
{
"compilerVersion"
:
"3.1.
1
"
"compilerVersion"
:
"3.1.
2
"
},
"gitHead"
:
"b366367ac0b63f41ef205dc93eee55d8e9f8f3ed"
}
src/core/service/plugins/app/create-app.js
浏览文件 @
61419ab3
...
...
@@ -18,14 +18,15 @@ export function getCurrentPages (isAll = false, ignoreError = false) {
let
childrenVm
=
app
.
$children
[
0
]
if
(
childrenVm
&&
childrenVm
.
$children
.
length
)
{
const
tabBarVm
=
childrenVm
.
$children
.
find
(
vm
=>
vm
.
$options
.
name
===
'
TabBar
'
)
const
layoutVm
=
childrenVm
.
$children
.
find
(
vm
=>
vm
.
$options
.
name
===
'
Layout
'
)
if
(
layoutVm
)
{
childrenVm
=
layoutVm
const
layoutVm
=
childrenVm
.
$children
.
find
(
vm
=>
vm
.
$options
.
name
===
'
Layout
'
)
if
(
layoutVm
)
{
childrenVm
=
layoutVm
}
childrenVm
.
$children
.
forEach
(
vm
=>
{
if
(
tabBarVm
!==
vm
&&
vm
.
$children
.
length
&&
vm
.
$children
[
0
].
$options
.
name
===
'
Page
'
&&
vm
.
$children
[
0
].
$slots
.
page
)
{
// vm.$children[0]=Page->PageBody->RealPage
const
pageVm
=
vm
.
$children
[
0
].
$children
.
find
(
vm
=>
vm
.
$options
.
name
===
'
PageBody
'
).
$children
.
find
(
vm
=>
!!
vm
.
$page
)
const
pageBody
=
vm
.
$children
[
0
].
$children
.
find
(
vm
=>
vm
.
$options
.
name
===
'
PageBody
'
)
const
pageVm
=
pageBody
&&
pageBody
.
$children
.
find
(
vm
=>
!!
vm
.
$page
)
if
(
pageVm
)
{
let
isActive
=
true
if
(
!
isAll
&&
tabBarVm
&&
pageVm
.
$page
&&
pageVm
.
$page
.
meta
.
isTabBar
)
{
// 选项卡仅列出活动的
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录