Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(module:sf): fix button spanLabelFixed is zero value #242

Merged
merged 1 commit into from
Oct 30, 2018
Merged

fix(module:sf): fix button spanLabelFixed is zero value #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/form/src/sf.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<sf-item [formProperty]="rootProperty"></sf-item>
<ng-container *ngIf="button !== 'none'; else con">
<nz-form-item [ngClass]="_btn.render.class" class="sf-btns" [fixed-label]="_btn.render.spanLabelFixed">
<nz-col class="ant-form-item-control-wrapper" [nzSpan]="_btn.render.grid.span" [nzOffset]="_btn.render.grid.offset"
<div nz-col class="ant-form-item-control-wrapper" [nzSpan]="_btn.render.grid.span" [nzOffset]="_btn.render.grid.offset"
[nzXs]="_btn.render.grid.xs" [nzSm]="_btn.render.grid.sm" [nzMd]="_btn.render.grid.md"
[nzLg]="_btn.render.grid.lg" [nzXl]="_btn.render.grid.xl">
[nzLg]="_btn.render.grid.lg" [nzXl]="_btn.render.grid.xl" [nzXXl]="_btn.render.grid.xxl">
<div class="ant-form-item-control">
<ng-container *ngIf="button; else con">
<button type="submit" nz-button [nzType]="_btn.submit_type" [disabled]="liveValidate && !valid">{{_btn.submit}}</button>
<button *ngIf="_btn.reset" (click)="reset(true)" type="button" nz-button [nzType]="_btn.reset_type">{{_btn.reset}}</button>
</ng-container>
</div>
</nz-col>
</div>
</nz-form-item>
</ng-container>
</form>
2 changes: 1 addition & 1 deletion packages/form/src/sf.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ export class SFComponent implements OnInit, OnChanges, OnDestroy {
};
}
// fixed label
if (!this._btn.render.spanLabelFixed) {
if (this._btn.render.spanLabelFixed == null) {
this._btn.render.spanLabelFixed = btnUi.spanLabelFixed;
}
// 固定标签宽度时，若不指定样式，则默认居中
Expand Down
8 changes: 4 additions & 4 deletions packages/form/src/widgets/object/object.widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ import { FormProperty } from '../../model/form.property';
selector: 'sf-object',
template: `
<ng-container *ngIf="grid; else noGrid">
<nz-row [nzGutter]="grid.gutter">
<div nz-row [nzGutter]="grid.gutter">
<ng-container *ngFor="let i of list">
<ng-container *ngIf="i.property.visible && i.show">
<nz-col
<div nz-col
[nzSpan]="i.grid.span" [nzOffset]="i.grid.offset"
[nzXs]="i.grid.xs" [nzSm]="i.grid.sm" [nzMd]="i.grid.md"
[nzLg]="i.grid.lg" [nzXl]="i.grid.xl" [nzXXl]="i.grid.xxl">
<sf-item [formProperty]="i.property" [fixed-label]="i.spanLabelFixed"></sf-item>
</nz-col>
</div>
</ng-container>
</ng-container>
</nz-row>
</div>
</ng-container>
<ng-template #noGrid>
<ng-container *ngFor="let i of list">
Expand Down
5 changes: 5 additions & 0 deletions packages/theme/styles/app/delon/form.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,9 @@
}
}
}
&__no-error {
.ant-form-item {
margin-bottom: 8px;
}
}
}