Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions examples/sites/demos/pc/app/date-picker/date-range.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,28 @@ test('测试日期范围选择', async ({ page }) => {
await expect(startYear).toHaveValue('2020')
await expect(endYear).toHaveValue('2023')
})

test('同一天结束时间早于开始时间时不改写开始时间 #4185', async ({ page }) => {
page.on('pageerror', (exception) => expect(exception).toBeNull())
await page.goto('date-picker#date-range')

const panelTrigger = page.getByPlaceholder('开始日期').nth(1)
await panelTrigger.click()

const panel = page.locator('.tiny-date-range-picker.has-time')
await expect(panel).toBeVisible()

const day = panel.locator('td.available.today').first()
await day.click()
await day.click()

const startTime = panel.getByPlaceholder('开始时间')
const endTime = panel.getByPlaceholder('结束时间')
await startTime.fill('10:00:00')
await startTime.press('Enter')
await endTime.fill('05:00:00')
await endTime.press('Enter')

await expect(startTime).toHaveValue('10:00:00')
await expect(endTime).toHaveValue('10:00:00')
})
8 changes: 4 additions & 4 deletions packages/renderless/src/date-range/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ export const handleDateChange =
)

if (state.maxDate < state.minDate) {
state.minDate = state.maxDate
state.maxDate = state.minDate
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
}
}
}
Expand Down Expand Up @@ -360,10 +360,10 @@ export const handleTimeChange =
)

if (state.maxDate < state.minDate) {
state.minDate = state.maxDate
state.maxDate = state.minDate
}

vm.$refs.maxTimePicker.state.value = state.minDate
vm.$refs.maxTimePicker.state.value = state.maxDate
state.maxTimePickerVisible = false
}
}
Expand Down Expand Up @@ -483,7 +483,7 @@ export const handleMaxTimePick =
}

if (state.maxDate && state.minDate && state.minDate.getTime() > state.maxDate.getTime()) {
state.minDate = new Date(state.maxDate)
state.maxDate = new Date(state.minDate)
}
}

Expand Down
39 changes: 39 additions & 0 deletions packages/vue/src/date-range/__tests__/end-time-clamp.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { describe, expect, test } from 'vitest'
import { handleMaxTimePick, handleTimeChange } from '@opentiny/vue-renderless/date-range'

describe('datetimerange end time vs start (#4185)', () => {
test('handleMaxTimePick clamps end time instead of rewriting start', () => {
const state = {
minDate: new Date(2026, 8, 4, 10, 0, 0),
maxDate: new Date(2026, 8, 4, 10, 0, 0),
maxTimePickerVisible: true
}

handleMaxTimePick({ state })(new Date(2026, 8, 4, 5, 0, 0), false, false)

expect(state.minDate.getHours()).toBe(10)
expect(state.maxDate.getHours()).toBe(10)
expect(state.maxTimePickerVisible).toBe(false)
})

test('handleTimeChange clamps end time instead of rewriting start', () => {
const state = {
minDate: new Date(2026, 8, 4, 10, 0, 0),
maxDate: new Date(2026, 8, 4, 10, 0, 0),
timeFormat: 'HH:mm:ss',
maxTimePickerVisible: true
}
const vm = {
$refs: {
maxTimePicker: { state: { value: null } }
}
}
const t = (key) => key

handleTimeChange({ state, t, vm })('05:00:00', 'max')

expect(state.minDate.getHours()).toBe(10)
expect(state.maxDate.getHours()).toBe(10)
expect(vm.$refs.maxTimePicker.state.value).toEqual(state.maxDate)
})
})