Skip to content

fix:[checkbox,time-line,steps] fix e2e test and icon modification #3226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzcr merged 1 commit into from
Apr 1, 2025
Merged

fix:[checkbox,time-line,steps] fix e2e test and icon modification #3226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions examples/sites/demos/pc/app/checkbox/basic-usage.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import { test, expect } from '@playwright/test'
test('基础用法', async ({ page }) => {
page.on('pageerror', (exception) => expect(exception).toBeNull())
await page.goto('checkbox#basic-usage')
const demo = page.locator('#basic-usage')
const checkbox = demo.locator('.tiny-checkbox')
const checkbox = await page.locator('.tiny-checkbox').first()
await expect(checkbox).toHaveClass(/is-checked/)
await expect(checkbox.locator('.tiny-checkbox__inner svg path').first()).toHaveCSS('fill', 'rgb(20, 118, 255)')
await checkbox.click()
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/time-line/status.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test.describe('节点状态', () => {
// 默认状态
await expect(timelineItems.first()).toHaveClass(/process-wait/)
await expect(timelineItems.first().locator('.icon')).toHaveCSS('border-color', 'rgb(219, 219, 219)')
await expect(timelineItems.first().locator('.icon .number')).toHaveCSS('color', 'rgb(128, 128, 128)')
await expect(timelineItems.first().locator('.icon .number')).toHaveCSS('color', 'rgb(25, 25, 25)')
Copy link

@petercat-assistant petercat-assistant bot Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change in expected CSS color from 'rgb(128, 128, 128)' to 'rgb(25, 25, 25)' should be verified to ensure it aligns with the intended design specifications, as it may affect the visual appearance of the timeline item.


// 成功状态
await expect(timelineItems.nth(1)).toBeVisible()
Expand Down
3 changes: 2 additions & 1 deletion packages/theme/src/checkbox/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
padding-left: 8px;
font-size: var(--tv-Checkbox-font-size);
font-weight: var(--tv-Checkbox-font-weight);
padding-top: 3px;
}

&.is-display-only {
Expand Down Expand Up @@ -149,7 +150,7 @@
}
}

&__input {
&__input {
.@{checkbox-prefix-cls}__inner {
svg {
font-size: var(--tv-Checkbox-icon-size);
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/src/dropdown-item/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
& > .@{dropdown-item-prefix-cls}__expand,
& > .@{dropdown-item-prefix-cls}__content {
.@{svg-prefix-cls} {
fill: var(--tv-DropdownItem-icon-color-hover);
fill: transparent;
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/theme/src/grid/checkbox.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
}
&.is__disabled > input:not(:checked) + .tiny-grid-checkbox__icon .icon-check {
path:first-child {
fill: var(--tv-Grid-bg-color-disable);
fill: var(--tv-Grid-bg-color-disabled);
}
&:hover {
path:last-child {
Expand Down
4 changes: 0 additions & 4 deletions packages/theme/src/grid/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,8 @@
--tv-Grid-border-color-active: var(--tv-color-border-active, #191919);
// 表格背景颜色
--tv-Grid-bg-color: var(--tv-color-bg-3, #ffffff);
// 表格激活态背景色
--tv-Grid-bg-color-active: var(--tv-color-bg-active-emphasize-light, #f0f7ff);
// 表格悬浮背景色
--tv-Grid-bg-color-hover: var(--tv-color-bg-hover, #f5f5f5);
// 表格禁用背景色
--tv-Grid-bg-color-disabled: var(--tv-color-bg-disabled, #f0f0f0);
// 表格选中背景色
--tv-Grid-bg-color-selected: var(--tv-color-bg-active-emphasize-light, #f0f7ff);
// 表格浅灰色背景颜色（展开行、斑马纹等）
Expand Down
3 changes: 1 addition & 2 deletions packages/theme/src/steps/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,6 @@
.title {
font-size: var(--tv-Steps-font-size);
margin-left: var(--tv-Steps-text-margin-left);
line-height: 1.5;
font-weight: 500;
overflow: hidden;
display: -webkit-box;
Expand Down Expand Up @@ -1146,7 +1145,6 @@
overflow: hidden;
z-index: 15;
color: var(--tv-Steps-unselected-icon-color);
background-color: var(--tv-Steps-node-icon-bg-color);
cursor: pointer;

&[class*=~'icon-'] {
Expand Down Expand Up @@ -1364,6 +1362,7 @@
display: flex;
flex: 1 0 auto;
align-items: center;
line-height: 18px;

.name {
display: -webkit-box;
Expand Down
11 changes: 1 addition & 10 deletions packages/theme/src/svgs/checked-sur.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/theme/src/tabs/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
}

.@{tabs-prefix-cls}__icon-close {
border-radius: 50%;
border-radius: 4px;
text-align: center;
transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
margin: var(--tv-Tabs-icon-close-margin-vertical) var(--tv-Tabs-icon-close-margin-right) var(--tv-Tabs-icon-close-margin-vertical) var(--tv-Tabs-icon-close-margin-left);
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/src/tabs/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
// 选中标签项小滑块边框色
--tv-Tabs-item-active-border-color: var(--tv-Tabs-header-font-active-border-color);
// 可关闭项关闭按钮悬浮背景色
--tv-Tabs-icon-close-hover-bg-color: var(--tv-color-bg-header, #f0f0f0);
--tv-Tabs-icon-close-hover-bg-color: var(--tv-color-bg-hover, #f0f0f0);
// 可关闭项关闭图标默认背景色
--tv-Tabs-icon-close-default-bg-color: transparent;
// 可关闭项未选中项的关闭图标色
Expand Down