From 4a8479bd9e7ac0f1c14562cde89c6eca7f163fba Mon Sep 17 00:00:00 2001 From: discreted66 <953831480@qq.com> Date: Thu, 29 May 2025 14:15:39 -0700 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=AE=BD=E5=BA=A6=E8=BF=87=E7=AA=84=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=8B=B1=E6=96=87=E7=8A=B6=E6=80=81=E4=B8=8B?= =?UTF-8?q?=E6=9C=88=E4=BB=BD=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demos/pc/app/date-panel/basic-usage.spec.ts | 12 ++++++------ .../demos/pc/app/date-panel/custom-week.spec.ts | 2 +- .../pc/app/date-panel/disabled-date.spec.ts | 17 ++++++++--------- .../sites/demos/pc/app/date-panel/event.spec.ts | 8 ++++---- .../demos/pc/app/date-panel/format.spec.ts | 4 ++-- .../demos/pc/app/date-panel/readonly.spec.ts | 6 +++--- .../pc/app/date-panel/unlink-panels.spec.ts | 8 ++++---- .../pc/app/date-picker/basic-usage.spec.ts | 4 ++-- .../demos/pc/app/date-picker/date-range.spec.ts | 6 +++--- packages/theme/src/date-panel/vars.less | 2 +- packages/vue/src/month-table/src/pc.vue | 2 +- 11 files changed, 35 insertions(+), 36 deletions(-) diff --git a/examples/sites/demos/pc/app/date-panel/basic-usage.spec.ts b/examples/sites/demos/pc/app/date-panel/basic-usage.spec.ts index 2dba8c9c31..2189f7af6a 100644 --- a/examples/sites/demos/pc/app/date-panel/basic-usage.spec.ts +++ b/examples/sites/demos/pc/app/date-panel/basic-usage.spec.ts @@ -10,10 +10,10 @@ test('[DatePanel] 测试月份/年份/日期选择', async ({ page }) => { // 选择年份展示月份面板 await page.getByRole('cell', { name: '2025' }).first().click() - await expect(page.getByRole('cell', { name: '一月', exact: true }).first()).toBeVisible() + await expect(page.getByRole('cell', { name: '1 月', exact: true }).first()).toBeVisible() // 选择月份展示日期面板 - await page.getByRole('cell', { name: '一月', exact: true }).first().click() + await page.getByRole('cell', { name: '1 月', exact: true }).first().click() await expect(page.getByRole('cell', { name: '15' }).locator('div').first()).toBeVisible() // 选择日期 @@ -21,7 +21,7 @@ test('[DatePanel] 测试月份/年份/日期选择', async ({ page }) => { await expect(page.locator('.value')).toHaveText('2025-01-16') // 月份面板 - await page.getByText('七月').first().click() + await page.getByText('7 月').first().click() await expect(page.locator('.month')).toHaveText('2025-07') // 年份面板 @@ -35,9 +35,9 @@ test('[DatePanel] 测试月份/年份/日期选择', async ({ page }) => { await expect(page.locator('.value1')).toHaveText('[ "2024-12-19", "2024-12-28" ]') // monthRange - await page.getByText('七月').nth(1).click() - await page.getByText('六月').nth(2).click() - await expect(page.locator('.value2')).toHaveText('[ "2024-07", "2025-06" ]') + await page.locator('#basic-usage').getByText('7 月').nth(1).click() + await page.locator('#basic-usage').getByText('6 月').nth(2).click() + await expect(page.locator('.value2')).toHaveText('[ "2024-03", "2025-02" ]') // yearRange await page.getByText('2037').click() diff --git a/examples/sites/demos/pc/app/date-panel/custom-week.spec.ts b/examples/sites/demos/pc/app/date-panel/custom-week.spec.ts index 9bec5f183a..8831bbbc23 100644 --- a/examples/sites/demos/pc/app/date-panel/custom-week.spec.ts +++ b/examples/sites/demos/pc/app/date-panel/custom-week.spec.ts @@ -8,7 +8,7 @@ test('[DatePanel] 测试周次序号', async ({ page }) => { // 选择年份月份日期 await page.getByRole('button', { name: '2025 年' }).click() await page.getByText('2026').click() - await page.getByText('三月').click() + await page.getByText('3 月').click() await expect(page.getByText('12w')).toBeVisible() // 选择下个月 diff --git a/examples/sites/demos/pc/app/date-panel/disabled-date.spec.ts b/examples/sites/demos/pc/app/date-panel/disabled-date.spec.ts index 4ac58cafc2..0bc6dcf3fc 100644 --- a/examples/sites/demos/pc/app/date-panel/disabled-date.spec.ts +++ b/examples/sites/demos/pc/app/date-panel/disabled-date.spec.ts @@ -19,8 +19,8 @@ test('[DatePanel] 测试时间禁用', async ({ page }) => { .filter({ hasText: /^2025 年6 月$/ }) .getByLabel('前一年') .click() - await page.getByText('一月', { exact: true }).first().click() - await page.getByText('六月').first().click() + await page.getByText('1 月', { exact: true }).first().click() + await page.getByText('6 月').nth(2).click() await expect(page.locator('.month')).toHaveText('2024-06') // 年份面板 @@ -31,21 +31,20 @@ test('[DatePanel] 测试时间禁用', async ({ page }) => { // dateRange await page.locator('.tiny-date-range-picker__header > button').first().click() await page.getByRole('cell', { name: '16' }).nth(1).click() - await page.locator('div').filter({ hasText: /^18$/ }).nth(2).click() + await page.locator('div').filter({ hasText: /^18$/ }).nth(1).click() await expect(page.locator('.value1')).toHaveText('[ "2025-01-15", "2025-02-15" ]') await page.locator('div:nth-child(2) > .tiny-date-range-picker__header > button').first().click() await page.locator('#disabled-date').getByText('31', { exact: true }).nth(2).click() await expect(page.locator('.value1')).toHaveText('[ "2025-01-15", "2025-02-15" ]') - await page.locator('#disabled-date').getByText('15').nth(3).click() - await page.locator('#disabled-date').getByText('19').nth(2).click() - await expect(page.locator('.value1')).toHaveText('[ "2025-02-15", "2025-02-19" ]') + await page.locator('#disabled-date').getByText('15').nth(2).click() + await expect(page.locator('.value1')).toHaveText('[ "2025-01-31", "2025-02-15" ]') // monthRange - await page.getByText('一月', { exact: true }).nth(1).click() - await page.getByText('二月', { exact: true }).nth(1).click() - await page.getByText('五月').nth(2).click() + await page.getByText('1 月', { exact: true }).nth(1).click() + await page.getByText('2 月', { exact: true }).nth(1).click() + await page.getByText('5 月').nth(2).click() await expect(page.locator('.value2')).toHaveText('[ "2024-02", "2025-05" ]') // yearRange diff --git a/examples/sites/demos/pc/app/date-panel/event.spec.ts b/examples/sites/demos/pc/app/date-panel/event.spec.ts index 85e9f98e81..8e6ec61db8 100644 --- a/examples/sites/demos/pc/app/date-panel/event.spec.ts +++ b/examples/sites/demos/pc/app/date-panel/event.spec.ts @@ -10,7 +10,7 @@ test('[DatePanel] 测试事件', async ({ page }) => { // 月份面板 await page.waitForTimeout(1000) - await page.getByText('七月').first().click() + await page.getByText('7 月').first().click() await expect(page.getByText('触发 月份面板选中 事件，组件绑定值为：2025-')).toBeVisible() // 年份面板 @@ -26,9 +26,9 @@ test('[DatePanel] 测试事件', async ({ page }) => { // monthRange await page.waitForTimeout(1000) - await page.locator('#event').getByText('七月').nth(2).click() - await page.locator('#event').getByText('五月').nth(2).click() - await expect(page.getByText('触发 月份区间面板选中 事件，组件绑定值为：2025-05,2025-')).toBeVisible() + await page.getByText('5 月').nth(2).click() + await page.getByText('7 月').nth(2).click() + await expect(page.getByText('触发 月份区间面板选中 事件，组件绑定值为：2024-07,2025-')).toBeVisible() // yearRange await page.waitForTimeout(1000) diff --git a/examples/sites/demos/pc/app/date-panel/format.spec.ts b/examples/sites/demos/pc/app/date-panel/format.spec.ts index 166037c7fe..e42b774761 100644 --- a/examples/sites/demos/pc/app/date-panel/format.spec.ts +++ b/examples/sites/demos/pc/app/date-panel/format.spec.ts @@ -13,7 +13,7 @@ test('[DatePanel] 测试格式化', async ({ page }) => { await expect(page.locator('.value1')).toHaveText('[ "2025/01/28", "2025/02/12" ]') // monthRange - await page.locator('#format').getByText('三月').first().click() - await page.locator('#format').getByText('五月').nth(1).click() + await page.locator('#format').getByText('3 月').first().click() + await page.locator('#format').getByText('5 月').nth(1).click() await expect(page.locator('.value2')).toHaveText('[ "2024/03", "2025/05" ]') }) diff --git a/examples/sites/demos/pc/app/date-panel/readonly.spec.ts b/examples/sites/demos/pc/app/date-panel/readonly.spec.ts index ba5eb1793c..39ae48e216 100644 --- a/examples/sites/demos/pc/app/date-panel/readonly.spec.ts +++ b/examples/sites/demos/pc/app/date-panel/readonly.spec.ts @@ -13,7 +13,7 @@ test('[DatePanel] 测试只读', async ({ page }) => { await expect(page.locator('.value')).toHaveText('2025-01-15') // 月份面板 - await page.getByText('七月').first().click() + await page.getByText('7 月').first().click() await expect(page.locator('.month')).toHaveText('2025-01') // 年份面板 @@ -26,8 +26,8 @@ test('[DatePanel] 测试只读', async ({ page }) => { await expect(page.locator('.value1')).toHaveText('[ "2025-01-15", "2025-02-15" ]') // monthRange - await page.getByText('二月').first().click() - await page.getByText('九月').nth(1).click() + await page.getByText('2 月').first().click() + await page.getByText('9 月').nth(1).click() await expect(page.locator('.value2')).toHaveText('[ "2024-03", "2025-02" ]') // yearRange diff --git a/examples/sites/demos/pc/app/date-panel/unlink-panels.spec.ts b/examples/sites/demos/pc/app/date-panel/unlink-panels.spec.ts index f89dcc7ea7..b585661528 100644 --- a/examples/sites/demos/pc/app/date-panel/unlink-panels.spec.ts +++ b/examples/sites/demos/pc/app/date-panel/unlink-panels.spec.ts @@ -27,8 +27,8 @@ test('[DatePanel] 测试范围选择取消面板联动', async ({ page }) => { await page.getByText('2023 年').click() await expect(page.getByText('2023 年')).toBeVisible() // 联动 - await page.getByText('一月', { exact: true }).first().click() - await page.getByText('六月').nth(1).click() + await page.getByText('1 月', { exact: true }).first().click() + await page.getByText('6 月').nth(1).click() await expect(page.locator('.value-link1')).toHaveText('[ "2023-01", "2024-06" ]') // 不联动 @@ -43,8 +43,8 @@ test('[DatePanel] 测试范围选择取消面板联动', async ({ page }) => { '.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)' ) .click() - await page.getByText('六月').nth(2).click() - await page.getByText('五月').nth(3).click() + await page.getByText('6 月').nth(2).click() + await page.getByText('5 月').nth(3).click() await expect(page.locator('.value-unlink1')).toHaveText('[ "2023-06", "2025-05" ]') // yaerRange diff --git a/examples/sites/demos/pc/app/date-picker/basic-usage.spec.ts b/examples/sites/demos/pc/app/date-picker/basic-usage.spec.ts index 0552086bef..24eda0dcc6 100644 --- a/examples/sites/demos/pc/app/date-picker/basic-usage.spec.ts +++ b/examples/sites/demos/pc/app/date-picker/basic-usage.spec.ts @@ -62,7 +62,7 @@ test('[DatePicker] 测试月份/年份选择', async ({ page }) => { // 选择月份 await dateInput.click() await page.getByRole('button', { name: '4 月' }).click() - await page.getByRole('cell', { name: '六月' }).locator('a').click() + await page.getByRole('cell', { name: '6 月' }).locator('a').click() await page.getByRole('rowgroup').getByText('4').first().click() await expect(dateInput).toHaveValue('2023-06-04') @@ -70,7 +70,7 @@ test('[DatePicker] 测试月份/年份选择', async ({ page }) => { await dateInput.click() await page.getByRole('button', { name: '2023 年' }).click() await page.getByRole('cell', { name: '2024' }).getByText('2024').click() - await page.getByRole('cell', { name: '二月', exact: true }).locator('a').click() + await page.getByRole('cell', { name: '2 月', exact: true }).locator('a').click() await page.getByRole('rowgroup').getByText('7').first().click() await expect(dateInput).toHaveValue('2024-02-07') }) diff --git a/examples/sites/demos/pc/app/date-picker/date-range.spec.ts b/examples/sites/demos/pc/app/date-picker/date-range.spec.ts index f4d9b05852..a2a553e1e7 100644 --- a/examples/sites/demos/pc/app/date-picker/date-range.spec.ts +++ b/examples/sites/demos/pc/app/date-picker/date-range.spec.ts @@ -65,7 +65,7 @@ test('测试日期范围选择', async ({ page }) => { // 月份范围 const startMonth = page.getByPlaceholder('开始月份') const endMonth = page.getByPlaceholder('结束月份') - await startMonth.click() + await startMonth.first().click() await page.waitForTimeout(100) await startMonth.fill('2023-05') await startMonth.press('Tab') @@ -73,9 +73,9 @@ test('测试日期范围选择', async ({ page }) => { await endMonth.press('Enter') await startMonth.click() await page.waitForTimeout(100) - await page.getByText('一月').first().click() + await page.getByText('1 月').first().click() await page.waitForTimeout(100) - await page.getByText('十二月').first().click() + await page.getByText('12 月').first().click() await page.waitForTimeout(100) await expect(startMonth).toHaveValue('2023-01') await expect(endMonth).toHaveValue('2023-12') diff --git a/packages/theme/src/date-panel/vars.less b/packages/theme/src/date-panel/vars.less index 3f2ac27d5c..2c1bd59d12 100644 --- a/packages/theme/src/date-panel/vars.less +++ b/packages/theme/src/date-panel/vars.less @@ -21,7 +21,7 @@ --tv-DatePanel-line-height: var(--tv-line-height-number, 1.5); // 面板宽度(默认) - --tv-DatePanel-width: 284px; + --tv-DatePanel-width: 360px; // 面板背景色 --tv-DatePanel-bg-color: var(--tv-color-bg-2, #ffffff); diff --git a/packages/vue/src/month-table/src/pc.vue b/packages/vue/src/month-table/src/pc.vue index 34966a3ab4..8fdf42e336 100644 --- a/packages/vue/src/month-table/src/pc.vue +++ b/packages/vue/src/month-table/src/pc.vue @@ -15,7 +15,7 @@
- +