Skip to content

fix(grid): increase the length of drag and drop lines in the grid and remove empty values when filtering #3475

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.

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
merged 4 commits into from
Jun 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ test('根据日期动态生成列', async ({ page }) => {
page.on('pageerror', (exception) => expect(exception).toBeNull())
await page.goto('grid-dynamically-columns#dynamically-columns-dynamically-columns')
await page.getByRole('textbox').nth(1).click()
await page.getByText('十二月').first().click()
await page.getByText('二月').nth(2).click()
await expect(page.getByRole('cell', { name: '12' })).toBeVisible()
await page.getByText('12 月').first().click()
await page.getByText('2 月').nth(2).click()
await expect(page.getByRole('cell', { name: '12' }).first()).toBeVisible()
})
4 changes: 2 additions & 2 deletions packages/theme-saas/src/grid/table-global.less
Original file line number Diff line number Diff line change
Expand Up @@ -630,15 +630,15 @@
@apply absolute;
@apply top-0;
@apply left-0;
@apply w-px;
@apply ~'w-0.5';
@apply h-full;
@apply ~'z-[4]';

&:before {
@apply content-[''];
@apply block;
@apply h-full;
@apply bg-color-bg-5;
@apply bg-color-brand;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/theme-saas/src/grid/table.less
Original file line number Diff line number Diff line change
Expand Up @@ -721,15 +721,15 @@
@apply absolute;
@apply top-0;
@apply left-0;
@apply w-px;
@apply ~'w-0.5';
@apply h-full;
@apply ~'z-[4]';

&:before {
@apply content-[''];
@apply block;
@apply h-full;
@apply bg-color-bg-5;
@apply bg-color-brand;
}
}

Expand Down
4 changes: 3 additions & 1 deletion packages/vue/src/grid/src/filter/src/panel.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable vue/no-use-computed-property-like-method */
/* eslint-disable vue/no-mutating-props */
/**
* MIT License
Expand Down Expand Up @@ -643,6 +642,9 @@ export default defineComponent({
} = this as any

this.condition.type = type
if (typeof this.condition.input === 'string') {
this.condition.input = this.condition.input?.trim()
}
column.filter.condition = extend(true, {}, this.condition)
this.$parent.confirmFilterEvent()
},
Expand Down
Loading