From 1f40db309d204e97a35c3070e57b633ca9bddaad Mon Sep 17 00:00:00 2001
From: mehaotian <490272692@qq.com>
Date: Wed, 27 Apr 2022 19:35:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(stat):=20=E4=BC=98=E5=8C=96=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/uni-stat/lib/uni.plugin.js   | 40 +++++++++++++------------
 packages/uni-stat/src/plugin/index.ts | 43 ++++++++++++++-------------
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/packages/uni-stat/lib/uni.plugin.js b/packages/uni-stat/lib/uni.plugin.js
index 7a9b9eba5..5ae74ceda 100644
--- a/packages/uni-stat/lib/uni.plugin.js
+++ b/packages/uni-stat/lib/uni.plugin.js
@@ -55,32 +55,34 @@ var index = () => [
                 // ssr 时不开启
                 if (!uniCliShared.isSsr(env.command, config)) {
                     const statConfig = uniCliShared.getUniStatistics(inputDir, platform);
-                    const uniCloudConfig = statConfig.uniCloud || {};
-                    statVersion = statConfig.version === '2' ? '2' : '1';
                     isEnable = statConfig.enable === true;
-                    process.env.UNI_STAT_UNI_CLOUD = JSON.stringify(uniCloudConfig);
-                    process.env.UNI_STAT_DEBUG = statConfig.debug ? 'true' : 'false';
-                    if (process.env.NODE_ENV === 'production') {
-                        const manifestJson = uniCliShared.parseManifestJsonOnce(inputDir);
-                        if (!manifestJson.appid) {
-                            uniStatLog(uniCliShared.M['stat.warn.appid']);
-                            isEnable = false;
-                        }
-                        else {
-                            if (!statConfig.version) {
-                                uniStatLog(uniCliShared.M['stat.warn.version']);
+                    if (isEnable) {
+                        const uniCloudConfig = statConfig.uniCloud || {};
+                        statVersion = statConfig.version === '2' ? '2' : '1';
+                        process.env.UNI_STAT_UNI_CLOUD = JSON.stringify(uniCloudConfig);
+                        process.env.UNI_STAT_DEBUG = statConfig.debug ? 'true' : 'false';
+                        if (process.env.NODE_ENV === 'production') {
+                            const manifestJson = uniCliShared.parseManifestJsonOnce(inputDir);
+                            if (!manifestJson.appid) {
+                                uniStatLog(uniCliShared.M['stat.warn.appid']);
+                                isEnable = false;
                             }
-                            if (isEnable) {
-                                uniStatLog(`已开启 uni统计${statVersion}.0 版本`);
+                            else {
+                                if (!statConfig.version) {
+                                    uniStatLog(uniCliShared.M['stat.warn.version']);
+                                }
+                                else {
+                                    uniStatLog(`已开启 uni统计${statVersion}.0 版本`);
+                                }
                             }
                         }
-                    }
-                    else {
-                        if (isEnable) {
+                        else {
                             if (!statConfig.version) {
                                 uniStatLog(uniCliShared.M['stat.warn.version']);
                             }
-                            uniStatLog(uniCliShared.M['stat.warn.tip'].replace('{version}', `${statVersion}.0`));
+                            else {
+                                uniStatLog(uniCliShared.M['stat.warn.tip'].replace('{version}', `${statVersion}.0`));
+                            }
                         }
                     }
                     debug__default["default"]('uni:stat')('isEnable', isEnable);
diff --git a/packages/uni-stat/src/plugin/index.ts b/packages/uni-stat/src/plugin/index.ts
index c63748e89..b430fdd30 100644
--- a/packages/uni-stat/src/plugin/index.ts
+++ b/packages/uni-stat/src/plugin/index.ts
@@ -51,33 +51,34 @@ export default () => [
         // ssr 时不开启
         if (!isSsr(env.command, config)) {
           const statConfig = getUniStatistics(inputDir, platform)
-          const uniCloudConfig = statConfig.uniCloud || {}
-          statVersion = statConfig.version === '2' ? '2' : '1'
           isEnable = statConfig.enable === true
 
-          process.env.UNI_STAT_UNI_CLOUD = JSON.stringify(uniCloudConfig)
-          process.env.UNI_STAT_DEBUG = statConfig.debug ? 'true' : 'false'
-          if (process.env.NODE_ENV === 'production') {
-            const manifestJson = parseManifestJsonOnce(inputDir)
-            if (!manifestJson.appid) {
-              uniStatLog(M['stat.warn.appid'])
-              isEnable = false
-            } else {
-              if (!statConfig.version) {
-                uniStatLog(M['stat.warn.version'])
-              }
-              if (isEnable) {
-                uniStatLog(`已开启 uni统计${statVersion}.0 版本`)
+          if (isEnable) {
+            const uniCloudConfig = statConfig.uniCloud || {}
+
+            statVersion = statConfig.version === '2' ? '2' : '1'
+            process.env.UNI_STAT_UNI_CLOUD = JSON.stringify(uniCloudConfig)
+            process.env.UNI_STAT_DEBUG = statConfig.debug ? 'true' : 'false'
+            if (process.env.NODE_ENV === 'production') {
+              const manifestJson = parseManifestJsonOnce(inputDir)
+              if (!manifestJson.appid) {
+                uniStatLog(M['stat.warn.appid'])
+                isEnable = false
+              } else {
+                if (!statConfig.version) {
+                  uniStatLog(M['stat.warn.version'])
+                } else {
+                  uniStatLog(`已开启 uni统计${statVersion}.0 版本`)
+                }
               }
-            }
-          } else {
-            if (isEnable) {
+            } else {
               if (!statConfig.version) {
                 uniStatLog(M['stat.warn.version'])
+              } else {
+                uniStatLog(
+                  M['stat.warn.tip'].replace('{version}', `${statVersion}.0`)
+                )
               }
-              uniStatLog(
-                M['stat.warn.tip'].replace('{version}', `${statVersion}.0`)
-              )
             }
           }
 
-- 
GitLab