zartui 2.1.6 → 2.1.8

package/es/utils/format/date-util.js

@@ -2,10 +2,8 @@ var __formatNumber__ = function __formatNumber__(number) {
   if (number < 10) {
     return "0" + number;
   }
-
   return number;
 };
-
 export var weekList = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
 export var FORMAT = {
   //英文简写如：12:01
@@ -42,19 +40,17 @@ export var FORMAT = {
   //中文全称  如：2010年12月01日  23时15分06秒
   FORMAT_YMDHMS_CN: "yyyy年MM月dd日  HH时mm分ss秒"
 };
+
 /**
  *
  * @param timestamp 1544580660000
  * @param formatType
  */
-
 export function formatDate(timestamp, formatType) {
   if (formatType == null) {
     formatType = "yyyy-MM-dd HH:mm:ss";
   }
-
   var stamp = parseInt(timestamp, 10);
-
   if (!isNaN(stamp)) {
     return formatDateByDate(new Date(stamp), formatType);
   } else {
@@ -65,21 +61,17 @@ export function formatDateByDate(date, formatType) {
   if (formatType === void 0) {
     formatType = FORMAT.FORMAT_YMDHMS;
   }
-
   if (typeof date != 'object') {
     // IOS5以下无法解析'2018-01-02'这种格式，需要替换为'2018/01/02'
     if (typeof date === 'string') {
       date = date.replace(/-/g, '/');
-
       if (date.length === 7) {
         // 只有月份的日期ios无法解析，例如  2021/06 , 需转换成2021/06/01
         date += "/01";
       }
     }
-
     date = new Date(date);
   }
-
   var formatResult = formatType.replace("yyyy", __formatNumber__(date.getFullYear()));
   formatResult = formatResult.replace("yy", String(date.getFullYear()).substring(2));
   formatResult = formatResult.replace("MM", __formatNumber__(date.getMonth() + 1));
@@ -94,9 +86,7 @@ export function formatDateByDateByObject(date, formatType) {
   if (formatType === void 0) {
     formatType = FORMAT.FORMAT_YMDHMS;
   }
-
   var formatResult = formatType;
-
   if (typeof date == 'object') {
     formatResult = formatType.replace("yyyy", __formatNumber__(date.year));
     formatResult = formatResult.replace("yy", String(date.year).substring(2));
@@ -106,7 +96,6 @@ export function formatDateByDateByObject(date, formatType) {
     formatResult = formatResult.replace("mm", __formatNumber__(date.minute));
     formatResult = formatResult.replace("ss", __formatNumber__(date.second));
   }
-
   return formatResult;
 }
 export function parseDate(dateStr) {
@@ -120,16 +109,13 @@ export function getTodayWeek() {
 }
 export function getWeekNum(date) {
   var week = date.getDay();
-
   if (week === 0) {
     week = 7;
   }
-
   return week;
 }
 export function getShortDateDesc(date) {
   var hours = date.getHours();
-
   if (hours >= 0 && hours < 6) {
     return "凌晨" + hours + "点";
   } else if (hours >= 6 && hours < 12) {
@@ -147,56 +133,49 @@ export function getDateDesc(date) {
   var timestamp = date.getTime();
   var diff = nowTimestamp - timestamp;
   var fix = "前";
-
   if (diff < 0) {
     fix = "后";
-  } //月
-
+  }
 
+  //月
   var unit = 1000 * 60 * 60 * 24 * 30;
-
   if (diff / unit > 1) {
     return parseInt(diff / unit, 10) + "个月" + fix;
-  } //周
-
+  }
 
+  //周
   unit = 1000 * 60 * 60 * 24 * 7;
-
   if (diff / unit > 1) {
     return parseInt(diff / unit, 10) + "周" + fix;
-  } //日
-
+  }
 
+  //日
   unit = 1000 * 60 * 60 * 24;
-
   if (diff / unit > 1) {
     return parseInt(diff / unit, 10) + "天" + fix;
-  } //小时
-
+  }
 
+  //小时
   unit = 1000 * 60 * 60;
-
   if (diff / unit > 1) {
     return parseInt(diff / unit, 10) + "个小时" + fix;
-  } //分钟
-
+  }
 
+  //分钟
   unit = 1000 * 60;
-
   if (diff / unit > 1) {
     return parseInt(diff / unit, 10) + "分钟" + fix;
-  } //秒
-
+  }
 
+  //秒
   unit = 1000;
-
   if (diff / unit > 1) {
     return "刚刚";
   }
-
   return formatDate(date.getTime(), FORMAT.FORMAT_YMDHMS);
-} //常规月起始日
+}
 
+//常规月起始日
 export function getFirstDayOfNormalMonth(year, month) {
   var date = new Date();
   date.setDate(1);
@@ -207,36 +186,34 @@ export function getFirstDayOfNormalMonth(year, month) {
 export function getWeekNumDefault(date) {
   var week = date.getDay();
   return week;
-} //获取当年起始日期
+}
 
+//获取当年起始日期
 export function getFirstDayOfYear(year) {
   var date = new Date();
   date.setDate(1);
   date.setYear(year);
   date.setMonth(0);
   return date;
-} //获取上月起始日期
-
+}
+//获取上月起始日期
 export function getLastMonthStartAndEnd() {
   var nowdays = new Date();
   var year = nowdays.getFullYear();
   var month = nowdays.getMonth();
-
   if (month === 0) {
     month = 12;
     year = year - 1;
   }
-
   if (month < 10) {
     month = '0' + month;
   }
-
   var myDate = new Date(year, month, 0);
   var startDate = year + '-' + month + '-01';
   var endDate = year + '-' + month + '-' + myDate.getDate();
   return startDate + ',' + endDate;
-} //常规月结束日
-
+}
+//常规月结束日
 export function getLastDayOfNormalMonth(year, month) {
   var date = new Date();
   date.setDate(1);
@@ -272,18 +249,17 @@ export function getDateCN(strDate) {
     var date = parseDate(strDate);
     return formatDateByDate(date, FORMAT.FORMAT_YMD_CN);
   }
-
   return null;
 }
 export function getCurMonth() {
   return formatDateByDate(new Date(), FORMAT.FORMAT_YM);
-} //strdate 格式为 "2017-03" 或者 "2017-02-23" , opreation :  1 上个月   2 下个月
+}
 
+//strdate 格式为 "2017-03" 或者 "2017-02-23" , opreation :  1 上个月   2 下个月
 export function operateMonth(strDate, operation) {
   var temp = strDate.split("-");
   var year = parseInt(temp[0], 10);
   var month = parseInt(temp[1], 10);
-
   if (operation === 1) {
     // 减 一个月
     if (month > 1) {
@@ -301,44 +277,36 @@ export function operateMonth(strDate, operation) {
       year += 1;
     }
   }
-
   if (month < 10) {
     return year + "-0" + month;
   }
-
   return year + "-" + month;
 }
 export function getLastDay(strDate, format) {
   if (format === void 0) {
     format = FORMAT.FORMAT_YMD;
   }
-
   if (strDate != null) {
     var date = parseDate(strDate);
     var lastDate = addDays(date, -1);
     return formatDateByDate(lastDate, format);
   }
-
   return null;
 }
 export function getNextDay(strDate, format) {
   if (format === void 0) {
     format = FORMAT.FORMAT_YMD;
   }
-
   var date;
-
   if (typeof strDate == 'object') {
     date = strDate;
   } else {
     date = parseDate(strDate);
   }
-
   if (date != null) {
     var lastDate = addDays(date, 1);
     return formatDateByDate(lastDate, format);
   }
-
   return null;
 }
 export function getYear() {
@@ -353,25 +321,21 @@ export function getPeriodDesc(milliseconds) {
   var h = parseInt(milliseconds / 1000 / 60 / 60 % 24, 10);
   var d = parseInt(milliseconds / 1000 / 60 / 60 / 24, 10);
   var desc = '';
-
   if (d > 0) {
     desc += d + '天';
   }
-
   if (h > 0) {
     desc += h + '小时';
   }
-
   if (m > 0) {
     desc += m + '分';
   }
-
   if (s > 0) {
     desc += s + '秒';
   }
-
   return desc;
 }
+
 /**
  * 将不规范书写的时间转为规范书写的
  * 9 09:00:00
@@ -380,34 +344,26 @@ export function getPeriodDesc(milliseconds) {
  * @param rawStr
  * @returns {*}
  */
-
 export function getTimeStrFromRaw(rawStr) {
   var items = rawStr.split(':');
-
   if (items === null) {
     return '00:00:00';
   }
-
   var threeItems = [];
-
   if (items.length >= 3) {
     threeItems = items.slice(0, 3);
   } else {
     var addNum = 3 - items.length;
     threeItems = items;
-
     for (var i = 0; i < addNum; i++) {
       threeItems.push('00');
     }
   }
-
   threeItems = threeItems.map(function (time) {
     var finedTime = time;
-
     if (time.length === 1) {
       finedTime = '0' + time;
     }
-
     return finedTime;
   });
   return threeItems.join(':');
@@ -418,7 +374,6 @@ export function formatLeftTime(leftTime) {
   var nm = 60;
   var ns = 1;
   var seconds = leftTime || 0;
-
   if (seconds < -(3600 * 24)) {
     seconds = -seconds;
     return "\u8D85\u65F6" + parseInt(seconds / nd, 10) + "\u5929";
@@ -442,6 +397,7 @@ export function formatLeftTime(leftTime) {
     return null;
   }
 }
+
 /**
  * get human readable time string from time result from server no matter whether it is timestamp or human readable string
  * dependent on FORMAT and formatDate, "import * as dateUtil from '***'" recommended
@@ -449,60 +405,48 @@ export function formatLeftTime(leftTime) {
  * @param format
  * @returns {*}
  */
-
 export function getTimeString(value, format) {
   if (format === void 0) {
     format = FORMAT.FORMAT_YMDHMS;
   }
-
   var stringifiedValue = value + '';
-
   if (stringifiedValue.indexOf(':') !== -1 || stringifiedValue.indexOf('：') !== -1) {
     return stringifiedValue;
   }
-
   if (parseInt(stringifiedValue, 10) > 999999999999) {
     return formatDate(parseInt(stringifiedValue, 10), format);
   }
-
   return value;
 }
 export function isValidTimeStamp(val) {
   if (!val) {
     return false;
   }
-
   if (Object.prototype.toString.call(val) !== '[object Number]') {
     return false;
   }
-
   if (val <= 0 || isNaN(val)) {
     return false;
   }
-
   if (val < 1000000000000 || val > 10000000000000) {
     return false;
   }
-
   return true;
 }
+
 /**
  * 将当天时间显示为”X小时前“/”X分钟前“/“X秒前”
  * 当天之前显示“MM-dd HH:mm”
  *
  */
-
 export function todaySpecialDate(time) {
   time = new Date(time);
-
   if (formatDateByDate(time, FORMAT.FORMAT_YMD) === formatDateByDate(new Date(), FORMAT.FORMAT_YMD)) {
     var lastHours = new Date().getHours() - new Date(time).getHours();
-
     if (lastHours > 0) {
       time = lastHours + "\u5C0F\u65F6\u524D";
     } else {
       var lastMinutes = new Date().getMinutes() - new Date(time).getMinutes();
-
       if (lastMinutes > 0) {
         time = lastMinutes + "\u5206\u949F\u524D";
       } else {
@@ -516,94 +460,84 @@ export function todaySpecialDate(time) {
       time = formatDateByDate(time, FORMAT.FORMAT_YMDHM);
     }
   }
-
   return time;
-} // 获取日期之间的时间
+}
 
+// 获取日期之间的时间
 export function getTimeDiff(firstDate, secondDate) {
   var result = '';
   var diff = Math.abs(firstDate.getTime() - secondDate.getTime());
   var hours = parseInt(diff / (1000 * 60 * 60), 10);
   var minutes = parseInt((diff - hours * 1000 * 60 * 60) / (1000 * 60), 10);
   var seconds = parseInt((diff - hours * 1000 * 60 * 60 - minutes * 1000 * 60) / 1000, 10);
-
   if (hours < 10) {
     result = result + '0' + hours + ':';
   } else {
     result = result + hours + ':';
   }
-
   if (minutes < 10) {
     result = result + '0' + minutes + ':';
   } else {
     result = result + minutes + ':';
   }
-
   if (seconds < 10) {
     result = result + '0' + seconds;
   } else {
     result = result + seconds;
   }
-
   return result;
 }
+
 /**
 *获取某年某月某天是一年的第几周
 *第一天为周日
 */
-
 export function getWeekNumber(date) {
   var targetDay = new Date(date);
   var year = targetDay.getFullYear();
   var month = targetDay.getMonth();
-  var days = targetDay.getDate(); //那一天是那一年中的第多少天
-
+  var days = targetDay.getDate();
+  //那一天是那一年中的第多少天
   for (var i = 1; i < month + 1; i++) {
     days += getMonthDays(year, i);
-  } //那一年第一天是星期几
-
-
-  var yearFirstDay = new Date(year, 0, 1).getDay(); //计算是第几周
-
+  }
+  //那一年第一天是星期几
+  var yearFirstDay = new Date(year, 0, 1).getDay();
+  //计算是第几周
   days += yearFirstDay;
   var week = Math.ceil(days / 7);
   return week;
 }
+
 /**
 *判断年份是否为润年
 */
-
 export function isLeapYear(year) {
   return year % 400 == 0 || year % 4 == 0 && year % 100 != 0;
 }
 /**
 *获取某年某月的天数
 */
-
 export function getMonthDays(year, month) {
   return [31, isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month - 1];
 }
 /**
  * 获取本周第一天
  */
-
 export function getFirstDayOfWeek(date) {
   var target = new Date(date);
   var weekday = target.getDay() || 7; //获取星期几,getDay()返回值是 0（周日） 到 6（周六） 之间的一个整数。0||7为7，即weekday的值为1-7
-
   return addDays(target, 1 - weekday);
 }
 /**
  * 加减月份
  */
-
 export function addMonths(date, months) {
   var target = new Date(date);
   var y = target.getFullYear();
   var m = target.getMonth();
   var d = target.getDate();
   m = m + months;
-
   if (m < 0) {
     m = m + 12;
     y = y - 1;
@@ -611,34 +545,32 @@ export function addMonths(date, months) {
     m = m - 12;
     y = y + 1;
   }
-
   return new Date(y, m, d);
-} //获取当前天是这个月的第几周
-
+}
+//获取当前天是这个月的第几周
 export function getMonthWeek(date) {
   var targetDay = new Date(date);
   var w = targetDay.getDay();
   var d = targetDay.getDate();
-
   if (w == 0) {
     w = 7;
   }
-
   return Math.ceil((d + 6 - w) / 7);
 }
-; //获取一年所有周开始日期和结束日期 , 返回 12.26-01.03   01.04-01.11
+;
 
+//获取一年所有周开始日期和结束日期 , 返回 12.26-01.03   01.04-01.11
 export function getYearWeekList(year) {
   //获取当前年份的第一天是周几
   var firstDay = new Date(year, 0, 1);
-  var yearFirstDay = firstDay.getDay(); //获取当前年份第一天所在的周的第一天
-
-  var firstWeekFirstDay = subDays(firstDay, yearFirstDay); //获取当前年份最后一天
+  var yearFirstDay = firstDay.getDay();
+  //获取当前年份第一天所在的周的第一天
+  var firstWeekFirstDay = subDays(firstDay, yearFirstDay);
 
+  //获取当前年份最后一天
   var endDay = subDays(new Date(year + 1, 0, 1), 1);
   var endWeekDay = firstWeekFirstDay;
   var weekStrList = [];
-
   while (endWeekDay < endDay) {
     var first = endWeekDay.getMonth() + 1 + "." + (endWeekDay.getDate() + 1);
     endWeekDay = addDays(endWeekDay, 7);
@@ -646,23 +578,23 @@ export function getYearWeekList(year) {
     var str = first + "-" + end;
     weekStrList.push(str);
   }
-
   console.log("weekStrList :" + JSON.stringify(weekStrList));
   return weekStrList;
 }
-; //武汉环卫获取一年所有周开始日期和结束日期，需要返回上周五到这周四
+;
 
+//武汉环卫获取一年所有周开始日期和结束日期，需要返回上周五到这周四
 export function getYearWeekListWh(year) {
   //获取当前年份的第一天是周几
   var firstDay = new Date(year, 0, 1);
-  var yearFirstDay = firstDay.getDay(); //获取当前年份第一天所在的周的第一天
-
-  var firstWeekFirstDay = addDays(subDays(firstDay, yearFirstDay), 4); //获取当前年份最后一天
+  var yearFirstDay = firstDay.getDay();
+  //获取当前年份第一天所在的周的第一天
+  var firstWeekFirstDay = addDays(subDays(firstDay, yearFirstDay), 4);
 
+  //获取当前年份最后一天
   var endDay = subDays(new Date(year + 1, 0, 1), 1);
   var endWeekDay = firstWeekFirstDay;
   var weekStrList = [];
-
   while (endWeekDay < endDay) {
     var first = endWeekDay.getMonth() + 1 + "." + (endWeekDay.getDate() + 1);
     endWeekDay = addDays(endWeekDay, 7);
@@ -670,21 +602,21 @@ export function getYearWeekListWh(year) {
     var str = first + "-" + end;
     weekStrList.push(str);
   }
-
   console.log("weekStrList :" + JSON.stringify(weekStrList));
   return weekStrList;
 }
-; // 判断开始时间是否小于结束时间
+;
 
+// 判断开始时间是否小于结束时间
 export function isLessThanDate(startDateStr, endDateStr) {
   if (new Date(startDateStr).getTime() > new Date(endDateStr).getTime()) {
     return false;
   }
-
   return true;
 }
-; // 获取日期之间天数
+;
 
+// 获取日期之间天数
 export function getDateDiff(firstDate, secondDate) {
   var diff = Math.abs(firstDate.getTime() - secondDate.getTime());
   var dateNum = parseInt(diff / (1000 * 60 * 60 * 24), 10);

package/es/utils/format/number.js

@@ -1,51 +1,42 @@
 export function range(num, min, max) {
   return Math.min(Math.max(num, min), max);
 }
-
 function trimExtraChar(value, _char, regExp) {
   var index = value.indexOf(_char);
   var prefix = '';
-
   if (index === -1) {
     return value;
   }
-
   if (_char === '-' && index !== 0) {
     return value.slice(0, index);
   }
-
   if (_char === '.' && value.match(/^(\.|-\.)/)) {
     prefix = index ? '-0' : '0';
   }
-
   return prefix + value.slice(0, index + 1) + value.slice(index).replace(regExp, '');
 }
-
 export function formatNumber(value, allowDot, allowMinus) {
   if (allowDot === void 0) {
     allowDot = true;
   }
-
   if (allowMinus === void 0) {
     allowMinus = true;
   }
-
   if (allowDot) {
     value = trimExtraChar(value, '.', /\./g);
   } else {
     value = value.split('.')[0];
   }
-
   if (allowMinus) {
     value = trimExtraChar(value, '-', /-/g);
   } else {
     value = value.replace(/-/, '');
   }
-
   var regExp = allowDot ? /[^-0-9.]/g : /[^-0-9]/g;
   return value.replace(regExp, '');
-} // add num and avoid float number
+}
 
+// add num and avoid float number
 export function addNumber(num1, num2) {
   var cardinal = Math.pow(10, 10);
   return Math.round((num1 + num2) * cardinal) / cardinal;

package/es/utils/format/string.js

@@ -8,12 +8,9 @@ export function padZero(num, targetLength) {
   if (targetLength === void 0) {
     targetLength = 2;
   }
-
   var str = num + '';
-
   while (str.length < targetLength) {
     str = '0' + str;
   }
-
   return str;
 }