@ebuilding/biz-design 2.8.6 → 2.8.8

package/fesm2022/ebuilding-biz-design.mjs

@@ -1938,6 +1938,14 @@ class DeonDesignSettingGrid extends DeonDesignSettingBasic {
             fieldGroup: [],
             active: false,
         });
+        this.valueChange();
+    }
+    /**
+     * Keep the OnPush designer and the persisted form JSON in sync with the
+     * in-place ngModel update.
+     */
+    colsChange() {
+        this.valueChange();
     }
     /**
      * 删除列
@@ -1965,6 +1973,7 @@ class DeonDesignSettingGrid extends DeonDesignSettingBasic {
           <nz-input-number
             [nzDisabled]="settingSrv?.isEditor == false"
             [(ngModel)]="item.props.cols"
+            (ngModelChange)="colsChange()"
             [nzMin]="1"
             [nzMax]="24"
             [nzStep]="1"
@@ -1988,6 +1997,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
           <nz-input-number
             [nzDisabled]="settingSrv?.isEditor == false"
             [(ngModel)]="item.props.cols"
+            (ngModelChange)="colsChange()"
             [nzMin]="1"
             [nzMax]="24"
             [nzStep]="1"
@@ -2847,6 +2857,10 @@ class DeonDesignSettingCheckBox extends DeonDesignSettingBasic {
         this.settingSrv = settingSrv;
     }
     ngOnInit() { }
+    labelPositionChange(position) {
+        this.sourceField.props.labelPosition = position;
+        this.valueChange();
+    }
     typeChange() {
         this.sourceField.type = 'radiogroup';
         this.fieldTypeChange();
@@ -2891,7 +2905,7 @@ class DeonDesignSettingCheckBox extends DeonDesignSettingBasic {
         nzButtonStyle="solid"
         [nzDisabled]="settingSrv?.isEditor == false"
         [(ngModel)]="sourceField.props.labelPosition"
-        (ngModelChange)="valueChange()"
+        (ngModelChange)="labelPositionChange($event)"
       >
         <label nz-radio-button nzValue="right">右边</label>
         <label nz-radio-button nzValue="left">左边</label>
@@ -2954,7 +2968,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
         nzButtonStyle="solid"
         [nzDisabled]="settingSrv?.isEditor == false"
         [(ngModel)]="sourceField.props.labelPosition"
-        (ngModelChange)="valueChange()"
+        (ngModelChange)="labelPositionChange($event)"
       >
         <label nz-radio-button nzValue="right">右边</label>
         <label nz-radio-button nzValue="left">左边</label>
@@ -4860,14 +4874,23 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
 
 class DeonDesignFieldCheckbox extends DeonDesignFieldBasic {
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: DeonDesignFieldCheckbox, deps: null, target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.15", type: DeonDesignFieldCheckbox, isStandalone: true, selector: "deon-field-checkbox", usesInheritance: true, ngImport: i0, template: ` <label nz-checkbox>  <ng-container *ngIf="to.hideLabel == true && to.labelPosition == 'right'"> {{ to.label }} </ng-container> </label> `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "ngmodule", type: FormsModule }, { kind: "ngmodule", type: ReactiveFormsModule }, { kind: "ngmodule", type: NzCheckboxModule }, { kind: "component", type: i7.NzCheckboxComponent, selector: "[nz-checkbox]", inputs: ["nzValue", "nzAutoFocus", "nzDisabled", "nzIndeterminate", "nzChecked", "nzId", "nzName"], outputs: ["nzCheckedChange"], exportAs: ["nzCheckbox"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.15", type: DeonDesignFieldCheckbox, isStandalone: true, selector: "deon-field-checkbox", usesInheritance: true, ngImport: i0, template: `
+    <ng-container *ngIf="to.labelPosition == 'left'">{{ to.label }}</ng-container>
+    <label nz-checkbox>
+      <ng-container *ngIf="to.labelPosition == 'right' || (to.hideLabel == true && to.labelPosition != 'left')">{{ to.label }}</ng-container>
+    </label>
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "ngmodule", type: FormsModule }, { kind: "ngmodule", type: ReactiveFormsModule }, { kind: "ngmodule", type: NzCheckboxModule }, { kind: "component", type: i7.NzCheckboxComponent, selector: "[nz-checkbox]", inputs: ["nzValue", "nzAutoFocus", "nzDisabled", "nzIndeterminate", "nzChecked", "nzId", "nzName"], outputs: ["nzCheckedChange"], exportAs: ["nzCheckbox"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: DeonDesignFieldCheckbox, decorators: [{
             type: Component,
             args: [{
                     selector: 'deon-field-checkbox',
-                    template: ` <label nz-checkbox>  <ng-container *ngIf="to.hideLabel == true && to.labelPosition == 'right'"> {{ to.label }} </ng-container> </label> `,
-                    changeDetection: ChangeDetectionStrategy.OnPush,
+                    template: `
+    <ng-container *ngIf="to.labelPosition == 'left'">{{ to.label }}</ng-container>
+    <label nz-checkbox>
+      <ng-container *ngIf="to.labelPosition == 'right' || (to.hideLabel == true && to.labelPosition != 'left')">{{ to.label }}</ng-container>
+    </label>
+  `,
                     imports: [
                         CommonModule,
                         FormsModule,
@@ -5474,7 +5497,7 @@ class DeonDesignFieldDefault {
         },
     };
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: DeonDesignFieldDefault, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.15", type: DeonDesignFieldDefault, isStandalone: true, selector: "deon-field-default", inputs: { field: "field" }, ngImport: i0, template: "<ng-container *ngIf=\"field?.props?.hideLabel != true && field.type != 'line' && field.type != 'indicator'\">\n  <deon-design-simple-label [field]=\"field\"><span\n      [innerHTML]=\"field?.props?.label | safeHtml\"></span></deon-design-simple-label>\n</ng-container>\n\n<deon-field-template [field]=\"field\"></deon-field-template>\n\n<div *ngIf=\"field.props && field.props?.hideJson\" class=\"hideJson\">\n  <i nz-icon nzType=\"control\" nzTheme=\"outline\"></i>\n</div>", styles: [":host ::ng-deep{position:relative;width:100%;background-color:#fdf6ed4d}:host ::ng-deep deon-design-simple-label{display:inline-block;padding:0}:host ::ng-deep .hideJson{position:absolute;top:-20px;right:-10px;color:red}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "ngmodule", type: FormsModule }, { kind: "ngmodule", type: ReactiveFormsModule }, { kind: "ngmodule", type: FormlyModule }, { kind: "ngmodule", type: NzIconModule }, { kind: "directive", type: i3$1.NzIconDirective, selector: "nz-icon,[nz-icon]", inputs: ["nzSpin", "nzRotate", "nzType", "nzTheme", "nzTwotoneColor", "nzIconfont"], exportAs: ["nzIcon"] }, { kind: "component", type: DeonDesignFieldTemplate, selector: "deon-field-template", inputs: ["field"], outputs: ["fieldChange"] }, { kind: "pipe", type: SafeHtmlPipe, name: "safeHtml" }, { kind: "component", type: DeonDesignSimpleLabel, selector: "deon-design-simple-label", inputs: ["field"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.15", type: DeonDesignFieldDefault, isStandalone: true, selector: "deon-field-default", inputs: { field: "field" }, ngImport: i0, template: "<ng-container *ngIf=\"field?.props?.hideLabel != true && field.type != 'line' && field.type != 'indicator' && !(field.type == 'checkbox' && field?.props?.labelPosition)\">\n  <deon-design-simple-label [field]=\"field\"><span\n      [innerHTML]=\"field?.props?.label | safeHtml\"></span></deon-design-simple-label>\n</ng-container>\n\n<deon-field-template [field]=\"field\"></deon-field-template>\n\n<div *ngIf=\"field.props && field.props?.hideJson\" class=\"hideJson\">\n  <i nz-icon nzType=\"control\" nzTheme=\"outline\"></i>\n</div>\n", styles: [":host ::ng-deep{position:relative;width:100%;background-color:#fdf6ed4d}:host ::ng-deep deon-design-simple-label{display:inline-block;padding:0}:host ::ng-deep .hideJson{position:absolute;top:-20px;right:-10px;color:red}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "ngmodule", type: FormsModule }, { kind: "ngmodule", type: ReactiveFormsModule }, { kind: "ngmodule", type: FormlyModule }, { kind: "ngmodule", type: NzIconModule }, { kind: "directive", type: i3$1.NzIconDirective, selector: "nz-icon,[nz-icon]", inputs: ["nzSpin", "nzRotate", "nzType", "nzTheme", "nzTwotoneColor", "nzIconfont"], exportAs: ["nzIcon"] }, { kind: "component", type: DeonDesignFieldTemplate, selector: "deon-field-template", inputs: ["field"], outputs: ["fieldChange"] }, { kind: "pipe", type: SafeHtmlPipe, name: "safeHtml" }, { kind: "component", type: DeonDesignSimpleLabel, selector: "deon-design-simple-label", inputs: ["field"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: DeonDesignFieldDefault, decorators: [{
             type: Component,
@@ -5487,7 +5510,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
                         DeonDesignFieldTemplate,
                         SafeHtmlPipe,
                         DeonDesignSimpleLabel
-                    ], template: "<ng-container *ngIf=\"field?.props?.hideLabel != true && field.type != 'line' && field.type != 'indicator'\">\n  <deon-design-simple-label [field]=\"field\"><span\n      [innerHTML]=\"field?.props?.label | safeHtml\"></span></deon-design-simple-label>\n</ng-container>\n\n<deon-field-template [field]=\"field\"></deon-field-template>\n\n<div *ngIf=\"field.props && field.props?.hideJson\" class=\"hideJson\">\n  <i nz-icon nzType=\"control\" nzTheme=\"outline\"></i>\n</div>", styles: [":host ::ng-deep{position:relative;width:100%;background-color:#fdf6ed4d}:host ::ng-deep deon-design-simple-label{display:inline-block;padding:0}:host ::ng-deep .hideJson{position:absolute;top:-20px;right:-10px;color:red}\n"] }]
+                    ], template: "<ng-container *ngIf=\"field?.props?.hideLabel != true && field.type != 'line' && field.type != 'indicator' && !(field.type == 'checkbox' && field?.props?.labelPosition)\">\n  <deon-design-simple-label [field]=\"field\"><span\n      [innerHTML]=\"field?.props?.label | safeHtml\"></span></deon-design-simple-label>\n</ng-container>\n\n<deon-field-template [field]=\"field\"></deon-field-template>\n\n<div *ngIf=\"field.props && field.props?.hideJson\" class=\"hideJson\">\n  <i nz-icon nzType=\"control\" nzTheme=\"outline\"></i>\n</div>\n", styles: [":host ::ng-deep{position:relative;width:100%;background-color:#fdf6ed4d}:host ::ng-deep deon-design-simple-label{display:inline-block;padding:0}:host ::ng-deep .hideJson{position:absolute;top:-20px;right:-10px;color:red}\n"] }]
         }], propDecorators: { field: [{
                 type: Input
             }] } });