@tmsfe/tms-core 0.0.178 → 0.0.179

package/package.json

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

package/src/encrypt/encrypt-util.ts

@@ -317,7 +317,7 @@ const cryptRuleUtil = {
   // 远程加密服务是否开启
   isServerOpen: (): boolean => !!wx.$_publicKey,
   // 检查path是否符合下发的路由前缀
-  pathInUnablePrefix: (path: string): boolean => {
+  pathInEnablePrefix: (path: string): boolean => {
     if (!wx.$_publicKey) {
       return false;
     }
@@ -392,8 +392,8 @@ const isCryptoRuleMath = (path: string, reqData: any): BaseResp<boolean> => {
   if (!cryptRuleUtil.isServerOpen()) {
     return new baseUtil.BaseRespFac(false, false, '服务端加密未开启');
   }
-  // 请求路由满足服务端下发的不加密规则，不走加密
-  if (cryptRuleUtil.pathInUnablePrefix(path)) {
+  // 请求路由不满足服务端下发的加密规则，不走加密
+  if (!cryptRuleUtil.pathInEnablePrefix(path)) {
     return new baseUtil.BaseRespFac(false, false, '未命中服务端加密规则');
   }
   // 请求接口是加密性能埋点上报接口，不加密

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();