diff --git a/examples/sites/demos/pc/app/grid/dynamically-columns/dynamically-columns.spec.js b/examples/sites/demos/pc/app/grid/dynamically-columns/dynamically-columns.spec.js index 3971b851bb..883a02024a 100644 --- a/examples/sites/demos/pc/app/grid/dynamically-columns/dynamically-columns.spec.js +++ b/examples/sites/demos/pc/app/grid/dynamically-columns/dynamically-columns.spec.js @@ -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() }) diff --git a/packages/theme-saas/src/grid/table-global.less b/packages/theme-saas/src/grid/table-global.less index 4297411ea1..41c4212dc0 100644 --- a/packages/theme-saas/src/grid/table-global.less +++ b/packages/theme-saas/src/grid/table-global.less @@ -630,7 +630,7 @@ @apply absolute; @apply top-0; @apply left-0; - @apply w-px; + @apply ~'w-0.5'; @apply h-full; @apply ~'z-[4]'; @@ -638,7 +638,7 @@ @apply content-['']; @apply block; @apply h-full; - @apply bg-color-bg-5; + @apply bg-color-brand; } } diff --git a/packages/theme-saas/src/grid/table.less b/packages/theme-saas/src/grid/table.less index 8fab3aeccf..57413de314 100644 --- a/packages/theme-saas/src/grid/table.less +++ b/packages/theme-saas/src/grid/table.less @@ -721,7 +721,7 @@ @apply absolute; @apply top-0; @apply left-0; - @apply w-px; + @apply ~'w-0.5'; @apply h-full; @apply ~'z-[4]'; @@ -729,7 +729,7 @@ @apply content-['']; @apply block; @apply h-full; - @apply bg-color-bg-5; + @apply bg-color-brand; } } diff --git a/packages/vue/src/grid/src/filter/src/panel.tsx b/packages/vue/src/grid/src/filter/src/panel.tsx index c6e49e3d4f..788e71be7b 100644 --- a/packages/vue/src/grid/src/filter/src/panel.tsx +++ b/packages/vue/src/grid/src/filter/src/panel.tsx @@ -1,4 +1,3 @@ -/* eslint-disable vue/no-use-computed-property-like-method */ /* eslint-disable vue/no-mutating-props */ /** * MIT License @@ -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() },