@tmsfe/tms-core 0.0.18 → 0.0.22

package/dist/index-proxy.js

@@ -1,5 +1,5 @@
-import { p as rpxToPx, o as serialize, s as syncApi, q as stringUtils, t as timeUtils, u as ipxHelper } from './ipxHelper-71ef86c1.js';
-import { m as md5 } from './md5-34a9daf3.js';
+import { o as rpxToPx, p as storage, s as syncApi, q as stringUtils, t as timeUtils, u as ipxHelper } from './storage-094c6ddb.js';
+import { m as md5, s as serialize } from './objUtils-154b94db.js';
 
 /**
  * 由于需要把tms-core、tms-runtime从主包中移到vendor分包中使用分包异步化加载，
@@ -231,6 +231,7 @@ const api = {
   getEnvInfo,
   isAppPageExist,
   getHomePage,
+  storage,
   ...asyncFuncs,
   ...objFuncs,
   ...syncApi,

package/dist/index.js

@@ -1,7 +1,7 @@
-import { R as Request, g as getLogManager, a as getRealtimeLogManager } from './request-f350158c.js';
+import { R as Request, g as getLogManager, a as getRealtimeLogManager } from './request-f8a4745b.js';
 import { g as getEnvInfo, a as getAuthInfo, s as setAuthInfo, i as isAppPageExist, b as getHomePage, c as setEnvInfo, d as setAppPagePaths } from './env-c7da70e1.js';
-import { s as syncApi, f as formatPlate, a as subStr, h as hidePhoneCenter, i as isValidPhone, b as isValidPlate, c as isValidAuthCode, r as roundStr, d as formatTime, e as formatTimeStr, g as formatTimeWithDetails, j as dateToString, k as ipxInit, l as isIPX, m as getIpxClass, n as getIpxConfig, o as serialize, p as rpxToPx } from './ipxHelper-71ef86c1.js';
-import { m as md5 } from './md5-34a9daf3.js';
+import { s as syncApi, r as roundStr, f as formatPlate, a as subStr, h as hidePhoneCenter, i as isValidPhone, b as isValidPlate, c as isValidAuthCode, d as formatTime, e as formatTimeStr, g as formatTimeWithDetails, j as dateToString, k as ipxInit, l as isIPX, m as getIpxClass, n as getIpxConfig, o as rpxToPx, p as storage } from './storage-094c6ddb.js';
+import { m as md5, s as serialize } from './objUtils-154b94db.js';
 import { callCloudFunc } from './cloudService.js';
 
 /**
@@ -1532,6 +1532,19 @@ const startListenApp = () => {
   });
 };
 
+/**
+ * 四舍五入（支持保留n位小数，n>=0）
+ * @param {any} x 原数字
+ *                如果n不是合法数字或者无法转换为合法数字，round结果返回NaN
+ * @param {any} n 保留几位小数，默认0
+ *                如果n不是合法数字或者无法转换为合法数字，round结果返回NaN
+ *                如果n小于0，round结果返回NaN
+ *                如果n的值包含小数部分，round处理时只关注n的整数部分值
+ * @return {number} 返回一个保留n位小数的数字，异常情况下可能是NaN
+ */
+
+const round = (x, n = 0) => parseFloat(roundStr(x, n, false));
+
 /**
  * 支持服务接入相关接口
  */
@@ -1719,6 +1732,9 @@ const api = {
   isValidAuthCode,
   roundStr,
 
+  /* 数字方法 */
+  round,
+
   /* 时间方法 */
   formatTime,
   formatTimeStr,
@@ -1741,6 +1757,7 @@ const api = {
 
   /** rpx转px */
   rpxToPx,
+  storage,
   ...syncApi
 };
 

package/dist/{md5-34a9daf3.js → objUtils-154b94db.js}

@@ -196,4 +196,49 @@ const md5 = function (str) {
 
 var md5$1 = md5;
 
-export { md5$1 as m };
+/**
+ * Tencent Inc. All Rights Reserved.
+ * Description: Some Functions for Obejct.
+ */
+
+/**
+ * @function
+ * @description 把对象拼接成 a=b&c=d 形式的字符串
+ * @param       {Object} queryObj  需要进行序列化的对象
+ * @returns     {String} 拼接后的字符串
+ */
+const serialize = (queryObj = {}) => {
+  if (!queryObj) {
+    return '';
+  }
+
+  const queryArray = [];
+  Object.keys(queryObj).forEach(key => {
+    queryArray.push(`${key}=${queryObj[key]}`);
+  });
+  return queryArray.join('&');
+};
+class JsonParseError extends Error {
+  constructor(text, data) {
+    super(text);
+    this.data = data;
+  }
+
+}
+/**
+ * 安全的JSON.parse
+ */
+
+function safeJsonParse(data, throwErrIfParseFail = false) {
+  try {
+    return JSON.parse(data);
+  } catch (e) {
+    if (throwErrIfParseFail) {
+      throw new JsonParseError('JSON.parse error', data);
+    }
+  }
+
+  return data;
+}
+
+export { safeJsonParse as a, md5$1 as m, serialize as s };

package/dist/{request-f350158c.js → request-f8a4745b.js}

@@ -1,4 +1,4 @@
-import { m as md5 } from './md5-34a9daf3.js';
+import { a as safeJsonParse, m as md5 } from './objUtils-154b94db.js';
 import { a as getAuthInfo, g as getEnvInfo } from './env-c7da70e1.js';
 
 /**
@@ -445,7 +445,7 @@ class Request {
     });
 
     if (typeof (res === null || res === void 0 ? void 0 : res.data) === 'string') {
-      return JSON.parse(res === null || res === void 0 ? void 0 : res.data);
+      return safeJsonParse(res === null || res === void 0 ? void 0 : res.data);
     }
 
     return res === null || res === void 0 ? void 0 : res.data;
@@ -464,7 +464,7 @@ class Request {
     const res = await this.createRequestTask(path, param, method, header);
 
     if (typeof (res === null || res === void 0 ? void 0 : res.data) === 'string') {
-      return JSON.parse(res === null || res === void 0 ? void 0 : res.data);
+      return safeJsonParse(res === null || res === void 0 ? void 0 : res.data);
     }
 
     return res === null || res === void 0 ? void 0 : res.data;

package/dist/request.js

@@ -1,3 +1,3 @@
-import './md5-34a9daf3.js';
-export { R as default } from './request-f350158c.js';
+import './objUtils-154b94db.js';
+export { R as default } from './request-f8a4745b.js';
 import './env-c7da70e1.js';

package/dist/{ipxHelper-71ef86c1.js → storage-094c6ddb.js}

@@ -112,29 +112,6 @@ const obj = {
 };
 var syncApi = obj;
 
-/**
- * Tencent Inc. All Rights Reserved.
- * Description: Some Functions for Obejct.
- */
-
-/**
- * @function
- * @description 把对象拼接成 a=b&c=d 形式的字符串
- * @param       {Object} queryObj  需要进行序列化的对象
- * @returns     {String} 拼接后的字符串
- */
-const serialize = (queryObj = {}) => {
-  if (!queryObj) {
-    return '';
-  }
-
-  const queryArray = [];
-  Object.keys(queryObj).forEach(key => {
-    queryArray.push(`${key}=${queryObj[key]}`);
-  });
-  return queryArray.join('&');
-};
-
 /**
  * @description rpx to px
  * @param    {Number} rpx 需要转换的rpx数值
@@ -272,8 +249,8 @@ const isValidPlate = plate => {
 };
 /**
  * 四舍五入，并返回格式化的字符串
- * 支持保留n位小数，n>=0，如 round(1.325, 2)=1.33
- * 支持格式化字符串时取出末尾的0，如round(1.109, 2, true)=1.1
+ * 支持保留n位小数，n>=0，如 roundStr(1.325, 2)=1.33
+ * 支持格式化字符串时取出末尾的0，如roundStr(1.109, 2, true)=1.1
  * @param {any} x 原数字
  *                如果n不是合法数字或者无法转换为合法数字，roundStr结果返回''
  * @param {any} n 保留几位小数，默认0
@@ -563,4 +540,112 @@ var ipxHelper = /*#__PURE__*/Object.freeze({
   getIpxConfig: getIpxConfig
 });
 
-export { subStr as a, isValidPlate as b, isValidAuthCode as c, formatTime as d, formatTimeStr as e, formatPlate as f, formatTimeWithDetails as g, hidePhoneCenter as h, isValidPhone as i, dateToString as j, ipxInit as k, isIPX as l, getIpxClass as m, getIpxConfig as n, serialize as o, rpxToPx as p, stringUtils as q, roundStr as r, syncApi as s, timeUtils as t, ipxHelper as u };
+/**
+ * 保存数据到localstorage
+ * @param key
+ * @param data
+ * @returns {boolean} true为成功，false为报错
+ */
+function setItem(key, data) {
+  try {
+    wx.setStorageSync(key, data);
+    return true;
+  } catch {
+    return false;
+  }
+}
+/**
+ * 从localstorage取数据
+ * @param key
+ * @param defaultValue wx接口报错时返回默认值
+ * @returns {null|any}
+ */
+
+
+function getItem(key, defaultValue = null) {
+  try {
+    const val = wx.getStorageSync(key);
+    return val === '' ? defaultValue : val;
+  } catch {
+    return defaultValue;
+  }
+}
+/**
+ * 从localstorage中删除
+ * @param key
+ * @returns {boolean}
+ */
+
+
+function removeItem(key) {
+  try {
+    wx.removeStorageSync(key);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+const cleanQueue = [];
+let cleanTimerId = 0;
+
+function cleanTask() {
+  while (cleanQueue.length > 0) {
+    const {
+      key,
+      version
+    } = cleanQueue.pop();
+
+    for (let i = version - 1; i > version - 10 && i > 0; i--) {
+      removeItem(`${key}_v${i}`);
+    }
+  }
+
+  cleanTimerId = 0;
+}
+/**
+ * 缓存组件或页面的缓存data
+ * @param key
+ * @param version 低于该版本号的缓存会被异步清除
+ * @param data
+ * @returns {boolean}
+ */
+
+
+function setCacheData(key, version, data) {
+  // 异步清理旧数据，不要阻塞当前线程
+  cleanQueue.push({
+    key,
+    version
+  });
+
+  if (cleanTimerId === 0) {
+    cleanTimerId = setTimeout(cleanTask, 2000);
+  }
+
+  const str = `${key}_v${version}`;
+  return setItem(str, data);
+}
+/**
+ * 获取组件或页面的缓存data
+ * @param key
+ * @param version
+ * @param defaultData
+ * @returns {*|null}
+ */
+
+
+function getCacheData(key, version, defaultData = null) {
+  const str = `${key}_v${version}`;
+  return getItem(str, defaultData);
+}
+
+var storage = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  getItem: getItem,
+  setItem: setItem,
+  setCacheData: setCacheData,
+  getCacheData: getCacheData
+});
+
+export { subStr as a, isValidPlate as b, isValidAuthCode as c, formatTime as d, formatTimeStr as e, formatPlate as f, formatTimeWithDetails as g, hidePhoneCenter as h, isValidPhone as i, dateToString as j, ipxInit as k, isIPX as l, getIpxClass as m, getIpxConfig as n, rpxToPx as o, storage as p, stringUtils as q, roundStr as r, syncApi as s, timeUtils as t, ipxHelper as u };

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.18",
+  "version": "0.0.22",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",
     "url": "http://git.code.oa.com/lbsweb/tms/tms-arch.git"
   },
   "scripts": {
-    "dev": "rollup -wc --environment TARGET:tms-core,INTER_ENV:public",
-    "build": "rollup -c --environment TARGET:tms-core,INTER_ENV:public"
+    "dev": "rimraf dist &&  rollup -wc --environment TARGET:tms-core,INTER_ENV:public",
+    "build": "rimraf dist && rollup -c --environment TARGET:tms-core,INTER_ENV:public"
   },
   "main": "dist/index",
   "miniprogram": "dist",
@@ -31,6 +31,7 @@
     "babel-core": "^6.26.3",
     "babel-preset-env": "^1.7.0",
     "miniprogram-api-typings": "^3.4.4",
+    "rimraf": "^3.0.2",
     "rollup": "^2.6.1",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^6.1.0",

package/src/index-proxy.js

@@ -12,6 +12,7 @@ import { serialize } from './objUtils';
 import * as stringUtils from './stringUtils';
 import * as timeUtils from './timeUtils';
 import * as ipxHelper from './ipxHelper';
+import * as storage from './storage';
 
 let app = null;
 let initOptions = null;
@@ -212,6 +213,7 @@ const api = {
   getEnvInfo,
   isAppPageExist,
   getHomePage,
+  storage,
   ...asyncFuncs,
   ...objFuncs,
   ...syncApi,

package/src/index.js

@@ -20,6 +20,9 @@ import {
   isValidAuthCode,
   roundStr,
 } from './stringUtils';
+import {
+  round,
+} from './numUtils';
 import {
   formatTime,
   formatTimeStr,
@@ -35,6 +38,7 @@ import {
 import getLocInstance from './location/index.ts';
 import LocationBase from './location/base.ts';
 import { getMpOpenId, getOuterOpenId } from './mpInfo';
+import * as storage from './storage';
 
 /**
  * @public
@@ -152,6 +156,9 @@ const api = {
   isValidAuthCode,
   roundStr,
 
+  /* 数字方法 */
+  round,
+
   /* 时间方法 */
   formatTime,
   formatTimeStr,
@@ -174,6 +181,8 @@ const api = {
   /** rpx转px */
   rpxToPx,
 
+  storage,
+
   ...syncApi,
 };
 

package/src/numUtils.js

@@ -0,0 +1,16 @@
+import { roundStr } from './stringUtils';
+/**
+ * 四舍五入（支持保留n位小数，n>=0）
+ * @param {any} x 原数字
+ *                如果n不是合法数字或者无法转换为合法数字，round结果返回NaN
+ * @param {any} n 保留几位小数，默认0
+ *                如果n不是合法数字或者无法转换为合法数字，round结果返回NaN
+ *                如果n小于0，round结果返回NaN
+ *                如果n的值包含小数部分，round处理时只关注n的整数部分值
+ * @return {number} 返回一个保留n位小数的数字，异常情况下可能是NaN
+ */
+const round = (x, n = 0) => parseFloat(roundStr(x, n, false));
+
+export {
+  round,
+};

package/src/objUtils.js

@@ -9,7 +9,7 @@
  * @param       {Object} queryObj  需要进行序列化的对象
  * @returns     {String} 拼接后的字符串
  */
-const serialize = (queryObj = {}) => {
+export const serialize = (queryObj = {}) => {
   if (!queryObj) {
     return '';
   }
@@ -23,4 +23,23 @@ const serialize = (queryObj = {}) => {
   return queryArray.join('&');
 };
 
-export { serialize };
+export class JsonParseError extends Error {
+  constructor(text, data) {
+    super(text);
+    this.data = data;
+  }
+}
+
+/**
+ * 安全的JSON.parse
+ */
+export function safeJsonParse(data, throwErrIfParseFail = false) {
+  try {
+    return JSON.parse(data);
+  } catch (e) {
+    if (throwErrIfParseFail) {
+      throw new JsonParseError('JSON.parse error', data);
+    }
+  }
+  return data;
+}

package/src/request.js

@@ -11,6 +11,7 @@
 import md5 from './md5';
 import { getLogManager } from './log';
 import { getEnvInfo, getAuthInfo } from './env';
+import { safeJsonParse } from './objUtils';
 
 /**
  * 用于序列化需要签名的参数
@@ -254,7 +255,7 @@ export default class Request {
     });
 
     if (typeof res?.data === 'string') {
-      return JSON.parse(res?.data);
+      return safeJsonParse(res?.data);
     }
     return res?.data;
   }
@@ -271,7 +272,7 @@ export default class Request {
     const res = await this.createRequestTask(path, param, method, header);
 
     if (typeof res?.data === 'string') {
-      return JSON.parse(res?.data);
+      return safeJsonParse(res?.data);
     }
 
     return res?.data;

package/src/storage.js

@@ -0,0 +1,93 @@
+/**
+ * 保存数据到localstorage
+ * @param key
+ * @param data
+ * @returns {boolean} true为成功，false为报错
+ */
+function setItem(key, data) {
+  try {
+    wx.setStorageSync(key, data);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * 从localstorage取数据
+ * @param key
+ * @param defaultValue wx接口报错时返回默认值
+ * @returns {null|any}
+ */
+function getItem(key, defaultValue = null) {
+  try {
+    const val = wx.getStorageSync(key);
+    return val === '' ? defaultValue : val;
+  } catch {
+    return defaultValue;
+  }
+}
+
+/**
+ * 从localstorage中删除
+ * @param key
+ * @returns {boolean}
+ */
+function removeItem(key) {
+  try {
+    wx.removeStorageSync(key);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+const cleanQueue = [];
+let cleanTimerId = 0;
+
+function cleanTask() {
+  while (cleanQueue.length > 0) {
+    const { key, version } = cleanQueue.pop();
+    for (let i = version - 1; i > version - 10 && i > 0; i--) {
+      removeItem(`${key}_v${i}`);
+    }
+  }
+  cleanTimerId = 0;
+}
+
+/**
+ * 缓存组件或页面的缓存data
+ * @param key
+ * @param version 低于该版本号的缓存会被异步清除
+ * @param data
+ * @returns {boolean}
+ */
+function setCacheData(key, version, data) {
+  // 异步清理旧数据，不要阻塞当前线程
+  cleanQueue.push({ key, version });
+  if (cleanTimerId === 0) {
+    cleanTimerId = setTimeout(cleanTask, 2000);
+  }
+
+  const str = `${key}_v${version}`;
+  return setItem(str, data);
+}
+
+/**
+ * 获取组件或页面的缓存data
+ * @param key
+ * @param version
+ * @param defaultData
+ * @returns {*|null}
+ */
+function getCacheData(key, version, defaultData = null) {
+  const str = `${key}_v${version}`;
+  return getItem(str, defaultData);
+}
+
+export {
+  getItem,
+  setItem,
+  setCacheData,
+  getCacheData,
+};

package/src/stringUtils.js

@@ -113,8 +113,8 @@ const isValidPlate = (plate) => {
 
 /**
  * 四舍五入，并返回格式化的字符串
- * 支持保留n位小数，n>=0，如 round(1.325, 2)=1.33
- * 支持格式化字符串时取出末尾的0，如round(1.109, 2, true)=1.1
+ * 支持保留n位小数，n>=0，如 roundStr(1.325, 2)=1.33
+ * 支持格式化字符串时取出末尾的0，如roundStr(1.109, 2, true)=1.1
  * @param {any} x 原数字
  *                如果n不是合法数字或者无法转换为合法数字，roundStr结果返回''
  * @param {any} n 保留几位小数，默认0