tools-for-js 1.2.5 → 1.2.7

package/README.md

@@ -52,3 +52,4 @@ import { API } from 'tools-for-js'
 | 根据 key 值排序，相同时则根据时间 timeKey 值排序 | sortByKeyAndTime  |
 | 根据 key 获取对象值                              | getValByKey       |
 | 数组随机打乱                                     | shuffleArray      |
+| 将路径中的反斜杠字符 \ 替换为斜杠 /              | replacePath       |

package/lib/index.js

@@ -153,6 +153,12 @@ Object.defineProperty(exports, "objectToQs", {
     return _object.objectToQs;
   }
 });
+Object.defineProperty(exports, "replacePath", {
+  enumerable: true,
+  get: function get() {
+    return _string.replacePath;
+  }
+});
 Object.defineProperty(exports, "shuffleArray", {
   enumerable: true,
   get: function get() {

package/lib/utils/string.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getStrLength = exports.encode = exports.decode = exports.checkPwdStrength = void 0;
+exports.replacePath = replacePath;
 exports.splitString = splitString;
 var _utf8_encode = function _utf8_encode(string) {
   string = string.replace(/\r\n/g, '\n');
@@ -181,4 +182,14 @@ function splitString(str, num) {
     }
   }
   return array;
+}
+
+/*******
+ * @description: 将路径中的反斜杠字符 \ 替换为斜杠 /
+ * @author: 琴时
+ * @param {*} path
+ * @return {*}
+ */
+function replacePath(path) {
+  return path.replace(/\\/g, '/');
 }

package/lib/utils/time.js

@@ -11,7 +11,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 // ES 2015
 
 _dayjs["default"].locale('zh-cn'); // 全局使用
-_dayjs["default"].extend(_relativeTime["default"]);
 
 /*******
  * @description: 生成时间格式化
@@ -146,10 +145,24 @@ var countDown = exports.countDown = function countDown(params) {
  * @description: 距离当前时间状况
  * @author: 琴时
  * @param {*} date
+ * @param {String} diff [year:年, month:月, week:周, day:天, hour:小时, minute:分钟, second:秒]
  * @return {String}
  */
-var transformDate = exports.transformDate = function transformDate(date) {
-  var diff = (0, _dayjs["default"])(date).fromNow().replace(/\s+/g, '');
-  if (diff === '几秒前') diff = '刚刚';
-  return diff;
+var transformDate = exports.transformDate = function transformDate(date, diff) {
+  _dayjs["default"].extend(_relativeTime["default"]);
+  var transDay = (0, _dayjs["default"])(date).fromNow().replace(/\s+/g, '');
+  if (transDay === '几秒前') transDay = '刚刚';
+  if (diff) {
+    var diffObj = {
+      year: '年',
+      month: '月',
+      week: '周',
+      day: '天'
+    };
+    // 匹配transDay有无该值==>超出界限则显示日期
+    if (new RegExp("(".concat(diffObj[diff], ")")).test(transDay)) {
+      transDay = (0, _dayjs["default"])(date).format('YYYY-MM-DD');
+    }
+  }
+  return transDay;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tools-for-js",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "基于babel构建的javascript工具库",
   "main": "lib/index.js",
   "scripts": {