@tmsfe/tms-core 0.0.13 → 0.0.14

package/dist/index.js

@@ -28,6 +28,15 @@ const getSystemInfo$1 = () => {
     host
   };
 };
+
+const handleParamOfDifferentType = param => {
+  const data = new Array(41);
+  Object.keys(param).forEach(key => {
+    const valType = typeof param[key];
+    if (valType === 'string') data[key] = param[key];else if (valType === 'object') data[key] = JSON.stringify(param[key]);else data[key] = String(param[key]);
+  });
+  return data;
+};
 /**
  * @class FastReport
  * @classdesc 快速上报模块，不依赖用户标识和位置
@@ -49,12 +58,8 @@ class FastReport {
     var _data$;
 
     if (!(param !== null && param !== void 0 && param[27])) return Promise.reject('invalid report param');
-    const data = new Array(41);
     const env = getEnvInfo();
-    Object.keys(param).forEach(key => {
-      const valType = typeof param[key];
-      if (valType === 'string') data[key] = param[key];else if (valType === 'object') data[key] = JSON.stringify(param[key]);else data[key] = String(param[key]);
-    });
+    const data = handleParamOfDifferentType(param);
     data[9] = '2';
     data[33] = encodeURIComponent(JSON.stringify(getSystemInfo$1()));
     appVer && !data[10] && (data[10] = env.appVersion);
@@ -543,8 +548,6 @@ function getWxLocation(type = defaultLocationType) {
         });
     });
 }
-// 是否开启监听位置变更
-let isListenerLocation = false;
 /**
  * @class Location
  * @classdesc 基于微信api，封装location相关的接口。 包括监听位置变化， 获取用户位置信息
@@ -552,14 +555,11 @@ let isListenerLocation = false;
  */
 class LocationBase {
     /**
-     * @private 开启监听位置变更，要在授权之后才能开启
+     * @private 构造函数
      */
-    listenerLocation() {
-        if (!isListenerLocation) {
-            isListenerLocation = true;
-            wx.onLocationChange(this.subscribeLocationChnage);
-            wx.startLocationUpdate({});
-        }
+    constructor() {
+        wx.onLocationChange(this.subscribeLocationChnage);
+        wx.startLocationUpdate({});
     }
     /**
      * 获取用户当前位置(经纬度)
@@ -609,7 +609,6 @@ class LocationBase {
     getWxLocationPromise(showModalWhenCloseAuth, type, content = '', showCancel = true) {
         return new Promise((resolve, reject) => {
             getWxLocation(type).then((res) => {
-                this.listenerLocation();
                 userLocationCache$1 = res;
                 // 更新用户状态 -- todo
                 updateLocStatus(true);
@@ -1254,16 +1253,21 @@ const formatReportData = async (reportData, deviceData) => {
 
   }; // 对部分空数据使用默认数据填充
 
-  Object.keys(defaultReportData).forEach(key => {
-    param[key] = param[key] !== null && JSON.stringify(param[key]) || defaultReportData[key];
+  const handleDefaultData = (paramItem, defaultData) => {
+    const arr = [paramItem, paramItem === 0, paramItem === false];
+    return arr.some(item => !!item) ? paramItem : defaultData || '';
+  };
+
+  Object.keys(defaultReportData).forEach(index => {
+    const paramItem = param[index];
+    param[index] = handleDefaultData(paramItem, defaultReportData[index]);
   }); // 所有上报数据都转换为字符串
 
   param.forEach((reportItem, index) => {
     if (reportItem && typeof reportItem !== 'string') {
       param[index] = `${JSON.stringify(reportItem)}`;
     } else {
-      const paramItem = param[index];
-      param[index] = paramItem || paramItem === 0 ? `${paramItem}` : '';
+      param[index] = handleDefaultData(reportItem, '');
     }
   });
   return param.map(item => item !== null ? encodeURIComponent(item) : item);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",
@@ -34,9 +34,7 @@
     "rollup": "^2.6.1",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^6.1.0",
-    "rollup-plugin-typescript2": "0.27.0",
-    "rollup-plugin-replace": "^2.2.0",
-    "typescript": "^4.5.2"
+    "rollup-plugin-typescript2": "0.27.0"
   },
   "author": "tms·web",
   "gitHead": "72bf52451594b49a1c9f78edbad5956d414a66ca"

package/src/fastreport.js

@@ -16,6 +16,18 @@ const getSystemInfo = () => {
   return { model, wxVersion, platform, SDKVersion, host };
 };
 
+const handleParamOfDifferentType = (param) => {
+  const data = new Array(41);
+  Object.keys(param).forEach((key) => {
+    const valType = typeof param[key];
+    if (valType === 'string') data[key] = param[key];
+    else if (valType === 'object') data[key] = JSON.stringify(param[key]);
+    else data[key] = String(param[key]);
+  });
+
+  return data;
+};
+
 /**
  * @class FastReport
  * @classdesc 快速上报模块，不依赖用户标识和位置
@@ -33,14 +45,8 @@ export default class FastReport {
    */
   static report(param, simulatedUserId = true, simulatedUserIdIndex = 40, reportShowScene = true, appVer = true) {
     if (!param?.[27]) return Promise.reject('invalid report param');
-    const data = new Array(41);
     const env = getEnvInfo();
-    Object.keys(param).forEach((key) => {
-      const valType = typeof param[key];
-      if (valType === 'string') data[key] = param[key];
-      else if (valType === 'object') data[key] = JSON.stringify(param[key]);
-      else data[key] = String(param[key]);
-    });
+    const data = handleParamOfDifferentType(param);
     data[9] = '2';
     data[33] = encodeURIComponent(JSON.stringify(getSystemInfo()));
     appVer && !data[10] && (data[10] = env.appVersion);

package/src/location/base.ts

@@ -29,9 +29,6 @@ function getWxLocation(type: string = defaultLocationType): Promise<WxPostionTyp
   });
 }
 
-// 是否开启监听位置变更
-let isListenerLocation = false;
-
 /**
  * @class Location
  * @classdesc 基于微信api，封装location相关的接口。 包括监听位置变化， 获取用户位置信息
@@ -39,14 +36,11 @@ let isListenerLocation = false;
  */
 class LocationBase {
   /**
-   * @private 开启监听位置变更，要在授权之后才能开启
+   * @private 构造函数
    */
-  listenerLocation() {
-    if (!isListenerLocation) {
-      isListenerLocation = true;
-      wx.onLocationChange(this.subscribeLocationChnage);
-      wx.startLocationUpdate({});
-    }
+  constructor() {
+    wx.onLocationChange(this.subscribeLocationChnage);
+    wx.startLocationUpdate({});
   }
 
   /**
@@ -101,7 +95,6 @@ class LocationBase {
   public getWxLocationPromise(showModalWhenCloseAuth: boolean, type: string, content = '', showCancel = true) {
     return new Promise((resolve, reject) => {
       getWxLocation(type).then((res: WxPostionType) => {
-        this.listenerLocation();
         userLocationCache = res;
         // 更新用户状态 -- todo
         updateLocStatus(true);

package/src/report.js

@@ -212,8 +212,14 @@ const formatReportData = async (reportData, deviceData) => {
     36: getAppShowOptions(),       // 打开小程序的场景值及参数
   };
   // 对部分空数据使用默认数据填充
-  Object.keys(defaultReportData).forEach((key) => {
-    param[key] = (param[key] !== null && JSON.stringify(param[key])) || defaultReportData[key];
+  const handleDefaultData = (paramItem, defaultData) => {
+    const arr = [paramItem, paramItem === 0, paramItem === false];
+    return (arr.some(item => !!item)) ? paramItem : (defaultData || '');
+  };
+
+  Object.keys(defaultReportData).forEach((index) => {
+    const paramItem = param[index];
+    param[index] = handleDefaultData(paramItem, defaultReportData[index]);
   });
 
   // 所有上报数据都转换为字符串
@@ -221,8 +227,7 @@ const formatReportData = async (reportData, deviceData) => {
     if (reportItem && typeof reportItem !== 'string') {
       param[index] = `${JSON.stringify(reportItem)}`;
     } else {
-      const paramItem = param[index];
-      param[index] = (paramItem || paramItem === 0) ? `${paramItem}` : '';
+      param[index] = handleDefaultData(reportItem, '');
     }
   });