@tmsfe/tms-core 0.0.78 → 0.0.81

package/package.json

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

package/src/index-proxy.js

@@ -11,6 +11,7 @@ import md5 from './md5';
 import { serialize } from './objUtils';
 import { calCoordinateDistance, formatDistance } from './distanceUtils';
 import { getNavBarConfigData } from './navbarUtils';
+import * as uiUtil from './tmsuiUtils';
 import * as rpxUtil from './rpx';
 import * as stringUtils from './stringUtils';
 import * as timeUtils from './timeUtils';
@@ -221,6 +222,7 @@ const api = {
   getHomePage,
   storage,
   ...rpxUtil,
+  ...uiUtil,
   ...asyncFuncs,
   ...objFuncs,
   ...syncApi,

package/src/index.js

@@ -45,6 +45,7 @@ import getLocInstance from './location/index';
 import LocationBase from './location/base';
 import { getMpOpenId, getOuterOpenId, getEncryptUserInfo } from './mpInfo';
 import * as storage from './storage';
+import * as uiUtil from './tmsuiUtils';
 import { throttle, debounce } from './funcUtils';
 
 /**
@@ -200,6 +201,7 @@ const api = {
   storage,
 
   ...syncApi,
+  ...uiUtil,
   throttle,
   debounce,
 };

package/src/report/formatV1.ts

@@ -45,6 +45,8 @@ function getBaseData(deviceData: IDeviceData): DataItem[] {
   arr[18] = location.cityName;
   // 19: f19，当前小程序运行的宿主环境
   arr[19] = host;
+  // 22: f22，小程序启动时的url和参数(与f36一致)
+  arr[22] = helper.getLaunchOptions();
   // 28: f28，sinan、mycar等
   arr[28] = client;
   // 29: f29，小程序场景值

package/src/report/helper.ts

@@ -16,19 +16,25 @@ let initOptions: IInitOptions;
  * 初始化
  */
 function init(options: IInitOptions): void {
-  if (!initOptions) {
-    initOptions = options;
-
-    // 从上次缓存中读取，方便首次Report可以先带上
-    const loc = wx.getStorageSync('home.location_city') || wx.getStorageSync('home.city');
-    deviceData = {
-      networkType: '',
-      location: {
-        province: loc?.province as string,
-        cityName: loc?.cityName as string,
-      },
-    };
+  if (initOptions) {
+    return;
   }
+
+  initOptions = options;
+
+  // 从上次缓存中读取，方便首次Report可以先带上
+  const loc = wx.getStorageSync('home.location_city') || wx.getStorageSync('home.city');
+  deviceData = {
+    networkType: '',
+    location: {
+      province: loc?.province as string,
+      cityName: loc?.cityName as string,
+    },
+  };
+
+  wx.onAppShow((options) => {
+    launchOptions = options;
+  });
 }
 
 /**
@@ -128,7 +134,7 @@ function getPageInfo(): IPage {
   let depth: number; // 页面深度
   // 刚启动时首页未渲染
   if (pages.length === 0) {
-    const launch = syncApi.getLaunchOptionsSync() as any;
+    const launch = getLaunchOptions();
     route = launch.path;
     options = launch.qurey;
     depth = 1;
@@ -146,12 +152,12 @@ function getPageInfo(): IPage {
   return { route, options, depth };
 }
 
-let launchOptions: object | null = null;
+let launchOptions: any = null;
 
 /**
  * 获取小程序启动参数
  */
-function getLaunchOptions(): object {
+function getLaunchOptions(): any {
   if (launchOptions === null) {
     launchOptions = syncApi.getLaunchOptionsSync();
   }
@@ -162,7 +168,7 @@ function getLaunchOptions(): object {
  * 获取小程序启动时的from参数
  */
 function getLaunchFrom(): string {
-  const obj = syncApi.getLaunchOptionsSync() as any;
+  const obj = getLaunchOptions();
   return obj.query?.from;
 }
 
@@ -170,7 +176,7 @@ function getLaunchFrom(): string {
  * 获取小程序启动场景值
  */
 function getAppScene(): number {
-  const { scene = -1 } = syncApi.getLaunchOptionsSync() as any;
+  const { scene = -1 } = getLaunchOptions();
   return scene;
 }
 
@@ -244,6 +250,18 @@ function getCacheDeviceData(): IDeviceData {
   return deviceData;
 }
 
+/**
+ * 设置字段到上报的SystemInfo中
+ * 用于携带自定义信息区分用户场景，比如新旧首页的区分
+ * @param fieldName
+ * @param value
+ */
+function setSystemField(fieldName: string, value: number | string): void {
+  const systemInfo = getSystemInfo();
+  // @ts-ignore
+  systemInfo[fieldName] = value;
+}
+
 export default {
   init,
   getTms,
@@ -260,4 +278,5 @@ export default {
   dataArrLen,
   getDeviceData,
   getCacheDeviceData,
+  setSystemField,
 };

package/src/report/index.ts

@@ -55,23 +55,11 @@ function fastReport2(...data: any[]): void {
   }
 }
 
-/**
- * 设置字段到上报的SystemInfo中
- * 用于携带自定义信息区分用户场景，比如新旧首页的区分
- * @param fieldName
- * @param value
- */
-function setSystemField(fieldName: string, value: number | string): void {
-  const systemInfo = helper.getSystemInfo();
-  // @ts-ignore
-  systemInfo[fieldName] = value;
-}
-
 export default {
   init,
   report,
   fastReport,
   report2,
   fastReport2,
-  setSystemField,
+  setSystemField: helper.setSystemField,
 };

package/src/report/proxy/page.ts

@@ -163,7 +163,7 @@ function proxySubscribeMessage(): void {
       // eslint-disable-next-line
       options.fail = function(err: any) {
         helper.reportData('wx_requestSubscribeMessage_fail', tmplIds, err.errMsg);
-        originalFail.fail(this, err);
+        originalFail.call(this, err);
       };
       originalApi.call(this, options);
     },

package/src/tmsuiUtils.js

@@ -0,0 +1,68 @@
+
+/**
+ * 从当前页面中选定组件
+ * @param {String} selector 元素选择器
+ * @returns {Element} 组件
+ */
+const selectCompFromCurPage = (selector) => {
+  const pages = getCurrentPages();
+  if (pages.length === 0) {
+    throw new Error('Empty page container found');
+  }
+
+  const context = pages[pages.length - 1];
+  const comp = context.selectComponent(selector);
+  if (!comp) {
+    throw new Error(`No component found with selector <${selector}>`);
+  }
+  return comp;
+};
+
+/* eslint-disable */
+const showDrawer = (options = {}, selectComp = selectCompFromCurPage) => {
+  const { selector = '#drawer' } = options;
+  const comp = selectComp(selector);
+  comp?.show(options);
+};
+const hideDrawer = (options = {}, selectComp = selectCompFromCurPage) => {
+  const { selector = '#drawer' } = options;
+  const comp = selectComp(selector);
+  comp?.hide(options);
+};
+/* eslint-disable */
+
+/**
+ * 显示或隐藏Modal
+ * @param {Boolean} display 展示/隐藏
+ * @param {Object} options Modal参数
+ * @param {Function} selectComp 选择组件的方法
+ * @returns {void}
+ */
+ const toggleModal = (display = true, options = {}, selectComp) => {
+  const { selector = '#modal' } = options;
+  try {
+    const comp = selectComp(selector);
+    if (display) {
+      comp.show(options);
+    } else {
+      comp.hide(options);
+    }
+  } catch (e) {
+    if (typeof options.fail === 'function') {
+      options.fail({ errMsg: e.toString() });
+    } else {
+      throw e;
+    }
+    if (typeof options.complete === 'function') {
+      options.complete({ success: false, errMsg: e.toString() });
+    }
+  }
+};
+
+const showModal = (options, selectComp = selectCompFromCurPage) => toggleModal(true, options, selectComp);
+const hideModal = (options, selectComp = selectCompFromCurPage) => toggleModal(false,options, selectComp);
+
+module.exports = {
+  showDrawer, hideDrawer,
+  showModal, hideModal,
+};