update at 2026-02-10 14:10:20
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
const { request, downloadFile, readFile } = require('./wx-promisify')
|
||||
const { ensureRouteReady, checkRouteOnFailure } = require('./route-manager')
|
||||
|
||||
const localFonts = require('../../assets/fonts')
|
||||
const localDefaultConfig = require('../../assets/default')
|
||||
@@ -111,6 +112,7 @@ function buildDefaultConfigUrl(manifestUrl, baseUrl) {
|
||||
|
||||
async function loadFontsManifest(options = {}) {
|
||||
const app = getApp()
|
||||
await ensureRouteReady(app)
|
||||
const manifestUrl = options.manifestUrl || app.globalData.fontsManifestUrl
|
||||
const baseUrl = options.baseUrl || app.globalData.fontsBaseUrl
|
||||
|
||||
@@ -138,7 +140,11 @@ async function loadFontsManifest(options = {}) {
|
||||
return fonts
|
||||
} catch (error) {
|
||||
console.warn('远程字体清单加载失败,回退到本地清单:', error)
|
||||
const fallbackFonts = normalizeManifest(localFonts, baseUrl)
|
||||
await checkRouteOnFailure(app).catch((routeError) => {
|
||||
console.warn('字体清单失败后的路由检查失败:', routeError)
|
||||
})
|
||||
const effectiveBaseUrl = app.globalData.fontsBaseUrl || baseUrl
|
||||
const fallbackFonts = normalizeManifest(localFonts, effectiveBaseUrl)
|
||||
app.globalData.fonts = fallbackFonts
|
||||
return fallbackFonts
|
||||
}
|
||||
@@ -146,6 +152,7 @@ async function loadFontsManifest(options = {}) {
|
||||
|
||||
async function loadDefaultConfig(options = {}) {
|
||||
const app = getApp()
|
||||
await ensureRouteReady(app)
|
||||
const manifestUrl = options.manifestUrl || app.globalData.fontsManifestUrl
|
||||
const baseUrl = options.baseUrl || app.globalData.fontsBaseUrl
|
||||
const defaultConfigUrl = options.defaultConfigUrl ||
|
||||
@@ -172,6 +179,9 @@ async function loadDefaultConfig(options = {}) {
|
||||
return remoteConfig
|
||||
} catch (error) {
|
||||
console.warn('远程 default.json 加载失败,回退到本地默认配置:', error)
|
||||
await checkRouteOnFailure(app).catch((routeError) => {
|
||||
console.warn('default 配置失败后的路由检查失败:', routeError)
|
||||
})
|
||||
const fallbackConfig = normalizeDefaultConfig(localDefaultConfig)
|
||||
app.globalData.defaultConfig = fallbackConfig
|
||||
return fallbackConfig
|
||||
|
||||
Reference in New Issue
Block a user