@chaoswise/ui 3.1.6 → 3.1.8

package/lib/CWRangePicker/utils/generate/dayjs.js

@@ -15,12 +15,11 @@ import originalDayjs from "dayjs";
 import duration from "dayjs/plugin/duration";
 import utc from "dayjs/plugin/utc";
 import timezone from "dayjs/plugin/timezone";
+import { v4 as uuidv4 } from 'uuid';
 originalDayjs.extend(duration);
 // 扩展 dayjs 支持时区
 originalDayjs.extend(utc);
 originalDayjs.extend(timezone);
-var _require = require("uuid"),
-  uuidv4 = _require.v4;
 var timeZone = ((_originalDayjs$tz = originalDayjs.tz()) === null || _originalDayjs$tz === void 0 || (_originalDayjs$tz = _originalDayjs$tz.$x) === null || _originalDayjs$tz === void 0 ? void 0 : _originalDayjs$tz.$timezone) || originalDayjs.tz.guess();
 // 封装 dayjs 函数，使其每次调用时自动应用当前的全局时区
 var dayjs = function dayjs() {
@@ -29,12 +28,60 @@ var dayjs = function dayjs() {
 };
 // 枚举时间单位
 var ENUM_TimeUnit = {
-  s: ["Second", "Seconds", "秒", "seconds"],
-  m: ["Minute", "Minutes", "分钟", "minutes"],
-  h: ["Hour", "Hours", "小时", "hours"],
-  d: ["Day", "Days", "天", "days"],
-  mo: ["Month", "Months", "月", "mo"],
-  y: ["Year", "Years", "年", "years"]
+  s: {
+    zh_CN: "秒",
+    en_US: {
+      singular: "Second",
+      plural: "Seconds"
+    },
+    zh_TW: "秒",
+    unit: "seconds"
+  },
+  m: {
+    zh_CN: "分钟",
+    en_US: {
+      singular: "Minute",
+      plural: "Minutes"
+    },
+    zh_TW: "分鐘",
+    unit: "minutes"
+  },
+  h: {
+    zh_CN: "小时",
+    en_US: {
+      singular: "Hour",
+      plural: "Hours"
+    },
+    zh_TW: "小時",
+    unit: "hours"
+  },
+  d: {
+    zh_CN: "天",
+    en_US: {
+      singular: "Day",
+      plural: "Days"
+    },
+    zh_TW: "天",
+    unit: "days"
+  },
+  mo: {
+    zh_CN: "月",
+    en_US: {
+      singular: "Month",
+      plural: "Months"
+    },
+    zh_TW: "月",
+    unit: "mo"
+  },
+  y: {
+    zh_CN: "年",
+    en_US: {
+      singular: "Year",
+      plural: "Years"
+    },
+    zh_TW: "年",
+    unit: "years"
+  }
 };
 
 /**
@@ -120,18 +167,60 @@ export var judgeType = function judgeType(recordDateValue) {
   return [isRule, captureUnit, recordUnit];
 };
 export var echoRecentlyTimeTitle = function echoRecentlyTimeTitle(locale, captureUnit) {
-  // todo： 需要优化
-  if (locale == "zh_CN" || locale == "zh" || locale == "zh_TW") {
-    if (captureUnit[1] === "mo") {
-      return "\u6700\u8FD1".concat(captureUnit[0], "\u4E2A").concat(ENUM_TimeUnit.mo[2]);
-    }
-    return "\u6700\u8FD1".concat(captureUnit[0]).concat(ENUM_TimeUnit[captureUnit[1]][2]);
-  } else {
-    if (captureUnit[0] == 1) {
-      return "Past ".concat(captureUnit[0], " ").concat(ENUM_TimeUnit[captureUnit[1]][0]);
-    }
-    return "Past ".concat(captureUnit[0], " ").concat(ENUM_TimeUnit[captureUnit[1]][1]);
+  // 参数验证
+  if (!captureUnit || !Array.isArray(captureUnit) || captureUnit.length < 2) {
+    return "";
+  }
+  var _captureUnit3 = _slicedToArray(captureUnit, 2),
+    count = _captureUnit3[0],
+    unit = _captureUnit3[1];
+  var timeUnit = ENUM_TimeUnit[unit];
+  if (!timeUnit) {
+    return "";
   }
+  var countNum = parseInt(count, 10);
+
+  // 语言配置映射
+  var localeConfig = {
+    zh_CN: {
+      template: function template(count, unitText) {
+        return "\u6700\u8FD1".concat(count).concat(unit === "mo" ? "个" : "").concat(unitText);
+      },
+      getUnitText: function getUnitText() {
+        return timeUnit.zh_CN;
+      }
+    },
+    zh: {
+      template: function template(count, unitText) {
+        return "\u6700\u8FD1".concat(count).concat(unit === "mo" ? "个" : "").concat(unitText);
+      },
+      getUnitText: function getUnitText() {
+        return timeUnit.zh_CN;
+      }
+    },
+    zh_TW: {
+      template: function template(count, unitText) {
+        return "\u6700\u8FD1".concat(count).concat(unit === "mo" ? "個" : "").concat(unitText);
+      },
+      getUnitText: function getUnitText() {
+        return timeUnit.zh_TW;
+      }
+    },
+    "default": {
+      template: function template(count, unitText) {
+        return "Past ".concat(count, " ").concat(unitText);
+      },
+      getUnitText: function getUnitText() {
+        var isPlural = countNum !== 1;
+        return isPlural ? timeUnit.en_US.plural : timeUnit.en_US.singular;
+      }
+    }
+  };
+
+  // 获取当前语言配置，如果不存在则使用默认配置
+  var config = localeConfig[locale] || localeConfig["default"];
+  var unitText = config.getUnitText();
+  return config.template(count, unitText);
 };
 export var echoAbsoluteTimeTitle = function echoAbsoluteTimeTitle(value, format) {
   var hasTimeSpan = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
@@ -388,7 +477,7 @@ export var getChangeDate = function getChangeDate(recordDateValue, direction) {
     value = funcValueChangeArrayValue(values);
   }
   if (isRule && !values) {
-    value = getChangeUnitDate(captureUnit[0], ENUM_TimeUnit[captureUnit[1]][3]);
+    value = getChangeUnitDate(captureUnit[0], ENUM_TimeUnit[captureUnit[1]].unit);
   }
   var timeDiff = value[1].diff(value[0]);
   var duration = originalDayjs.duration(timeDiff);
@@ -546,7 +635,7 @@ var getFormatParseDate = function getFormatParseDate() {
         cloneEndDate = null;
       }
     } else if (NEED_CHANGE_FORMATS.slice(0, 4).includes(format)) {
-      cloneEndDate = cloneEndDate.set('hour', 23).set('minute', 59).set('second', 59);
+      cloneEndDate = cloneEndDate.set("hour", 23).set("minute", 59).set("second", 59);
       if (isAfterDate(cloneEndDate, cloneStartDate)) {
         if (!isAfterCurrentDate(cloneStartDate, cloneEndDate)) {
           if (cloneEndDate.isSame(dayjs(), "day")) {
@@ -584,7 +673,7 @@ var getFormatParseDate = function getFormatParseDate() {
     if (format !== "X") {
       _cloneStartDate = _endDate.clone();
       _cloneEndDate = _endDate.clone();
-      _cloneStartDate = _cloneStartDate.set('hour', 0).set('minute', 0).set('second', 0);
+      _cloneStartDate = _cloneStartDate.set("hour", 0).set("minute", 0).set("second", 0);
       if (NOT_CHANGE_FORMATS.includes(format)) {
         if (!isAfterCurrentDate(_cloneStartDate, _cloneEndDate, true)) {
           _cloneStartDate = null;
@@ -592,7 +681,7 @@ var getFormatParseDate = function getFormatParseDate() {
         }
       }
       if (NEED_CHANGE_FORMATS.slice(0, 4).includes(format)) {
-        _cloneEndDate = _cloneEndDate.set('hour', 23).set('minute', 59).set('second', 59);
+        _cloneEndDate = _cloneEndDate.set("hour", 23).set("minute", 59).set("second", 59);
         if (!isAfterCurrentDate(_cloneStartDate, _cloneEndDate, true)) {
           if (_cloneEndDate.isSame(dayjs(), "day")) {
             _cloneEndDate = dayjs();

package/lib/CWRangePicker/utils/generate/moment.js

@@ -11,18 +11,64 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import moment from "moment";
-var _require = require("uuid"),
-  uuidv4 = _require.v4;
+import { v4 as uuidv4 } from 'uuid';
 // 枚举时间单位
 var ENUM_TimeUnit = {
-  s: ["Second", "Seconds", "秒", "seconds"],
-  m: ["Minute", "Minutes", "分钟", "minutes"],
-  h: ["Hour", "Hours", "小时", "hours"],
-  d: ["Day", "Days", "天", "days"],
-  mo: ["Month", "Months", "月", "mo"],
-  y: ["Year", "Years", "年", "years"]
+  s: {
+    zh_CN: "秒",
+    en_US: {
+      singular: "Second",
+      plural: "Seconds"
+    },
+    zh_TW: "秒",
+    unit: "seconds"
+  },
+  m: {
+    zh_CN: "分钟",
+    en_US: {
+      singular: "Minute",
+      plural: "Minutes"
+    },
+    zh_TW: "分鐘",
+    unit: "minutes"
+  },
+  h: {
+    zh_CN: "小时",
+    en_US: {
+      singular: "Hour",
+      plural: "Hours"
+    },
+    zh_TW: "小時",
+    unit: "hours"
+  },
+  d: {
+    zh_CN: "天",
+    en_US: {
+      singular: "Day",
+      plural: "Days"
+    },
+    zh_TW: "天",
+    unit: "days"
+  },
+  mo: {
+    zh_CN: "月",
+    en_US: {
+      singular: "Month",
+      plural: "Months"
+    },
+    zh_TW: "月",
+    unit: "mo"
+  },
+  y: {
+    zh_CN: "年",
+    en_US: {
+      singular: "Year",
+      plural: "Years"
+    },
+    zh_TW: "年",
+    unit: "years"
+  }
 };
-
 /**
  * 变换数据源格式
  * @param {Array} 数据源
@@ -106,18 +152,60 @@ export var judgeType = function judgeType(recordDateValue) {
   return [isRule, captureUnit, recordUnit];
 };
 export var echoRecentlyTimeTitle = function echoRecentlyTimeTitle(locale, captureUnit) {
-  // todo： 需要优化
-  if (locale == "zh_CN" || locale == "zh" || locale == "zh_TW") {
-    if (captureUnit[1] === "mo") {
-      return "\u6700\u8FD1".concat(captureUnit[0], "\u4E2A").concat(ENUM_TimeUnit.mo[2]);
-    }
-    return "\u6700\u8FD1".concat(captureUnit[0]).concat(ENUM_TimeUnit[captureUnit[1]][2]);
-  } else {
-    if (captureUnit[0] == 1) {
-      return "Past ".concat(captureUnit[0], " ").concat(ENUM_TimeUnit[captureUnit[1]][0]);
-    }
-    return "Past ".concat(captureUnit[0], " ").concat(ENUM_TimeUnit[captureUnit[1]][1]);
+  // 参数验证
+  if (!captureUnit || !Array.isArray(captureUnit) || captureUnit.length < 2) {
+    return '';
+  }
+  var _captureUnit3 = _slicedToArray(captureUnit, 2),
+    count = _captureUnit3[0],
+    unit = _captureUnit3[1];
+  var timeUnit = ENUM_TimeUnit[unit];
+  if (!timeUnit) {
+    return '';
   }
+  var countNum = parseInt(count, 10);
+
+  // 语言配置映射
+  var localeConfig = {
+    zh_CN: {
+      template: function template(count, unitText) {
+        return "\u6700\u8FD1".concat(count).concat(unit === 'mo' ? '个' : '').concat(unitText);
+      },
+      getUnitText: function getUnitText() {
+        return timeUnit.zh_CN;
+      }
+    },
+    zh: {
+      template: function template(count, unitText) {
+        return "\u6700\u8FD1".concat(count).concat(unit === 'mo' ? '个' : '').concat(unitText);
+      },
+      getUnitText: function getUnitText() {
+        return timeUnit.zh_CN;
+      }
+    },
+    zh_TW: {
+      template: function template(count, unitText) {
+        return "\u6700\u8FD1".concat(count).concat(unit === 'mo' ? '個' : '').concat(unitText);
+      },
+      getUnitText: function getUnitText() {
+        return timeUnit.zh_TW;
+      }
+    },
+    "default": {
+      template: function template(count, unitText) {
+        return "Past ".concat(count, " ").concat(unitText);
+      },
+      getUnitText: function getUnitText() {
+        var isPlural = countNum !== 1;
+        return isPlural ? timeUnit.en_US.plural : timeUnit.en_US.singular;
+      }
+    }
+  };
+
+  // 获取当前语言配置，如果不存在则使用默认配置
+  var config = localeConfig[locale] || localeConfig["default"];
+  var unitText = config.getUnitText();
+  return config.template(count, unitText);
 };
 export var echoAbsoluteTimeTitle = function echoAbsoluteTimeTitle(value, format) {
   var hasTimeSpan = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
@@ -374,7 +462,7 @@ export var getChangeDate = function getChangeDate(recordDateValue, direction) {
     value = funcValueChangeArrayValue(values);
   }
   if (isRule && !values) {
-    value = getChangeUnitDate(captureUnit[0], ENUM_TimeUnit[captureUnit[1]][3]);
+    value = getChangeUnitDate(captureUnit[0], ENUM_TimeUnit[captureUnit[1]].unit);
   }
   var timeDiff = value[1].diff(value[0]);
   var duration = moment.duration(timeDiff);