eoss 0.1.0-alpha.35 → 0.1.0-alpha.36

package/lib/flows.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 182);
+/******/ 	return __webpack_require__(__webpack_require__.s = 184);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3528,7 +3528,7 @@ module.exports = require("lodash/set");
 
 /***/ }),
 
-/***/ 182:
+/***/ 184:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7393,736 +7393,759 @@ module.exports = require("eoss/lib/tag");
 /* unused harmony export getSecond */
 /* unused harmony export getWeekday */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "F", function() { return timeCycle; });
-
-
+/* Modified from https://github.com/taylorhakes/fecha
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Taylor Hakes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ *     The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*eslint-disable*/
+// 把 YYYY-MM-DD 改成了 yyyy-MM-dd
+
+
 /**
  * Parse or format dates
  * @class fecha
- */
-var fecha = {};
-var token = /d{1,4}|M{1,4}|yy(?:yy)?|S{1,3}|Do|ZZ|([HhMsDm])\1?|[aA]|"[^"]*"|'[^']*'/g;
-var twoDigits = '\\d\\d?';
-var threeDigits = '\\d{3}';
-var fourDigits = '\\d{4}';
-var word = '[^\\s]+';
-var literal = /\[([^]*?)\]/gm;
-var noop = function noop() {};
-
-function regexEscape(str) {
-  return str.replace(/[|\\{()[^$+*?.-]/g, '\\$&');
-}
-
-function shorten(arr, sLen) {
-  var newArr = [];
-  for (var i = 0, len = arr.length; i < len; i++) {
-    newArr.push(arr[i].substr(0, sLen));
-  }
-  return newArr;
-}
-
-function monthUpdate() {
-  return function (d, v) {
-    var index = ['january', 'february', 'march', 'april', 'may', 'june', 'july', 'august', 'september', 'october', 'november', 'december'].indexOf(v.toLowerCase());
-    if (~index) {
-      d.month = index;
-    }
-  };
-}
-
-function pad(val, len) {
-  val = String(val);
-  len = len || 2;
-  while (val.length < len) {
-    val = '0' + val;
-  }
-  return val;
-}
-
-// 直接使用中文日期名称常量
-var dayNames = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
-var monthNames = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'];
-var monthNamesShort = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二'];
-var dayNamesShort = ['日', '一', '二', '三', '四', '五', '六'];
-var amPm = ['上午', '下午'];
-var DoFn = function DoFn(D) {
-  return D + '日';
-};
-
-var formatFlags = {
-  D: function D(dateObj) {
-    return dateObj.getDay();
-  },
-  DD: function DD(dateObj) {
-    return pad(dateObj.getDay());
-  },
-  Do: function Do(dateObj) {
-    return DoFn(dateObj.getDate());
-  },
-  d: function d(dateObj) {
-    return dateObj.getDate();
-  },
-  dd: function dd(dateObj) {
-    return pad(dateObj.getDate());
-  },
-  ddd: function ddd(dateObj) {
-    return dayNamesShort[dateObj.getDay()];
-  },
-  dddd: function dddd(dateObj) {
-    return dayNames[dateObj.getDay()];
-  },
-  M: function M(dateObj) {
-    return dateObj.getMonth() + 1;
-  },
-  MM: function MM(dateObj) {
-    return pad(dateObj.getMonth() + 1);
-  },
-  MMM: function MMM(dateObj) {
-    return monthNamesShort[dateObj.getMonth()];
-  },
-  MMMM: function MMMM(dateObj) {
-    return monthNames[dateObj.getMonth()];
-  },
-  yy: function yy(dateObj) {
-    return pad(String(dateObj.getFullYear()), 4).substr(2);
-  },
-  yyyy: function yyyy(dateObj) {
-    return pad(dateObj.getFullYear(), 4);
-  },
-  h: function h(dateObj) {
-    return dateObj.getHours() % 12 || 12;
-  },
-  hh: function hh(dateObj) {
-    return pad(dateObj.getHours() % 12 || 12);
-  },
-  H: function H(dateObj) {
-    return dateObj.getHours();
-  },
-  HH: function HH(dateObj) {
-    return pad(dateObj.getHours());
-  },
-  m: function m(dateObj) {
-    return dateObj.getMinutes();
-  },
-  mm: function mm(dateObj) {
-    return pad(dateObj.getMinutes());
-  },
-  s: function s(dateObj) {
-    return dateObj.getSeconds();
-  },
-  ss: function ss(dateObj) {
-    return pad(dateObj.getSeconds());
-  },
-  S: function S(dateObj) {
-    return Math.round(dateObj.getMilliseconds() / 100);
-  },
-  SS: function SS(dateObj) {
-    return pad(Math.round(dateObj.getMilliseconds() / 10), 2);
-  },
-  SSS: function SSS(dateObj) {
-    return pad(dateObj.getMilliseconds(), 3);
-  },
-  a: function a(dateObj) {
-    return dateObj.getHours() < 12 ? '上午' : '下午';
-  },
-  A: function A(dateObj) {
-    return dateObj.getHours() < 12 ? '上午' : '下午';
-  },
-  ZZ: function ZZ(dateObj) {
-    var o = dateObj.getTimezoneOffset();
-    return (o > 0 ? '-' : '+') + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4);
-  }
-};
-
-var parseFlags = {
-  d: [twoDigits, function (d, v) {
-    d.day = v;
-  }],
-  Do: [twoDigits + word, function (d, v) {
-    d.day = parseInt(v, 10);
-  }],
-  M: [twoDigits, function (d, v) {
-    d.month = v - 1;
-  }],
-  yy: [twoDigits, function (d, v) {
-    var da = new Date(),
-        cent = +('' + da.getFullYear()).substr(0, 2);
-    d.year = '' + (v > 68 ? cent - 1 : cent) + v;
-  }],
-  h: [twoDigits, function (d, v) {
-    d.hour = v;
-  }],
-  m: [twoDigits, function (d, v) {
-    d.minute = v;
-  }],
-  s: [twoDigits, function (d, v) {
-    d.second = v;
-  }],
-  yyyy: [fourDigits, function (d, v) {
-    d.year = v;
-  }],
-  S: ['\\d', function (d, v) {
-    d.millisecond = v * 100;
-  }],
-  SS: ['\\d{2}', function (d, v) {
-    d.millisecond = v * 10;
-  }],
-  SSS: [threeDigits, function (d, v) {
-    d.millisecond = v;
-  }],
-  D: [twoDigits, noop],
-  ddd: [word, noop],
-  MMM: [word, monthUpdate('monthNamesShort')],
-  MMMM: [word, monthUpdate('monthNames')],
-  a: [word, function (d, v) {
-    var val = v.toLowerCase();
-    if (val === '上午') {
-      d.isPm = false;
-    } else if (val === '下午') {
-      d.isPm = true;
-    }
-  }],
-  ZZ: ['[^\\s]*?[\\+\\-]\\d\\d:?\\d\\d|[^\\s]*?Z', function (d, v) {
-    var parts = (v + '').match(/([+-]|\d\d)/gi),
-        minutes = void 0;
-
-    if (parts) {
-      minutes = +(parts[1] * 60) + parseInt(parts[2], 10);
-      d.timezoneOffset = parts[0] === '+' ? minutes : -minutes;
-    }
-  }]
-};
-parseFlags.dd = parseFlags.d;
-parseFlags.dddd = parseFlags.ddd;
-parseFlags.DD = parseFlags.D;
-parseFlags.mm = parseFlags.m;
-parseFlags.hh = parseFlags.H = parseFlags.HH = parseFlags.h;
-parseFlags.MM = parseFlags.M;
-parseFlags.ss = parseFlags.s;
-parseFlags.A = parseFlags.a;
-
-// Some common format strings
-fecha.masks = {
-  default: 'ddd MMM dd yyyy HH:mm:ss',
-  shortDate: 'M/D/yy',
-  mediumDate: 'MMM d, yyyy',
-  longDate: 'MMMM d, yyyy',
-  fullDate: 'dddd, MMMM d, yyyy',
-  shortTime: 'HH:mm',
-  mediumTime: 'HH:mm:ss',
-  longTime: 'HH:mm:ss.SSS'
-};
-
+ */
+const fecha = {};
+const token = /d{1,4}|M{1,4}|yy(?:yy)?|S{1,3}|Do|ZZ|([HhMsDm])\1?|[aA]|"[^"]*"|'[^']*'/g;
+const twoDigits = '\\d\\d?';
+const threeDigits = '\\d{3}';
+const fourDigits = '\\d{4}';
+const word = '[^\\s]+';
+const literal = /\[([^]*?)\]/gm;
+const noop = function () {};
+
+function regexEscape(str) {
+  return str.replace(/[|\\{()[^$+*?.-]/g, '\\$&');
+}
+
+function shorten(arr, sLen) {
+  const newArr = [];
+  for (let i = 0, len = arr.length; i < len; i++) {
+    newArr.push(arr[i].substr(0, sLen));
+  }
+  return newArr;
+}
+
+function monthUpdate() {
+  return function (d, v) {
+    const index = ['january', 'february', 'march', 'april', 'may', 'june', 'july', 'august', 'september', 'october', 'november', 'december'].indexOf(v.toLowerCase());
+    if (~index) {
+      d.month = index;
+    }
+  };
+}
+
+function pad(val, len) {
+  val = String(val);
+  len = len || 2;
+  while (val.length < len) {
+    val = '0' + val;
+  }
+  return val;
+}
+
+// 直接使用中文日期名称常量
+const dayNames = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+const monthNames = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'];
+const monthNamesShort = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二'];
+const dayNamesShort = ['日', '一', '二', '三', '四', '五', '六'];
+const amPm = ['上午', '下午'];
+const DoFn = function DoFn(D) {
+  return D + '日';
+};
+
+const formatFlags = {
+  D: function(dateObj) {
+    return dateObj.getDay();
+  },
+  DD: function(dateObj) {
+    return pad(dateObj.getDay());
+  },
+  Do: function(dateObj) {
+    return DoFn(dateObj.getDate());
+  },
+  d: function(dateObj) {
+    return dateObj.getDate();
+  },
+  dd: function(dateObj) {
+    return pad(dateObj.getDate());
+  },
+  ddd: function(dateObj) {
+    return dayNamesShort[dateObj.getDay()];
+  },
+  dddd: function(dateObj) {
+    return dayNames[dateObj.getDay()];
+  },
+  M: function(dateObj) {
+    return dateObj.getMonth() + 1;
+  },
+  MM: function(dateObj) {
+    return pad(dateObj.getMonth() + 1);
+  },
+  MMM: function(dateObj) {
+    return monthNamesShort[dateObj.getMonth()];
+  },
+  MMMM: function(dateObj) {
+    return monthNames[dateObj.getMonth()];
+  },
+  yy: function(dateObj) {
+    return pad(String(dateObj.getFullYear()), 4).substr(2);
+  },
+  yyyy: function(dateObj) {
+    return pad(dateObj.getFullYear(), 4);
+  },
+  h: function(dateObj) {
+    return dateObj.getHours() % 12 || 12;
+  },
+  hh: function(dateObj) {
+    return pad(dateObj.getHours() % 12 || 12);
+  },
+  H: function(dateObj) {
+    return dateObj.getHours();
+  },
+  HH: function(dateObj) {
+    return pad(dateObj.getHours());
+  },
+  m: function(dateObj) {
+    return dateObj.getMinutes();
+  },
+  mm: function(dateObj) {
+    return pad(dateObj.getMinutes());
+  },
+  s: function(dateObj) {
+    return dateObj.getSeconds();
+  },
+  ss: function(dateObj) {
+    return pad(dateObj.getSeconds());
+  },
+  S: function(dateObj) {
+    return Math.round(dateObj.getMilliseconds() / 100);
+  },
+  SS: function(dateObj) {
+    return pad(Math.round(dateObj.getMilliseconds() / 10), 2);
+  },
+  SSS: function(dateObj) {
+    return pad(dateObj.getMilliseconds(), 3);
+  },
+  a: function(dateObj) {
+    return dateObj.getHours() < 12 ? '上午' : '下午';
+  },
+  A: function(dateObj) {
+    return dateObj.getHours() < 12 ? '上午' : '下午';
+  },
+  ZZ: function(dateObj) {
+    const o = dateObj.getTimezoneOffset();
+    return (o > 0 ? '-' : '+') + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4);
+  }
+};
+
+const parseFlags = {
+  d: [twoDigits, function (d, v) {
+    d.day = v;
+  }],
+  Do: [twoDigits + word, function (d, v) {
+    d.day = parseInt(v, 10);
+  }],
+  M: [twoDigits, function (d, v) {
+    d.month = v - 1;
+  }],
+  yy: [twoDigits, function (d, v) {
+    const da = new Date(), cent = +('' + da.getFullYear()).substr(0, 2);
+    d.year = '' + (v > 68 ? cent - 1 : cent) + v;
+  }],
+  h: [twoDigits, function (d, v) {
+    d.hour = v;
+  }],
+  m: [twoDigits, function (d, v) {
+    d.minute = v;
+  }],
+  s: [twoDigits, function (d, v) {
+    d.second = v;
+  }],
+  yyyy: [fourDigits, function (d, v) {
+    d.year = v;
+  }],
+  S: ['\\d', function (d, v) {
+    d.millisecond = v * 100;
+  }],
+  SS: ['\\d{2}', function (d, v) {
+    d.millisecond = v * 10;
+  }],
+  SSS: [threeDigits, function (d, v) {
+    d.millisecond = v;
+  }],
+  D: [twoDigits, noop],
+  ddd: [word, noop],
+  MMM: [word, monthUpdate('monthNamesShort')],
+  MMMM: [word, monthUpdate('monthNames')],
+  a: [word, function (d, v) {
+    const val = v.toLowerCase();
+    if (val === '上午') {
+      d.isPm = false;
+    } else if (val === '下午') {
+      d.isPm = true;
+    }
+  }],
+  ZZ: ['[^\\s]*?[\\+\\-]\\d\\d:?\\d\\d|[^\\s]*?Z', function (d, v) {
+    let parts = (v + '').match(/([+-]|\d\d)/gi), minutes;
+
+    if (parts) {
+      minutes = +(parts[1] * 60) + parseInt(parts[2], 10);
+      d.timezoneOffset = parts[0] === '+' ? minutes : -minutes;
+    }
+  }]
+};
+parseFlags.dd = parseFlags.d;
+parseFlags.dddd = parseFlags.ddd;
+parseFlags.DD = parseFlags.D;
+parseFlags.mm = parseFlags.m;
+parseFlags.hh = parseFlags.H = parseFlags.HH = parseFlags.h;
+parseFlags.MM = parseFlags.M;
+parseFlags.ss = parseFlags.s;
+parseFlags.A = parseFlags.a;
+
+
+// Some common format strings
+fecha.masks = {
+  default: 'ddd MMM dd yyyy HH:mm:ss',
+  shortDate: 'M/D/yy',
+  mediumDate: 'MMM d, yyyy',
+  longDate: 'MMMM d, yyyy',
+  fullDate: 'dddd, MMMM d, yyyy',
+  shortTime: 'HH:mm',
+  mediumTime: 'HH:mm:ss',
+  longTime: 'HH:mm:ss.SSS'
+};
+
 /***
  * Format a date
  * @method format
  * @param {Date|number} dateObj
  * @param {string} mask Format of the date, i.e. 'mm-dd-yy' or 'shortDate'
- */
-fecha.format = function (dateObj, mask) {
-  if (typeof dateObj === 'number') {
-    dateObj = new Date(dateObj);
-  }
-
-  if (Object.prototype.toString.call(dateObj) !== '[object Date]' || isNaN(dateObj.getTime())) {
-    throw new Error('Invalid Date in fecha.format');
-  }
-
-  mask = fecha.masks[mask] || mask || fecha.masks['default'];
-
-  var literals = [];
-
-  // Make literals inactive by replacing them with ??
-  mask = mask.replace(literal, function ($0, $1) {
-    literals.push($1);
-    return '@@@';
-  });
-  // Apply formatting rules
-  mask = mask.replace(token, function ($0) {
-    return $0 in formatFlags ? formatFlags[$0](dateObj) : $0.slice(1, $0.length - 1);
-  });
-  // Inline literal values back into the formatted value
-  return mask.replace(/@@@/g, function () {
-    return literals.shift();
-  });
-};
-
+ */
+fecha.format = function (dateObj, mask) {
+  if (typeof dateObj === 'number') {
+    dateObj = new Date(dateObj);
+  }
+
+  if (Object.prototype.toString.call(dateObj) !== '[object Date]' || isNaN(dateObj.getTime())) {
+    throw new Error('Invalid Date in fecha.format');
+  }
+
+  mask = fecha.masks[mask] || mask || fecha.masks['default'];
+
+  const literals = [];
+
+  // Make literals inactive by replacing them with ??
+  mask = mask.replace(literal, function($0, $1) {
+    literals.push($1);
+    return '@@@';
+  });
+  // Apply formatting rules
+  mask = mask.replace(token, function ($0) {
+    return $0 in formatFlags ? formatFlags[$0](dateObj) : $0.slice(1, $0.length - 1);
+  });
+  // Inline literal values back into the formatted value
+  return mask.replace(/@@@/g, function() {
+    return literals.shift();
+  });
+};
+
 /**
  * Parse a date string into an object, changes - into /
  * @method parse
  * @param {string} dateStr Date string
  * @param {string} format Date parse format
  * @returns {Date|boolean}
- */
-fecha.parse = function (dateStr, format) {
-  if (typeof format !== 'string') {
-    throw new Error('Invalid format in fecha.parse');
-  }
-
-  format = fecha.masks[format] || format;
-
-  // Avoid regular expression denial of service, fail early for really long strings
-  // https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS
-  if (dateStr.length > 1000) {
-    return null;
-  }
-
-  var dateInfo = {};
-  var parseInfo = [];
-  var literals = [];
-  format = format.replace(literal, function ($0, $1) {
-    literals.push($1);
-    return '@@@';
-  });
-  var newFormat = regexEscape(format).replace(token, function ($0) {
-    if (parseFlags[$0]) {
-      var info = parseFlags[$0];
-      parseInfo.push(info[1]);
-      return '(' + info[0] + ')';
-    }
-
-    return $0;
-  });
-  newFormat = newFormat.replace(/@@@/g, function () {
-    return literals.shift();
-  });
-  var matches = dateStr.match(new RegExp(newFormat, 'i'));
-  if (!matches) {
-    return null;
-  }
-
-  for (var i = 1; i < matches.length; i++) {
-    parseInfo[i - 1](dateInfo, matches[i]);
-  }
-
-  var today = new Date();
-  if (dateInfo.isPm === true && dateInfo.hour != null && +dateInfo.hour !== 12) {
-    dateInfo.hour = +dateInfo.hour + 12;
-  } else if (dateInfo.isPm === false && +dateInfo.hour === 12) {
-    dateInfo.hour = 0;
-  }
-
-  var date = void 0;
-  if (dateInfo.timezoneOffset != null) {
-    dateInfo.minute = +(dateInfo.minute || 0) - +dateInfo.timezoneOffset;
-    date = new Date(Date.UTC(dateInfo.year || today.getFullYear(), dateInfo.month || 0, dateInfo.day || 1, dateInfo.hour || 0, dateInfo.minute || 0, dateInfo.second || 0, dateInfo.millisecond || 0));
-  } else {
-    date = new Date(dateInfo.year || today.getFullYear(), dateInfo.month || 0, dateInfo.day || 1, dateInfo.hour || 0, dateInfo.minute || 0, dateInfo.second || 0, dateInfo.millisecond || 0);
-  }
-  return date;
-};
-
-// 导出fecha对象
-
-
-// 以下是从date-util.js合并的函数
-var newArray = function newArray(start, end) {
-  var result = [];
-  for (var i = start; i <= end; i++) {
-    result.push(i);
-  }
-  return result;
-};
-
-var getSettings = function getSettings() {
-  return {
-    dayNamesShort: ['日', '一', '二', '三', '四', '五', '六'],
-    dayNames: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
-    monthNamesShort: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
-    monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
-    amPm: ['上午', '下午']
-  };
-};
-
-var toDate = function toDate(date) {
-  return isDate(date) ? new Date(date) : null;
-};
-
-var isDate = function isDate(date) {
-  if (date === null || date === undefined) return false;
-  if (isNaN(new Date(date).getTime())) return false;
-  if (Array.isArray(date)) return false; // deal with `new Date([ new Date() ]) -> new Date()`
-  return true;
-};
-
-var isDateObject = function isDateObject(val) {
-  return val instanceof Date;
-};
-
-var formatDate = function formatDate(date) {
-  var format = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'yyyy-MM-dd';
-
-  // 处理多种输入类型
-  if (!date) return '';
-
-  // 如果是时间戳，转成日期对象
-  if (typeof date === 'number') {
-    date = new Date(date);
-  }
-  // 如果是字符串，转成日期对象
-  if (typeof date === 'string') {
-    date = new Date(date);
-  }
-
-  // 调用toDate进一步验证和转换
-  date = toDate(date);
-  if (!date) return '';
-
-  // 兼容大写和小写的格式标记
-  // 将大写的YYYY/MM/DD/HH/mm/ss转换为小写的yyyy/mm/dd/hh/mm/ss
-  var lowercaseFormat = format.replace(/YYYY/g, 'yyyy').replace(/D/g, 'd');
-
-  // 使用fecha库进行格式化，支持中文配置
-  var str = fecha.format(date, lowercaseFormat, getSettings());
-  return str;
-};
-
-var parseDate = function parseDate(string, format) {
-  return fecha.parse(string, format || 'yyyy-MM-dd', getSettings());
-};
-
-var getDayCountOfMonth = function getDayCountOfMonth(year, month) {
-  if (month === 3 || month === 5 || month === 8 || month === 10) {
-    return 30;
-  }
-
-  if (month === 1) {
-    if (year % 4 === 0 && year % 100 !== 0 || year % 400 === 0) {
-      return 29;
-    } else {
-      return 28;
-    }
-  }
-
-  return 31;
-};
-
-var getDayCountOfYear = function getDayCountOfYear(year) {
-  var isLeapYear = year % 400 === 0 || year % 100 !== 0 && year % 4 === 0;
-  return isLeapYear ? 366 : 365;
-};
-
-var getFirstDayOfMonth = function getFirstDayOfMonth(date) {
-  var temp = new Date(date.getTime());
-  temp.setDate(1);
-  return temp.getDay();
-};
-
-// see: https://stackoverflow.com/questions/3674539/incrementing-a-date-in-javascript
-// {prev, next} Date should work for Daylight Saving Time
-// Adding 24 * 60 * 60 * 1000 does not work in the above scenario
-var prevDate = function prevDate(date) {
-  var amount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-
-  return new Date(date.getFullYear(), date.getMonth(), date.getDate() - amount);
-};
-
-var nextDate = function nextDate(date) {
-  var amount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-
-  return new Date(date.getFullYear(), date.getMonth(), date.getDate() + amount);
-};
-
-var getStartDateOfMonth = function getStartDateOfMonth(year, month) {
-  var result = new Date(year, month, 1);
-  var day = result.getDay();
-
-  if (day === 0) {
-    return prevDate(result, 7);
-  } else {
-    return prevDate(result, day);
-  }
-};
-
-var getWeekNumber = function getWeekNumber(date) {
-  // 支持多种输入类型
-  if (!date || !isDate(date)) {
-    date = new Date();
-  }
-  if (typeof date === 'string') {
-    date = new Date(date);
-  }
-
-  // 验证日期有效性
-  if (!isDate(date)) return null;
-
-  var d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
-  // 设置为最近的星期四：当前日期 + 4 - 当前星期数
-  // 将星期日的星期数设为7
-  d.setUTCDate(d.getUTCDate() + 4 - (d.getUTCDay() || 7));
-  // 获取当年的第一天
-  var yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1));
-  // 计算到最近的星期四的完整周数
-  var weekNo = Math.ceil(((d - yearStart) / 86400000 + 1) / 7);
-  // 返回周数
-  return weekNo;
-};
-
-var getRangeHours = function getRangeHours(ranges) {
-  var hours = [];
-  var disabledHours = [];
-
-  (ranges || []).forEach(function (range) {
-    var value = range.map(function (date) {
-      return date.getHours();
-    });
-
-    disabledHours = disabledHours.concat(newArray(value[0], value[1]));
-  });
-
-  if (disabledHours.length) {
-    for (var i = 0; i < 24; i++) {
-      hours[i] = disabledHours.indexOf(i) === -1;
-    }
-  } else {
-    for (var _i = 0; _i < 24; _i++) {
-      hours[_i] = false;
-    }
-  }
-
-  return hours;
-};
-
-var getPrevMonthLastDays = function getPrevMonthLastDays(date, amount) {
-  if (amount <= 0) return [];
-  var temp = new Date(date.getTime());
-  temp.setDate(0);
-  var lastDay = temp.getDate();
-  return range(amount).map(function (_, index) {
-    return lastDay - (amount - index - 1);
-  });
-};
-
-var getMonthDays = function getMonthDays(date) {
-  var temp = new Date(date.getFullYear(), date.getMonth() + 1, 0);
-  var days = temp.getDate();
-  return range(days).map(function (_, index) {
-    return index + 1;
-  });
-};
-
-function setRangeData(arr, start, end, value) {
-  for (var i = start; i < end; i++) {
-    arr[i] = value;
-  }
-}
-
-var getRangeMinutes = function getRangeMinutes(ranges, hour) {
-  var minutes = new Array(60);
-
-  if (ranges.length > 0) {
-    ranges.forEach(function (range) {
-      var start = range[0];
-      var end = range[1];
-      var startHour = start.getHours();
-      var startMinute = start.getMinutes();
-      var endHour = end.getHours();
-      var endMinute = end.getMinutes();
-      if (startHour === hour && endHour !== hour) {
-        setRangeData(minutes, startMinute, 60, true);
-      } else if (startHour === hour && endHour === hour) {
-        setRangeData(minutes, startMinute, endMinute + 1, true);
-      } else if (startHour !== hour && endHour === hour) {
-        setRangeData(minutes, 0, endMinute + 1, true);
-      } else if (startHour < hour && endHour > hour) {
-        setRangeData(minutes, 0, 60, true);
-      }
-    });
-  } else {
-    setRangeData(minutes, 0, 60, true);
-  }
-  return minutes;
-};
-
-var range = function range(n) {
-  // see https://stackoverflow.com/questions/3746725/create-a-javascript-array-containing-1-n
-  return Array.apply(null, { length: n }).map(function (_, n) {
-    return n;
-  });
-};
-
-var modifyDate = function modifyDate(date, y, m, d) {
-  return new Date(y, m, d, date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds());
-};
-
-var modifyTime = function modifyTime(date, h, m, s) {
-  return new Date(date.getFullYear(), date.getMonth(), date.getDate(), h, m, s, date.getMilliseconds());
-};
-
-var modifyWithTimeString = function modifyWithTimeString(date, time) {
-  if (date == null || !time) {
-    return date;
-  }
-  time = parseDate(time, 'HH:mm:ss');
-  return modifyTime(date, time.getHours(), time.getMinutes(), time.getSeconds());
-};
-
-var clearTime = function clearTime(date) {
-  return new Date(date.getFullYear(), date.getMonth(), date.getDate());
-};
-
-var clearMilliseconds = function clearMilliseconds(date) {
-  return new Date(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), 0);
-};
-
-var limitTimeRange = function limitTimeRange(date, ranges) {
-  var format = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'HH:mm:ss';
-
-  // TODO: refactory a more elegant solution
-  if (ranges.length === 0) return date;
-  var normalizeDate = function normalizeDate(date) {
-    return fecha.parse(fecha.format(date, format), format);
-  };
-  var ndate = normalizeDate(date);
-  var nranges = ranges.map(function (range) {
-    return range.map(normalizeDate);
-  });
-  if (nranges.some(function (nrange) {
-    return ndate >= nrange[0] && ndate <= nrange[1];
-  })) return date;
-
-  var minDate = nranges[0][0];
-  var maxDate = nranges[0][0];
-
-  nranges.forEach(function (nrange) {
-    minDate = new Date(Math.min(nrange[0], minDate));
-    maxDate = new Date(Math.max(nrange[1], minDate));
-  });
-
-  var ret = ndate < minDate ? minDate : maxDate;
-  // preserve Year/Month/Date
-  return modifyDate(ret, date.getFullYear(), date.getMonth(), date.getDate());
-};
-
-var timeWithinRange = function timeWithinRange(date, selectableRange, format) {
-  var limitedDate = limitTimeRange(date, selectableRange, format);
-  return limitedDate.getTime() === date.getTime();
-};
-
-var changeYearMonthAndClampDate = function changeYearMonthAndClampDate(date, year, month) {
-  // clamp date to the number of days in `year`, `month`
-  // eg: (2010-1-31, 2010, 2) => 2010-2-28
-  var monthDate = Math.min(date.getDate(), getDayCountOfMonth(year, month));
-  return modifyDate(date, year, month, monthDate);
-};
-
-var prevMonth = function prevMonth(date) {
-  var year = date.getFullYear();
-  var month = date.getMonth();
-  return month === 0 ? changeYearMonthAndClampDate(date, year - 1, 11) : changeYearMonthAndClampDate(date, year, month - 1);
-};
-
-var nextMonth = function nextMonth(date) {
-  var year = date.getFullYear();
-  var month = date.getMonth();
-  return month === 11 ? changeYearMonthAndClampDate(date, year + 1, 0) : changeYearMonthAndClampDate(date, year, month + 1);
-};
-
-var prevYear = function prevYear(date) {
-  var amount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-
-  var year = date.getFullYear();
-  var month = date.getMonth();
-  return changeYearMonthAndClampDate(date, year - amount, month);
-};
-
-var nextYear = function nextYear(date) {
-  var amount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-
-  var year = date.getFullYear();
-  var month = date.getMonth();
-  return changeYearMonthAndClampDate(date, year + amount, month);
-};
-
-var extractDateFormat = function extractDateFormat(format) {
-  return format.replace(/\W?m{1,2}|\W?ZZ/g, '').replace(/\W?h{1,2}|\W?s{1,3}|\W?a/gi, '').trim();
-};
-
-var extractTimeFormat = function extractTimeFormat(format) {
-  return format.replace(/\W?D{1,2}|\W?Do|\W?d{1,4}|\W?M{1,4}|\W?y{2,4}/g, '').trim();
-};
-
-var validateRangeInOneMonth = function validateRangeInOneMonth(start, end) {
-  return start.getMonth() === end.getMonth() && start.getFullYear() === end.getFullYear();
-};
-
+ */
+fecha.parse = function (dateStr, format) {
+  if (typeof format !== 'string') {
+    throw new Error('Invalid format in fecha.parse');
+  }
+
+  format = fecha.masks[format] || format;
+
+  // Avoid regular expression denial of service, fail early for really long strings
+  // https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS
+  if (dateStr.length > 1000) {
+    return null;
+  }
+
+  const dateInfo = {};
+  const parseInfo = [];
+  const literals = [];
+  format = format.replace(literal, function($0, $1) {
+    literals.push($1);
+    return '@@@';
+  });
+  let newFormat = regexEscape(format).replace(token, function ($0) {
+    if (parseFlags[$0]) {
+      const info = parseFlags[$0];
+      parseInfo.push(info[1]);
+      return '(' + info[0] + ')';
+    }
+
+    return $0;
+  });
+  newFormat = newFormat.replace(/@@@/g, function() {
+    return literals.shift();
+  });
+  const matches = dateStr.match(new RegExp(newFormat, 'i'));
+  if (!matches) {
+    return null;
+  }
+
+  for (let i = 1; i < matches.length; i++) {
+    parseInfo[i - 1](dateInfo, matches[i]);
+  }
+
+  const today = new Date();
+  if (dateInfo.isPm === true && dateInfo.hour != null && +dateInfo.hour !== 12) {
+    dateInfo.hour = +dateInfo.hour + 12;
+  } else if (dateInfo.isPm === false && +dateInfo.hour === 12) {
+    dateInfo.hour = 0;
+  }
+
+  let date;
+  if (dateInfo.timezoneOffset != null) {
+    dateInfo.minute = +(dateInfo.minute || 0) - +dateInfo.timezoneOffset;
+    date = new Date(Date.UTC(dateInfo.year || today.getFullYear(), dateInfo.month || 0, dateInfo.day || 1,
+      dateInfo.hour || 0, dateInfo.minute || 0, dateInfo.second || 0, dateInfo.millisecond || 0));
+  } else {
+    date = new Date(dateInfo.year || today.getFullYear(), dateInfo.month || 0, dateInfo.day || 1,
+      dateInfo.hour || 0, dateInfo.minute || 0, dateInfo.second || 0, dateInfo.millisecond || 0);
+  }
+  return date;
+};
+
+// 导出fecha对象
+
+
+// 以下是从date-util.js合并的函数
+const newArray = function(start, end) {
+  let result = [];
+  for (let i = start; i <= end; i++) {
+    result.push(i);
+  }
+  return result;
+};
+
+const getSettings = () => {
+  return {
+    dayNamesShort: ['日', '一', '二', '三', '四', '五', '六'],
+    dayNames: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
+    monthNamesShort: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+    monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+    amPm: ['上午', '下午']
+  };
+};
+
+const toDate = function(date) {
+  return isDate(date) ? new Date(date) : null;
+};
+
+const isDate = function(date) {
+  if (date === null || date === undefined) return false;
+  if (isNaN(new Date(date).getTime())) return false;
+  if (Array.isArray(date)) return false; // deal with `new Date([ new Date() ]) -> new Date()`
+  return true;
+};
+
+const isDateObject = function(val) {
+  return val instanceof Date;
+};
+
+const formatDate = function (date, format = 'yyyy-MM-dd') {
+  // 处理多种输入类型
+  if (!date) return '';
+
+  // 如果是时间戳，转成日期对象
+  if (typeof date === 'number') {
+    date = new Date(date);
+  }
+  // 如果是字符串，转成日期对象
+  if (typeof date === 'string') {
+    date = new Date(date);
+  }
+
+  // 调用toDate进一步验证和转换
+  date = toDate(date);
+  if (!date) return '';
+
+  // 兼容大写和小写的格式标记
+  // 将大写的YYYY/MM/DD/HH/mm/ss转换为小写的yyyy/mm/dd/hh/mm/ss
+  const lowercaseFormat = format
+    .replace(/YYYY/g, 'yyyy')
+    .replace(/D/g, 'd')
+
+  // 使用fecha库进行格式化，支持中文配置
+  const str = fecha.format(date, lowercaseFormat, getSettings());
+  return str;
+};
+
+const parseDate = function(string, format) {
+  return fecha.parse(string, format || 'yyyy-MM-dd', getSettings());
+};
+
+const getDayCountOfMonth = function(year, month) {
+  if (month === 3 || month === 5 || month === 8 || month === 10) {
+    return 30;
+  }
+
+  if (month === 1) {
+    if (year % 4 === 0 && year % 100 !== 0 || year % 400 === 0) {
+      return 29;
+    } else {
+      return 28;
+    }
+  }
+
+  return 31;
+};
+
+const getDayCountOfYear = function(year) {
+  const isLeapYear = year % 400 === 0 || (year % 100 !== 0 && year % 4 === 0);
+  return isLeapYear ? 366 : 365;
+};
+
+const getFirstDayOfMonth = function(date) {
+  const temp = new Date(date.getTime());
+  temp.setDate(1);
+  return temp.getDay();
+};
+
+// see: https://stackoverflow.com/questions/3674539/incrementing-a-date-in-javascript
+// {prev, next} Date should work for Daylight Saving Time
+// Adding 24 * 60 * 60 * 1000 does not work in the above scenario
+const prevDate = function(date, amount = 1) {
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate() - amount);
+};
+
+const nextDate = function(date, amount = 1) {
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate() + amount);
+};
+
+const getStartDateOfMonth = function(year, month) {
+  const result = new Date(year, month, 1);
+  const day = result.getDay();
+
+  if (day === 0) {
+    return prevDate(result, 7);
+  } else {
+    return prevDate(result, day);
+  }
+};
+
+const getWeekNumber = function(date) {
+  // 支持多种输入类型
+  if (!date||!isDate(date)) {
+    date = new Date();
+  }
+  if (typeof date === 'string') {
+    date = new Date(date);
+  }
+  
+  // 验证日期有效性
+  if (!isDate(date)) return null;
+  
+  const d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
+  // 设置为最近的星期四：当前日期 + 4 - 当前星期数
+  // 将星期日的星期数设为7
+  d.setUTCDate(d.getUTCDate() + 4 - (d.getUTCDay() || 7));
+  // 获取当年的第一天
+  const yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1));
+  // 计算到最近的星期四的完整周数
+  const weekNo = Math.ceil((((d - yearStart) / 86400000) + 1) / 7);
+  // 返回周数
+  return weekNo;
+};
+
+const getRangeHours = function(ranges) {
+  const hours = [];
+  let disabledHours = [];
+
+  (ranges || []).forEach(range => {
+    const value = range.map(date => date.getHours());
+
+    disabledHours = disabledHours.concat(newArray(value[0], value[1]));
+  });
+
+  if (disabledHours.length) {
+    for (let i = 0; i < 24; i++) {
+      hours[i] = disabledHours.indexOf(i) === -1;
+    }
+  } else {
+    for (let i = 0; i < 24; i++) {
+      hours[i] = false;
+    }
+  }
+
+  return hours;
+};
+
+const getPrevMonthLastDays = (date, amount) => {
+  if (amount <= 0) return [];
+  const temp = new Date(date.getTime());
+  temp.setDate(0);
+  const lastDay = temp.getDate();
+  return range(amount).map((_, index) => lastDay - (amount - index - 1));
+};
+
+const getMonthDays = (date) => {
+  const temp = new Date(date.getFullYear(), date.getMonth() + 1, 0);
+  const days = temp.getDate();
+  return range(days).map((_, index) => index + 1);
+};
+
+function setRangeData(arr, start, end, value) {
+  for (let i = start; i < end; i++) {
+    arr[i] = value;
+  }
+}
+
+const getRangeMinutes = function(ranges, hour) {
+  const minutes = new Array(60);
+
+  if (ranges.length > 0) {
+    ranges.forEach(range => {
+      const start = range[0];
+      const end = range[1];
+      const startHour = start.getHours();
+      const startMinute = start.getMinutes();
+      const endHour = end.getHours();
+      const endMinute = end.getMinutes();
+      if (startHour === hour && endHour !== hour) {
+        setRangeData(minutes, startMinute, 60, true);
+      } else if (startHour === hour && endHour === hour) {
+        setRangeData(minutes, startMinute, endMinute + 1, true);
+      } else if (startHour !== hour && endHour === hour) {
+        setRangeData(minutes, 0, endMinute + 1, true);
+      } else if (startHour < hour && endHour > hour) {
+        setRangeData(minutes, 0, 60, true);
+      }
+    });
+  } else {
+    setRangeData(minutes, 0, 60, true);
+  }
+  return minutes;
+};
+
+const range = function(n) {
+  // see https://stackoverflow.com/questions/3746725/create-a-javascript-array-containing-1-n
+  return Array.apply(null, {length: n}).map((_, n) => n);
+};
+
+const modifyDate = function(date, y, m, d) {
+  return new Date(y, m, d, date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds());
+};
+
+const modifyTime = function(date, h, m, s) {
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate(), h, m, s, date.getMilliseconds());
+};
+
+const modifyWithTimeString = (date, time) => {
+  if (date == null || !time) {
+    return date;
+  }
+  time = parseDate(time, 'HH:mm:ss');
+  return modifyTime(date, time.getHours(), time.getMinutes(), time.getSeconds());
+};
+
+const clearTime = function(date) {
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate());
+};
+
+const clearMilliseconds = function(date) {
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), 0);
+};
+
+const limitTimeRange = function(date, ranges, format = 'HH:mm:ss') {
+  // TODO: refactory a more elegant solution
+  if (ranges.length === 0) return date;
+  const normalizeDate = date => fecha.parse(fecha.format(date, format), format);
+  const ndate = normalizeDate(date);
+  const nranges = ranges.map(range => range.map(normalizeDate));
+  if (nranges.some(nrange => ndate >= nrange[0] && ndate <= nrange[1])) return date;
+
+  let minDate = nranges[0][0];
+  let maxDate = nranges[0][0];
+
+  nranges.forEach(nrange => {
+    minDate = new Date(Math.min(nrange[0], minDate));
+    maxDate = new Date(Math.max(nrange[1], minDate));
+  });
+
+  const ret = ndate < minDate ? minDate : maxDate;
+  // preserve Year/Month/Date
+  return modifyDate(
+    ret,
+    date.getFullYear(),
+    date.getMonth(),
+    date.getDate()
+  );
+};
+
+const timeWithinRange = function(date, selectableRange, format) {
+  const limitedDate = limitTimeRange(date, selectableRange, format);
+  return limitedDate.getTime() === date.getTime();
+};
+
+const changeYearMonthAndClampDate = function(date, year, month) {
+  // clamp date to the number of days in `year`, `month`
+  // eg: (2010-1-31, 2010, 2) => 2010-2-28
+  const monthDate = Math.min(date.getDate(), getDayCountOfMonth(year, month));
+  return modifyDate(date, year, month, monthDate);
+};
+
+const prevMonth = function(date) {
+  const year = date.getFullYear();
+  const month = date.getMonth();
+  return month === 0
+    ? changeYearMonthAndClampDate(date, year - 1, 11)
+    : changeYearMonthAndClampDate(date, year, month - 1);
+};
+
+const nextMonth = function(date) {
+  const year = date.getFullYear();
+  const month = date.getMonth();
+  return month === 11
+    ? changeYearMonthAndClampDate(date, year + 1, 0)
+    : changeYearMonthAndClampDate(date, year, month + 1);
+};
+
+const prevYear = function(date, amount = 1) {
+  const year = date.getFullYear();
+  const month = date.getMonth();
+  return changeYearMonthAndClampDate(date, year - amount, month);
+};
+
+const nextYear = function(date, amount = 1) {
+  const year = date.getFullYear();
+  const month = date.getMonth();
+  return changeYearMonthAndClampDate(date, year + amount, month);
+};
+
+const extractDateFormat = function(format) {
+  return format
+    .replace(/\W?m{1,2}|\W?ZZ/g, '')
+    .replace(/\W?h{1,2}|\W?s{1,3}|\W?a/gi, '')
+    .trim();
+};
+
+const extractTimeFormat = function(format) {
+  return format
+    .replace(/\W?D{1,2}|\W?Do|\W?d{1,4}|\W?M{1,4}|\W?y{2,4}/g, '')
+    .trim();
+};
+
+const validateRangeInOneMonth = function(start, end) {
+  return (start.getMonth() === end.getMonth()) && (start.getFullYear() === end.getFullYear());
+};
+
 /**
  * 计算两个日期之间的工作日数量（不包括周末和节假日）
  * @param {string} start_date - 开始日期字符串，格式为 "YYYY-MM-DD"
  * @param {string} end_date - 结束日期字符串，格式为 "YYYY-MM-DD"
  * @param {Array<string>} holidays - 假期日期字符串数组，格式为 "YYYY-MM-DD"
  * @returns {number} 工作日数量
- */
-var calculateNetworkDays = function calculateNetworkDays(start_date, end_date) {
-  var holidays = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-
-  if (typeof start_date !== 'string' || typeof end_date !== 'string') {
-    throw new Error("Invalid input. Please provide valid date strings in the format 'YYYY-MM-DD'.");
-  }
-
-  var startDateObj = new Date(start_date);
-  var endDateObj = new Date(end_date);
-
-  if (isNaN(startDateObj.getTime()) || isNaN(endDateObj.getTime())) {
-    throw new Error("Invalid date format. Please provide valid date strings in the format 'YYYY-MM-DD'.");
-  }
-
-  if (startDateObj > endDateObj) {
-    throw new Error('Start date should be earlier than or equal to end date.');
-  }
-
-  var workdays = 0;
-
-  // Iterate through each day in the date range
-
-  var _loop = function _loop(currentDate) {
-    // Check if the current day is a weekend (Saturday or Sunday)
-    var isWeekend = currentDate.getDay() === 0 || currentDate.getDay() === 6;
-
-    // Check if the current day is a holiday
-    var isHoliday = holidays.some(function (holiday) {
-      var holidayDate = new Date(holiday);
-      return currentDate.toDateString() === holidayDate.toDateString();
-    });
-
-    // If it's a workday (not a weekend or holiday), increment the workdays count
-    if (!isWeekend && !isHoliday) {
-      workdays++;
-    }
-  };
-
-  for (var currentDate = new Date(startDateObj); currentDate <= endDateObj; currentDate.setDate(currentDate.getDate() + 1)) {
-    _loop(currentDate);
-  }
-
-  return workdays;
-};
-
+ */
+const calculateNetworkDays = function (start_date, end_date, holidays = []) {
+  if (typeof start_date !== 'string' || typeof end_date !== 'string') {
+    throw new Error(
+      "Invalid input. Please provide valid date strings in the format 'YYYY-MM-DD'."
+    );
+  }
+
+  const startDateObj = new Date(start_date);
+  const endDateObj = new Date(end_date);
+
+  if (isNaN(startDateObj.getTime()) || isNaN(endDateObj.getTime())) {
+    throw new Error(
+      "Invalid date format. Please provide valid date strings in the format 'YYYY-MM-DD'."
+    );
+  }
+
+  if (startDateObj > endDateObj) {
+    throw new Error('Start date should be earlier than or equal to end date.');
+  }
+
+  let workdays = 0;
+
+  // Iterate through each day in the date range
+  for (
+    let currentDate = new Date(startDateObj);
+    currentDate <= endDateObj;
+    currentDate.setDate(currentDate.getDate() + 1)
+  ) {
+    // Check if the current day is a weekend (Saturday or Sunday)
+    const isWeekend = currentDate.getDay() === 0 || currentDate.getDay() === 6;
+
+    // Check if the current day is a holiday
+    const isHoliday = holidays.some((holiday) => {
+      const holidayDate = new Date(holiday);
+      return currentDate.toDateString() === holidayDate.toDateString();
+    });
+
+    // If it's a workday (not a weekend or holiday), increment the workdays count
+    if (!isWeekend && !isHoliday) {
+      workdays++;
+    }
+  }
+
+  return workdays;
+};
+
 /**
  * 日期加减天数
  * @param {string} start_date - 起始日期字符串，格式为 "YYYY-MM-DD"
  * @param {number} days - 要加上或减去的天数，正数表示加，负数表示减
  * @returns {string} 结果日期，格式为 "YYYY-MM-DD"
- */
-var dateAddDays = function dateAddDays(start_date, days) {
-  if (typeof start_date !== 'string' || !Number.isInteger(days)) {
-    throw new Error("Invalid input. Please provide a valid date string in the format 'YYYY-MM-DD' and a valid integer for the number of days.");
-  }
-
-  var startDateObj = new Date(start_date);
-  if (isNaN(startDateObj.getTime())) {
-    throw new Error("Invalid date format. Please provide a valid date string in the format 'YYYY-MM-DD'.");
-  }
-
-  var resultDateObj = new Date(startDateObj);
-  resultDateObj.setDate(resultDateObj.getDate() + days);
-
-  var resultYear = resultDateObj.getFullYear();
-  var resultMonth = String(resultDateObj.getMonth() + 1).padStart(2, '0');
-  var resultDay = String(resultDateObj.getDate()).padStart(2, '0');
-
-  return resultYear + '-' + resultMonth + '-' + resultDay;
-};
-
+ */
+const dateAddDays = function (start_date, days) {
+  if (typeof start_date !== 'string' || !Number.isInteger(days)) {
+    throw new Error(
+      "Invalid input. Please provide a valid date string in the format 'YYYY-MM-DD' and a valid integer for the number of days."
+    );
+  }
+
+  const startDateObj = new Date(start_date);
+  if (isNaN(startDateObj.getTime())) {
+    throw new Error(
+      "Invalid date format. Please provide a valid date string in the format 'YYYY-MM-DD'."
+    );
+  }
+
+  const resultDateObj = new Date(startDateObj);
+  resultDateObj.setDate(resultDateObj.getDate() + days);
+
+  const resultYear = resultDateObj.getFullYear();
+  const resultMonth = String(resultDateObj.getMonth() + 1).padStart(2, '0');
+  const resultDay = String(resultDateObj.getDate()).padStart(2, '0');
+
+  return `${resultYear}-${resultMonth}-${resultDay}`;
+};
+
 /**
  * 计算两个日期之间的差值
  * @date 2023年12月14日
@@ -8130,180 +8153,182 @@ var dateAddDays = function dateAddDays(start_date, days) {
  * @param {String} end_date - 结束日期字符串
  * @param {String} unit - 单位：year/month/day
  * @returns {Number} 差值
- */
-var dateDiff = function dateDiff(start_date, end_date) {
-  var unit = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'day';
-
-  // Assuming date strings are in "YYYY-MM-DD" format
-  var startDate = new Date(start_date);
-  var endDate = new Date(end_date);
-
-  // If the date is invalid, return 0
-  if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) {
-    return 0;
-  }
-
-  if (unit === 'year') {
-    return endDate.getFullYear() - startDate.getFullYear();
-  } else if (unit === 'month') {
-    return (endDate.getFullYear() - startDate.getFullYear()) * 12 + (endDate.getMonth() - startDate.getMonth());
-  } else {
-    // Default to day
-    var timeDifference = endDate - startDate;
-    // Calculate days (86400000 milliseconds per day)
-    return Math.floor(timeDifference / 86400000);
-  }
-};
-
+ */
+const dateDiff = function (start_date, end_date, unit = 'day') {
+  // Assuming date strings are in "YYYY-MM-DD" format
+  var startDate = new Date(start_date);
+  var endDate = new Date(end_date);
+
+  // If the date is invalid, return 0
+  if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) {
+    return 0;
+  }
+
+  if (unit === 'year') {
+    return endDate.getFullYear() - startDate.getFullYear();
+  } else if (unit === 'month') {
+    return (
+      (endDate.getFullYear() - startDate.getFullYear()) * 12 +
+      (endDate.getMonth() - startDate.getMonth())
+    );
+  } else {
+    // Default to day
+    var timeDifference = endDate - startDate;
+    // Calculate days (86400000 milliseconds per day)
+    return Math.floor(timeDifference / 86400000);
+  }
+};
+
 /**
  * 获取月份中的日期
  * @param {string} date - 日期字符串，格式为 "YYYY-MM-DD"
  * @returns {number} 月份中的日期（1-31）
- */
-var dayOfMonth = function dayOfMonth(date) {
-  if (typeof date !== 'string') {
-    throw new Error("Invalid input. Please provide a valid date string in the format 'YYYY-MM-DD'.");
-  }
-
-  var dateObj = new Date(date);
-  if (isNaN(dateObj.getTime())) {
-    throw new Error("Invalid date format. Please provide a valid date string in the format 'YYYY-MM-DD'.");
-  }
-
-  return dateObj.getDate();
-};
-
+ */
+const dayOfMonth = function (date) {
+  if (typeof date !== 'string') {
+    throw new Error(
+      "Invalid input. Please provide a valid date string in the format 'YYYY-MM-DD'."
+    );
+  }
+
+  const dateObj = new Date(date);
+  if (isNaN(dateObj.getTime())) {
+    throw new Error(
+      "Invalid date format. Please provide a valid date string in the format 'YYYY-MM-DD'."
+    );
+  }
+
+  return dateObj.getDate();
+};
+
 /**
  * 获取当前日期
  * @date 2022年5月7日
  * @param {string} format - 日期格式，默认为'YYYY-MM-DD'
  * @returns {string} 当前日期的格式化字符串
- */
-var getCurrentDate = function getCurrentDate() {
-  var format = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'YYYY-MM-DD';
-
-  return formatDate(new Date(), format);
-};
-
+ */
+const getCurrentDate = function (format = 'YYYY-MM-DD') {
+  return formatDate(new Date(), format);
+};
+
 /**
  * 获取当前日期时间
  * @date 2022年5月7日
  * @param {string} format - 日期时间格式，默认为'YYYY-MM-DD HH:mm:ss'
  * @returns {string} 当前日期时间的格式化字符串
- */
-var getCurrentDateTime = function getCurrentDateTime() {
-  var format = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'YYYY-MM-DD HH:mm:ss';
-
-  return formatDate(new Date(), format);
-};
-
+ */
+const getCurrentDateTime = function (format = 'YYYY-MM-DD HH:mm:ss') {
+  return formatDate(new Date(), format);
+};
+
 /**
  * 获取小时
  * @date 2022年5月7日
  * @param {Date|string} [date] - 日期对象或日期字符串
  * @returns {number} 小时数（0-23）
- */
-var getHour = function getHour(date) {
-  if (!date) {
-    return new Date().getHours();
-  }
-  if (typeof date === 'string') {
-    date = new Date(date);
-  }
-  return date.getHours();
-};
-
+ */
+const getHour = function (date) {
+  if (!date) {
+    return new Date().getHours();
+  }
+  if (typeof date === 'string') {
+    date = new Date(date);
+  }
+  return date.getHours();
+};
+
 /**
  * 获取分钟
  * @date 2022年5月7日
  * @param {Date|string} [date] - 日期对象或日期字符串
  * @returns {number} 分钟数（0-59）
- */
-var getMinute = function getMinute(date) {
-  if (!date) {
-    return new Date().getMinutes();
-  }
-  if (typeof date === 'string') {
-    date = new Date(date);
-  }
-  return date.getMinutes();
-};
-
+ */
+const getMinute = function (date) {
+  if (!date) {
+    return new Date().getMinutes();
+  }
+  if (typeof date === 'string') {
+    date = new Date(date);
+  }
+  return date.getMinutes();
+};
+
 /**
  * 获取月份
  * @date 2022年5月7日
  * @param {Date|string} [date] - 日期对象或日期字符串
  * @returns {number} 月份数（1-12）
- */
-var getMonth = function getMonth(date) {
-  if (!date) {
-    return new Date().getMonth() + 1;
-  }
-  if (typeof date === 'string') {
-    date = new Date(date);
-  }
-  return date.getMonth() + 1;
-};
-
+ */
+const getMonth = function (date) {
+  if (!date) {
+    return new Date().getMonth() + 1;
+  }
+  if (typeof date === 'string') {
+    date = new Date(date);
+  }
+  return date.getMonth() + 1;
+};
+
 /**
  * 获取秒
  * @date 2022年5月7日
  * @param {Date|string} [date] - 日期对象或日期字符串
  * @returns {number} 秒数（0-59）
- */
-var getSecond = function getSecond(date) {
-  if (!date) {
-    return new Date().getSeconds();
-  }
-  if (typeof date === 'string') {
-    date = new Date(date);
-  }
-  return date.getSeconds();
-};
-
+ */
+const getSecond = function (date) {
+  if (!date) {
+    return new Date().getSeconds();
+  }
+  if (typeof date === 'string') {
+    date = new Date(date);
+  }
+  return date.getSeconds();
+};
+
 /**
  * 获取星期几
  * @date 2022年5月7日
  * @param {Date|string} [date] - 日期对象或日期字符串
  * @returns {number} 星期几（0-6，0表示星期日）
- */
-var getWeekday = function getWeekday(date) {
-  if (!date) {
-    return new Date().getDay();
-  }
-  if (typeof date === 'string') {
-    date = new Date(date);
-  }
-  return date.getDay();
-};
-
+ */
+const getWeekday = function (date) {
+  if (!date) {
+    return new Date().getDay();
+  }
+  if (typeof date === 'string') {
+    date = new Date(date);
+  }
+  return date.getDay();
+};
+
+
 /**
  * @desc 获取上午/下午/晚上
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [time] - 时间
- **/
-var timeCycle = function timeCycle(time) {
-  var hour = 0;
-  if (!time) {
-    hour = new Date().getHours();
-  } else if (typeof time === 'string') {
-    // 从时间字符串中提取小时
-    var match = time.match(/^(\d{1,2})/);
-    if (match) {
-      hour = parseInt(match[1], 10);
-    }
-  } else if (typeof time === 'number') {
-    hour = time;
-  }
-  // 判断时间段
-  if (hour >= 5 && hour < 12) {
-    return '上午';
-  } else if (hour >= 12 && hour < 18) {
-    return '下午';
-  } else {
-    return '晚上';
-  }
+ **/
+const timeCycle = function (time) {
+  let hour = 0;
+  if (!time) {
+    hour = new Date().getHours();
+  } else if (typeof time === 'string') {
+    // 从时间字符串中提取小时
+    const match = time.match(/^(\d{1,2})/);
+    if (match) {
+      hour = parseInt(match[1], 10);
+    }
+  } else if (typeof time === 'number') {
+    hour = time;
+  }
+  // 判断时间段
+  if (hour >= 5 && hour < 12) {
+    return '上午';
+  } else if (hour >= 12 && hour < 18) {
+    return '下午';
+  } else {
+    return '晚上';
+  }
 };
 
 /***/ }),