tools-for-js 1.3.2 → 1.4.0

package/README.md

@@ -32,7 +32,6 @@ import { API } from 'tools-for-js'
 | 深拷贝变量                                       | deepCopy          |
 | 校验空值参数                                     | isEmpty           |
 | 校验两个参数是否相等                             | isEqual           |
-| 生成 UUID                                        | createUUID        |
 | 数组去重                                         | deWeightArray     |
 | 计算树的最后节点某字段的总和                     | treeLastChildSum  |
 | 校验数组对象中是否存在指定的字段为空             | checkKeyEmpty     |
@@ -55,8 +54,12 @@ import { API } from 'tools-for-js'
 | 将路径中的反斜杠字符 \ 替换为斜杠 /              | replacePath       |
 | 切割/获取文件名                                  | splitToFileName   |
 | 数组反选                                         | invertSelection   |
-| 生成随机颜色                                     | getRandomColor    |
 | 创建时间对象                                     | createDate        |
 | 获取结束时间                                     | getExpiresEndTime |
 | 判断是否过期                                     | isExpires         |
-| 计算指定时间到间隔 n 天的时间                    | getAfterNDays     |
+| 随机数字                                         | randomNum         |
+| 随机字符串                                       | randomCode        |
+| 随机颜色                                         | randomColor       |
+| 创建 UUID                                        | createUUID        |
+| 随机 MAC 地址                                    | randomMac         |
+| 待更新                                           | function          |

package/lib/index.js

@@ -66,7 +66,7 @@ Object.defineProperty(exports, "createDate", {
 Object.defineProperty(exports, "createUUID", {
   enumerable: true,
   get: function get() {
-    return _common.createUUID;
+    return _random.createUUID;
   }
 });
 Object.defineProperty(exports, "dateFormat", {
@@ -117,12 +117,6 @@ Object.defineProperty(exports, "getPagination", {
     return _array.getPagination;
   }
 });
-Object.defineProperty(exports, "getRandomColor", {
-  enumerable: true,
-  get: function get() {
-    return _string.getRandomColor;
-  }
-});
 Object.defineProperty(exports, "getStrLength", {
   enumerable: true,
   get: function get() {
@@ -189,6 +183,30 @@ Object.defineProperty(exports, "objectToQs", {
     return _object.objectToQs;
   }
 });
+Object.defineProperty(exports, "randomCode", {
+  enumerable: true,
+  get: function get() {
+    return _random.randomCode;
+  }
+});
+Object.defineProperty(exports, "randomColor", {
+  enumerable: true,
+  get: function get() {
+    return _random.randomColor;
+  }
+});
+Object.defineProperty(exports, "randomMac", {
+  enumerable: true,
+  get: function get() {
+    return _random.randomMac;
+  }
+});
+Object.defineProperty(exports, "randomNum", {
+  enumerable: true,
+  get: function get() {
+    return _random.randomNum;
+  }
+});
 Object.defineProperty(exports, "replacePath", {
   enumerable: true,
   get: function get() {
@@ -261,4 +279,5 @@ var _array = require("./utils/array");
 var _calculate = require("./utils/calculate");
 var _common = require("./utils/common");
 var _string = require("./utils/string");
+var _random = require("./utils/random");
 var _object = require("./utils/object");

package/lib/utils/common.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isEqual = exports.isEmpty = exports.deepCopy = exports.createUUID = exports.IsType = void 0;
+exports.isEqual = exports.isEmpty = exports.deepCopy = exports.IsType = void 0;
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 /*******
  * @description: 变量类型判断
@@ -112,29 +112,4 @@ var isEqual = exports.isEqual = function isEqual(a, b) {
     return false; // 其它类型,均返回false
   }
   return true;
-};
-
-/*******
- * @description: 生成UUID
- * UUID(Universally Unique IDentifier) 全局唯一标识符。
- * UUID是一种由算法生成的二进制长度为128位的数字标识符。
- * UUID的格式为“xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx”，
- * 其中的 x 是 0-9 或 a-f 范围内的一个32位十六进制数。
- * 在理想情况下，任何计算机和计算机集群都不会生成两个相同的UUID。
- * @author: 琴时
- * @param {String} symbol [分隔符] [默认为空]
- * @return {String}
- * @example: createUUID('-') // 生成UUID并使用[-]作为分隔符
- */
-var createUUID = exports.createUUID = function createUUID() {
-  var symbol = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  var s = [];
-  var hexDigits = '0123456789abcdef';
-  for (var i = 0; i < 36; i++) {
-    s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
-  }
-  s[14] = '4'; // bits 12-15 of 时间和版本字段设置为0010
-  s[19] = hexDigits.substr(s[19] & 0x3 | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
-  s[8] = s[13] = s[18] = s[23] = '-';
-  return s.join('').replace(/-/g, symbol);
 };

package/lib/utils/random.js

@@ -0,0 +1,100 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.randomCode = exports.createUUID = void 0;
+exports.randomColor = randomColor;
+exports.randomNum = exports.randomMac = void 0;
+/*******
+ * @description: 随机数字
+ * @author: 琴时
+ * @param {Number} length [长度] [默认为6]
+ * @return {String}
+ */
+var randomNum = exports.randomNum = function randomNum() {
+  var length = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 6;
+  var result = '';
+  var decimalDigits = '0123456789';
+  for (var i = 0; i < length; i++) {
+    var index = Math.floor(Math.random() * 10); //随机生成一位0~9的数
+    result += decimalDigits.charAt(index);
+  }
+  return result;
+};
+
+/*******
+ * @description: 随机字符串
+ * @author: 琴时
+ * @param {Number} length [长度] [默认为6]
+ * @return {String}
+ */
+var randomCode = exports.randomCode = function randomCode() {
+  var length = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 6;
+  var result = '';
+  var num = '0123456789';
+  var lower = 'abcdefghijklmnopqrstuvwxyz';
+  var capital = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+  var character = num + lower + capital;
+  for (var i = 0; i < length; i++) {
+    var index = Math.floor(Math.random() * character.length); //随机生成一位0~61的数
+    result += character.charAt(index);
+  }
+  return result;
+};
+
+/*******
+ * @description: 随机颜色
+ * @author: 琴时
+ * @param {Array} exclude [跳过颜色(可选参数)，默认为空数组]
+ * @return {String}
+ */
+function randomColor() {
+  var exclude = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var hexDigits = '0123456789ABCDEF';
+  var color = '#';
+  for (var i = 0; i < 6; i++) {
+    var index = Math.floor(Math.random() * 16); //随机生成一位0~15的数
+    color += hexDigits.charAt(index);
+  }
+  //如果生成的颜色和默认颜色重复了，则重新生成
+  if (exclude.includes(color)) randomColor(exclude);
+  return color;
+}
+
+/*******
+ * @description: 创建UUID
+ * UUID(Universally Unique IDentifier) 全局唯一标识符。
+ * UUID是一种由算法生成的二进制长度为128位的数字标识符。
+ * UUID的格式为“xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx”，
+ * 其中的 x 是 0-9 或 a-f 范围内的一个32位十六进制数。
+ * 在理想情况下，任何计算机和计算机集群都不会生成两个相同的UUID。
+ * @author: 琴时
+ * @param {String} symbol [分隔符] [默认为空]
+ * @return {String}
+ * @example: createUUID('-') // 生成UUID并使用[-]作为分隔符
+ */
+var createUUID = exports.createUUID = function createUUID() {
+  var symbol = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '-';
+  var s = [];
+  var hexDigits = '0123456789abcdef';
+  for (var i = 0; i < 36; i++) {
+    s[i] = hexDigits.charAt(Math.floor(Math.random() * 16));
+  }
+  s[14] = '4'; // bits 12-15 of 时间和版本字段设置为0010
+  s[19] = hexDigits.charAt(s[19] & 3 | 8); // bits 6-7 of the clock_seq_hi_and_reserved to 01
+  s[8] = s[13] = s[18] = s[23] = '-';
+  return s.join('').replace(/-/g, symbol);
+};
+
+/*******
+ * @description: 随机MAC地址
+ * @author: 琴时
+ * @return {String}
+ */
+var randomMac = exports.randomMac = function randomMac() {
+  return 'XX:XX:XX:XX:XX:XX'.replace(/X/g, function () {
+    var hexDigits = '0123456789ABCDEF';
+    return hexDigits.charAt(Math.floor(Math.random() * 16));
+  });
+};

package/lib/utils/string.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.encode = exports.decode = exports.checkPwdStrength = void 0;
-exports.getRandomColor = getRandomColor;
-exports.getStrLength = void 0;
+exports.getStrLength = exports.encode = exports.decode = exports.checkPwdStrength = void 0;
 exports.replacePath = replacePath;
 exports.splitString = splitString;
 exports.splitToFileName = splitToFileName;
@@ -208,22 +206,4 @@ function splitToFileName(path) {
   var lastIndex = path.lastIndexOf('/');
   if (lastIndex === -1) return path;
   return path.substring(lastIndex + 1);
-}
-
-/*******
- * @description: 生成随机颜色
- * @author: 琴时
- * @param {Array} defaultList [跳过颜色(可选参数)，默认为空数组]
- * @return {String}
- */
-function getRandomColor() {
-  var defaultList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var letters = '0123456789ABCDEF';
-  var color = '#';
-  for (var i = 0; i < 6; i++) {
-    color += letters[Math.floor(Math.random() * 16)];
-  }
-  //如果生成的颜色和默认颜色重复了，则重新生成
-  if (defaultList.includes(color)) getRandomColor(defaultList);
-  return color;
 }

package/package.json

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