forked from opentiny/tiny-vue
fix(calendar-view): [calendar-view] week display error (#1241)
* fix(calendar-view): week display error #1158 * fix(calendar-view): [calendar-view] week display error - mobile * test(calendar-view): [calendar-view] amend e2e ttest --------- Co-authored-by: “Jevin” <jevin@mogul-tech.com>
This commit is contained in:
parent
b9fe6eda7d
commit
c50688a916
|
@ -3,7 +3,7 @@ import { test, expect } from '@playwright/test'
|
||||||
test('日期禁用', async ({ page }) => {
|
test('日期禁用', async ({ page }) => {
|
||||||
page.on('pageerror', (exception) => expect(exception).toBeNull())
|
page.on('pageerror', (exception) => expect(exception).toBeNull())
|
||||||
await page.goto('calendar-view#calendar-disabled-day')
|
await page.goto('calendar-view#calendar-disabled-day')
|
||||||
const day10 = page.getByText('10').nth(1)
|
const day10 = page.getByText('10').nth(2)
|
||||||
const day14 = page.getByText('14').nth(1)
|
const day14 = page.getByText('14').nth(1)
|
||||||
const day15 = page.getByText('15').nth(1)
|
const day15 = page.getByText('15').nth(1)
|
||||||
await expect(day10).toHaveClass(/is-disabled/)
|
await expect(day10).toHaveClass(/is-disabled/)
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
</div>
|
</div>
|
||||||
<ul data-tag="tiny-calendar-view-monthlist" class="flex justify-around flex-1 h-full">
|
<ul data-tag="tiny-calendar-view-monthlist" class="flex justify-around flex-1 h-full">
|
||||||
<li data-tag="tiny-calendar-view-monthitem" v-for="day in state.weekDays" :key="day" class="leading-10">
|
<li data-tag="tiny-calendar-view-monthitem" v-for="day in state.weekDays" :key="day" class="leading-10">
|
||||||
<span class="text-sm text-color-text-primary">{{ t(`ui.calendarView.weekDays[${day}]`) }}</span>
|
<span class="text-sm text-color-text-primary">{{ t(`ui.calendarView.weekDays.${day}`) }}</span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div
|
<div
|
||||||
|
@ -172,7 +172,7 @@
|
||||||
name="header"
|
name="header"
|
||||||
:slot-scope="{
|
:slot-scope="{
|
||||||
date: date.value,
|
date: date.value,
|
||||||
weekDay: t(`ui.calendarView.weekDays[${index}]`)
|
weekDay: t(`ui.calendarView.weekDays.${index}`)
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
|
@ -189,9 +189,7 @@
|
||||||
<span
|
<span
|
||||||
class="text-sm"
|
class="text-sm"
|
||||||
:class="[dateIsToday(date.value) ? 'text-color-brand' : 'text-color-text-placeholder']"
|
:class="[dateIsToday(date.value) ? 'text-color-brand' : 'text-color-text-placeholder']"
|
||||||
>{{
|
>{{ dateIsToday(date.value) ? t('ui.datepicker.today') : t(`ui.calendarView.weekDays.${index}`) }}</span
|
||||||
dateIsToday(date.value) ? t('ui.datepicker.today') : t(`ui.calendarView.weekDays[${index}]`)
|
|
||||||
}}</span
|
|
||||||
>
|
>
|
||||||
</slot>
|
</slot>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
</div>
|
</div>
|
||||||
<ul class="header-main">
|
<ul class="header-main">
|
||||||
<li v-for="day in state.weekDays" :key="day">
|
<li v-for="day in state.weekDays" :key="day">
|
||||||
<span>{{ t(`ui.calendarView.weekDays[${day}]`) }}</span>
|
<span>{{ t(`ui.calendarView.weekDays.${day}`) }}</span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="header-right" @click="goNextMonth">
|
<div class="header-right" @click="goNextMonth">
|
||||||
|
@ -111,7 +111,7 @@
|
||||||
name="header"
|
name="header"
|
||||||
:slot-scope="{
|
:slot-scope="{
|
||||||
date: date.value,
|
date: date.value,
|
||||||
weekDay: t(`ui.calendarView.weekDays[${index}]`)
|
weekDay: t(`ui.calendarView.weekDays.${index}`)
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<span class="date" :class="dateIsToday(date.value) && 'is-today'">
|
<span class="date" :class="dateIsToday(date.value) && 'is-today'">
|
||||||
|
@ -123,7 +123,7 @@
|
||||||
></span>
|
></span>
|
||||||
</span>
|
</span>
|
||||||
<span class="week-day" :class="dateIsToday(date.value) && 'is-today'">{{
|
<span class="week-day" :class="dateIsToday(date.value) && 'is-today'">{{
|
||||||
dateIsToday(date.value) ? t('ui.datepicker.today') : t(`ui.calendarView.weekDays[${index}]`)
|
dateIsToday(date.value) ? t('ui.datepicker.today') : t(`ui.calendarView.weekDays.${index}`)
|
||||||
}}</span>
|
}}</span>
|
||||||
</slot>
|
</slot>
|
||||||
</li>
|
</li>
|
||||||
|
|
Loading…
Reference in New Issue