Skip to content
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

fix(cascader): [cascader] update cascader's x design #2158

Merged
merged 2 commits into from
Sep 23, 2024
Merged

fix(cascader): [cascader] update cascader's x design #2158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ea7651
fix(cascader): update cascader's x design
shenjunjian Sep 20, 2024
d7649c2
test(cascader): fix e2e
shenjunjian Sep 21, 2024
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
4 changes: 0 additions & 4 deletions examples/sites/demos/pc/app/cascader/check-strictly-multiple.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,4 @@ test('多选选择任意一级选项', async ({ page }) => {
await page.getByText('指南 /安装指南 /开发 /引入组件').click()
await page.getByRole('menuitem', { name: '开发' }).locator('span').nth(1).click()
await page.getByRole('menuitem', { name: '安装' }).click()
const kaifa = page.getByRole('menuitem', { name: '开发' }).locator('span').nth(1)
const anzhuang = page.getByRole('menuitem', { name: '安装' }).locator('span').nth(1)
await expect(kaifa).toHaveCSS('background-color', 'rgb(94, 124, 224)')
await expect(anzhuang).toHaveCSS('background-color', 'rgb(94, 124, 224)')
})
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/cascader/filter-mode-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
tip="提示"
label="开发文档"
></tiny-cascader>
<div>
<div style="margin-top: 16px">
<tiny-cascader v-model="value" :options="options" shape="filter" label="开发文档" blank></tiny-cascader>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/cascader/filter-mode.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
tip="提示"
label="开发文档"
></tiny-cascader>
<div>
<div style="margin-top: 16px">
<tiny-cascader v-model="value" :options="options" shape="filter" label="开发文档" blank></tiny-cascader>
</div>
</div>
Expand Down
3 changes: 1 addition & 2 deletions examples/sites/demos/pc/app/cascader/size.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ test('size', async ({ page }) => {

await expect(page.locator('.tiny-cascader.tiny-cascader--mini input')).toHaveCSS('height', '24px')

await expect(page.locator('.tiny-cascader.tiny-cascader--small input')).toHaveCSS('height', '32px')
await expect(page.locator('.tiny-cascader.tiny-cascader--small input')).toHaveCSS('height', '28px')

await expect(page.locator('.tiny-cascader.tiny-cascader--medium input')).toHaveCSS('height', '40px')

})
4 changes: 2 additions & 2 deletions packages/theme/src/cascader-node/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// 下拉列表子项选中后悬浮时的背景色
--ti-cascader-node-selectable-hover-bg-color: var(--ti-common-color-selected-background, #5e7ce0);
// 下拉列表子项选中时的文本色
--ti-cascader-node-selectable-text-color: var(--ti-common-color-text-highlight);
--ti-cascader-node-selectable-text-color: var(--ti-common-color-text-primary);
// 下拉列表子项禁用状态时的文本色
--ti-cascader-node-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
// 下拉列表子项禁用状态时的背景色
Expand Down Expand Up @@ -48,5 +48,5 @@
// 下拉列表子项最大宽度
--ti-cascader-node-label-max-width: calc(var(--ti-common-space-2) * 53 + 1px);
// 下拉列表子项高亮时字重
--ti-cascader-node-active-font-weight: var(--ti-common-font-weight-bold);
--ti-cascader-node-active-font-weight: var(--ti-common-font-weight-normal);
}
2 changes: 1 addition & 1 deletion packages/theme/src/filter-box/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
.value {
max-width: 100px;
height: inherit;
line-height: inherit;
line-height: 1.5;
margin-right: 4px;
overflow: hidden;
text-overflow: ellipsis;
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/src/filter-box/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// 按钮悬浮文本色和图标色
--ti-filter-box-btn-hover-text-color: var(--ti-common-color-text-primary);
// 按钮文本字号
--ti-filter-box-btn-font-size: var(--ti-common-font-size-base, 12px);
--ti-filter-box-btn-font-size: var(--ti-common-font-size-0, 12px);
// 按钮文本行高
--ti-filter-box-btn-title-line-height: var(--ti-common-line-height-number);
// 按钮问号图标色
Expand Down
Loading