@tmsfe/tms-core 0.0.49 → 0.0.50

package/package.json

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

package/src/report/proxy/clone.ts

@@ -77,7 +77,7 @@ function deepClone(obj: any, depth = 0, maxDepth = 5): any {
  * 获取触发绑定事件的携带数据
  * @param event
  */
-function getEventExtend(event: any): any {
+function getEventExtra(event: any): any {
   if (!event) {
     return '';
   }
@@ -100,5 +100,5 @@ function getEventExtend(event: any): any {
 
 export default {
   deepClone,
-  getEventExtend,
+  getEventExtra,
 };

package/src/report/proxy/component.ts

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

package/src/report/proxy/page.ts

@@ -28,8 +28,8 @@ function proxyLifeMethod(pageOptions: any, methodName: string): void {
   pageOptions[methodName] = function (...args: any[]): any {
     // 生命周期函数先发埋点，避免次过程用户退出而丢失埋点
     const options = clone.deepClone(args[0], 0, 1);
-    const extend = getPageLifeExtend(this, methodName);
-    helper.reportData(`Page_${methodName}`, options, extend);
+    const extra = getPageLifeExtra(this, methodName);
+    helper.reportData(`Page_${methodName}`, options, extra);
 
     // 执行原函数
     return helper.executeFunc(this, original, args, helper.emptyFunc);
@@ -37,9 +37,8 @@ function proxyLifeMethod(pageOptions: any, methodName: string): void {
 }
 
 // 获取生命周期函数上报时的附加信息
-function getPageLifeExtend(page: any, methodName: string): IPageLifeExtend {
+function getPageLifeExtra(page: any, methodName: string): IPageLifeExtra {
   /* eslint-disable */
-  page.tmsPageShowCount = page.tmsPageShowCount || 0;
   // 页面生命周期内第几次曝光
   let showCount: number;
   // 距离onShow的时长，如果是onShow函数则为距离onLoad的时长
@@ -50,9 +49,10 @@ function getPageLifeExtend(page: any, methodName: string): IPageLifeExtend {
     showCount = page.tmsPageShowCount;
     lessShowTime = page.tmsPageShowTime - page.tmsPageLoadTime;
   } else if (methodName === 'onLoad') {
+    page.tmsPageShowCount = 0;
+    page.tmsPageLoadTime = Date.now();
     showCount = 1;
     lessShowTime = 0;
-    page.tmsPageLoadTime = Date.now();
   } else {
     showCount = page.tmsPageShowCount;
     lessShowTime = Date.now() - page.tmsPageShowTime;
@@ -70,13 +70,13 @@ function proxyBindEvent(pageOptions: any, methodName: string): void {
   }
   // eslint-disable-next-line no-param-reassign
   pageOptions[methodName] = function (...args: any[]): any {
-    const extend = clone.getEventExtend(args[0]) ; // 把触发事件附加数据也带上
+    const extra = clone.getEventExtra(args[0]) ; // 把触发事件附加数据也带上
     // 执行原函数之后再发埋点
     return helper.executeFunc(this, original, args, () => {
       const data = clone.deepClone(this.data);
       const eventName = `Page_${methodName}`;
-      helper.setLastBindEvent({ eventName, methodName, data, extend });
-      helper.reportData(eventName, data, extend);
+      helper.setLastBindEvent({ eventName, methodName, data, extra });
+      helper.reportData(eventName, data, extra);
     });
   };
 }

package/src/report/proxy/types.ts

@@ -23,13 +23,13 @@ interface IBindEvent {
   /**
    * 触发事件的携带参数
    */
-  extend: object,
+  extra: object,
 }
 
 /**
  * 页面生命周期函数的埋点附加数据
  */
-interface IPageLifeExtend {
+interface IPageLifeExtra {
   /**
    * 页面生命周期内第几次曝光
    */
@@ -37,7 +37,7 @@ interface IPageLifeExtend {
   /**
    * 距离onShow的时长，如果是onShow函数则为距离onLoad的时长
    */
-  lessShowTime?: number,
+  lessShowTime: number,
   /**
    * 最后一个触发绑定事件埋点
    */