Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小浣熊撸代码
uni-app
提交
61549c56
U
uni-app
项目概览
小浣熊撸代码
/
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,体验更适合开发者的 AI 搜索 >>
提交
61549c56
编写于
10月 26, 2022
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(h5): darkmode
上级
3b9af626
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
3 deletion
+16
-3
packages/uni-cli-shared/src/json/app/pages/uniConfig.ts
packages/uni-cli-shared/src/json/app/pages/uniConfig.ts
+1
-2
packages/uni-h5-vite/src/plugins/manifestJson.ts
packages/uni-h5-vite/src/plugins/manifestJson.ts
+12
-0
packages/uni-h5-vite/src/plugins/pagesJson.ts
packages/uni-h5-vite/src/plugins/pagesJson.ts
+3
-1
未找到文件。
packages/uni-cli-shared/src/json/app/pages/uniConfig.ts
浏览文件 @
61549c56
...
...
@@ -51,7 +51,6 @@ export function normalizeAppUniConfig(
manifestJson
[
process
.
env
.
UNI_PLATFORM
===
'
app
'
?
'
app-plus
'
:
process
.
env
.
UNI_PLATFORM
]
||
{}
const
darkmode
=
platformConfig
.
darkmode
||
false
const
config
:
AppUniConfig
=
{
pages
:
[],
...
...
@@ -73,7 +72,7 @@ export function normalizeAppUniConfig(
networkTimeout
:
normalizeNetworkTimeout
(
manifestJson
.
networkTimeout
),
tabBar
:
pagesJson
.
tabBar
,
locales
:
initLocales
(
path
.
join
(
process
.
env
.
UNI_INPUT_DIR
,
'
locale
'
)),
darkmode
,
darkmode
:
platformConfig
.
darkmode
||
false
,
themeConfig
:
normalizeThemeConfigOnce
(
platformConfig
),
}
// TODO 待支持分包
...
...
packages/uni-h5-vite/src/plugins/manifestJson.ts
浏览文件 @
61549c56
...
...
@@ -5,6 +5,7 @@ import {
normalizeNetworkTimeout
,
parseJson
,
initI18nOptions
,
normalizeThemeConfigOnce
,
}
from
'
@dcloudio/uni-cli-shared
'
const
defaultRouter
=
{
...
...
@@ -96,6 +97,13 @@ export function uniManifestJsonPlugin(): Plugin {
manifest
[
'
app
'
].
nvue
[
'
flex-direction
'
])
||
'
column
'
const
platformConfig
=
manifest
[
process
.
env
.
UNI_PLATFORM
===
'
app
'
?
'
app-plus
'
:
process
.
env
.
UNI_PLATFORM
]
||
{}
return
{
code
:
`export const appId =
${
JSON
.
stringify
(
manifest
.
appid
||
''
)}
export const appName =
${
JSON
.
stringify
(
manifest
.
name
||
''
)}
...
...
@@ -118,6 +126,10 @@ export function uniManifestJsonPlugin(): Plugin {
export const sdkConfigs =
${
JSON
.
stringify
(
sdkConfigs
)}
export const locale = '
${
locale
}
'
export const fallbackLocale = '
${
fallbackLocale
}
'
export const darkmode =
${
platformConfig
.
darkmode
||
'
false
'
}
export const themeConfig =
${
JSON
.
stringify
(
normalizeThemeConfigOnce
(
platformConfig
)
)}
`
,
map
:
{
mappings
:
''
},
}
...
...
packages/uni-h5-vite/src/plugins/pagesJson.ts
浏览文件 @
61549c56
...
...
@@ -53,7 +53,7 @@ function generatePagesJsonCode(
return
`
import { defineAsyncComponent, resolveComponent, createVNode, withCtx, openBlock, createBlock } from 'vue'
import { PageComponent, AsyncLoadingComponent, AsyncErrorComponent, useI18n, setupWindow, setupPage } from '@dcloudio/uni-h5'
import { appId, appName, appVersion, appVersionCode, debug, networkTimeout, router, async, sdkConfigs, qqMapKey, googleMapKey, aMapKey, aMapSecurityJsCode, aMapServiceHost, nvue, locale, fallbackLocale } from './
${
MANIFEST_JSON_JS
}
'
import { appId, appName, appVersion, appVersionCode, debug, networkTimeout, router, async, sdkConfigs, qqMapKey, googleMapKey, aMapKey, aMapSecurityJsCode, aMapServiceHost, nvue, locale, fallbackLocale
, darkmode, themeConfig
} from './
${
MANIFEST_JSON_JS
}
'
const locales = import.meta.globEager('./locale/*.json')
${
importLayoutComponentsCode
}
const extend = Object.assign
...
...
@@ -270,6 +270,8 @@ function generateConfig(
fallbackLocale,
locales:Object.keys(locales).reduce((res,name)=>{const locale=name.replace(/\\.\\/locale\\/(uni-app.)?(.*).json/,'$2');extend(res[locale]||(res[locale]={}),locales[name].default);return res},{}),
router,
darkmode,
themeConfig,
})
`
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录