@10yun/cv-mobile-ui 0.5.42 → 0.5.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.5.42",
+  "version": "0.5.43",
   "description": "十云cvjs移动端ui，适用uniapp",
   "author": "10yun",
   "license": "Apache-2.0",

package/uview-plus/libs/ctocode/date.js

@@ -1,53 +1,82 @@
 /**
- * 判断是否在日期范围内
- * @param {*} monthStr
- * @param {*} startDateStr
- * @param {*} endDateStr
- * @returns
- */
-export function cc_date_in_scope(checkDateStr, startDateStr, endDateStr) {
-  const checkDate = new Date(checkDateStr);
-  // 将日期字符串转换为日期对象
-  const startDate = new Date(startDateStr);
-  const endDate = new Date(endDateStr);
-  // NaN 防御
-  if (isNaN(checkDate) || isNaN(startDate) || isNaN(endDate)) {
-    return false;
-  }
-
-  return checkDate >= startDate && checkDate <= endDate;
-}
-/**
- * 判断某个月是否完全在指定时间范围内
- * @param {string} monthStr - 如 "2025-07"
+ * 判断某个时间（年/月/日/时分秒）是否完全包含在范围内
+ * @param {string|Date} inputStr
+ *   - 可为 "2020"、"2020-07"、"2020-07-25"、"2020-07-25 12:00:00"
  * @param {string|Date} startDateStr - 开始时间
  * @param {string|Date} endDateStr - 结束时间
  * @returns {boolean}
  */
-export function cc_month_in_scope(monthStr, startDateStr, endDateStr) {
-  const [year, month] = monthStr.split('-').map(Number);
-  const monthStart = new Date(year, month - 1, 1, 0, 0, 0);
-  const monthEnd = new Date(year, month, 0, 23, 59, 59); // 当月最后一天
-
+export function cc_date_time_in_scope(inputStr, startDateStr, endDateStr) {
   const startDate = new Date(startDateStr);
   const endDate = new Date(endDateStr);
+  if (isNaN(startDate) || isNaN(endDate)) return false;
 
-  return monthStart >= startDate && monthEnd <= endDate;
+  let inputStart, inputEnd;
+
+  if (typeof inputStr === 'string') {
+    if (/^\d{4}$/.test(inputStr)) {
+      // 年份：整年
+      inputStart = new Date(`${inputStr}-01-01T00:00:00`);
+      inputEnd = new Date(`${inputStr}-12-31T23:59:59`);
+    } else if (/^\d{4}-\d{2}$/.test(inputStr)) {
+      // 月份：整月
+      const [year, month] = inputStr.split('-').map(Number);
+      inputStart = new Date(year, month - 1, 1, 0, 0, 0);
+      inputEnd = new Date(year, month, 0, 23, 59, 59);
+    } else if (/^\d{4}-\d{2}-\d{2}$/.test(inputStr)) {
+      // 日期：整天
+      inputStart = new Date(`${inputStr}T00:00:00`);
+      inputEnd = new Date(`${inputStr}T23:59:59`);
+    } else {
+      // 时间点
+      const point = new Date(inputStr);
+      if (isNaN(point)) return false;
+      inputStart = point;
+      inputEnd = point;
+    }
+  } else if (inputStr instanceof Date) {
+    inputStart = inputStr;
+    inputEnd = inputStr;
+  } else {
+    return false;
+  }
+
+  return inputStart >= startDate && inputEnd <= endDate;
 }
 /**
  * 判断某个月是否与指定时间范围有交集
- * @param {string} monthStr - 如 "2025-07"
+ * @param {string|Date} inputStr
+ *   - 可为 "2020"、"2020-07"、"2020-07-25"、"2020-07-25 12:00:00"
  * @param {string|Date} startDateStr - 开始时间
  * @param {string|Date} endDateStr - 结束时间
  * @returns {boolean}
  */
-export function cc_month_overlap_scope(monthStr, startDateStr, endDateStr) {
-  const [year, month] = monthStr.split('-').map(Number);
-  const monthStart = new Date(year, month - 1, 1, 0, 0, 0);
-  const monthEnd = new Date(year, month, 0, 23, 59, 59);
-
+export function cc_date_time_overlap_scope(inputStr, startDateStr, endDateStr) {
   const startDate = new Date(startDateStr);
   const endDate = new Date(endDateStr);
-
-  return monthEnd >= startDate && monthStart <= endDate;
+  if (isNaN(startDate) || isNaN(endDate)) {
+    return false;
+  }
+  let inputStart, inputEnd;
+  if (/^\d{4}$/.test(inputStr)) {
+    // 年份：2025 → 2025-01-01 ~ 2025-12-31 23:59:59
+    inputStart = new Date(`${inputStr}-01-01T00:00:00`);
+    inputEnd = new Date(`${inputStr}-12-31T23:59:59`);
+  } else if (/^\d{4}-\d{2}$/.test(inputStr)) {
+    // 月份：2025-07 → 2025-07-01 ~ 2025-07-31
+    const [year, month] = inputStr.split('-').map(Number);
+    inputStart = new Date(year, month - 1, 1, 0, 0, 0);
+    inputEnd = new Date(year, month, 0, 23, 59, 59); // 当月最后一天
+  } else if (/^\d{4}-\d{2}-\d{2}$/.test(inputStr)) {
+    // 日期：2025-07-25 → 当天整天
+    inputStart = new Date(`${inputStr}T00:00:00`);
+    inputEnd = new Date(`${inputStr}T23:59:59`);
+  } else {
+    // 其他格式：默认作为精确时间点
+    const point = new Date(inputStr);
+    if (isNaN(point)) return false;
+    inputStart = point;
+    inputEnd = point;
+  }
+  return inputEnd >= startDate && inputStart <= endDate;
 }