@tmsfe/tms-core 0.0.76 → 0.0.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.76",
+  "version": "0.0.79",
   "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/mpInfo.js

@@ -32,10 +32,17 @@ async function getOuterOpenId(apiKey) {
   return openId;
 }
 
-async function getEncryptUserInfo(mpId = '', queryTypes = '') {
+/**
+ * 获取用户加密数据
+ * @param {String} mpId        服务接入方渠道标识，spId 或 apiKey。注意：如果使用 apiKey，需要在后台增加 apiKey 和 spId 的映射
+ * @param {String} queryTypes  要加密的用户信息类型集合，多个种类型用','连接；支持的类型见下文“用户信息类型标识” |
+ * @param {Object} propNameMap 加密数据对象中信息字段名映射
+ * @returns {Promise<{ encrStr: String }>} 加密字符串
+ */
+async function getEncryptUserInfo(mpId = '', queryTypes = '', propNameMap = {}) {
   if (!mpId) return Promise.reject('缺少服务标志mpId');
   if (!queryTypes) return Promise.reject('缺少需要加密的用户信息字段描述');
-  return new Request().get('user/info/encrypt', { mpId, queryTypes })
+  return new Request().get('user/info/encrypt', { mpId, queryTypes, propNameMap })
     .then((res) => {
       const { resData, errCode, errMsg } = res || {};
       if (errCode === 0) {
@@ -44,7 +51,7 @@ async function getEncryptUserInfo(mpId = '', queryTypes = '') {
       }
       return Promise.reject(errMsg);
     })
-    .catch(e => Promise.reject('请求发生错误，请重试'));
+    .catch(() => Promise.reject('请求发生错误，请重试'));
 }
 
 export {

package/src/report/proxy/page.ts

@@ -139,9 +139,41 @@ function proxyNavigateApi(api: string): void {
   });
 }
 
+// 劫持消息订阅接口
+function proxySubscribeMessage(): void {
+  const originalApi = wx.requestSubscribeMessage;
+  Object.defineProperty(wx, 'requestSubscribeMessage', {
+    writable: true,
+    enumerable: true,
+    configurable: true,
+    value(options: any) {
+      const { tmplIds } = options;
+      const originalSuccess = options.success || helper.emptyFunc;
+      const originalFail = options.fail || helper.emptyFunc;
+      // eslint-disable-next-line
+      options.success = function(res: any) {
+        for (const tmplId of tmplIds) {
+          const result = res[tmplId];
+          if (result) {
+            helper.reportData('wx_requestSubscribeMessage_result', tmplId, result);
+          }
+        }
+        originalSuccess.call(this, res);
+      };
+      // eslint-disable-next-line
+      options.fail = function(err: any) {
+        helper.reportData('wx_requestSubscribeMessage_fail', tmplIds, err.errMsg);
+        originalFail.fail(this, err);
+      };
+      originalApi.call(this, options);
+    },
+  });
+}
+
 // 劫持Page
 function init(): void {
   proxyPage();
+  proxySubscribeMessage();
   proxyNavigateApi('navigateTo');
   proxyNavigateApi('redirectTo');
   proxyNavigateApi('reLaunch');

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,
+};