@tmsfe/tms-core 0.0.10 → 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);
@@ -1248,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);
@@ -1476,41 +1486,6 @@ const startListenApp = () => {
     // onHide时立即上报，并清除定时器
     report(true, true);
   });
-  /**
-   * 监听小程序路由切换事件
-   */
-
-  if (!wx.onAppRoute) {
-    cache({
-      26: 'H',
-      27: 'H100',
-      40: 'notReport'
-    }, true);
-    wx.reportAnalytics('onapproute_not_support', {
-      mp_version: getMiniProgramVersion()
-    });
-    return;
-  }
-
-  wx.onAppRoute(res => {
-    const {
-      path,
-      query,
-      openType
-    } = res || {};
-    cache({
-      26: 'H',
-      27: 'H100',
-      38: path,
-      39: JSON.stringify(query),
-      40: openType
-    });
-    wx.reportAnalytics('page_show', {
-      path,
-      query: JSON.stringify(query),
-      opentype: openType
-    });
-  });
 };
 
 /**

package/package.json

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

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/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, '');
     }
   });
 
@@ -409,26 +414,6 @@ const startListenApp = () => {
     // onHide时立即上报，并清除定时器
     report(true, true);
   });
-
-  /**
-   * 监听小程序路由切换事件
-   */
-  if (!wx.onAppRoute) {
-    cache({ 26: 'H', 27: 'H100', 40: 'notReport' }, true);
-    wx.reportAnalytics('onapproute_not_support', {
-      mp_version: getMiniProgramVersion(),
-    });
-    return;
-  }
-  wx.onAppRoute((res) => {
-    const { path, query, openType } = res || {};
-    cache({ 26: 'H', 27: 'H100', 38: path, 39: JSON.stringify(query), 40: openType });
-    wx.reportAnalytics('page_show', {
-      path,
-      query: JSON.stringify(query),
-      opentype: openType,
-    });
-  });
 };
 
 export {