@tmsfe/tms-core 0.0.177 → 0.0.179

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.177",
+  "version": "0.0.179",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",

package/src/encrypt/index.ts

@@ -145,7 +145,7 @@ function proxyWxRequest(): void {
                 });
                 success?.call(this, res);
                 // 接口重试耗时
-                let now = Date.now();
+                const now = Date.now();
                 wx.reportEvent?.('cost_encrypt_statistic', {
                   period: 'retry_request',
                   cost: Date.now() - startTime,
@@ -165,7 +165,7 @@ function proxyWxRequest(): void {
             });
             success?.call(this, res);
             // 响应回调耗时
-            let now = Date.now();
+            const now = Date.now();
             wx.reportEvent?.('cost_encrypt_statistic', {
               period: 'response_callback',
               cost: now - startTime,
@@ -192,7 +192,7 @@ function proxyWxRequest(): void {
         },
       });
       // 加密请求准备耗时
-      let now = Date.now();
+      const now = Date.now();
       wx.reportEvent?.('cost_encrypt_statistic', {
         period: 'before_request',
         cost: now - startTime,

package/src/navbarUtils.js

@@ -135,6 +135,7 @@ const calNavBarHeight = (menuTop, menuHeight, statusBarHeight, apiCategory) => {
  * @returns {Object} data.enterOptions             启动参数
  * @returns {Object} data.enterOptions.apiCategory API 类别（不同apiCategory场景下的API有不同限制，UI也有不同）
  */
+/* eslint-disable */
 const getNavBarConfigData = () => { // eslint-disable-line require-jsdoc
   const systemInfo = getSysInfo();
   const { brand, getSystemInfoSuccess, platform } = systemInfo;
@@ -151,7 +152,9 @@ const getNavBarConfigData = () => { // eslint-disable-line require-jsdoc
     statusBarHeight = isIOS ? StatusBarHeightOnIOS : StatusBarHeightOnAndroid;
   }
 
-  const enable = compareVersion(version, '7.0.0') >= 0 || brand === 'devtools' || platform === 'ohos'; // 微信版本是否支持自定义顶栏，不支持时自动隐藏
+  const isPCShowNavBar = getPCNavbarShowStatus(systemInfo);
+  // 手机端微信版本version格式为7.0.0，电脑端为4.0.3.93，compareVersion(version, '7.0.0') >= 0只处理了手机端是否展示自定义导航栏
+  const enable = compareVersion(version, '7.0.0') >= 0 || brand === 'devtools' || platform === 'ohos' || isPCShowNavBar; // 微信版本是否支持自定义顶栏，不支持时自动隐藏
   const enterOptions = getEnterOptions();
   if (enable) {
     return { enable, ...calculateNavBarLayout(isIOS, statusBarHeight, enterOptions.apiCategory) };
@@ -160,6 +163,20 @@ const getNavBarConfigData = () => { // eslint-disable-line require-jsdoc
   return { enable };
 };
 
+// 电脑端是否展示导航栏
+const getPCNavbarShowStatus = (systemInfo) => {
+  const { SDKVersion, platform } = systemInfo;
+  if (['windows', 'mac'].includes(platform)) {
+    try {
+      return compareVersion(SDKVersion, '3.6.1') >= 0;
+    } catch (_) {
+      return true;
+    }
+  } else {
+    return false;
+  }
+};
+
 // 获取需要对外暴露的启动参数
 const getEnterOptions = () => {
   const options = wx.getEnterOptionsSync();