github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Form: fix label style (#14969)

pull/14992/head
hetech 2019-04-03 20:03:56 +08:00 committed by iamkun
parent 7eacbbeb2e
commit 7b24f82586
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/form/src/form.vue
View File

@ -56,6 +56,7 @@
}, },
computed: { computed: {
autoLabelWidth() { autoLabelWidth() {
if (!this.potentialLabelWidthArr.length) return 0;
const max = Math.max(...this.potentialLabelWidthArr); const max = Math.max(...this.potentialLabelWidthArr);
return max ? `${max}px` : ''; return max ? `${max}px` : '';
} }

12
packages/form/src/label-wrap.vue
View File

@ -15,7 +15,10 @@ export default {
const autoLabelWidth = this.elForm.autoLabelWidth; const autoLabelWidth = this.elForm.autoLabelWidth;
const style = {}; const style = {};
if (autoLabelWidth && autoLabelWidth !== 'auto') { if (autoLabelWidth && autoLabelWidth !== 'auto') {
style.width = autoLabelWidth; const marginLeft = parseInt(autoLabelWidth, 10) - this.computedWidth;
if (marginLeft) {
style.marginLeft = marginLeft + 'px';
}
} }
return (<div class="el-form-item__label-wrap" style={style}> return (<div class="el-form-item__label-wrap" style={style}>
{ slots } { slots }
@ -64,10 +67,9 @@ export default {
this.updateLabelWidth('update'); this.updateLabelWidth('update');
}, },
// Is this necessary? updated() {
// updated() { this.updateLabelWidth('update');
// this.updateLabelWidth('update'); },
// },
beforeDestroy() { beforeDestroy() {
this.updateLabelWidth('remove'); this.updateLabelWidth('remove');

1
packages/theme-chalk/src/form.scss
View File

@ -86,7 +86,6 @@
@include e(label-wrap) { @include e(label-wrap) {
float: left; float: left;
text-align: right;
.el-form-item__label { .el-form-item__label {
display: inline-block; display: inline-block;
float: none; float: none;