@tmsfe/tms-core 0.0.98 → 0.0.100

package/package.json

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

package/src/index-proxy.js

@@ -66,7 +66,7 @@ const asyncFuncNames = [
   // 这行是tms-ui的
   'showDrawer', 'hideDrawer', 'showModal', 'hideModal',
   // 这行是runtime的
-  'getPhone', 'registerPhone', 'login', 'getLoginInfo', 'getOpenId', 'getMycarPubOpenId', 'getSinanPubOpenId',
+  'getPhone', 'registerPhone', 'login', 'checkLogin', 'getLoginInfo', 'getOpenId', 'getMycarPubOpenId', 'getSinanPubOpenId',
   // tms-core
   'setAuthInfo', 'getConfig', 'getApolloConfig', 'navigateToWebview', 'callCloudFunc', 'getEncryptUserInfo',
   'setUserLocation', 'getUserLocation', 'getMpOpenId', 'getOuterOpenId',

package/src/report/proxy/component.ts

@@ -5,11 +5,12 @@
 
 // / <reference path='./types.ts'/>
 
+// uniapp转换工具执行之后会打开这句注释
+// import Vue from 'vue';
+
 import clone from '../clone';
 import helper from './helper';
 
-let originalComponent: any = null;
-
 // 劫持Component的生命周期
 function proxyLifeMethod(componentName: string, componentOptions: any, methodName: string): void {
   /* eslint-disable */
@@ -21,7 +22,9 @@ function proxyLifeMethod(componentName: string, componentOptions: any, methodNam
   obj[methodName] = function (...args: any[]): any {
     // 生命周期函数先发埋点，避免次过程用户退出而丢失埋点
     const data = clone.deepClone(this.data);
-    const eventName = `Component_${componentName}_${methodName}`;
+    // vue下组件ready事件名是mounted，这里统一改为跟小程序一样用ready
+    const funcName = methodName === 'mounted' ? 'ready' : methodName;
+    const eventName = `Component_${componentName}_${funcName}`;
     helper.reportData(eventName, data);
     // 执行原函数
     return helper.executeFunc(this, original, args, helper.emptyFunc);
@@ -48,9 +51,9 @@ function proxyBindEvent(componentName: string, methods: any, methodName: string,
   };
 }
 
-// 劫持Page
-function init(): void {
-  originalComponent = Component;
+// 劫持小程序的Component
+function proxyMpComponent(): void {
+  const originalComponent = Component;
   // @ts-ignore
   Component = function (options: any) {
     // 只有tms的页面才需要上报
@@ -67,6 +70,37 @@ function init(): void {
   };
 }
 
+// 劫持vue的Component
+function proxyVueComponent(): void {
+  // @ts-ignore
+  Vue.mixin({
+    beforeCreate() {
+      const options = this.$options;
+      // 有组件名则不是页面
+      if (!options.tmsAutoReport || !options.tmsComponentName) {
+        return;
+      }
+
+      const { methods } = options;
+      for (const event of options.tmsReportEvents) {
+        const { name, type } = event;
+        proxyBindEvent(options.tmsComponentName, methods, name, type);
+      }
+
+      proxyLifeMethod(options.tmsComponentName, options, 'mounted');
+    },
+  });
+}
+
+// 劫持Page
+function init(): void {
+  if (wx.isH5) {
+    proxyVueComponent();
+  } else {
+    proxyMpComponent();
+  }
+}
+
 export default {
   init,
 };

package/src/report/proxy/page.ts

@@ -5,6 +5,9 @@
 
 // / <reference path='./types.ts'/>
 
+// uniapp转换工具执行之后会打开这句注释
+// import Vue from 'vue';
+
 import clone from '../clone';
 import helper from './helper';
 
@@ -19,8 +22,6 @@ const maybeLifeMethods = [
 ];
 const lifeMethods = mustLifeMethods.concat(maybeLifeMethods);
 
-let originalPage: any = null;
-
 // 劫持Page的生命周期
 function proxyLifeMethod(pageOptions: any, methodName: string): void {
   if (!pageOptions[methodName] && !mustLifeMethods.includes(methodName)) {
@@ -104,9 +105,9 @@ function proxyBindEvent(pageOptions: any, methodName: string, bindType: string):
   };
 }
 
-// 劫持Page
-function proxyPage(): void {
-  originalPage = Page;
+// 劫持小程序的Page
+function proxyMpPage(): void {
+  const originalPage = Page;
   Page = function (options: any) {
     // 只有tms的页面才需要上报
     if (options.tmsAutoReport) {
@@ -123,9 +124,35 @@ function proxyPage(): void {
   };
 }
 
+// 劫持vue的Page
+function proxyVuePage(): void {
+  // @ts-ignore
+  Vue.mixin({
+    beforeCreate() {
+      const options = this.$options;
+      // 有组件名则不是页面
+      if (!options.tmsAutoReport || options.tmsComponentName) {
+        return;
+      }
+
+      for (const methodName of lifeMethods) {
+        proxyLifeMethod(options, methodName);
+      }
+      for (const event of options.tmsReportEvents) {
+        const { name, type } = event;
+        proxyBindEvent(options.methods, name, type);
+      }
+    },
+  });
+}
+
 // 劫持Page
 function init(): void {
-  proxyPage();
+  if (wx.isH5) {
+    proxyVuePage();
+  } else {
+    proxyMpPage();
+  }
 }
 
 export default {

package/src/request.js

@@ -264,7 +264,7 @@ export default class Request {
   /**
    * @memberof Request
    * @param {string} path 请求接口路径
-   * @param {string} param 业务参数
+   * @param {object} param 业务参数
    * @param {string} method 请求方法 get/post
    * @param {object} header 自定义的请求头
    * @returns {object} 接口返回结果

package/src/runtime/index.js

@@ -47,6 +47,15 @@ const loginInfoPromise = new Promise(resolver => __resolver__.getLoginInfo = res
  */
 const getLoginInfo = () => loginInfoPromise;
 
+/**
+ * @public
+ * @description 获取用户userId等登录信息
+ * @param autoLogin 未登录时是否自动登录（小程序中启动时就已登录，该参数用于uniapp的h5页面）
+ */
+function checkLogin(autoLogin = false) {
+  // uniapp的h5会覆盖checkLogin函数实现检查和自动登录功能
+  return getLoginInfo().then(() => true);
+}
 
 /**
  * tms.getCarManager 用户获取小程序统一维护的车信息管理器
@@ -62,7 +71,7 @@ const getCarManager = () => Car;
  * 返回数据示意
  * {
  *   userId: "1135608",
- *   token: "a209e79c667d8711ec7564c1bf86f327",
+ *   token: "xxxxxx",
  *   firstLogin: 0,
  * },
  */
@@ -226,6 +235,7 @@ const api = {
   getPhone,
   registerPhone,
   login,
+  checkLogin,
   getLoginInfo,
   getOpenId,
   getMycarPubOpenId,

package/tsconfig.json

@@ -1,30 +0,0 @@
-{
-  "compilerOptions": {
-    "sourceMap": false,
-    "target": "esnext",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "allowJs": true,
-    "strict": false,
-    "declarationMap": false,
-    "noUnusedLocals": false,
-    "experimentalDecorators": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "removeComments": false,
-    "jsx": "preserve",
-    "lib": ["esnext"],
-    "rootDir": ".",
-    "types": [
-      "miniprogram-api-typings"
-    ],
-    "outDir": "dist",
-    "paths": {
-    }
-  },
-  "include": [
-    "src/**/*.js",
-    "src/**/*.ts"
-  ]
-}
-