diff --git a/examples/sites/demos/apis/calendar-view.js b/examples/sites/demos/apis/calendar-view.js index bc1ee9bb1b..92be41da0e 100644 --- a/examples/sites/demos/apis/calendar-view.js +++ b/examples/sites/demos/apis/calendar-view.js @@ -43,7 +43,7 @@ export default { }, { name: 'height', - type: 'string', + type: 'string | number', defaultValue: '', desc: { 'zh-CN': '日历高度', diff --git a/examples/sites/demos/pc/app/calendar-view/calendar-disabled-day.spec.ts b/examples/sites/demos/pc/app/calendar-view/calendar-disabled-day.spec.ts index 6e9eb4eb06..002ffd163e 100644 --- a/examples/sites/demos/pc/app/calendar-view/calendar-disabled-day.spec.ts +++ b/examples/sites/demos/pc/app/calendar-view/calendar-disabled-day.spec.ts @@ -3,9 +3,9 @@ import { test, expect } from '@playwright/test' test('日期禁用', async ({ page }) => { page.on('pageerror', (exception) => expect(exception).toBeNull()) await page.goto('calendar-view#calendar-disabled-day') - const day10 = page.getByText('10').nth(3) + const day10 = page.getByText('10').nth(1) const day14 = page.getByText('14').nth(1) - const day15 = page.getByText('15').nth(1) + const day15 = page.getByText('15').nth(2) await expect(day10).toHaveClass(/is-disabled/) await expect(day14).toHaveClass(/is-disabled/) await expect(day15).toHaveClass('date') diff --git a/packages/theme/src/calendar-view/index.less b/packages/theme/src/calendar-view/index.less index 729b7f54a7..5fbf10e591 100644 --- a/packages/theme/src/calendar-view/index.less +++ b/packages/theme/src/calendar-view/index.less @@ -23,6 +23,7 @@ padding-top: 32px; border: 1px solid #ebebeb; background-color: var(--tv-CalendarView-bg-color); + overflow: auto; &__header { display: flex; diff --git a/packages/vue/src/calendar-view/src/index.ts b/packages/vue/src/calendar-view/src/index.ts index 6f45d687af..802b10071f 100644 --- a/packages/vue/src/calendar-view/src/index.ts +++ b/packages/vue/src/calendar-view/src/index.ts @@ -66,7 +66,7 @@ export const calendarViewProps = { } }, height: { - type: String, + type: [String, Number], default: '' }, markColor: { diff --git a/packages/vue/src/calendar-view/src/pc.vue b/packages/vue/src/calendar-view/src/pc.vue index a471155caf..fa619b4db9 100644 --- a/packages/vue/src/calendar-view/src/pc.vue +++ b/packages/vue/src/calendar-view/src/pc.vue @@ -1,5 +1,5 @@