af-mobile-client-vue3 1.4.86 → 1.4.87

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.4.86",
+  "version": "1.4.87",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/components/core/XDatePicker/index.vue

@@ -120,7 +120,7 @@ const datePickerMaxDate = computed(() => {
 })
 
 // 根据 attr.dateRangeOption 限制时间选择器的列选项
-// 如果 type 为 'afterToday'，则小时列从当前小时+1开始
+// 如果 type 为 'afterToday'，则根据选择的日期决定小时起始值
 const timePickerColumns = computed(() => {
   const opt = (props.attr as any).dateRangeOption
   if (!opt || opt.type !== 'afterToday' || props.mode === '查询')
@@ -129,11 +129,32 @@ const timePickerColumns = computed(() => {
   const columns: any[] = []
   const pad = (n: number) => n.toString().padStart(2, '0')
   const now = dayjs()
-  const start = now.hour() + 1
 
-  // 小时列从当前小时+1开始到23
+  // 获取用户选择的日期
+  const selectedDate = dateTimePickerValue.value.date
+  let startHour = 0 // 默认从00:00开始
+
+  // 如果选择的日期是今天，才限制从当前小时+1开始
+  if (selectedDate && selectedDate.length >= 3) {
+    const selectedYear = parseInt(selectedDate[0])
+    const selectedMonth = parseInt(selectedDate[1])
+    const selectedDay = parseInt(selectedDate[2] || '1')
+
+    const selectedDateTime = dayjs().year(selectedYear).month(selectedMonth - 1).date(selectedDay).startOf('day')
+    const today = now.startOf('day')
+
+    // 如果选择的是今天，才从当前小时+1开始
+    if (selectedDateTime.isSame(today, 'day')) {
+      startHour = now.hour() + 1
+    }
+  } else {
+    // 如果没有选择日期，默认为今天，限制时间
+    startHour = now.hour() + 1
+  }
+
+  // 小时列从计算出的起始小时开始到23
   const hourOptions = []
-  for (let h = start; h < 24; h++) {
+  for (let h = startHour; h < 24; h++) {
     hourOptions.push({ text: pad(h), value: pad(h) })
   }
   // 如果没有可选小时（例如当前为23），允许选择23