diff --git a/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue b/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue index 07959cf7b3..8155d89c0a 100644 --- a/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue +++ b/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue @@ -115,6 +115,7 @@ v-model:model-value="item.value" allow-clear allow-search + :search-keys="['label', 'text']" :placeholder="t('common.pleaseSelect')" :disabled="isValueDisabled(item)" :options="item.selectProps?.options || []" @@ -148,32 +149,6 @@ :separator="t('common.to')" :disabled="isValueDisabled(item)" /> - - - {{ it[item.radioProps?.labelKey || 'label'] }} - - - - - {{ it[item.checkProps?.labelKey || 'label'] }} - - = { INPUT: { type: 'INPUT', @@ -75,42 +81,22 @@ export const CustomTypeMaps: Record = { SELECT: { type: 'SELECT', propsKey: 'selectProps', - props: { - mode: 'static', - multiple: true, - valueKey: 'value', - labelKey: 'text', - options: [], - }, + props: { ...baseSelectProps }, }, MULTIPLE_SELECT: { type: 'SELECT', propsKey: 'selectProps', - props: { - mode: 'static', - multiple: true, - valueKey: 'value', - labelKey: 'text', - options: [], - }, + props: { ...baseSelectProps }, }, RADIO: { - type: 'RADIO', - propsKey: 'radioProps', - props: { - options: [], - valueKey: 'value', - labelKey: 'text', - }, + type: 'SELECT', + propsKey: 'selectProps', + props: { ...baseSelectProps }, }, CHECKBOX: { - type: 'CHECKBOX', - propsKey: 'checkProps', - props: { - options: [], - valueKey: 'value', - labelKey: 'text', - }, + type: 'SELECT', + propsKey: 'selectProps', + props: { ...baseSelectProps }, }, MEMBER: { type: 'MEMBER', diff --git a/frontend/src/components/pure/ms-advance-filter/type.ts b/frontend/src/components/pure/ms-advance-filter/type.ts index 09cd7de0a1..8e8c6eaa4b 100644 --- a/frontend/src/components/pure/ms-advance-filter/type.ts +++ b/frontend/src/components/pure/ms-advance-filter/type.ts @@ -1,4 +1,4 @@ -import type { MsSearchSelectProps, RadioProps } from '@/components/business/ms-select'; +import type { MsSearchSelectProps } from '@/components/business/ms-select'; import { FilterType, OperatorEnum } from '@/enums/advancedFilterEnum'; @@ -47,8 +47,6 @@ export interface FilterFormItem { cascaderProps?: Partial; // cascader的props, 参考 MsCascader treeSelectData?: TreeNodeData[]; treeSelectProps?: Partial; - radioProps?: Partial; - checkProps?: Partial; } export type AccordBelowType = 'AND' | 'OR';