diff --git a/packages/design/src/Autocomplete.vue b/packages/design/src/Autocomplete.vue index e485669f..f89c874b 100644 --- a/packages/design/src/Autocomplete.vue +++ b/packages/design/src/Autocomplete.vue @@ -27,7 +27,7 @@ diff --git a/packages/design/src/FormItem.vue b/packages/design/src/FormItem.vue index ea892bb7..ce7d7b0c 100644 --- a/packages/design/src/FormItem.vue +++ b/packages/design/src/FormItem.vue @@ -3,7 +3,11 @@ - + + @@ -23,5 +27,10 @@ const ui = getDesignConfig('components')?.formItem; const uiComponent = ui?.component || 'el-form-item'; -const uiProps = computed(() => ui?.props(props) || props); +const adapterType = getDesignConfig('adapterType'); + +const uiProps = computed(() => { + const { extra, ...rest } = ui?.props(props) || props; + return rest; +}); diff --git a/packages/design/src/types.ts b/packages/design/src/types.ts index 3eeea05b..3426d290 100644 --- a/packages/design/src/types.ts +++ b/packages/design/src/types.ts @@ -6,7 +6,6 @@ export type FieldSize = 'large' | 'default' | 'small'; export interface AutocompleteProps { modelValue?: string; placeholder?: string; - label?: string; clearable?: boolean; disabled?: boolean; triggerOnFocus?: boolean; @@ -185,7 +184,7 @@ export interface FormItemProps { labelWidth?: string | number; rules?: any; extra?: string; - labelPosition?: string; + labelPosition?: 'top' | 'left' | 'right'; } export interface InputProps { diff --git a/packages/editor/src/fields/DataSourceInput.vue b/packages/editor/src/fields/DataSourceInput.vue index 457dec5d..f583c4ec 100644 --- a/packages/editor/src/fields/DataSourceInput.vue +++ b/packages/editor/src/fields/DataSourceInput.vue @@ -38,12 +38,29 @@
-
-
+
+
- +