From fd97a9db284f558716962a624c68771160c869d4 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Fri, 7 Jan 2022 16:42:46 +0800
Subject: [PATCH] fix(stat): parse title text

---
 packages/uni-stat/dist/uni-stat.cjs.js | 12 +-----------
 packages/uni-stat/dist/uni-stat.es.js  | 12 +-----------
 packages/uni-stat/lib/uni.plugin.js    | 12 ++++++++++--
 packages/uni-stat/src/plugin/index.ts  | 12 +++++++++---
 packages/uni-stat/src/stat.js          | 13 ++-----------
 5 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/packages/uni-stat/dist/uni-stat.cjs.js b/packages/uni-stat/dist/uni-stat.cjs.js
index 730a14687..4ce1be85a 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 f64beabc3..bea897c84 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 e0cb1123c..554f7484b 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 360a236a8..0dc66d2c0 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 61e2b374c..b75500f6c 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,
-- 
GitLab