Skip to content

Commit ce01c5b

Browse files
committed
fix:修复面板初始宽度过窄,以及英文状态下月份显示
1 parent cfb7481 commit ce01c5b

File tree

11 files changed

+30
-30
lines changed

11 files changed

+30
-30
lines changed

examples/sites/demos/pc/app/date-panel/basic-usage.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ test('[DatePanel] 测试月份/年份/日期选择', async ({ page }) => {
1010

1111
// 选择年份展示月份面板
1212
await page.getByRole('cell', { name: '2025' }).first().click()
13-
await expect(page.getByRole('cell', { name: '一月', exact: true }).first()).toBeVisible()
13+
await expect(page.getByRole('cell', { name: '1 月', exact: true }).first()).toBeVisible()
1414

1515
// 选择月份展示日期面板
16-
await page.getByRole('cell', { name: '一月', exact: true }).first().click()
16+
await page.getByRole('cell', { name: '1 月', exact: true }).first().click()
1717
await expect(page.getByRole('cell', { name: '15' }).locator('div').first()).toBeVisible()
1818

1919
// 选择日期
2020
await page.getByText('16').first().click()
2121
await expect(page.locator('.value')).toHaveText('2025-01-16')
2222

2323
// 月份面板
24-
await page.getByText('七月').first().click()
24+
await page.getByText('7 月').first().click()
2525
await expect(page.locator('.month')).toHaveText('2025-07')
2626

2727
// 年份面板
@@ -35,8 +35,8 @@ test('[DatePanel] 测试月份/年份/日期选择', async ({ page }) => {
3535
await expect(page.locator('.value1')).toHaveText('[ "2024-12-19", "2024-12-28" ]')
3636

3737
// monthRange
38-
await page.getByText('七月').nth(1).click()
39-
await page.getByText('六月').nth(2).click()
38+
await page.getByText('7 月').nth(1).click()
39+
await page.getByText('6 月').nth(2).click()
4040
await expect(page.locator('.value2')).toHaveText('[ "2024-07", "2025-06" ]')
4141

4242
// yearRange

examples/sites/demos/pc/app/date-panel/custom-week.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ test('[DatePanel] 测试周次序号', async ({ page }) => {
88
// 选择年份月份日期
99
await page.getByRole('button', { name: '2025 年' }).click()
1010
await page.getByText('2026').click()
11-
await page.getByText('三月').click()
11+
await page.getByText('3 月').click()
1212
await expect(page.getByText('12w')).toBeVisible()
1313

1414
// 选择下个月

examples/sites/demos/pc/app/date-panel/disabled-date.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ test('[DatePanel] 测试时间禁用', async ({ page }) => {
1919
.filter({ hasText: /^2025 6 $/ })
2020
.getByLabel('前一年')
2121
.click()
22-
await page.getByText('一月', { exact: true }).first().click()
23-
await page.getByText('六月').first().click()
22+
await page.getByText('1 月', { exact: true }).first().click()
23+
await page.getByText('6 月').first().click()
2424
await expect(page.locator('.month')).toHaveText('2024-06')
2525

2626
// 年份面板
@@ -43,9 +43,9 @@ test('[DatePanel] 测试时间禁用', async ({ page }) => {
4343
await expect(page.locator('.value1')).toHaveText('[ "2025-02-15", "2025-02-19" ]')
4444

4545
// monthRange
46-
await page.getByText('一月', { exact: true }).nth(1).click()
47-
await page.getByText('二月', { exact: true }).nth(1).click()
48-
await page.getByText('五月').nth(2).click()
46+
await page.getByText('1 月', { exact: true }).nth(1).click()
47+
await page.getByText('2 月', { exact: true }).nth(1).click()
48+
await page.getByText('5 月').nth(2).click()
4949
await expect(page.locator('.value2')).toHaveText('[ "2024-02", "2025-05" ]')
5050

5151
// yearRange

examples/sites/demos/pc/app/date-panel/event.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ test('[DatePanel] 测试事件', async ({ page }) => {
1010

1111
// 月份面板
1212
await page.waitForTimeout(1000)
13-
await page.getByText('七月').first().click()
13+
await page.getByText('7 月').first().click()
1414
await expect(page.getByText('触发 月份面板选中 事件,组件绑定值为:2025-')).toBeVisible()
1515

1616
// 年份面板
@@ -26,8 +26,8 @@ test('[DatePanel] 测试事件', async ({ page }) => {
2626

2727
// monthRange
2828
await page.waitForTimeout(1000)
29-
await page.locator('#event').getByText('七月').nth(2).click()
30-
await page.locator('#event').getByText('五月').nth(2).click()
29+
await page.locator('#event').getByText('7 月').nth(2).click()
30+
await page.locator('#event').getByText('5 月').nth(2).click()
3131
await expect(page.getByText('触发 月份区间面板选中 事件,组件绑定值为:2025-05,2025-')).toBeVisible()
3232

3333
// yearRange

examples/sites/demos/pc/app/date-panel/format.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ test('[DatePanel] 测试格式化', async ({ page }) => {
1313
await expect(page.locator('.value1')).toHaveText('[ "2025/01/28", "2025/02/12" ]')
1414

1515
// monthRange
16-
await page.locator('#format').getByText('三月').first().click()
17-
await page.locator('#format').getByText('五月').nth(1).click()
16+
await page.locator('#format').getByText('3 月').first().click()
17+
await page.locator('#format').getByText('5 月').nth(1).click()
1818
await expect(page.locator('.value2')).toHaveText('[ "2024/03", "2025/05" ]')
1919
})

examples/sites/demos/pc/app/date-panel/readonly.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ test('[DatePanel] 测试只读', async ({ page }) => {
1313
await expect(page.locator('.value')).toHaveText('2025-01-15')
1414

1515
// 月份面板
16-
await page.getByText('七月').first().click()
16+
await page.getByText('7 月').first().click()
1717
await expect(page.locator('.month')).toHaveText('2025-01')
1818

1919
// 年份面板
@@ -26,8 +26,8 @@ test('[DatePanel] 测试只读', async ({ page }) => {
2626
await expect(page.locator('.value1')).toHaveText('[ "2025-01-15", "2025-02-15" ]')
2727

2828
// monthRange
29-
await page.getByText('二月').first().click()
30-
await page.getByText('九月').nth(1).click()
29+
await page.getByText('2 月').first().click()
30+
await page.getByText('9 月').nth(1).click()
3131
await expect(page.locator('.value2')).toHaveText('[ "2024-03", "2025-02" ]')
3232

3333
// yearRange

examples/sites/demos/pc/app/date-panel/unlink-panels.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ test('[DatePanel] 测试范围选择取消面板联动', async ({ page }) => {
2727
await page.getByText('2023 年').click()
2828
await expect(page.getByText('2023 年')).toBeVisible()
2929
// 联动
30-
await page.getByText('一月', { exact: true }).first().click()
31-
await page.getByText('六月').nth(1).click()
30+
await page.getByText('1 月', { exact: true }).first().click()
31+
await page.getByText('6 月').nth(1).click()
3232
await expect(page.locator('.value-link1')).toHaveText('[ "2023-01", "2024-06" ]')
3333

3434
// 不联动
@@ -43,8 +43,8 @@ test('[DatePanel] 测试范围选择取消面板联动', async ({ page }) => {
4343
'.tiny-month-range > .tiny-picker-panel__body-wrapper > .tiny-picker-panel__body > div:nth-child(2) > .tiny-date-range-picker__header > button:nth-child(2)'
4444
)
4545
.click()
46-
await page.getByText('六月').nth(2).click()
47-
await page.getByText('五月').nth(3).click()
46+
await page.getByText('6 月').nth(2).click()
47+
await page.getByText('5 月').nth(3).click()
4848
await expect(page.locator('.value-unlink1')).toHaveText('[ "2023-06", "2025-05" ]')
4949

5050
// yaerRange

examples/sites/demos/pc/app/date-picker/basic-usage.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ test('[DatePicker] 测试月份/年份选择', async ({ page }) => {
6262
// 选择月份
6363
await dateInput.click()
6464
await page.getByRole('button', { name: '4 月' }).click()
65-
await page.getByRole('cell', { name: '六月' }).locator('a').click()
65+
await page.getByRole('cell', { name: '6 月' }).locator('a').click()
6666
await page.getByRole('rowgroup').getByText('4').first().click()
6767
await expect(dateInput).toHaveValue('2023-06-04')
6868

6969
// 选择年份
7070
await dateInput.click()
7171
await page.getByRole('button', { name: '2023 年' }).click()
7272
await page.getByRole('cell', { name: '2024' }).getByText('2024').click()
73-
await page.getByRole('cell', { name: '二月', exact: true }).locator('a').click()
73+
await page.getByRole('cell', { name: '2 月', exact: true }).locator('a').click()
7474
await page.getByRole('rowgroup').getByText('7').first().click()
7575
await expect(dateInput).toHaveValue('2024-02-07')
7676
})

examples/sites/demos/pc/app/date-picker/date-range.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,17 @@ test('测试日期范围选择', async ({ page }) => {
6565
// 月份范围
6666
const startMonth = page.getByPlaceholder('开始月份')
6767
const endMonth = page.getByPlaceholder('结束月份')
68-
await startMonth.click()
68+
await startMonth.first().click()
6969
await page.waitForTimeout(100)
7070
await startMonth.fill('2023-05')
7171
await startMonth.press('Tab')
7272
await endMonth.fill('2023-06')
7373
await endMonth.press('Enter')
7474
await startMonth.click()
7575
await page.waitForTimeout(100)
76-
await page.getByText('一月').first().click()
76+
await page.getByText('1 月').first().click()
7777
await page.waitForTimeout(100)
78-
await page.getByText('十二月').first().click()
78+
await page.getByText('12 月').first().click()
7979
await page.waitForTimeout(100)
8080
await expect(startMonth).toHaveValue('2023-01')
8181
await expect(endMonth).toHaveValue('2023-12')

packages/theme/src/date-panel/vars.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
--tv-DatePanel-line-height: var(--tv-line-height-number, 1.5);
2222

2323
// 面板宽度(默认)
24-
--tv-DatePanel-width: 284px;
24+
--tv-DatePanel-width: 360px;
2525
// 面板背景色
2626
--tv-DatePanel-bg-color: var(--tv-color-bg-2, #ffffff);
2727

packages/vue/src/month-table/src/pc.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<tr v-for="(row, key) in state.rows" :key="key">
1616
<td v-for="(cell, key) in row" :class="getCellStyle(cell)" :key="key">
1717
<div>
18-
<a class="cell" v-text="t('ui.datepicker.months.' + state.months[cell.text])"></a>
18+
<a class="cell" v-text="t(`ui.datepicker.month${cell.text + 1}`)"></a>
1919
</div>
2020
</td>
2121
</tr>

0 commit comments

Comments
 (0)