feat: add submitOnEnter configuration to form (#4670)

pull/48/MERGE
Vben 2024-10-17 22:53:05 +08:00 committed by GitHub
parent f89f4f32c7
commit 6cd9937c03
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 29 additions and 1 deletions

View File

@ -311,6 +311,7 @@ useVbenForm 返回的第二个参数,是一个对象,包含了一些表单
| collapsedRows | 折叠时保持的行数 | `number` | `1` | | collapsedRows | 折叠时保持的行数 | `number` | `1` |
| commonConfig | 表单项的通用配置,每个配置都会传递到每个表单项,表单项可覆盖 | `FormCommonConfig` | - | | commonConfig | 表单项的通用配置,每个配置都会传递到每个表单项,表单项可覆盖 | `FormCommonConfig` | - |
| schema | 表单项的每一项配置 | `FormSchema` | - | | schema | 表单项的每一项配置 | `FormSchema` | - |
| submitOnEnter | 按下回车健时提交表单 | `boolean` | false |
### TS 类型说明 ### TS 类型说明

View File

@ -75,6 +75,11 @@ watch(
} }
}, },
); );
defineExpose({
handleReset,
handleSubmit,
});
</script> </script>
<template> <template>
<div <div

View File

@ -35,6 +35,7 @@ function getDefaultState(): VbenFormProps {
showCollapseButton: false, showCollapseButton: false,
showDefaultActions: true, showDefaultActions: true,
submitButtonOptions: {}, submitButtonOptions: {},
submitOnEnter: false,
wrapperClass: 'grid-cols-1', wrapperClass: 'grid-cols-1',
}; };
} }

View File

@ -319,7 +319,6 @@ export interface VbenFormProps<
* *
*/ */
resetButtonOptions?: ActionButtonOptions; resetButtonOptions?: ActionButtonOptions;
/** /**
* *
* @default true * @default true
@ -330,6 +329,12 @@ export interface VbenFormProps<
* *
*/ */
submitButtonOptions?: ActionButtonOptions; submitButtonOptions?: ActionButtonOptions;
/**
*
* @default false
*/
submitOnEnter?: boolean;
} }
export type ExtendedFormApi = { export type ExtendedFormApi = {

View File

@ -6,6 +6,8 @@ import type { ExtendedFormApi, VbenFormProps } from './types';
import { useForwardPriorityValues } from '@vben-core/composables'; import { useForwardPriorityValues } from '@vben-core/composables';
// import { isFunction } from '@vben-core/shared/utils'; // import { isFunction } from '@vben-core/shared/utils';
import { useTemplateRef } from 'vue';
import FormActions from './components/form-actions.vue'; import FormActions from './components/form-actions.vue';
import { import {
COMPONENT_BIND_EVENT_MAP, COMPONENT_BIND_EVENT_MAP,
@ -21,6 +23,8 @@ interface Props extends VbenFormProps {
const props = defineProps<Props>(); const props = defineProps<Props>();
const formActionsRef = useTemplateRef<typeof FormActions>('formActionsRef');
const state = props.formApi?.useStore?.(); const state = props.formApi?.useStore?.();
const forward = useForwardPriorityValues(props, state); const forward = useForwardPriorityValues(props, state);
@ -34,10 +38,18 @@ props.formApi?.mount?.(form);
const handleUpdateCollapsed = (value: boolean) => { const handleUpdateCollapsed = (value: boolean) => {
props.formApi?.setState({ collapsed: !!value }); props.formApi?.setState({ collapsed: !!value });
}; };
function handleKeyDownEnter() {
if (!state.value.submitOnEnter || !formActionsRef.value) {
return;
}
formActionsRef.value?.handleSubmit?.();
}
</script> </script>
<template> <template>
<Form <Form
@keydown.enter.prevent="handleKeyDownEnter"
v-bind="forward" v-bind="forward"
:collapsed="state.collapsed" :collapsed="state.collapsed"
:component-bind-event-map="COMPONENT_BIND_EVENT_MAP" :component-bind-event-map="COMPONENT_BIND_EVENT_MAP"
@ -56,6 +68,7 @@ const handleUpdateCollapsed = (value: boolean) => {
<slot v-bind="slotProps"> <slot v-bind="slotProps">
<FormActions <FormActions
v-if="forward.showDefaultActions" v-if="forward.showDefaultActions"
ref="formActionsRef"
:model-value="state.collapsed" :model-value="state.collapsed"
@update:model-value="handleUpdateCollapsed" @update:model-value="handleUpdateCollapsed"
> >

View File

@ -16,6 +16,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
class: 'w-full', class: 'w-full',
}, },
}, },
// //
handleSubmit: onSubmit, handleSubmit: onSubmit,
// labelinputvertical // labelinputvertical

View File

@ -65,6 +65,8 @@ const formOptions: VbenFormProps = {
], ],
// //
showCollapseButton: true, showCollapseButton: true,
//
submitOnEnter: false,
}; };
const gridOptions: VxeGridProps<RowType> = { const gridOptions: VxeGridProps<RowType> = {