diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index 02325ff0b..c548c53c7 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -31,7 +31,8 @@ const props = defineProps({ // 是否显示伸缩 expand: propTypes.bool.def(false), // 伸缩的界限字段 - expandField: propTypes.string.def('') + expandField: propTypes.string.def(''), + inline: propTypes.bool.def(true) }) const emit = defineEmits(['search', 'reset']) @@ -96,7 +97,7 @@ const setVisible = () => { :is-custom="false" :label-width="labelWidth" hide-required-asterisk - inline + :inline="inline" :is-col="isCol" :schema="newSchema" @register="register" diff --git a/src/hooks/web/useCrudSchemas.ts b/src/hooks/web/useCrudSchemas.ts index 4a4a04f45..c15dd9ce4 100644 --- a/src/hooks/web/useCrudSchemas.ts +++ b/src/hooks/web/useCrudSchemas.ts @@ -169,10 +169,10 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For eachTree(crudSchema, (schemaItem: CrudSchema) => { // 判断是否显示 - if (schemaItem?.form?.show) { + if (schemaItem?.form?.show !== false) { const formSchemaItem = { // 默认为 input - component: schemaItem.form.component || 'Input', + component: schemaItem?.form?.component || 'Input', componentProps: {}, ...schemaItem.form, field: schemaItem.field, @@ -211,7 +211,7 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For for (const task of formRequestTask) { task() } - + console.log(formSchema) return formSchema } diff --git a/src/views/Example/Dialog/ExampleDialog.vue b/src/views/Example/Dialog/ExampleDialog.vue index b41c6565c..c2b23d559 100644 --- a/src/views/Example/Dialog/ExampleDialog.vue +++ b/src/views/Example/Dialog/ExampleDialog.vue @@ -90,6 +90,9 @@ const crudSchemas = reactive([ form: { component: 'Select', componentProps: { + style: { + width: '100%' + }, options: [ { label: '重要',