@tmsfe/tms-core 0.0.79 → 0.0.82

package/package.json

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

package/src/report/formatV1.ts

@@ -45,6 +45,8 @@ function getBaseData(deviceData: IDeviceData): DataItem[] {
   arr[18] = location.cityName;
   // 19: f19，当前小程序运行的宿主环境
   arr[19] = host;
+  // 22: f22，小程序启动时的url和参数(与f36一致)
+  arr[22] = helper.getLaunchOptions();
   // 28: f28，sinan、mycar等
   arr[28] = client;
   // 29: f29，小程序场景值

package/src/report/helper.ts

@@ -16,19 +16,25 @@ let initOptions: IInitOptions;
  * 初始化
  */
 function init(options: IInitOptions): void {
-  if (!initOptions) {
-    initOptions = options;
-
-    // 从上次缓存中读取，方便首次Report可以先带上
-    const loc = wx.getStorageSync('home.location_city') || wx.getStorageSync('home.city');
-    deviceData = {
-      networkType: '',
-      location: {
-        province: loc?.province as string,
-        cityName: loc?.cityName as string,
-      },
-    };
+  if (initOptions) {
+    return;
   }
+
+  initOptions = options;
+
+  // 从上次缓存中读取，方便首次Report可以先带上
+  const loc = wx.getStorageSync('home.location_city') || wx.getStorageSync('home.city');
+  deviceData = {
+    networkType: '',
+    location: {
+      province: loc?.province as string,
+      cityName: loc?.cityName as string,
+    },
+  };
+
+  wx.onAppShow((options) => {
+    launchOptions = options;
+  });
 }
 
 /**
@@ -128,7 +134,7 @@ function getPageInfo(): IPage {
   let depth: number; // 页面深度
   // 刚启动时首页未渲染
   if (pages.length === 0) {
-    const launch = syncApi.getLaunchOptionsSync() as any;
+    const launch = getLaunchOptions();
     route = launch.path;
     options = launch.qurey;
     depth = 1;
@@ -146,12 +152,12 @@ function getPageInfo(): IPage {
   return { route, options, depth };
 }
 
-let launchOptions: object | null = null;
+let launchOptions: any = null;
 
 /**
  * 获取小程序启动参数
  */
-function getLaunchOptions(): object {
+function getLaunchOptions(): any {
   if (launchOptions === null) {
     launchOptions = syncApi.getLaunchOptionsSync();
   }
@@ -162,7 +168,7 @@ function getLaunchOptions(): object {
  * 获取小程序启动时的from参数
  */
 function getLaunchFrom(): string {
-  const obj = syncApi.getLaunchOptionsSync() as any;
+  const obj = getLaunchOptions();
   return obj.query?.from;
 }
 
@@ -170,7 +176,7 @@ function getLaunchFrom(): string {
  * 获取小程序启动场景值
  */
 function getAppScene(): number {
-  const { scene = -1 } = syncApi.getLaunchOptionsSync() as any;
+  const { scene = -1 } = getLaunchOptions();
   return scene;
 }
 
@@ -244,6 +250,18 @@ function getCacheDeviceData(): IDeviceData {
   return deviceData;
 }
 
+/**
+ * 设置字段到上报的SystemInfo中
+ * 用于携带自定义信息区分用户场景，比如新旧首页的区分
+ * @param fieldName
+ * @param value
+ */
+function setSystemField(fieldName: string, value: number | string): void {
+  const systemInfo = getSystemInfo();
+  // @ts-ignore
+  systemInfo[fieldName] = value;
+}
+
 export default {
   init,
   getTms,
@@ -260,4 +278,5 @@ export default {
   dataArrLen,
   getDeviceData,
   getCacheDeviceData,
+  setSystemField,
 };

package/src/report/index.ts

@@ -55,23 +55,11 @@ function fastReport2(...data: any[]): void {
   }
 }
 
-/**
- * 设置字段到上报的SystemInfo中
- * 用于携带自定义信息区分用户场景，比如新旧首页的区分
- * @param fieldName
- * @param value
- */
-function setSystemField(fieldName: string, value: number | string): void {
-  const systemInfo = helper.getSystemInfo();
-  // @ts-ignore
-  systemInfo[fieldName] = value;
-}
-
 export default {
   init,
   report,
   fastReport,
   report2,
   fastReport2,
-  setSystemField,
+  setSystemField: helper.setSystemField,
 };

package/src/report/proxy/component.ts

@@ -29,7 +29,7 @@ function proxyLifeMethod(componentName: string, componentOptions: any, methodNam
 }
 
 // 劫持绑定事件
-function proxyBindEvent(componentName: string, methods: any, methodName: string): void {
+function proxyBindEvent(componentName: string, methods: any, methodName: string, bindType: string): void {
   const original = methods[methodName];
   if (!original) {
     return;
@@ -41,8 +41,8 @@ function proxyBindEvent(componentName: string, methods: any, methodName: string)
       const extra = clone.getEventExtra(args[0]) ; // 把触发事件附加数据也带上
       const data = clone.deepClone(this.data);
       const eventName = `Component_${componentName}_${methodName}`;
-      helper.setLastBindEvent({ eventName, data, extra });
-      helper.reportData(eventName, data, extra);
+      helper.setLastBindEvent({ eventName, data, extra, bindType });
+      helper.reportData(eventName, data, extra, bindType);
     });
   };
 }
@@ -56,8 +56,9 @@ function init(): void {
     if (options.tmsAutoReport) {
       // tmsReportEvents是由工具在编译时分析出的要上报的事件列表
       const methods = options.methods || {};
-      for (const name of options.tmsReportEvents) {
-        proxyBindEvent(options.tmsComponentName, methods, name);
+      for (const event of options.tmsReportEvents) {
+        const { name, type } = event;
+        proxyBindEvent(options.tmsComponentName, methods, name, type);
       }
       proxyLifeMethod(options.tmsComponentName, options, 'ready');
     }

package/src/report/proxy/page.ts

@@ -85,7 +85,7 @@ function getPageLifeExtra(page: any, methodName: string, args: any[]): IPageLife
 }
 
 // 劫持绑定事件
-function proxyBindEvent(pageOptions: any, methodName: string): void {
+function proxyBindEvent(pageOptions: any, methodName: string, bindType: string): void {
   const original = pageOptions[methodName];
   if (!original) {
     return;
@@ -97,8 +97,8 @@ function proxyBindEvent(pageOptions: any, methodName: string): void {
     return helper.executeFunc(this, original, args, () => {
       const data = clone.deepClone(this.data);
       const eventName = `Page_${methodName}`;
-      helper.setLastBindEvent({ eventName, data, extra });
-      helper.reportData(eventName, data, extra);
+      helper.setLastBindEvent({ eventName, data, extra, bindType });
+      helper.reportData(eventName, data, extra, bindType);
     });
   };
 }
@@ -113,8 +113,9 @@ function proxyPage(): void {
         proxyLifeMethod(options, methodName);
       }
       // tmsReportEvents是由工具在编译时分析出的要上报的事件列表
-      for (const methodName of options.tmsReportEvents) {
-        proxyBindEvent(options, methodName);
+      for (const event of options.tmsReportEvents) {
+        const { name, type } = event;
+        proxyBindEvent(options, name, type);
       }
     }
     originalPage(options);
@@ -163,7 +164,7 @@ function proxySubscribeMessage(): void {
       // eslint-disable-next-line
       options.fail = function(err: any) {
         helper.reportData('wx_requestSubscribeMessage_fail', tmplIds, err.errMsg);
-        originalFail.fail(this, err);
+        originalFail.call(this, err);
       };
       originalApi.call(this, options);
     },

package/src/report/proxy/types.ts

@@ -20,6 +20,10 @@ interface IBindEvent {
    * 触发事件的携带参数
    */
   extra: object,
+  /**
+   * 事件类型
+   */
+  bindType: string,
 }
 
 /**