Commit ed8cffb2a186c9436a3aeeee755190116d43cc99

Authored by luocong2016
Committed by GitHub
1 parent 8284d106

fix: 组件属性优先默认 (#2581)

src/components/Form/src/components/FormItem.vue
@@ -80,10 +80,14 @@ @@ -80,10 +80,14 @@
80 componentProps = componentProps({ schema, tableAction, formModel, formActionType }) ?? {}; 80 componentProps = componentProps({ schema, tableAction, formModel, formActionType }) ?? {};
81 } 81 }
82 if (schema.component === 'Divider') { 82 if (schema.component === 'Divider') {
83 - componentProps = Object.assign({ type: 'horizontal' }, componentProps, {  
84 - orientation: 'left',  
85 - plain: true,  
86 - }); 83 + componentProps = Object.assign(
  84 + { type: 'horizontal' },
  85 + {
  86 + orientation: 'left',
  87 + plain: true,
  88 + },
  89 + componentProps,
  90 + );
87 } 91 }
88 return componentProps as Recordable; 92 return componentProps as Recordable;
89 }); 93 });