@tmsfe/tms-core 0.0.204 → 0.0.207

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.204",
+  "version": "0.0.207",
   "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/report/helper.ts

@@ -4,7 +4,6 @@
  */
 
 import clone from './clone';
-import { getSystemInfoSync } from '../wxApi';
 import {
   IPage,
   DataItem,
@@ -43,7 +42,7 @@ let systemInfo: ISystemInfo;
  */
 function getSystemInfo(): ISystemInfo {
   if (!systemInfo) {
-    const currentSystemInfo = getSystemInfoSync() as any;
+    const currentSystemInfo = wx.getSystemInfoSync() as any;
     // eslint-disable-next-line
     const { model = '', version: wxVersion = '', platform = '', SDKVersion = '', host } = currentSystemInfo;
     systemInfo = { model, wxVersion, platform, SDKVersion, host };

package/src/report/proxy/helper.ts

@@ -5,7 +5,6 @@
 
 import clone from '../clone';
 import helper from '../helper';
-import { getSystemInfoSync } from '../../wxApi';
 import { IInitOptions, IBindEvent } from './types';
 
 let initOptions: IInitOptions;
@@ -31,11 +30,16 @@ function fastReportData(...args: any[]): any {
   initOptions.fastReport(...args);
 }
 
+let systemInfo: WechatMiniprogram.SystemInfo;
+
 /**
  * 获取wx.getSystemInfoSync()
  */
 function getSystemInfo(): any {
-  return getSystemInfoSync();
+  if (!systemInfo) {
+    systemInfo = wx.getSystemInfoSync();
+  }
+  return systemInfo;
 }
 
 let lastBindEvent: IBindEvent;

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;