@tmsfe/tms-core 0.0.54 → 0.0.57

package/package.json

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

package/src/index.js

@@ -28,6 +28,7 @@ import {
   formatTime,
   formatTimeStr,
   formatTimeWithDetails,
+  formatDateTime,
   dateToString,
 } from './timeUtils';
 import {
@@ -159,6 +160,7 @@ const api = {
   formatTime,
   formatTimeStr,
   formatTimeWithDetails,
+  formatDateTime,
   dateToString,
 
   /* IPX方法 */

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,29 @@ 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 };
+  // wx_navigate_before埋点上报时可能route是一个很大的对象而不是字符串，原因不详
+  if (typeof route as any !== 'string') {
+    route = '';
+  }
+  return { route, options, depth };
 }
 
 let launchOptions: object | null = null;

package/src/report/proxy/component.ts

@@ -21,9 +21,9 @@ function proxyBindEvent(componentName: string, methods: any, methodName: string)
     return helper.executeFunc(this, original, args, () => {
       const extra = clone.getEventExtra(args[0]) ; // 把触发事件附加数据也带上
       const data = clone.deepClone(this.data);
-      const eventName = `Component_${componentName}`;
-      helper.setLastBindEvent({ eventName, methodName, data, extra });
-      helper.reportData(eventName, methodName, data, extra);
+      const eventName = `Component_${componentName}_${methodName}`;
+      helper.setLastBindEvent({ eventName, data, extra });
+      helper.reportData(eventName, data, extra);
     });
   };
 }

package/src/report/proxy/page.ts

@@ -93,7 +93,7 @@ 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, methodName, data, extra });
+      helper.setLastBindEvent({ eventName, data, extra });
       helper.reportData(eventName, data, extra);
     });
   };

package/src/report/proxy/types.ts

@@ -9,13 +9,9 @@ interface IBindEvent {
    */
   pageUrl?: string,
   /**
-   * 事件名，如 `Page_${methodName}`、`Component_${componentName}`
+   * 事件名，如 `Page_${methodName}`、`Component_${componentName}_${methodName}`
    */
   eventName: string,
-  /**
-   * 触发的函数名
-   */
-  methodName: string,
   /**
    * Page或者Component的data
    */

package/src/report/types.ts

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

package/src/timeUtils.js

@@ -110,9 +110,41 @@ const formatTimeStr = (str = '', dateSeprator = '.', keepSeconds = false) => {
   return s;
 };
 
+/**
+  * 格式化时间对象
+  * @param {Date|Number} date  Date对象
+  * @param {String}      fmt 目标格式，如：yyyy年MM月dd日，MM/dd/yyyy，yyyyMMdd，yyyy-MM-dd hh:mm:ss等
+  * @returns {String}    格式化结果；异常情况下返回空串
+  */
+const formatDateTime = (date, fmt = 'yyyy-MM-dd hh:mm:ss') => {
+  const dateObj = date instanceof Date ? date : new Date(date);
+  if (isNaN(dateObj.getTime())) return '';
+
+  const obj = {
+    'M+': dateObj.getMonth() + 1,  // 月份
+    'd+': dateObj.getDate(),   // 日
+    'h+': dateObj.getHours(),  // 小时
+    'm+': dateObj.getMinutes(),  // 分
+    's+': dateObj.getSeconds(),  // 秒
+    S: dateObj.getMilliseconds(),  // 毫秒
+  };
+
+  let dateStr = fmt || 'yyyy-MM-dd hh:mm:ss';
+  if (/(y+)/.test(dateStr)) {
+    dateStr = dateStr.replace(RegExp.$1, (`${dateObj.getFullYear()}`).substr(4 - RegExp.$1.length));
+  }
+
+  Object.entries(obj).forEach(([key, value]) => {
+    if (new RegExp(`(${key})`).test(dateStr)) {
+      dateStr = dateStr.replace(RegExp.$1, (RegExp.$1.length === 1) ? (value) : (`${value}`.padStart(2, '0')));
+    }
+  });
+
+  return dateStr;
+};
 
 /**
- * @description 格式化时间戳为 yyyy-mm-dd, yyyy-mm-dd HH:MM, yyyy-mm-dd HH:MM:SS
+ * @description 格式化时间戳为 yyyy-MM-dd, yyyy-MM-dd hh:mm, yyyy-MM-dd hh:mm:ss
  * @param {Date} date 日期
  * @param {Boolean} withTime 是否带时间
  * @param {Boolean} withSeconds 是否带秒数
@@ -120,28 +152,13 @@ const formatTimeStr = (str = '', dateSeprator = '.', keepSeconds = false) => {
  * @returns {String} 格式化后的字符串，如 2021-03-18 或者 2021-03-18 10:11
  */
 const dateToString = (date, withTime = false, withSeconds = false, join = '-') => {
-  const DATE = date ? new Date(date) : new Date();
-  // 为兼容ios，android平台的差异，故而不使用toLocaleDateString方法
-  const year = DATE.getFullYear();
-  const month = DATE.getMonth() + 1;
-  const day = DATE.getDate();
-  const time = DATE.toTimeString().slice(0, 8);
-  let dateStr = year + join + month + join + day;
-
-  if (!withTime) {
-    return dateStr.replace(/\b\d\b/g, '0$&');
-  }
-
-  dateStr = `${dateStr} ${time}`.replace(/\b\d\b/g, '0$&');
-
-  if (!withSeconds) {
-    dateStr = dateStr.slice(0, -3);
-  }
-
-  return dateStr;
+  let fmt = `yyyy${join}MM${join}dd`;
+  if (withTime) fmt += withSeconds ? 'hh:mm:ss' : 'hh:mm';
+  return formatDateTime(date, fmt);
 };
 
 export {
+  formatDateTime,
   formatTime,
   formatTimeStr,
   formatTimeWithDetails,