Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
loop04
uni-app
提交
33d31247
U
uni-app
项目概览
loop04
/
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,发现更多精彩内容 >>
提交
33d31247
编写于
11月 11, 2022
作者:
D
DCloud_LXH
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: mp theme.json copy
上级
f10317a0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
21 deletion
+22
-21
packages/uni-cli-shared/lib/theme.js
packages/uni-cli-shared/lib/theme.js
+10
-13
packages/webpack-uni-pages-loader/lib/index-new.js
packages/webpack-uni-pages-loader/lib/index-new.js
+7
-3
packages/webpack-uni-pages-loader/lib/platforms/mp.js
packages/webpack-uni-pages-loader/lib/platforms/mp.js
+4
-4
src/platforms/h5/components/app/observable.js
src/platforms/h5/components/app/observable.js
+1
-1
未找到文件。
packages/uni-cli-shared/lib/theme.js
浏览文件 @
33d31247
const
fs
=
require
(
'
fs
'
)
const
path
=
require
(
'
path
'
)
const
{
parseJson
}
=
require
(
'
./json
'
)
const
{
getJson
}
=
require
(
'
./json
'
)
const
{
parseJson
,
getJson
}
=
require
(
'
./json
'
)
let
themeConfig
=
{}
let
manifestJsonDarkmode
=
false
function
parseThemeByJsonStr
(
jsonStr
,
keys
,
theme
)
{
if
(
jsonStr
.
indexOf
(
'
@
'
)
===
-
1
)
{
...
...
@@ -27,7 +22,7 @@ function hasTheme (themeLocation = 'theme.json') {
}
function
darkmode
()
{
return
manifestJsonDarkmode
&&
!!
(
global
.
uniPlugin
.
options
||
{}).
darkmode
return
!!
(
global
.
uniPlugin
.
options
||
{}).
darkmode
}
module
.
exports
=
{
...
...
@@ -37,7 +32,6 @@ module.exports = {
initTheme
(
manifestJson
=
{})
{
const
platform
=
process
.
env
.
UNI_PLATFORM
const
themeLocation
=
(
manifestJson
[
platform
]
||
{}).
themeLocation
||
'
theme.json
'
manifestJsonDarkmode
=
(
manifestJson
[
platform
]
||
{}).
darkmode
||
false
if
(
!
hasTheme
(
themeLocation
))
{
return
}
...
...
@@ -66,11 +60,14 @@ module.exports = {
return
JSON
.
parse
(
parseThemeByJsonStr
(
JSON
.
stringify
(
json
),
keys
,
theme
))
},
copyMiniProgramThemeJson
(
platformOptions
,
vueOptions
)
{
platformOptions
.
themeLocation
||
(
platformOptions
.
themeLocation
=
'
theme.json
'
)
return
{
from
:
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
platformOptions
.
themeLocation
),
to
:
path
.
resolve
(
process
.
env
.
UNI_OUTPUT_DIR
,
platformOptions
.
themeLocation
),
transform
:
content
=>
JSON
.
stringify
(
parseJson
(
content
.
toString
(),
true
))
const
themeLocation
=
platformOptions
.
themeLocation
||
'
theme.json
'
if
(
hasTheme
(
themeLocation
))
{
platformOptions
.
themeLocation
=
themeLocation
return
{
from
:
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
platformOptions
.
themeLocation
),
to
:
path
.
resolve
(
process
.
env
.
UNI_OUTPUT_DIR
,
platformOptions
.
themeLocation
),
transform
:
content
=>
JSON
.
stringify
(
parseJson
(
content
.
toString
(),
true
))
}
}
}
}
packages/webpack-uni-pages-loader/lib/index-new.js
浏览文件 @
33d31247
...
...
@@ -18,7 +18,8 @@ const {
const
{
initTheme
,
parseTheme
parseTheme
,
darkmode
}
=
require
(
'
@dcloudio/uni-cli-shared/lib/theme
'
)
const
{
...
...
@@ -123,9 +124,12 @@ module.exports = function (content, map) {
process
.
UNI_TRANSFORM_PX
=
true
}
if
(
process
.
env
.
VUE_APP_DARK_MODE
!==
'
true
'
)
{
if
(
(
process
.
env
.
UNI_PLATFORM
.
indexOf
(
'
mp
'
)
!==
-
1
&&
!
darkmode
())
||
process
.
env
.
VUE_APP_DARK_MODE
!==
'
true
'
)
{
const
{
pages
,
globalStyle
,
tabBar
}
=
parseTheme
(
pagesJson
)
Object
.
assign
(
pagesJson
,
{
pages
,
globalStyle
,
tabBar
}
)
Object
.
assign
(
pagesJson
,
JSON
.
parse
(
JSON
.
stringify
({
pages
,
globalStyle
,
tabBar
}))
)
}
if
(
process
.
env
.
UNI_PLATFORM
===
'
h5
'
)
{
...
...
packages/webpack-uni-pages-loader/lib/platforms/mp.js
浏览文件 @
33d31247
...
...
@@ -258,9 +258,9 @@ module.exports = function (pagesJson, manifestJson, project = {}) {
updateAppJsonUsingComponents
(
app
.
usingComponents
)
}
if
(
darkmode
()
&&
hasTheme
())
{
app
.
darkmode
=
true
app
.
themeLocation
=
'
theme.json
'
const
themeLocation
=
(
manifestJson
[
process
.
env
.
UNI_PLATFORM
]
||
{}).
themeLocation
if
(
darkmode
()
&&
hasTheme
(
themeLocation
))
{
app
.
themeLocation
=
themeLocation
||
'
theme.json
'
}
const
projectName
=
getPlatformProject
()
...
...
@@ -376,4 +376,4 @@ module.exports = function (pagesJson, manifestJson, project = {}) {
}
}
}
}
}
src/platforms/h5/components/app/observable.js
浏览文件 @
33d31247
...
...
@@ -13,7 +13,7 @@ onThemeChange(() => {
__uniConfig
.
tabBar
.
color
=
tabBarStyle
.
color
__uniConfig
.
tabBar
.
selectedColor
=
tabBarStyle
.
selectedColor
__uniConfig
.
tabBar
.
blurEffect
=
tabBarStyle
.
blurEffect
if
(
tabBarStyle
.
list
.
length
&&
__uniConfig
.
tabBar
.
list
.
length
)
{
if
(
tabBarStyle
.
list
&&
tabBarStyle
.
list
.
length
&&
__uniConfig
.
tabBar
.
list
.
length
)
{
tabBarStyle
.
list
.
forEach
((
item
,
index
)
=>
{
__uniConfig
.
tabBar
.
list
[
index
].
iconPath
=
item
.
iconPath
__uniConfig
.
tabBar
.
list
[
index
].
selectedIconPath
=
item
.
selectedIconPath
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录