diff --git a/packages/uni-stat/dist/uni-stat.cjs.js b/packages/uni-stat/dist/uni-stat.cjs.js index 730a14687432895fde97fc2611b792790769bd15..4ce1be85a725ee8a41c0d5ec4d776e162ce6bb26 100644 --- a/packages/uni-stat/dist/uni-stat.cjs.js +++ b/packages/uni-stat/dist/uni-stat.cjs.js @@ -385,17 +385,7 @@ const requestData = (done) => { }); }; -let titleJsons = {}; -// #ifdef MP -let pagesTitle = require('uni-pages?{"type":"style"}').default; -pagesTitle = pagesTitle.pages; -for (let i in pagesTitle) { - titleJsons[i] = pagesTitle[i].navigationBarTitleText || ''; -} -// #endif -// #ifndef MP -titleJsons = process.env.UNI_STAT_TITLE_JSON; -// #endif +const titleJsons = process.env.UNI_STAT_TITLE_JSON; const statConfig = { appid: process.env.UNI_APP_ID, diff --git a/packages/uni-stat/dist/uni-stat.es.js b/packages/uni-stat/dist/uni-stat.es.js index f64beabc32d0c365698e547001b75a99071129b2..bea897c84481034de52d563bba26e649422bb9e4 100644 --- a/packages/uni-stat/dist/uni-stat.es.js +++ b/packages/uni-stat/dist/uni-stat.es.js @@ -383,17 +383,7 @@ const requestData = (done) => { }); }; -let titleJsons = {}; -// #ifdef MP -let pagesTitle = require('uni-pages?{"type":"style"}').default; -pagesTitle = pagesTitle.pages; -for (let i in pagesTitle) { - titleJsons[i] = pagesTitle[i].navigationBarTitleText || ''; -} -// #endif -// #ifndef MP -titleJsons = process.env.UNI_STAT_TITLE_JSON; -// #endif +const titleJsons = process.env.UNI_STAT_TITLE_JSON; const statConfig = { appid: process.env.UNI_APP_ID, diff --git a/packages/uni-stat/lib/uni.plugin.js b/packages/uni-stat/lib/uni.plugin.js index e0cb1123c0a5af1736207a8f302b688284cf8c77..554f7484bfccd7c4f1c74130b38c7190d366b6be 100644 --- a/packages/uni-stat/lib/uni.plugin.js +++ b/packages/uni-stat/lib/uni.plugin.js @@ -31,8 +31,16 @@ var index = [ } const titlesJson = Object.create(null); if (isEnable) { - uniCliShared.parsePagesJsonOnce(inputDir, platform).pages.forEach((page) => { - const titleText = page.style.navigationBar.titleText || ''; + uniCliShared.parsePagesJson(inputDir, platform).pages.forEach((page) => { + var _a; + const style = page.style || {}; + const titleText = + // MP + style.navigationBarTitleText || + ( + // H5 || App + (_a = style.navigationBar) === null || _a === void 0 ? void 0 : _a.titleText) || + ''; if (titleText) { titlesJson[page.path] = titleText; } diff --git a/packages/uni-stat/src/plugin/index.ts b/packages/uni-stat/src/plugin/index.ts index 360a236a81325c2edbac1d86b5ea36fd2f3da011..0dc66d2c08ba612e0d4e75042d90f3caf2b94dfd 100644 --- a/packages/uni-stat/src/plugin/index.ts +++ b/packages/uni-stat/src/plugin/index.ts @@ -5,7 +5,7 @@ import { defineUniMainJsPlugin, getUniStatistics, parseManifestJsonOnce, - parsePagesJsonOnce, + parsePagesJson, } from '@dcloudio/uni-cli-shared' export default [ @@ -32,8 +32,14 @@ export default [ } const titlesJson = Object.create(null) if (isEnable) { - parsePagesJsonOnce(inputDir, platform).pages.forEach((page: any) => { - const titleText = page.style.navigationBar.titleText || '' + parsePagesJson(inputDir, platform).pages.forEach((page: any) => { + const style = page.style || {} + const titleText = + // MP + style.navigationBarTitleText || + // H5 || App + style.navigationBar?.titleText || + '' if (titleText) { titlesJson[page.path] = titleText } diff --git a/packages/uni-stat/src/stat.js b/packages/uni-stat/src/stat.js index 61e2b374c885dee0e5a3fe35f8ed013dbbbd29e5..b75500f6ccb5e802fe278b06d29a84ce65053eab 100644 --- a/packages/uni-stat/src/stat.js +++ b/packages/uni-stat/src/stat.js @@ -30,17 +30,8 @@ import { STAT_H5_URL, OPERATING_TIME, } from './config.ts' -let titleJsons = {} -// #ifdef MP -let pagesTitle = require('uni-pages?{"type":"style"}').default -pagesTitle = pagesTitle.pages -for (let i in pagesTitle) { - titleJsons[i] = pagesTitle[i].navigationBarTitleText || '' -} -// #endif -// #ifndef MP -titleJsons = process.env.UNI_STAT_TITLE_JSON -// #endif + +const titleJsons = process.env.UNI_STAT_TITLE_JSON const statConfig = { appid: process.env.UNI_APP_ID,