@tmsfe/tms-core 0.0.71 → 0.0.74

package/package.json

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

package/src/index-proxy.js

@@ -8,9 +8,10 @@
 import syncApi from './syncfnmanager';
 import AutoReport from './report/proxy/index';
 import md5 from './md5';
-import { rpxToPx } from './rpx';
 import { serialize } from './objUtils';
 import { calCoordinateDistance, formatDistance } from './distanceUtils';
+import { getNavBarConfigData } from './navbarUtils';
+import * as rpxUtil from './rpx';
 import * as stringUtils from './stringUtils';
 import * as timeUtils from './timeUtils';
 import * as ipxHelper from './ipxHelper';
@@ -210,15 +211,16 @@ const api = {
   md5,
   getCarManager,
   getLocationManager,
-  rpxToPx,
   serialize,
   calCoordinateDistance,
   formatDistance,
+  getNavBarConfigData,
   createRequest,
   getEnvInfo,
   isAppPageExist,
   getHomePage,
   storage,
+  ...rpxUtil,
   ...asyncFuncs,
   ...objFuncs,
   ...syncApi,

package/src/index.js

@@ -11,7 +11,8 @@ import { callCloudFunc } from './cloudService';
 import EventDispatcher from './eventDispatcher';
 import { serialize } from './objUtils';
 import { calCoordinateDistance, formatDistance } from './distanceUtils';
-import { rpxToPx } from './rpx';
+import { rpxToPx, pxToRpx } from './rpx';
+import { getNavBarConfigData } from './navbarUtils';
 import {
   formatPlate,
   subStr,
@@ -192,6 +193,9 @@ const api = {
 
   /** rpx转px */
   rpxToPx,
+  pxToRpx,
+
+  getNavBarConfigData,
 
   storage,
 

package/src/location/index.ts

@@ -8,6 +8,7 @@ interface PostionType {
   province: string,
   cityCode: string,
   cityName: string,
+  district: string,
   latitude: number,
   longitude: number,
 }
@@ -55,6 +56,7 @@ class Location extends LocationBase {
     province: '广东省',
     cityCode: '440300',
     cityName: '深圳市',
+    district: '福田区',
     latitude: 22.54286,
     longitude: 114.05956,
   };
@@ -93,6 +95,7 @@ class Location extends LocationBase {
           nationCode: adInfo.nation_code,
           province: adInfo.province,
           cityName: adInfo.city,
+          district: adInfo.district,
           adCode: adInfo.adcode,
           cityCode: formatCityCode(adInfo.city_code, adInfo.nation_code),
           latitude: lat,

package/src/navbarUtils.js

@@ -0,0 +1,28 @@
+/**
+ * 获取导航栏相关信息
+ * @returns {Object} data                 导航栏布局信息
+ * @returns {Number} data.enable          是否支持自定义导航栏
+ * @returns {Number} data.statusBarHeight 状态栏高度，单位px
+ * @returns {Number} data.navBarHeight    导航栏高度（不含状态栏），单位px
+ * @returns {Number} data.menuTop         菜单按钮上边距，单位px
+ * @returns {Number} data.menuRight       菜单按钮右边缘距离屏幕左边缘的距离，单位px
+ * @returns {Number} data.menuWidth       菜单按钮宽度，单位px
+ * @returns {Number} data.menuHeight      菜单按钮高度，单位px
+ */
+const getNavBarConfigData = () => {
+  const { statusBarHeight } = wx.getSystemInfoSync();
+  const { right, width, height = 0, top } = wx.getMenuButtonBoundingClientRect(); // 插件下基础库2.15.0起支持
+  return {
+    enable: true,
+    statusBarHeight, // 顶部状态栏高度
+    navBarHeight: height + ((top - statusBarHeight) * 2), // 小程序导航栏高度
+    menuTop: top, // 菜单按钮上边距
+    menuRight: right, // 菜单按钮右边距离屏幕左边缘的距离
+    menuWidth: width, // 菜单按钮宽度
+    menuHeight: height, // 菜单按钮高度
+  };
+};
+
+export {
+  getNavBarConfigData,
+};

package/src/report/README.md

@@ -48,7 +48,7 @@
 #### 页面自动上报事件
 ##### 一、必须上报的生命周期事件：
 1. onLoad: 页面加载
-2. onShow: 页面显示
+2. onShow: 页面显示(曝光)
 3. onReady: 页面初次渲染完成
 4. onHide: 页面隐藏
 5. onUnload: 页面卸载
@@ -56,7 +56,7 @@
 ##### 二、可能会上报的生命周期事件（取决于页面是否实现该函数）：
 1. onPullDownRefresh: 用户下拉动作
 2. onReachBottom: 页面上拉触底
-3. onShareAppMessage: 用户点击右上角转发
+3. onShareAppMessage: 用户点击右上角转发(分享)
 4. onShareTimeline: 用户点击右上角转发到朋友圈
 5. onAddToFavorites: 用户点击右上角收藏
 6. onReportPageTouch: 用户触摸页面 - 如果页面wxml有view节点则会注入该事件

package/src/report/proxy/helper.ts

@@ -65,7 +65,13 @@ function emptyFunc(): void {
  * @param callback
  */
 function executeFunc(context: any, func: Function, args: any[], callback: Function): any {
-  const value = func.apply(context, args);
+  let value: any;
+  try {
+    value = func.apply(context, args);
+  } catch (e) {
+    callback();
+    throw e;
+  }
   // 如果不会返回promise
   if (!value || !value.then || typeof value.then !== 'function') {
     callback();

package/src/rpx.js

@@ -12,6 +12,19 @@ const rpxToPx = (rpx) => {
   return rpx * ratio;
 };
 
+/**
+ * @description px to rpx
+ * @returns  {Number}     转换后的rpx数值
+ * @param px
+ */
+const pxToRpx = (px) => {
+  const sys = syncApi.getSystemInfoSync();
+  const ww = sys.windowWidth;
+  const ratio = 750 / ww;
+  return px * ratio;
+};
+
 export {
   rpxToPx,
+  pxToRpx,
 };

package/rollup.config.js

@@ -1,177 +0,0 @@
-import path from 'path';
-import ts from 'rollup-plugin-typescript2';
-import babel from '@rollup/plugin-babel';
-import json from '@rollup/plugin-json';
-import replace from 'rollup-plugin-replace';
-import nodeResolve from 'rollup-plugin-node-resolve';
-import commonjs from '@rollup/plugin-commonjs';
-
-if (!process.env.TARGET) {
-  throw new Error('TARGET package must be specified via --environment flag.');
-}
-
-// 指定包地址
-const packageDir = path.resolve(__dirname);
-// 包名
-const name = path.basename(packageDir);
-// 环境
-const interEnv = process.env.INTER_ENV || 'public';
-
-// eslint-disable-next-line
-const packageJson = require('./package.json');
-
-const packageOptions = packageJson.buildOptions || {};
-
-function resolve(name) { // eslint-disable-line
-  return path.resolve(packageDir, name);
-}
-
-const outputConfig = {
-  esm: {
-    dir: resolve('dist'),
-    entryFileNames: '[name].js',
-    format: 'es',
-  },
-  'esm-browser': {
-    dir: resolve('dist'),
-    entryFileNames: '[name].esm-browser.js',
-    format: 'es',
-  },
-  cjs: {
-    dir: resolve('dist'),
-    entryFileNames: '[name].cjs.js',
-    format: 'cjs',
-  },
-  global: {
-    dir: resolve('dist'),
-    entryFileNames: '[name].global.js',
-    format: 'iife',
-  },
-};
-
-const defaultFormats = ['esm'];
-// 打包格式
-const packageFormats = packageOptions.formats || defaultFormats;
-
-const packageConfigs = packageFormats.map(format => createConfig(format, outputConfig[format]));
-
-export default packageConfigs;
-
-/**
- * format rollup package configuration object
- * @param {string} format 文件打包格式
- * @param {object} output 输出对象
- * @param {array} plugins 插件
- * @returns {object} rollup配置对象
- */
-function createConfig(format, output, plugins = []) {
-  if (!output) {
-    // eslint-disable-next-line
-    console.log(require('chalk').yellow(`invalid format: "${format}"`));  // eslint-disable-line no-console
-    process.exit(1);
-  }
-
-  output.sourceMap = true;  // eslint-disable-line
-  output.externalLiveBindings = false;  // eslint-disable-line
-
-  // 兼容不同的包的入口文件 -- 后面会统一为index.ts
-  const entryFile = setEntryFile(name);
-
-  // 定制化cjs的插件和esmodule的插件。
-  const extralPlugin = setEsPlugin(output.format);
-
-  return {
-    input: entryFile,
-    output,
-    external: [],
-    plugins: [
-      json({
-        namedExports: false,
-      }),
-      commonjs({
-        ignoreDynamicRequires: true,
-        // include: 'node_modules/**', // Default: undefined
-        browser: true,
-      }),
-      babel({
-        plugins: ['@babel/plugin-proposal-nullish-coalescing-operator', '@babel/plugin-proposal-optional-chaining'],
-        // exclude: ['node_modules/**'],
-      }),
-      // terser(),
-      createReplacePlugin(),
-      ...extralPlugin,
-      ...plugins,
-    ],
-    onwarn: (msg, warn) => {
-      if (!/Circular/.test(msg)) {
-        warn(msg);
-      }
-    },
-    treeshake: {
-      moduleSideEffects: false,
-    },
-  };
-}
-
-/**
- * 兼容现在的包会存在不同入口的情况。 后面会统一为index.ts
- * @param {  string } packageN ame 包名称
- * @returns { Object } entryFile
- */
-function setEntryFile(packageName) {
-  let entryFile = resolve('src/index.js');
-
-  switch (packageName) {
-    case 'tms-core':
-      entryFile = {
-        index: resolve('src/index'),
-        request: resolve('src/request'),
-        cloudService: resolve('src/cloudService'),
-        'index-proxy': resolve('src/index-proxy'),
-      };
-      break;
-    case 'tms-websdk':
-      entryFile = resolve('src/index.ts');
-      break;
-    default:
-      entryFile = resolve('src/index.js');
-  };
-
-  return entryFile;
-}
-
-/**
- * 定制化cjs和esmodule的插件
- * @param { string } format 打包格式
- * @returns { Array<plugin> } 插件数组
- */
-function setEsPlugin(format) {
-  const extralPlugins = [];
-
-
-  if (format.indexOf('es') > -1) {
-    extralPlugins.push(ts({
-      tsconfig: resolve('tsconfig.json'),
-    }));
-  };
-  if (format.indexOf('iife') > -1) {
-    extralPlugins.push(nodeResolve({ jsnext: true, preferBuiltins: true, browser: true }));
-  }
-  return extralPlugins;
-}
-
-/**
- * 创建变量替换插件
- * @returns {function} 插件函数
- */
-function createReplacePlugin() {
-  const replacements = {
-    tmsCore: interEnv === 'public' ? '@tmsfe/tms-core' : '@tmsfe/tms-core',
-    INTER_ENV_VB: JSON.stringify(interEnv || 'private'),
-  };
-
-  return replace({
-    values: replacements,
-    preventAssignment: true,
-  });
-}