@tmsfe/tms-core 0.0.136 → 0.0.138

package/package.json

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

package/src/report/formatV2.ts

@@ -66,7 +66,9 @@ function getBaseData(page: IPage, deviceData: IDeviceData): { arr: DataItem[], n
   arr[26] = helper.getLifeReportKey();
   // 27: f27，生成用户唯一id，方便追踪未登录接口
   arr[27] = helper.getTmsUUID();
-  // 28 ~ 30: 预留字段给后续扩展使用
+  // 28: f28，实际执行页面url
+  arr[28] = page.execRoute;
+  // 29 ~ 30: 预留字段给后续扩展使用
   // 31 ~ 40: 提供给开发自定义
   // --------------------------字段列表--------------------------
   return { arr, nextIndex: 31 };
@@ -94,7 +96,13 @@ function jointData(page: IPage, data: any[], deviceData: IDeviceData): DataItem[
  */
 function formatData(data: any[]): Promise<DataItem[]> {
   // getDeviceData可能会太慢导致页面已跳转完，所以先获取page比较准确
+  // 提取最后一个数据项的 execPage 属性，并处理 data 为空数组的情况
+  const lastData = data.length > 0 ? data[data.length - 1] : null;
   const page = helper.getPageInfo();
+  if (lastData?.execPage) {
+    data.pop();
+    page.execRoute = lastData.execPage.route;
+  }
   return new Promise<DataItem[]>((resolve) => {
     helper.getDeviceData().then((deviceData: IDeviceData) => {
       const arr = jointData(page, data, deviceData);

package/src/report/proxy/component.ts

@@ -38,12 +38,14 @@ function proxyBindEvent(componentName: string, methods: any, methodName: string,
   // eslint-disable-next-line no-param-reassign
   methods[methodName] = function (...args: any[]): any {
     // 执行原函数之后再发埋点
-    return helper.executeFunc(this, original, args, () => {
+    return helper.executeFunc(this, original, args, (execPage) => {
       const extra = helper.getEventExtra(args[0]) ; // 把触发事件附加数据也带上
       const data = helper.cloneData(this);
       const eventName = `Component_${componentName}_${methodName}`;
       helper.setLastBindEvent({ eventName, data, extra, bindType });
-      helper.reportData(eventName, data, extra, bindType);
+      helper.reportData(eventName, data, extra, bindType, {
+        execPage,
+      });
     });
   };
 }

package/src/report/proxy/helper.ts

@@ -4,6 +4,7 @@
  */
 
 import clone from '../clone';
+import helper from '../helper';
 import { IInitOptions, IBindEvent } from './types';
 
 let initOptions: IInitOptions;
@@ -77,24 +78,26 @@ function emptyFunc(): void {
  * @param callback
  */
 function executeFunc(context: any, func: Function, args: any[], callback: Function): any {
+  // 获取当前page: route、options、depth
+  const page = helper.getPageInfo();
   let value: any;
   try {
     value = func.apply(context, args);
   } catch (e) {
-    callback();
+    callback(page);
     throw e;
   }
   // 如果不会返回promise
   if (!value || !value.then || typeof value.then !== 'function') {
-    callback();
+    callback(page);
     return value;
   }
 
   return value.then((res: any) => {
-    callback();
+    callback(page);
     return res;
   }).catch((err: any) => {
-    callback();
+    callback(page);
     return Promise.reject(err);
   });
 }

package/src/report/proxy/page.ts

@@ -96,11 +96,13 @@ function proxyBindEvent(pageOptions: any, methodName: string, bindType: string):
   pageOptions[methodName] = function (...args: any[]): any {
     const extra = helper.getEventExtra(args[0]) ; // 把触发事件附加数据也带上
     // 执行原函数之后再发埋点
-    return helper.executeFunc(this, original, args, () => {
+    return helper.executeFunc(this, original, args, (execPage) => {
       const data = helper.cloneData(this);
       const eventName = `Page_${methodName}`;
       helper.setLastBindEvent({ eventName, data, extra, bindType });
-      helper.reportData(eventName, data, extra, bindType);
+      helper.reportData(eventName, data, extra, bindType, {
+        execPage,
+      });
     });
   };
 }

package/src/report/types.ts

@@ -31,6 +31,7 @@ export interface IPage {
   route: string,
   options: object,
   depth: number,
+  execRoute?: string,
 }
 
 /**