@tmsfe/tms-core 0.0.54 → 0.0.55

package/package.json

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

package/src/report/formatV2.ts

@@ -8,8 +8,7 @@ import helper from './helper';
 /**
  * 获取埋点的基础字段
  */
-function getBaseData(deviceData: IDeviceData): { arr: DataItem[], nextIndex: number } {
-  const { page, pageDepth } = helper.getPageInfo();
+function getBaseData(page: IPage, deviceData: IDeviceData): { arr: DataItem[], nextIndex: number } {
   const { networkType, location } = deviceData;
   const { appVersion, client } = helper.getInitOptions();
   const arr = new Array<DataItem>(helper.dataArrLen);
@@ -51,11 +50,11 @@ function getBaseData(deviceData: IDeviceData): { arr: DataItem[], nextIndex: num
   // 22: f22，小程序启动时的url和参数
   arr[22] = helper.getLaunchOptions();
   // 23: f23，当前页面的url
-  arr[23] = page?.route;
+  arr[23] = page.route;
   // 24: f24，当前页面的query
-  arr[24] = page?.options;
+  arr[24] = page.options;
   // 25: f25，当前页面深度
-  arr[25] = pageDepth;
+  arr[25] = page.depth;
   // 26: f26，一次小程序生命周期中的埋点统一标记
   arr[26] = helper.getLifeReportKey();
   // 27 ~ 30: 预留字段给后续扩展使用
@@ -67,8 +66,8 @@ function getBaseData(deviceData: IDeviceData): { arr: DataItem[], nextIndex: num
 /**
  * 拼接埋点数组
  */
-function jointData(data: any[], deviceData: IDeviceData): DataItem[] {
-  const { arr, nextIndex } = getBaseData(deviceData);
+function jointData(page: IPage, data: any[], deviceData: IDeviceData): DataItem[] {
+  const { arr, nextIndex } = getBaseData(page, deviceData);
   let index = nextIndex;
   for (const item of data) {
     if (index >= arr.length) {
@@ -85,9 +84,11 @@ function jointData(data: any[], deviceData: IDeviceData): DataItem[] {
  * 格式化上报埋点数据
  */
 function formatData(data: any[]): Promise<DataItem[]> {
+  // getDeviceData可能会太慢导致页面已跳转完，所以先获取page比较准确
+  const page = helper.getPageInfo();
   return new Promise<DataItem[]>((resolve) => {
     helper.getDeviceData().then((deviceData: IDeviceData) => {
-      const arr = jointData(data, deviceData);
+      const arr = jointData(page, data, deviceData);
       resolve(arr);
     });
   });
@@ -97,7 +98,9 @@ function formatData(data: any[]): Promise<DataItem[]> {
  * 格式化快速上报埋点数据，不依赖用户位置
  */
 function formatFastData(data: any[]): DataItem[] {
-  return jointData(data, helper.getCacheDeviceData());
+  const page = helper.getPageInfo();
+  const deviceData = helper.getCacheDeviceData();
+  return jointData(page, data, deviceData);
 }
 
 export default {

package/src/report/helper.ts

@@ -116,20 +116,25 @@ function getLifeReportKey(): string {
 /**
  * 获取当前页面信息
  */
-function getPageInfo(): { page: IPage, pageDepth: number } {
+function getPageInfo(): IPage {
   const pages = getCurrentPages();
-  let page: IPage;
-  let pageDepth = 1; // 页面深度
-  // 首页未渲染
+  let route: string;
+  let options: object;
+  let depth: number; // 页面深度
+  // 刚启动时首页未渲染
   if (pages.length === 0) {
     const launch = syncApi.getLaunchOptionsSync() as any;
-    page = { route: launch.path, options: launch.query };
+    route = launch.path;
+    options = launch.qurey;
+    depth = 1;
   } else {
-    pageDepth = pages.length;
     // 如果最后一个为空，则当前是在插件页，继续找上一个页面
-    page = pages.reverse().find((t: IPage) => t);
+    const page = pages.reverse().find((t: any) => t);
+    route = page?.route;
+    options = page?.options;
+    depth = pages.length;
   }
-  return { page, pageDepth };
+  return { route, options, depth };
 }
 
 let launchOptions: object | null = null;

package/src/report/types.ts

@@ -16,6 +16,7 @@ interface IInitOptions {
 interface IPage {
   route: string,
   options: object,
+  depth: number,
 }
 
 /**