@tmsfe/tms-core 0.0.83 → 0.0.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.83",
+  "version": "0.0.86",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",
@@ -17,27 +17,20 @@
       "esm"
     ]
   },
-  "whiteDependencies": {
-    "@babel/core": "ignore",
-    "@babel/plugin-proposal-optional-chaining": "ignore",
-    "@typescript-eslint/eslint-plugin": "ignore",
-    "@typescript-eslint/parser": "ignore",
-    "miniprogram-api-typings": "ignore"
-  },
   "devDependencies": {
-    "@babel/core": "^7.15.0",
+    "@babel/core": "^7.17.9",
     "@babel/plugin-proposal-class-properties": "^7.14.5",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2",
-    "@babel/plugin-proposal-optional-chaining": "^7.14.2",
+    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
     "@rollup/plugin-babel": "^5.0.2",
     "@rollup/plugin-commonjs": "^19.0.0",
     "@rollup/plugin-dynamic-import-vars": "^1.1.1",
     "@rollup/plugin-json": "^4.0.3",
-    "@typescript-eslint/eslint-plugin": "^4.29.3",
-    "@typescript-eslint/parser": "^4.29.3",
+    "@typescript-eslint/eslint-plugin": "^5.2.0",
+    "@typescript-eslint/parser": "^5.2.0",
     "babel-core": "^6.26.3",
     "babel-preset-env": "^1.7.0",
-    "miniprogram-api-typings": "^3.4.4",
+    "miniprogram-api-typings": "latest",
     "rimraf": "^3.0.2",
     "rollup": "^2.6.1",
     "rollup-plugin-node-resolve": "^5.2.0",

package/src/index-proxy.js

@@ -10,7 +10,7 @@ import AutoReport from './report/proxy/index';
 import md5 from './md5';
 import { serialize } from './objUtils';
 import { calCoordinateDistance, formatDistance } from './distanceUtils';
-import { getNavBarConfigData } from './navbarUtils';
+import { getNavBarConfigData, compareVersion } from './navbarUtils';
 import * as uiUtil from './tmsuiUtils';
 import * as rpxUtil from './rpx';
 import * as stringUtils from './stringUtils';
@@ -216,6 +216,7 @@ const api = {
   calCoordinateDistance,
   formatDistance,
   getNavBarConfigData,
+  compareVersion,
   createRequest,
   getEnvInfo,
   isAppPageExist,

package/src/index.js

@@ -12,7 +12,7 @@ import EventDispatcher from './eventDispatcher';
 import { serialize } from './objUtils';
 import { calCoordinateDistance, formatDistance } from './distanceUtils';
 import { rpxToPx, pxToRpx } from './rpx';
-import { getNavBarConfigData } from './navbarUtils';
+import { getNavBarConfigData, compareVersion } from './navbarUtils';
 import {
   formatPlate,
   subStr,
@@ -196,6 +196,8 @@ const api = {
   rpxToPx,
   pxToRpx,
 
+  /** 版本比较 */
+  compareVersion,
   getNavBarConfigData,
 
   storage,

package/src/navbarUtils.js

@@ -194,4 +194,5 @@ const getEnterOptions = () => {
 
 export {
   getNavBarConfigData,
+  compareVersion,
 };

package/src/utils/canvas/canvasDrawer.js

@@ -125,14 +125,15 @@ class CanvasDrawer {
    * @memberof Wxml2Poster
    */
   drawText(text, x, y, size, color, align = 'left', bold = 'normal', baseLine = 'middle', calWidth = false) {
+    const str = `${text}`;  // 避免某些环境下字体宽度计算异常（如手图），这里统一将绘制文本转为字符串
     this.ctx.save();
     this.ctx.fillStyle = color;
     this.ctx.font = `normal ${bold} ${~~(this.toPx(size))}px sans-serif`;
     let width = 0;
-    if (calWidth) width = this.ctx.measureText(text).width; // 必须在设置字体属性后未绘制前计算才能拿到准确值; 无需计算时避免耗费性能
+    if (calWidth) width = this.ctx.measureText(str).width; // 必须在设置字体属性后未绘制前计算才能拿到准确值; 无需计算时避免耗费性能
     this.ctx.textAlign = align;
     this.ctx.textBaseline = baseLine;
-    this.ctx.fillText(text, this.toPx(x), this.toPx(y));
+    this.ctx.fillText(str, this.toPx(x), this.toPx(y));
     this.ctx.restore();
     return width;
   }

package/src/utils/location/index.js

@@ -1,3 +1,11 @@
+/**
+ * @desc: 位置工具方法语法糖
+ * @author: fenggangsun
+ * @date: 2022-06-27 11:46:25
+ * @lastEditors: fenggangsun
+ * @lastEditTime: 2022-06-29 17:34:24
+ * @copyright 2022-present, Tencent, Inc. All rights reserved.
+ */
 const defaultLoc = {
   province: '广东省',
   cityName: '深圳市',
@@ -29,6 +37,7 @@ const locTypeEnum = { // 位置类型
  * @param {String}  option.authTip  获取实时定位，发起授权时的提示语
  * @param {Boolean} option.ipCache  是否使用缓存的 ip 位置，默认 true；ipCache = false 时会重新发起 ip 定位
  * @returns {Promise<Object>} { loc, locType }
+ *                              loc: { adCode, provinceCode, cityCode, province, cityName, longitude, latitude }
  */
 const getPrioritizedLocation = async (typeOrders, option) => {
   const { showAuth, authTip, ipCache = true } = option || {};
@@ -39,7 +48,15 @@ const getPrioritizedLocation = async (typeOrders, option) => {
         getLocProm = defaultLoc;
         break;
       case locTypeEnum.ip:
-        getLocProm = getLocManager().getIpLocation(!ipCache);
+        getLocProm = getLocManager().getIpLocation(!ipCache)
+          .then((data) => {
+            const { ad_info: { adcode, cityCode, province, city }, location: { lng, lat } } = data;
+            return {
+              adCode: adcode, cityCode, provinceCode: `${cityCode.slice(0, 4)}00`,
+              province, cityName: city, longitude: lng, latitude: lat,
+              ...data,
+            };
+          });
         break;
       case locTypeEnum.real: // 实时位置
         getLocProm = getLocManager().getLocationDetail(showAuth, undefined, authTip);