Merge 6248e62 into 43595f2

ng-alain · Feb 14, 2022 · 4809ee3 · 4809ee3
2 parents 43595f2 + 6248e62
commit 4809ee3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/packages/form/src/sf-item.component.ts b/packages/form/src/sf-item.component.ts
@@ -5,6 +5,7 @@ import {
   OnChanges,
   OnDestroy,
   OnInit,
+  TemplateRef,
   ViewChild,
   ViewContainerRef,
   ViewEncapsulation
@@ -23,7 +24,10 @@ let nextUniqueId = 0;
   selector: 'sf-item',
   exportAs: 'sfItem',
   host: { '[class.sf__item]': 'true' },
-  template: ` <ng-template #target></ng-template> `,
+  template: `
+    <ng-template #target></ng-template>
+    <ng-container *ngTemplateOutlet="footer"></ng-container>
+  `,
   preserveWhitespaces: false,
   encapsulation: ViewEncapsulation.None
 })
@@ -33,9 +37,10 @@ export class SFItemComponent implements OnInit, OnChanges, OnDestroy {
   widget: Widget<FormProperty, SFUISchemaItem> | null = null;
 
   @Input() formProperty!: FormProperty;
+  @Input() footer: TemplateRef<void> | null = null;
 
   @ViewChild('target', { read: ViewContainerRef, static: true })
-  container!: ViewContainerRef;
+  private container!: ViewContainerRef;
 
   constructor(private widgetFactory: WidgetFactory, private terminator: TerminatorService) {}
 

diff --git a/packages/form/src/sf.component.html b/packages/form/src/sf.component.html
@@ -1,8 +1,7 @@
 <ng-template #con>
   <ng-content></ng-content>
 </ng-template>
-<form nz-form [nzLayout]="layout" (submit)="onSubmit($event)" [attr.autocomplete]="autocomplete">
-  <sf-item *ngIf="rootProperty" [formProperty]="rootProperty"></sf-item>
+<ng-template #btnTpl>
   <ng-container *ngIf="button !== 'none'; else con">
     <nz-form-item
       *ngIf="_btn && _btn.render"
@@ -70,4 +69,7 @@
       </div>
     </nz-form-item>
   </ng-container>
+</ng-template>
+<form nz-form [nzLayout]="layout" (submit)="onSubmit($event)" [attr.autocomplete]="autocomplete">
+  <sf-item *ngIf="rootProperty" [formProperty]="rootProperty" [footer]="btnTpl"></sf-item>
 </form>
diff --git a/packages/form/src/style/index.less b/packages/form/src/style/index.less
@@ -110,15 +110,6 @@
     }
   }
 
-  &__checkbox-list {
-    display: block;
-    width: 100%;
-    @media (min-width: @mobile-min) {
-      .@{ant-prefix}-col {
-        margin-top: 8px;
-      }
-    }
-  }
   // upload
   .@{ant-prefix}-upload-select-picture-card i {
     color: #999;
@@ -184,6 +175,7 @@
       }
 
       &-btns {
+        display: inline-block;
         margin-right: 0;
       }
     }