From 0488a5a54c8ca5733bbce207ce2da600f0e4ed4c Mon Sep 17 00:00:00 2001 From: minlovehua <321512939@qq.com> Date: Tue, 24 Dec 2024 18:13:37 +0800 Subject: [PATCH 1/3] fix(grid): should clear matchedCells when keyword is null --- packages/grid/src/services/match-cell.service.ts | 5 +++++ packages/grid/src/utils/field/index.ts | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/grid/src/services/match-cell.service.ts b/packages/grid/src/services/match-cell.service.ts index a5dc53ab..2b659aa2 100644 --- a/packages/grid/src/services/match-cell.service.ts +++ b/packages/grid/src/services/match-cell.service.ts @@ -12,6 +12,11 @@ export class AITableGridMatchCellService { } findMatchedCells(keywords: string, references: AITableReferences) { + if (!keywords) { + this.aiTable.matchedCells.set([]); + return; + } + let matchedCells: string[] = []; this.aiTable.records().forEach((record) => { this.aiTable.fields().forEach((field) => { diff --git a/packages/grid/src/utils/field/index.ts b/packages/grid/src/utils/field/index.ts index f09ee6dc..aaa4661a 100644 --- a/packages/grid/src/utils/field/index.ts +++ b/packages/grid/src/utils/field/index.ts @@ -2,6 +2,7 @@ import { AITableFieldType } from '../../index'; import { Field } from './field'; import { LinkField } from './link'; import { MemberField } from './member'; +import { ProgressField } from './progress'; import { SelectField } from './select'; import { TextField } from './text'; @@ -16,7 +17,7 @@ export const ViewOperationMap: Record = { [AITableFieldType.rate]: new TextField(), [AITableFieldType.link]: new LinkField(), [AITableFieldType.member]: new MemberField(), - [AITableFieldType.progress]: new TextField(), + [AITableFieldType.progress]: new ProgressField(), [AITableFieldType.createdBy]: new MemberField(), [AITableFieldType.updatedBy]: new MemberField() }; From 0892def14aa1fe7705445e06dce91d7c30a4556b Mon Sep 17 00:00:00 2001 From: minlovehua <321512939@qq.com> Date: Tue, 24 Dec 2024 18:18:27 +0800 Subject: [PATCH 2/3] fix(grid): search for progress field --- packages/grid/src/utils/field/progress.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/grid/src/utils/field/progress.ts b/packages/grid/src/utils/field/progress.ts index f2201efc..aa2ec833 100644 --- a/packages/grid/src/utils/field/progress.ts +++ b/packages/grid/src/utils/field/progress.ts @@ -1,9 +1,13 @@ +import { isEmpty } from 'lodash'; import { AITableField } from '../../index'; import { Field } from './field'; export class ProgressField extends Field { cellFullText(transformValue: number, field: AITableField): string[] { - const fullText = `${transformValue}%`; - return [fullText]; + let fullText: string[] = []; + if (!isEmpty(transformValue)) { + fullText.push(`${transformValue}%`); + } + return fullText; } } From 35ff4c547604fdc9a492a84b81968a6ef90abd12 Mon Sep 17 00:00:00 2001 From: minlovehua <321512939@qq.com> Date: Tue, 24 Dec 2024 18:26:31 +0800 Subject: [PATCH 3/3] fix(grid): search for progress field --- packages/grid/src/utils/field/progress.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/grid/src/utils/field/progress.ts b/packages/grid/src/utils/field/progress.ts index aa2ec833..946b040c 100644 --- a/packages/grid/src/utils/field/progress.ts +++ b/packages/grid/src/utils/field/progress.ts @@ -1,5 +1,4 @@ -import { isEmpty } from 'lodash'; -import { AITableField } from '../../index'; +import { AITableField, isEmpty } from '../../index'; import { Field } from './field'; export class ProgressField extends Field {