From c9da59114dc58b1c397726d5f1b64cbac24529a1 Mon Sep 17 00:00:00 2001
From: cipchk <cipchk@qq.com>
Date: Mon, 29 Oct 2018 13:17:22 +0800
Subject: [PATCH] fix(module:sf): fix button spanLabelFixed is zero value

---
 packages/form/src/sf.component.html               | 6 +++---
 packages/form/src/sf.component.ts                 | 2 +-
 packages/form/src/widgets/object/object.widget.ts | 8 ++++----
 packages/theme/styles/app/delon/form.less         | 5 +++++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/form/src/sf.component.html b/packages/form/src/sf.component.html
index f44febd28..2d78d8050 100644
--- a/packages/form/src/sf.component.html
+++ b/packages/form/src/sf.component.html
@@ -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>
diff --git a/packages/form/src/sf.component.ts b/packages/form/src/sf.component.ts
index be949c8ce..2ef9d065e 100644
--- a/packages/form/src/sf.component.ts
+++ b/packages/form/src/sf.component.ts
@@ -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;
       }
       // 固定标签宽度时，若不指定样式，则默认居中
diff --git a/packages/form/src/widgets/object/object.widget.ts b/packages/form/src/widgets/object/object.widget.ts
index a0cf8d28a..5aa1918f1 100644
--- a/packages/form/src/widgets/object/object.widget.ts
+++ b/packages/form/src/widgets/object/object.widget.ts
@@ -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">
diff --git a/packages/theme/styles/app/delon/form.less b/packages/theme/styles/app/delon/form.less
index da0069b6d..4800045fa 100644
--- a/packages/theme/styles/app/delon/form.less
+++ b/packages/theme/styles/app/delon/form.less
@@ -87,4 +87,9 @@
       }
     }
   }
+  &__no-error {
+    .ant-form-item {
+      margin-bottom: 8px;
+    }
+  }
 }