diff --git a/packages/design/src/Autocomplete.vue b/packages/design/src/Autocomplete.vue index f43eb12e..9062c0f6 100644 --- a/packages/design/src/Autocomplete.vue +++ b/packages/design/src/Autocomplete.vue @@ -42,7 +42,7 @@ const ui = getConfig('components')?.autocomplete; const uiComponent = ui?.component || 'el-autocomplete'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['change', 'select', 'update:modelValue']); diff --git a/packages/design/src/Badge.vue b/packages/design/src/Badge.vue index 2cc68b53..7b02cb32 100644 --- a/packages/design/src/Badge.vue +++ b/packages/design/src/Badge.vue @@ -19,5 +19,5 @@ const props = defineProps(); const ui = getConfig('components')?.badge; const uiComponent = ui?.component || 'el-badge'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/Button.vue b/packages/design/src/Button.vue index 4d89a3d1..aeef4e7d 100644 --- a/packages/design/src/Button.vue +++ b/packages/design/src/Button.vue @@ -22,7 +22,7 @@ const ui = getConfig('components')?.button; const uiComponent = ui?.component || 'el-button'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['click']); diff --git a/packages/design/src/Card.vue b/packages/design/src/Card.vue index 66dcf6ed..82428a93 100644 --- a/packages/design/src/Card.vue +++ b/packages/design/src/Card.vue @@ -26,5 +26,5 @@ const ui = getConfig('components')?.card; const uiComponent = ui?.component || 'el-card'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/Cascader.vue b/packages/design/src/Cascader.vue index 8ff9c03f..d1641314 100644 --- a/packages/design/src/Cascader.vue +++ b/packages/design/src/Cascader.vue @@ -25,7 +25,7 @@ const ui = getConfig('components')?.cascader; const uiComponent = ui?.component || 'el-cascader'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const cascader = ref(); diff --git a/packages/design/src/Checkbox.vue b/packages/design/src/Checkbox.vue index 6e12ce3e..5783ea9d 100644 --- a/packages/design/src/Checkbox.vue +++ b/packages/design/src/Checkbox.vue @@ -31,7 +31,7 @@ const ui = getConfig('components')?.checkbox; const uiComponent = ui?.component || 'el-checkbox'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['change', 'update:modelValue']); diff --git a/packages/design/src/CheckboxGroup.vue b/packages/design/src/CheckboxGroup.vue index faf6c809..b0fe5ad5 100644 --- a/packages/design/src/CheckboxGroup.vue +++ b/packages/design/src/CheckboxGroup.vue @@ -26,7 +26,7 @@ const ui = getConfig('components')?.checkboxGroup; const uiComponent = ui?.component || 'el-checkbox-group'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['change', 'update:modelValue']); diff --git a/packages/design/src/Col.vue b/packages/design/src/Col.vue index fc25a882..2a648b5a 100644 --- a/packages/design/src/Col.vue +++ b/packages/design/src/Col.vue @@ -20,5 +20,5 @@ const ui = getConfig('components')?.col; const uiComponent = ui?.component || 'el-col'; -const uiProps = computed(() => ui?.props(props)); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/Collapse.vue b/packages/design/src/Collapse.vue index 776d89c1..ee3d02a6 100644 --- a/packages/design/src/Collapse.vue +++ b/packages/design/src/Collapse.vue @@ -26,7 +26,7 @@ const ui = getConfig('components')?.collapse; const uiComponent = ui?.component || 'el-collapse'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['change', 'update:modelValue']); diff --git a/packages/design/src/CollapseItem.vue b/packages/design/src/CollapseItem.vue index 1ffe61f0..c30b2416 100644 --- a/packages/design/src/CollapseItem.vue +++ b/packages/design/src/CollapseItem.vue @@ -32,7 +32,7 @@ const ui = getConfig('components')?.collapseItem; const uiComponent = ui?.component || 'el-collapse-item'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['change', 'update:modelValue']); diff --git a/packages/design/src/ColorPicker.vue b/packages/design/src/ColorPicker.vue index a87d4086..375b4f34 100644 --- a/packages/design/src/ColorPicker.vue +++ b/packages/design/src/ColorPicker.vue @@ -28,7 +28,7 @@ const ui = getConfig('components')?.colorPicker; const uiComponent = ui?.component || 'el-color-picker'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['change', 'update:modelValue']); diff --git a/packages/design/src/DatePicker.vue b/packages/design/src/DatePicker.vue index 2438065c..e9419152 100644 --- a/packages/design/src/DatePicker.vue +++ b/packages/design/src/DatePicker.vue @@ -27,7 +27,7 @@ const ui = getConfig('components')?.datePicker; const uiComponent = ui?.component || 'el-date-picker'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['change', 'update:modelValue']); diff --git a/packages/design/src/Dialog.vue b/packages/design/src/Dialog.vue index db854d45..f7ad77e6 100644 --- a/packages/design/src/Dialog.vue +++ b/packages/design/src/Dialog.vue @@ -26,13 +26,13 @@ defineOptions({ const props = defineProps(); +const emit = defineEmits(['close', 'update:modelValue']); + const ui = getConfig('components')?.dialog; const uiComponent = ui?.component || 'el-dialog'; -const uiProps = computed(() => ui?.props(props) || {}); - -const emit = defineEmits(['close', 'update:modelValue']); +const uiProps = computed(() => ui?.props(props) || props); const closeHandler = (...args: any[]) => { emit('close', ...args); diff --git a/packages/design/src/Divider.vue b/packages/design/src/Divider.vue index 4bbd2453..67c427b5 100644 --- a/packages/design/src/Divider.vue +++ b/packages/design/src/Divider.vue @@ -20,5 +20,5 @@ const ui = getConfig('components')?.divider; const uiComponent = ui?.component || 'el-divider'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/Drawer.vue b/packages/design/src/Drawer.vue index 56322c08..79a9d9ab 100644 --- a/packages/design/src/Drawer.vue +++ b/packages/design/src/Drawer.vue @@ -39,7 +39,7 @@ const ui = getConfig('components')?.drawer; const uiComponent = ui?.component || 'el-drawer'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const openHandler = (...args: any[]) => { emit('open', ...args); diff --git a/packages/design/src/Dropdown.vue b/packages/design/src/Dropdown.vue index 0a889e93..54542a1a 100644 --- a/packages/design/src/Dropdown.vue +++ b/packages/design/src/Dropdown.vue @@ -24,7 +24,7 @@ const ui = getConfig('components')?.dropdown; const uiComponent = ui?.component || 'el-dropdown'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['command']); diff --git a/packages/design/src/DropdownItem.vue b/packages/design/src/DropdownItem.vue index 651a9499..344af6c7 100644 --- a/packages/design/src/DropdownItem.vue +++ b/packages/design/src/DropdownItem.vue @@ -20,5 +20,5 @@ const ui = getConfig('components')?.dropdownItem; const uiComponent = ui?.component || 'el-dropdown-item'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/Form.vue b/packages/design/src/Form.vue index 0e461fd6..e2cd5c7a 100644 --- a/packages/design/src/Form.vue +++ b/packages/design/src/Form.vue @@ -20,7 +20,7 @@ const ui = getConfig('components')?.form; const uiComponent = ui?.component || 'el-form'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const form = ref(); diff --git a/packages/design/src/FormItem.vue b/packages/design/src/FormItem.vue index 79e0d533..d54d10ef 100644 --- a/packages/design/src/FormItem.vue +++ b/packages/design/src/FormItem.vue @@ -23,5 +23,5 @@ const ui = getConfig('components')?.formItem; const uiComponent = ui?.component || 'el-form-item'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/Input.vue b/packages/design/src/Input.vue index 32b679d4..5985c23d 100644 --- a/packages/design/src/Input.vue +++ b/packages/design/src/Input.vue @@ -38,7 +38,7 @@ const ui = getConfig('components')?.input; const uiComponent = ui?.component || 'el-input'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['change', 'input', 'update:modelValue']); diff --git a/packages/design/src/InputNumber.vue b/packages/design/src/InputNumber.vue index e026e749..605088f7 100644 --- a/packages/design/src/InputNumber.vue +++ b/packages/design/src/InputNumber.vue @@ -25,7 +25,7 @@ const ui = getConfig('components')?.inputNumber; const uiComponent = ui?.component || 'el-input-number'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['change', 'input', 'update:modelValue']); diff --git a/packages/design/src/Option.vue b/packages/design/src/Option.vue index 9eaf9910..ba2ffc40 100644 --- a/packages/design/src/Option.vue +++ b/packages/design/src/Option.vue @@ -20,5 +20,5 @@ const ui = getConfig('components')?.option; const uiComponent = ui?.component || 'el-option'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/OptionGroup.vue b/packages/design/src/OptionGroup.vue index 583a1837..6a681997 100644 --- a/packages/design/src/OptionGroup.vue +++ b/packages/design/src/OptionGroup.vue @@ -20,7 +20,7 @@ const ui = getConfig('components')?.optionGroup; const uiComponent = ui?.component || 'el-option-group'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const optionGroup = ref(); diff --git a/packages/design/src/Pagination.vue b/packages/design/src/Pagination.vue index 631f2bfa..7f126e30 100644 --- a/packages/design/src/Pagination.vue +++ b/packages/design/src/Pagination.vue @@ -21,13 +21,13 @@ defineOptions({ const props = defineProps(); +const emit = defineEmits(['size-change', 'current-change']); + const ui = getConfig('components')?.pagination; const uiComponent = ui?.component || 'el-pagination'; -const uiProps = computed(() => ui?.props(props) || {}); - -const emit = defineEmits(['size-change', 'current-change']); +const uiProps = computed(() => ui?.props(props) || props); const handleSizeChange = (...args: any[]) => { emit('size-change', ...args); diff --git a/packages/design/src/Popover.vue b/packages/design/src/Popover.vue index 2ef4e7b4..3fdec213 100644 --- a/packages/design/src/Popover.vue +++ b/packages/design/src/Popover.vue @@ -24,5 +24,5 @@ const ui = getConfig('components')?.popover; const uiComponent = ui?.component || 'el-popover'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/Radio.vue b/packages/design/src/Radio.vue index 54a956fa..527d7ec8 100644 --- a/packages/design/src/Radio.vue +++ b/packages/design/src/Radio.vue @@ -20,5 +20,5 @@ const ui = getConfig('components')?.radio; const uiComponent = ui?.component || 'el-radio'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/RadioButton.vue b/packages/design/src/RadioButton.vue index 036ea96e..1ca4538f 100644 --- a/packages/design/src/RadioButton.vue +++ b/packages/design/src/RadioButton.vue @@ -20,5 +20,5 @@ const ui = getConfig('components')?.radioButton; const uiComponent = ui?.component || 'el-radio-button'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/RadioGroup.vue b/packages/design/src/RadioGroup.vue index 631ebc73..01e4e252 100644 --- a/packages/design/src/RadioGroup.vue +++ b/packages/design/src/RadioGroup.vue @@ -26,7 +26,7 @@ const ui = getConfig('components')?.radioGroup; const uiComponent = ui?.component || 'el-radio-group'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['change', 'update:modelValue']); diff --git a/packages/design/src/Select.vue b/packages/design/src/Select.vue index a37cb7ef..f77e60cb 100644 --- a/packages/design/src/Select.vue +++ b/packages/design/src/Select.vue @@ -25,13 +25,13 @@ defineOptions({ const props = defineProps(); +const emit = defineEmits(['change', 'update:modelValue', 'visibleHandler']); + const ui = getConfig('components')?.select; const uiComponent = ui?.component || 'el-select'; -const uiProps = computed(() => ui?.props(props) || {}); - -const emit = defineEmits(['change', 'update:modelValue', 'visibleHandler']); +const uiProps = computed(() => ui?.props(props) || props); const select = ref(); diff --git a/packages/design/src/Step.vue b/packages/design/src/Step.vue index 33dc4052..fb6fdb6a 100644 --- a/packages/design/src/Step.vue +++ b/packages/design/src/Step.vue @@ -26,5 +26,5 @@ const ui = getConfig('components')?.step; const uiComponent = ui?.component || 'el-step'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/Steps.vue b/packages/design/src/Steps.vue index 2730a1a9..fb0f6686 100644 --- a/packages/design/src/Steps.vue +++ b/packages/design/src/Steps.vue @@ -20,5 +20,5 @@ const ui = getConfig('components')?.steps; const uiComponent = ui?.component || 'el-steps'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/Switch.vue b/packages/design/src/Switch.vue index abf491a8..83d1f158 100644 --- a/packages/design/src/Switch.vue +++ b/packages/design/src/Switch.vue @@ -28,7 +28,7 @@ const ui = getConfig('components')?.switch; const uiComponent = ui?.component || 'el-switch'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['change', 'update:modelValue']); diff --git a/packages/design/src/TabPane.vue b/packages/design/src/TabPane.vue index c29cb20c..921cebec 100644 --- a/packages/design/src/TabPane.vue +++ b/packages/design/src/TabPane.vue @@ -26,5 +26,5 @@ const ui = getConfig('components')?.tabPane; const uiComponent = ui?.component || 'el-tab-pane'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/Table.vue b/packages/design/src/Table.vue index aa934670..87770de2 100644 --- a/packages/design/src/Table.vue +++ b/packages/design/src/Table.vue @@ -31,7 +31,7 @@ const ui = getConfig('components')?.table; const uiComponent = ui?.component || 'el-table'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['select', 'sort-change', 'expand-change', 'cell-click']); diff --git a/packages/design/src/TableColumn.vue b/packages/design/src/TableColumn.vue index a1e7e446..810a41a4 100644 --- a/packages/design/src/TableColumn.vue +++ b/packages/design/src/TableColumn.vue @@ -23,5 +23,5 @@ const ui = getConfig('components')?.tableColumn; const uiComponent = ui?.component || 'el-table-column'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/Tabs.vue b/packages/design/src/Tabs.vue index e990ec15..3e51bc02 100644 --- a/packages/design/src/Tabs.vue +++ b/packages/design/src/Tabs.vue @@ -30,7 +30,7 @@ const ui = getConfig('components')?.tabs; const uiComponent = ui?.component || 'el-tabs'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['tab-click', 'tab-add', 'tab-remove', 'update:model-value']); diff --git a/packages/design/src/Tag.vue b/packages/design/src/Tag.vue index a0306b0e..ee291b85 100644 --- a/packages/design/src/Tag.vue +++ b/packages/design/src/Tag.vue @@ -20,5 +20,5 @@ const ui = getConfig('components')?.tag; const uiComponent = ui?.component || 'el-tag'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/TimePicker.vue b/packages/design/src/TimePicker.vue index 597a7885..80ca4690 100644 --- a/packages/design/src/TimePicker.vue +++ b/packages/design/src/TimePicker.vue @@ -25,7 +25,7 @@ const ui = getConfig('components')?.timePicker; const uiComponent = ui?.component || 'el-time-picker'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits(['change', 'update:modelValue']); diff --git a/packages/design/src/Tooltip.vue b/packages/design/src/Tooltip.vue index fbd06e27..8465b944 100644 --- a/packages/design/src/Tooltip.vue +++ b/packages/design/src/Tooltip.vue @@ -23,5 +23,5 @@ const ui = getConfig('components')?.tooltip; const uiComponent = ui?.component || 'el-tooltip'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); diff --git a/packages/design/src/Tree.vue b/packages/design/src/Tree.vue index 7ed633a8..7ee2b7e1 100644 --- a/packages/design/src/Tree.vue +++ b/packages/design/src/Tree.vue @@ -35,7 +35,7 @@ const ui = getConfig('components')?.tree; const uiComponent = ui?.component || 'el-tree'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const emit = defineEmits([ 'node-click', diff --git a/packages/design/src/Upload.vue b/packages/design/src/Upload.vue index ebf8cbfb..40b6d869 100644 --- a/packages/design/src/Upload.vue +++ b/packages/design/src/Upload.vue @@ -29,7 +29,7 @@ const ui = getConfig('components')?.upload; const uiComponent = ui?.component || 'el-upload'; -const uiProps = computed(() => ui?.props(props) || {}); +const uiProps = computed(() => ui?.props(props) || props); const upload = ref();