From af393e34fb3782ad237cd5ca928ba57c1c4a003d Mon Sep 17 00:00:00 2001 From: roymondchen Date: Tue, 25 Apr 2023 11:37:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(form):=20select=E6=94=AF=E6=8C=81clearable?= =?UTF-8?q?,filterable=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/form/src/containers/Table.vue | 2 +- packages/form/src/fields/Select.vue | 4 ++-- packages/form/src/schema.ts | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/form/src/containers/Table.vue b/packages/form/src/containers/Table.vue index c9d24308..d295f999 100644 --- a/packages/form/src/containers/Table.vue +++ b/packages/form/src/containers/Table.vue @@ -534,7 +534,7 @@ const clearHandler = () => { }; const excelHandler = (file: any) => { - if (!file || !file.raw) { + if (!file?.raw) { return false; } const reader = new FileReader(); diff --git a/packages/form/src/fields/Select.vue b/packages/form/src/fields/Select.vue index 2686faef..d348736f 100644 --- a/packages/form/src/fields/Select.vue +++ b/packages/form/src/fields/Select.vue @@ -5,8 +5,8 @@ v-loading="loading" class="m-select" ref="tMagicSelect" - clearable - filterable + :clearable="typeof config.clearable !== 'undefined' ? config.clearable : true" + :filterable="typeof config.filterable !== 'undefined' ? config.filterable : true" :popper-class="`m-select-popper ${popperClass}`" :size="size" :remote="remote" diff --git a/packages/form/src/schema.ts b/packages/form/src/schema.ts index db055fbd..c70e15b0 100644 --- a/packages/form/src/schema.ts +++ b/packages/form/src/schema.ts @@ -432,6 +432,7 @@ export interface SelectConfig extends FormItem, Input { multiple?: boolean; valueKey?: string; allowCreate?: boolean; + filterable?: boolean; group?: boolean; options: SelectConfigOption[] | SelectConfigGroupOption[] | SelectOptionFunction; remote: true;