util-helpers 4.12.9 → 4.13.0

package/esm/formatBankCard.js

@@ -28,12 +28,12 @@ import normalizeString from './normalizeString';
 
 function formatBankCard() {
   var bankCardNo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$char = _ref["char"],
-      _char = _ref$char === void 0 ? ' ' : _ref$char,
-      _ref$length = _ref.length,
-      length = _ref$length === void 0 ? 4 : _ref$length;
+  var _options$char = options["char"],
+      _char = _options$char === void 0 ? ' ' : _options$char,
+      _options$length = options.length,
+      length = _options$length === void 0 ? 4 : _options$length;
 
   var reg = new RegExp("(.{".concat(length, "})"), 'g');
   var regChar = new RegExp("".concat(_char), 'g');

package/esm/formatMobile.js

@@ -26,9 +26,10 @@ import normalizeString from './normalizeString';
  */
 
 function formatMobile(mobileNo) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$char = _ref["char"],
-      _char = _ref$char === void 0 ? ' ' : _ref$char;
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+  var _options$char = options["char"],
+      _char = _options$char === void 0 ? ' ' : _options$char;
 
   var regChar = new RegExp(_char, 'g');
   var realValue = normalizeString(mobileNo).replace(regChar, '').substring(0, 11);

package/esm/formatMoney.js

@@ -118,17 +118,16 @@ function formatDec(decStr, precision, decimal) {
 
 
 var formatMoney = function formatMoney(num) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$precision = _ref.precision,
-      precision = _ref$precision === void 0 ? 2 : _ref$precision,
-      symbol = _ref.symbol,
-      _ref$thousand = _ref.thousand,
-      thousand = _ref$thousand === void 0 ? ',' : _ref$thousand,
-      _ref$decimal = _ref.decimal,
-      decimal = _ref$decimal === void 0 ? '.' : _ref$decimal;
-
-  // 数字参数不正确，返回空字符串
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$precision = options.precision,
+      precision = _options$precision === void 0 ? 2 : _options$precision,
+      symbol = options.symbol,
+      _options$thousand = options.thousand,
+      thousand = _options$thousand === void 0 ? ',' : _options$thousand,
+      _options$decimal = options.decimal,
+      decimal = _options$decimal === void 0 ? '.' : _options$decimal; // 数字参数不正确，返回空字符串
   // @ts-ignore
+
   if (!checkNumber(num)) {
     return '';
   } // 参数规整化

package/esm/isBankCard.js

@@ -47,12 +47,11 @@ function sumCheckCode(numStr) {
 
 
 function isBankCard(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$loose = _ref.loose,
-      loose = _ref$loose === void 0 ? false : _ref$loose,
-      _ref$luhn = _ref.luhn,
-      luhn = _ref$luhn === void 0 ? false : _ref$luhn;
-
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$loose = options.loose,
+      loose = _options$loose === void 0 ? false : _options$loose,
+      _options$luhn = options.luhn,
+      luhn = _options$luhn === void 0 ? false : _options$luhn;
   var valueStr = normalizeString(value);
   var validateResult = loose ? regLoose.test(valueStr) : reg.test(valueStr);
 

package/esm/isChinese.js

@@ -31,6 +31,8 @@ var supportRegExpUnicode = RegExp.prototype.hasOwnProperty('unicode');
  * @alias module:Validator.isChinese
  * @since 1.1.0
  * @see 参考 {@link http://www.unicode.org/reports/tr38/#BlockListing|4.4 Listing of Characters Covered by the Unihan Database}
+ * @see 参考 {@link https://zh.wikipedia.org/wiki/Unicode字符平面映射|Unicode字符平面映射}
+ * @see 参考 {@link https://zh.wikipedia.org/wiki/Unicode區段|Unicode区段}
  * @param {*} value 要检测的值
  * @param {Object} [options] 配置项
  * @param {boolean} [options.loose=false] 宽松模式。如果为true，只要包含中文即为true
@@ -55,12 +57,11 @@ var supportRegExpUnicode = RegExp.prototype.hasOwnProperty('unicode');
  */
 
 function isChinese(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$loose = _ref.loose,
-      loose = _ref$loose === void 0 ? false : _ref$loose,
-      _ref$useExtend = _ref.useExtend,
-      useExtend = _ref$useExtend === void 0 ? false : _ref$useExtend;
-
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$loose = options.loose,
+      loose = _options$loose === void 0 ? false : _options$loose,
+      _options$useExtend = options.useExtend,
+      useExtend = _options$useExtend === void 0 ? false : _options$useExtend;
   var valueStr = normalizeString(value);
   var basicRegExp = loose ? looseChineseRegExp : chineseRegExp;
   var extendRegExp = loose ? looseChineseExtendRegExp : chineseExtendRegExp;

package/esm/isIdCard.js

@@ -55,12 +55,11 @@ function check(id) {
 
 
 function isIdCard(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$loose = _ref.loose,
-      loose = _ref$loose === void 0 ? false : _ref$loose,
-      _ref$checkCode = _ref.checkCode,
-      checkCode = _ref$checkCode === void 0 ? true : _ref$checkCode;
-
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$loose = options.loose,
+      loose = _options$loose === void 0 ? false : _options$loose,
+      _options$checkCode = options.checkCode,
+      checkCode = _options$checkCode === void 0 ? true : _options$checkCode;
   var valueStr = normalizeString(value);
 
   if (valueStr.length === 15 && loose) {

package/esm/isPassword.js

@@ -34,14 +34,13 @@ import validatePassword from './validatePassword';
  */
 
 function isPassword(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$level = _ref.level,
-      level = _ref$level === void 0 ? 2 : _ref$level,
-      _ref$ignoreCase = _ref.ignoreCase,
-      ignoreCase = _ref$ignoreCase === void 0 ? false : _ref$ignoreCase,
-      _ref$special = _ref.special,
-      special = _ref$special === void 0 ? '\\x21-\\x2F\\x3A-\\x40\\x5B-\\x60\\x7B-\\x7E' : _ref$special;
-
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$level = options.level,
+      level = _options$level === void 0 ? 2 : _options$level,
+      _options$ignoreCase = options.ignoreCase,
+      ignoreCase = _options$ignoreCase === void 0 ? false : _options$ignoreCase,
+      _options$special = options.special,
+      special = _options$special === void 0 ? '\\x21-\\x2F\\x3A-\\x40\\x5B-\\x60\\x7B-\\x7E' : _options$special;
   return validatePassword(value, {
     level: level,
     ignoreCase: ignoreCase,

package/esm/isTWCard.js

@@ -27,10 +27,9 @@ var singleRegTWCard = /^[\da-z]{10,12}$/i;
  */
 
 function isTWCard(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$loose = _ref.loose,
-      loose = _ref$loose === void 0 ? false : _ref$loose;
-
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$loose = options.loose,
+      loose = _options$loose === void 0 ? false : _options$loose;
   var valueStr = normalizeString(value);
 
   if (regTWCard.test(valueStr)) {

package/esm/isUrl.js

@@ -1,6 +1,19 @@
-import normalizeString from './normalizeString'; // url正则
+import normalizeString from './normalizeString'; // 标准格式如下：
+// [协议类型]://[服务器地址]:[端口号]/[资源层级UNIX文件路径][文件名]?[查询]#[片段ID]
+// 完整格式如下：
+// [协议类型]://[访问资源需要的凭证信息]@[服务器地址]:[端口号]/[资源层级UNIX文件路径][文件名]?[查询]#[片段ID]
+// 
+// 其中[访问凭证信息]、[端口号]、[查询]、[片段ID]都属于选填项。
 
-var reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\*\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
+var protocalReg = '[\\w-.]+:\\/\\/';
+var credentialsReg = '[-;:&=\\+\\$,\\w]+@';
+var serverReg = 'localhost|(([^\\s:\\/]+?\\.)+?[^\\s:\\/]+)';
+var portReg = ':\\d+';
+var pathReg = '\\/.*';
+var searchReg = '\\?.*';
+var hashReg = '#.*';
+var regWithProtocal = new RegExp("^".concat(protocalReg, "(?:").concat(credentialsReg, ")?(?:").concat(serverReg, ")(?:").concat(portReg, ")?(?:").concat(pathReg, ")*(?:").concat(searchReg, ")?(?:").concat(hashReg, ")?$"));
+var regNonProtocal = new RegExp("^(?:".concat(serverReg, ")(?:").concat(portReg, ")?(?:").concat(pathReg, ")*(?:").concat(searchReg, ")?(?:").concat(hashReg, ")?$"));
 /**
  * 检测值是否为url
  *
@@ -13,18 +26,27 @@ var reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:
  * @example
  *
  * isUrl(''); // false
- * isUrl('8.8.8.8'); // false
+ * isUrl('/foo/bar'); // false
+ * 
+ * isUrl('8.8.8.8'); // true
  * isUrl('example.com'); // true
  * isUrl('http://example.com'); // true
  * isUrl('https://example.com:8080'); // true
- * isUrl('http://www.example.com/test/123'); // true
- * isUrl('http://www.example.com/test/123?foo=bar'); // true
+ * isUrl('https://www.example.com/test/123'); // true
+ * isUrl('https://www.example.com/test/123?foo=bar'); // true
+ * isUrl('https://www.example.com/test/123?foo=中文#id'); // true
+ * isUrl('https://www.example.com/test/123?foo=中文#测试'); // true
+ * isUrl('ftp://127.0.0.1:8080/测试.tar'); // true
+ * isUrl('a.b'); // true
+ * isUrl('a.b:8080'); // true
+ * isUrl('p://a.b'); // true
+ * isUrl('p://a.b:8888'); // true
  * 
  */
 
 function isUrl(value) {
   var valueStr = normalizeString(value);
-  return reg.test(valueStr);
+  return regWithProtocal.test(valueStr) || regNonProtocal.test(valueStr);
 }
 
 export default isUrl;

package/esm/numberToChinese.js

@@ -180,21 +180,20 @@ function mapNumberChar(num) {
 
 
 function numberToChinese(num) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$big = _ref.big5,
-      big5 = _ref$big === void 0 ? false : _ref$big,
-      _ref$unit = _ref.unit,
-      unit = _ref$unit === void 0 ? true : _ref$unit,
-      _ref$decimal = _ref.decimal,
-      decimal = _ref$decimal === void 0 ? '' : _ref$decimal,
-      _ref$zero = _ref.zero,
-      zero = _ref$zero === void 0 ? '' : _ref$zero,
-      _ref$negative = _ref.negative,
-      negative = _ref$negative === void 0 ? '负' : _ref$negative,
-      _ref$unitConfig = _ref.unitConfig,
-      unitConfig = _ref$unitConfig === void 0 ? {} : _ref$unitConfig;
-
-  // 非数字 或 NaN 不处理
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$big = options.big5,
+      big5 = _options$big === void 0 ? false : _options$big,
+      _options$unit = options.unit,
+      unit = _options$unit === void 0 ? true : _options$unit,
+      _options$zero = options.zero,
+      zero = _options$zero === void 0 ? '' : _options$zero,
+      _options$negative = options.negative,
+      negative = _options$negative === void 0 ? '负' : _options$negative,
+      _options$unitConfig = options.unitConfig,
+      unitConfig = _options$unitConfig === void 0 ? {} : _options$unitConfig;
+  var _options$decimal = options.decimal,
+      decimal = _options$decimal === void 0 ? '' : _options$decimal; // 非数字 或 NaN 不处理
+
   if (typeof num !== 'number' || isNaN(num)) {
     devWarn("\u53C2\u6570\u9519\u8BEF ".concat(num, "\uFF0C\u8BF7\u4F20\u5165\u6570\u5B57"));
     return '';

package/esm/replaceChar.js

@@ -39,16 +39,17 @@ import normalizeString from './normalizeString';
  */
 
 function replaceChar(str) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$start = _ref.start,
-      start = _ref$start === void 0 ? 3 : _ref$start,
-      _ref$end = _ref.end,
-      end = _ref$end === void 0 ? -4 : _ref$end,
-      _ref$char = _ref["char"],
-      _char = _ref$char === void 0 ? '*' : _ref$char,
-      repeat = _ref.repeat,
-      exclude = _ref.exclude;
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
+  var _options$char = options["char"],
+      _char = _options$char === void 0 ? '*' : _options$char,
+      exclude = options.exclude;
+
+  var _options$start = options.start,
+      start = _options$start === void 0 ? 3 : _options$start,
+      _options$end = options.end,
+      end = _options$end === void 0 ? -4 : _options$end,
+      repeat = options.repeat;
   var realStr = normalizeString(str);
   var strLen = realStr.length; // 开始位置超过str长度
 

package/esm/utils/config.js

@@ -1,5 +1,5 @@
 // @ts-ignore
-var version = "4.12.9";
+var version = "4.13.0";
 var config = {
   // 禁用warning提示
   disableWarning: true

package/esm/validatePassword.js

@@ -217,14 +217,13 @@ function hasUnallowableCharacter(val, chars) {
 
 
 function validatePassword(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$level = _ref.level,
-      level = _ref$level === void 0 ? 2 : _ref$level,
-      _ref$ignoreCase = _ref.ignoreCase,
-      ignoreCase = _ref$ignoreCase === void 0 ? false : _ref$ignoreCase,
-      _ref$special = _ref.special,
-      special = _ref$special === void 0 ? '\\x21-\\x2F\\x3A-\\x40\\x5B-\\x60\\x7B-\\x7E' : _ref$special;
-
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$level = options.level,
+      level = _options$level === void 0 ? 2 : _options$level,
+      _options$ignoreCase = options.ignoreCase,
+      ignoreCase = _options$ignoreCase === void 0 ? false : _options$ignoreCase,
+      _options$special = options.special,
+      special = _options$special === void 0 ? '\\x21-\\x2F\\x3A-\\x40\\x5B-\\x60\\x7B-\\x7E' : _options$special;
   var valStr = value;
 
   if (typeof value !== 'string') {

package/lib/calculateCursorPosition.js

@@ -32,13 +32,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
  * @returns {number} 格式化后的光标位置
  */
 function calculateCursorPosition(prevPos, prevCtrlValue, rawValue, ctrlValue) {
-  var _ref = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {},
-      _ref$placeholderChar = _ref.placeholderChar,
-      placeholderChar = _ref$placeholderChar === void 0 ? ' ' : _ref$placeholderChar,
-      _ref$maskReg = _ref.maskReg,
-      maskReg = _ref$maskReg === void 0 ? /\D/g : _ref$maskReg,
-      type = _ref.type;
-
+  var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  var _options$placeholderC = options.placeholderChar,
+      placeholderChar = _options$placeholderC === void 0 ? ' ' : _options$placeholderC,
+      _options$maskReg = options.maskReg,
+      maskReg = _options$maskReg === void 0 ? /\D/g : _options$maskReg,
+      type = options.type;
   var realCtrlValue = (0, _normalizeString["default"])(prevCtrlValue);
   var realRawValue = (0, _normalizeString["default"])(rawValue);
   var placeholderChars = Array.isArray(placeholderChar) ? placeholderChar : [placeholderChar];

package/lib/formatBankCard.js

@@ -37,12 +37,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
  */
 function formatBankCard() {
   var bankCardNo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$char = _ref["char"],
-      _char = _ref$char === void 0 ? ' ' : _ref$char,
-      _ref$length = _ref.length,
-      length = _ref$length === void 0 ? 4 : _ref$length;
+  var _options$char = options["char"],
+      _char = _options$char === void 0 ? ' ' : _options$char,
+      _options$length = options.length,
+      length = _options$length === void 0 ? 4 : _options$length;
 
   var reg = new RegExp("(.{".concat(length, "})"), 'g');
   var regChar = new RegExp("".concat(_char), 'g');

package/lib/formatMobile.js

@@ -35,9 +35,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
  * 
  */
 function formatMobile(mobileNo) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$char = _ref["char"],
-      _char = _ref$char === void 0 ? ' ' : _ref$char;
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+  var _options$char = options["char"],
+      _char = _options$char === void 0 ? ' ' : _options$char;
 
   var regChar = new RegExp(_char, 'g');
   var realValue = (0, _normalizeString["default"])(mobileNo).replace(regChar, '').substring(0, 11);

package/lib/formatMoney.js

@@ -140,17 +140,16 @@ function formatDec(decStr, precision, decimal) {
 
 
 var formatMoney = function formatMoney(num) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$precision = _ref.precision,
-      precision = _ref$precision === void 0 ? 2 : _ref$precision,
-      symbol = _ref.symbol,
-      _ref$thousand = _ref.thousand,
-      thousand = _ref$thousand === void 0 ? ',' : _ref$thousand,
-      _ref$decimal = _ref.decimal,
-      decimal = _ref$decimal === void 0 ? '.' : _ref$decimal;
-
-  // 数字参数不正确，返回空字符串
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$precision = options.precision,
+      precision = _options$precision === void 0 ? 2 : _options$precision,
+      symbol = options.symbol,
+      _options$thousand = options.thousand,
+      thousand = _options$thousand === void 0 ? ',' : _options$thousand,
+      _options$decimal = options.decimal,
+      decimal = _options$decimal === void 0 ? '.' : _options$decimal; // 数字参数不正确，返回空字符串
   // @ts-ignore
+
   if (!checkNumber(num)) {
     return '';
   } // 参数规整化

package/lib/isBankCard.js

@@ -57,12 +57,11 @@ function sumCheckCode(numStr) {
 
 
 function isBankCard(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$loose = _ref.loose,
-      loose = _ref$loose === void 0 ? false : _ref$loose,
-      _ref$luhn = _ref.luhn,
-      luhn = _ref$luhn === void 0 ? false : _ref$luhn;
-
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$loose = options.loose,
+      loose = _options$loose === void 0 ? false : _options$loose,
+      _options$luhn = options.luhn,
+      luhn = _options$luhn === void 0 ? false : _options$luhn;
   var valueStr = (0, _normalizeString["default"])(value);
   var validateResult = loose ? regLoose.test(valueStr) : reg.test(valueStr);
 

package/lib/isChinese.js

@@ -41,6 +41,8 @@ var supportRegExpUnicode = RegExp.prototype.hasOwnProperty('unicode');
  * @alias module:Validator.isChinese
  * @since 1.1.0
  * @see 参考 {@link http://www.unicode.org/reports/tr38/#BlockListing|4.4 Listing of Characters Covered by the Unihan Database}
+ * @see 参考 {@link https://zh.wikipedia.org/wiki/Unicode字符平面映射|Unicode字符平面映射}
+ * @see 参考 {@link https://zh.wikipedia.org/wiki/Unicode區段|Unicode区段}
  * @param {*} value 要检测的值
  * @param {Object} [options] 配置项
  * @param {boolean} [options.loose=false] 宽松模式。如果为true，只要包含中文即为true
@@ -65,12 +67,11 @@ var supportRegExpUnicode = RegExp.prototype.hasOwnProperty('unicode');
  */
 
 function isChinese(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$loose = _ref.loose,
-      loose = _ref$loose === void 0 ? false : _ref$loose,
-      _ref$useExtend = _ref.useExtend,
-      useExtend = _ref$useExtend === void 0 ? false : _ref$useExtend;
-
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$loose = options.loose,
+      loose = _options$loose === void 0 ? false : _options$loose,
+      _options$useExtend = options.useExtend,
+      useExtend = _options$useExtend === void 0 ? false : _options$useExtend;
   var valueStr = (0, _normalizeString["default"])(value);
   var basicRegExp = loose ? looseChineseRegExp : chineseRegExp;
   var extendRegExp = loose ? looseChineseExtendRegExp : chineseExtendRegExp;

package/lib/isIdCard.js

@@ -65,12 +65,11 @@ function check(id) {
 
 
 function isIdCard(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$loose = _ref.loose,
-      loose = _ref$loose === void 0 ? false : _ref$loose,
-      _ref$checkCode = _ref.checkCode,
-      checkCode = _ref$checkCode === void 0 ? true : _ref$checkCode;
-
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$loose = options.loose,
+      loose = _options$loose === void 0 ? false : _options$loose,
+      _options$checkCode = options.checkCode,
+      checkCode = _options$checkCode === void 0 ? true : _options$checkCode;
   var valueStr = (0, _normalizeString["default"])(value);
 
   if (valueStr.length === 15 && loose) {

package/lib/isPassword.js

@@ -43,14 +43,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
  * 
  */
 function isPassword(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$level = _ref.level,
-      level = _ref$level === void 0 ? 2 : _ref$level,
-      _ref$ignoreCase = _ref.ignoreCase,
-      ignoreCase = _ref$ignoreCase === void 0 ? false : _ref$ignoreCase,
-      _ref$special = _ref.special,
-      special = _ref$special === void 0 ? '\\x21-\\x2F\\x3A-\\x40\\x5B-\\x60\\x7B-\\x7E' : _ref$special;
-
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$level = options.level,
+      level = _options$level === void 0 ? 2 : _options$level,
+      _options$ignoreCase = options.ignoreCase,
+      ignoreCase = _options$ignoreCase === void 0 ? false : _options$ignoreCase,
+      _options$special = options.special,
+      special = _options$special === void 0 ? '\\x21-\\x2F\\x3A-\\x40\\x5B-\\x60\\x7B-\\x7E' : _options$special;
   return (0, _validatePassword["default"])(value, {
     level: level,
     ignoreCase: ignoreCase,

package/lib/isTWCard.js

@@ -37,10 +37,9 @@ var singleRegTWCard = /^[\da-z]{10,12}$/i;
  */
 
 function isTWCard(value) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$loose = _ref.loose,
-      loose = _ref$loose === void 0 ? false : _ref$loose;
-
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$loose = options.loose,
+      loose = _options$loose === void 0 ? false : _options$loose;
   var valueStr = (0, _normalizeString["default"])(value);
 
   if (regTWCard.test(valueStr)) {

package/lib/isUrl.js

@@ -9,8 +9,21 @@ var _normalizeString = _interopRequireDefault(require("./normalizeString"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-// url正则
-var reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\*\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
+// 标准格式如下：
+// [协议类型]://[服务器地址]:[端口号]/[资源层级UNIX文件路径][文件名]?[查询]#[片段ID]
+// 完整格式如下：
+// [协议类型]://[访问资源需要的凭证信息]@[服务器地址]:[端口号]/[资源层级UNIX文件路径][文件名]?[查询]#[片段ID]
+// 
+// 其中[访问凭证信息]、[端口号]、[查询]、[片段ID]都属于选填项。
+var protocalReg = '[\\w-.]+:\\/\\/';
+var credentialsReg = '[-;:&=\\+\\$,\\w]+@';
+var serverReg = 'localhost|(([^\\s:\\/]+?\\.)+?[^\\s:\\/]+)';
+var portReg = ':\\d+';
+var pathReg = '\\/.*';
+var searchReg = '\\?.*';
+var hashReg = '#.*';
+var regWithProtocal = new RegExp("^".concat(protocalReg, "(?:").concat(credentialsReg, ")?(?:").concat(serverReg, ")(?:").concat(portReg, ")?(?:").concat(pathReg, ")*(?:").concat(searchReg, ")?(?:").concat(hashReg, ")?$"));
+var regNonProtocal = new RegExp("^(?:".concat(serverReg, ")(?:").concat(portReg, ")?(?:").concat(pathReg, ")*(?:").concat(searchReg, ")?(?:").concat(hashReg, ")?$"));
 /**
  * 检测值是否为url
  *
@@ -23,18 +36,27 @@ var reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:
  * @example
  *
  * isUrl(''); // false
- * isUrl('8.8.8.8'); // false
+ * isUrl('/foo/bar'); // false
+ * 
+ * isUrl('8.8.8.8'); // true
  * isUrl('example.com'); // true
  * isUrl('http://example.com'); // true
  * isUrl('https://example.com:8080'); // true
- * isUrl('http://www.example.com/test/123'); // true
- * isUrl('http://www.example.com/test/123?foo=bar'); // true
+ * isUrl('https://www.example.com/test/123'); // true
+ * isUrl('https://www.example.com/test/123?foo=bar'); // true
+ * isUrl('https://www.example.com/test/123?foo=中文#id'); // true
+ * isUrl('https://www.example.com/test/123?foo=中文#测试'); // true
+ * isUrl('ftp://127.0.0.1:8080/测试.tar'); // true
+ * isUrl('a.b'); // true
+ * isUrl('a.b:8080'); // true
+ * isUrl('p://a.b'); // true
+ * isUrl('p://a.b:8888'); // true
  * 
  */
 
 function isUrl(value) {
   var valueStr = (0, _normalizeString["default"])(value);
-  return reg.test(valueStr);
+  return regWithProtocal.test(valueStr) || regNonProtocal.test(valueStr);
 }
 
 var _default = isUrl;

package/lib/numberToChinese.js

@@ -191,21 +191,20 @@ function mapNumberChar(num) {
 
 
 function numberToChinese(num) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$big = _ref.big5,
-      big5 = _ref$big === void 0 ? false : _ref$big,
-      _ref$unit = _ref.unit,
-      unit = _ref$unit === void 0 ? true : _ref$unit,
-      _ref$decimal = _ref.decimal,
-      decimal = _ref$decimal === void 0 ? '' : _ref$decimal,
-      _ref$zero = _ref.zero,
-      zero = _ref$zero === void 0 ? '' : _ref$zero,
-      _ref$negative = _ref.negative,
-      negative = _ref$negative === void 0 ? '负' : _ref$negative,
-      _ref$unitConfig = _ref.unitConfig,
-      unitConfig = _ref$unitConfig === void 0 ? {} : _ref$unitConfig;
-
-  // 非数字 或 NaN 不处理
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$big = options.big5,
+      big5 = _options$big === void 0 ? false : _options$big,
+      _options$unit = options.unit,
+      unit = _options$unit === void 0 ? true : _options$unit,
+      _options$zero = options.zero,
+      zero = _options$zero === void 0 ? '' : _options$zero,
+      _options$negative = options.negative,
+      negative = _options$negative === void 0 ? '负' : _options$negative,
+      _options$unitConfig = options.unitConfig,
+      unitConfig = _options$unitConfig === void 0 ? {} : _options$unitConfig;
+  var _options$decimal = options.decimal,
+      decimal = _options$decimal === void 0 ? '' : _options$decimal; // 非数字 或 NaN 不处理
+
   if (typeof num !== 'number' || isNaN(num)) {
     (0, _devWarn["default"])("\u53C2\u6570\u9519\u8BEF ".concat(num, "\uFF0C\u8BF7\u4F20\u5165\u6570\u5B57"));
     return '';