@tmsfe/tms-core 0.0.206 → 0.0.208

package/package.json

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

package/src/index.js

@@ -56,6 +56,7 @@ import * as storage from './storage';
 import * as uiUtil from './tmsuiUtils';
 import { throttle, debounce } from './funcUtils';
 import { formatAmount } from './priceUtils';
+import { getSystemInfoSync } from './wxApi';
 
 /**
  * @public
@@ -279,6 +280,8 @@ const api = {
 
   storage,
 
+  getSystemInfoSync,
+
   ...syncApi,
   ...uiUtil,
   throttle,

package/src/navbarUtils.js

@@ -2,7 +2,23 @@
  * @desc: 获取导航高度的相关函数
  */
 import { compareVersion } from './compareVersion';
-import { getSystemInfoSync } from './wxApi';
+let systemInfo = null;
+
+/**
+ * 获取系统信息，有缓存, 返回数据同wx.getSystemInfoSync  {@link https://developers.weixin.qq.com/miniprogram/dev/api/base/system/wx.getSystemInfoSync.html}
+ * @returns {Object} 系统信息
+ */
+const getSystemInfoSync = () => {
+  if (systemInfo) return systemInfo;
+  let res;
+  try {
+    systemInfo = wx.getSystemInfoSync();
+    res = systemInfo;
+  } catch (_) {
+    res = {};
+  }
+  return res;
+};
 
 /**
  * 获取系统信息，有缓存, 返回数据同wx.getSystemInfoSync {@link https://developers.weixin.qq.com/miniprogram/dev/api/base/system/wx.getSystemInfoSync.html}

package/src/request.js

@@ -416,11 +416,13 @@ export default class Request {
         return await this.invokeRequest(path, param, method, header);
       }
 
-      // 重试case3：处理网关框架码重试 requestRetryFlag?.gatewayCode由七彩石配置
+      // 重试case3：处理网关框架码重试 requestRetryFlag?.gwCodeReTryPath由七彩石配置
       const { requestRetryFlag } = wx.tmsFlagMap || {};
       // X-Gateway-Code必须首字母大写，否则真机取不到
       const gatewayCode = res?.header?.['X-Gateway-Code'];
-      if (requestRetryFlag?.gatewayCode && isGatewayCodeNeedRetry(gatewayCode)) {
+      // 判断网关框架码重试白名单
+      const isGwCodeRetryPathWhite = requestRetryFlag?.gwCodeReTryPath.includes(path);
+      if (isGwCodeRetryPathWhite && isGatewayCodeNeedRetry(gatewayCode)) {
         return await this.handleReTry(path, param, method, header, {
           reportMsg: {
             gatewayCode,

package/src/utils/canvas/canvasDrawer.js

@@ -1,5 +1,3 @@
-import { getSystemInfoSync } from '../../wxApi';
-
 class CanvasDrawer {
   constructor(canvasId, container, instance = '', designWindowWidth = 750) {
     this.canvasId = canvasId; // canvasId
@@ -18,7 +16,7 @@ class CanvasDrawer {
           const canvas = res[0].node;
           this.canvas = canvas;
           this.ctx = canvas.getContext('2d');
-          const { pixelRatio: dpr, windowWidth } = getSystemInfoSync();
+          const { pixelRatio: dpr, windowWidth } = wx.getSystemInfoSync();
           canvas.width = res[0].width * dpr;
           canvas.height = res[0].height * dpr;
           this.ratio = windowWidth / this.designWindowWidth;