chore: remove object spead (#8514)

This commit is contained in:
neverland
2021-04-12 20:57:24 +08:00
committed by GitHub
parent 0b764b6347
commit 9deca34d1d
41 changed files with 204 additions and 241 deletions
+5 -6
View File
@@ -1,5 +1,5 @@
import { ref, defineComponent } from 'vue';
import { pick, createNamespace, ComponentInstance } from '../utils';
import { pick, createNamespace, ComponentInstance, extend } from '../utils';
import { useExpose } from '../composables/use-expose';
import TimePicker from './TimePicker';
import DatePicker from './DatePicker';
@@ -12,11 +12,9 @@ const datePickerProps = Object.keys(DatePicker.props);
export default defineComponent({
name,
props: {
...TimePicker.props,
...DatePicker.props,
props: extend({}, TimePicker.props, DatePicker.props, {
modelValue: [String, Date],
},
}),
setup(props, { attrs, slots }) {
const root = ref<ComponentInstance>();
@@ -38,7 +36,8 @@ export default defineComponent({
v-slots={slots}
ref={root}
class={bem()}
{...{ ...inheritProps, ...attrs }}
{...inheritProps}
{...attrs}
/>
);
};