@dignite-ng/expand.dynamic-form 3.0.0-rc.1 → 3.0.0-rc.11

package/fesm2022/dignite-ng-expand.dynamic-form.mjs

@@ -1,16 +1,17 @@
 import * as i0 from '@angular/core';
-import { Component, Input, ViewChild, ChangeDetectionStrategy, inject, Injectable, ViewContainerRef, NgModule } from '@angular/core';
+import { inject, ChangeDetectorRef, ViewChild, Input, Component, ChangeDetectionStrategy, Injectable, ViewContainerRef, Inject, NgModule } from '@angular/core';
 import * as i1 from '@angular/forms';
 import { Validators, FormArray, FormGroup, FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import * as i2 from '@abp/ng.core';
 import { CoreModule } from '@abp/ng.core';
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
-import { NzTreeModule } from 'ng-zorro-antd/tree';
 import * as i3 from '@ngx-validate/core';
 import * as i2$1 from '@angular/common';
 import { DatePipe } from '@angular/common';
 import { pinyin } from 'pinyin-pro';
+import * as i4 from 'ng-zorro-antd/select';
+import { NzSelectModule } from 'ng-zorro-antd/select';
 
 class TextEditConfig {
     constructor(data) {
@@ -42,6 +43,7 @@ class TextEditConfigComponent {
     constructor(fb) {
         this.fb = fb;
         this._TextEditMode = TextEditMode;
+        this.cdr = inject(ChangeDetectorRef);
     }
     set type(v) {
         this._type = v;
@@ -61,7 +63,8 @@ class TextEditConfigComponent {
     async dataLoaded() {
         if (this._Entity && this._type) {
             await this.AfterInit();
-            this.submitclick.nativeElement.click();
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
         }
     }
     AfterInit() {
@@ -69,7 +72,7 @@ class TextEditConfigComponent {
             this._Entity.setControl('formConfiguration', this.fb.group(new TextEditConfig()));
             if (this._selected && this._selected.formControlName == this._type) {
                 this.formConfiguration.patchValue({
-                    ...this._selected.formConfiguration
+                    ...this._selected.formConfiguration,
                 });
             }
             resolve(true);
@@ -100,6 +103,7 @@ class TextEditComponent {
         this._TextEditMode = TextEditMode;
         /**字段配置列表 */
         this._fields = '';
+        this.cdr = inject(ChangeDetectorRef);
         this.isObjEmpty = (obj) => Object.keys(obj).length === 0;
     }
     set entity(v) {
@@ -126,6 +130,7 @@ class TextEditComponent {
         if (this._fields && this._entity && this._parentFiledName) {
             this.extraProperties = this._entity.get(this._parentFiledName);
             await this.AfterInit();
+            this.cdr.detectChanges(); // 手动触发变更检测
             this.submitclick?.nativeElement?.click();
         }
     }
@@ -143,14 +148,14 @@ class TextEditComponent {
                 ValidatorsArray.push(Validators.maxLength(this._fields.field.formConfiguration['TextEdit.CharLimit']));
             }
             let newControl = this.fb.control(this._selected, ValidatorsArray);
-            this.extraProperties.setControl(this._fields.field.name, newControl);
+            this.extraProperties?.setControl(this._fields.field.name, newControl);
             resolve(true);
         });
     }
     ngOnDestroy() {
         //Called once, before the instance is destroyed.
         //Add 'implements OnDestroy' to the class.
-        this.extraProperties.removeControl(this._fields.field.name);
+        this.extraProperties?.removeControl(this._fields.field.name);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: TextEditComponent, deps: [{ token: i1.FormBuilder }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: TextEditComponent, selector: "df-text-edit", inputs: { entity: "entity", fields: "fields", parentFiledName: "parentFiledName", selected: "selected" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true, static: true }], ngImport: i0, template: "<form [formGroup]=\"_entity\">\n    <div [formGroupName]=\"_parentFiledName\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n            <ng-container *ngIf=\"_fields.field.formConfiguration['TextEdit.Mode'] ===_TextEditMode.SingleLine\">\n                <input type=\"text\" class=\"form-control\" formControlName=\"{{_fields.field.name}}\"\n                    [placeholder]=\"_fields.field.formConfiguration['TextEdit.Placeholder']\" />\n            </ng-container>\n            <ng-container *ngIf=\"_fields.field.formConfiguration['TextEdit.Mode'] === _TextEditMode.MultipleLine\">\n                <textarea class=\"form-control\" formControlName=\"{{_fields.field.name}}\"\n                    [placeholder]=\"_fields.field.formConfiguration['TextEdit.Placeholder']\" rows=\"3\"></textarea>\n            </ng-container>\n            <small class=\"form-text text-muted d-block\" *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\n        </div>\n    </div>\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\n</form>", styles: [""], dependencies: [{ kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i1.FormGroupName, selector: "[formGroupName]", inputs: ["formGroupName"] }, { kind: "directive", type: i3.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "directive", type: i3.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }] }); }
@@ -171,6 +176,115 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 args: ['submitclick', { static: true }]
             }] } });
 
+class TextEditViewComponent {
+    constructor() {
+        /**展示则内容 */
+        this.showValue = '';
+        /**是否显示再列表 */
+        this.showInList = false;
+        /**表单控件Value */
+        this._value = '';
+    }
+    set value(v) {
+        this._value = v;
+    }
+    async ngAfterContentInit() {
+        //Called after ngOnInit when the component's or directive's content has been initialized.
+        //Add 'implements AfterContentInit' to the class.
+        let valueOptions = this._value;
+        if (this.type && valueOptions) {
+            this.showValue = valueOptions;
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: TextEditViewComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.1.5", type: TextEditViewComponent, selector: "df-text-edit-view", inputs: { showInList: "showInList", fields: "fields", type: "type", value: "value" }, ngImport: i0, template: "@if(showInList){\r\n{{showValue}}\r\n} @else{\r\n<div class=\"mb-3\">\r\n    <label class=\"form-label\" *ngIf=\"fields.displayName\">{{ fields.displayName }}</label>\r\n    <div>\r\n        {{showValue}}\r\n    </div>\r\n</div>\r\n}", styles: [""], dependencies: [{ kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: TextEditViewComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-text-edit-view', template: "@if(showInList){\r\n{{showValue}}\r\n} @else{\r\n<div class=\"mb-3\">\r\n    <label class=\"form-label\" *ngIf=\"fields.displayName\">{{ fields.displayName }}</label>\r\n    <div>\r\n        {{showValue}}\r\n    </div>\r\n</div>\r\n}" }]
+        }], propDecorators: { showInList: [{
+                type: Input
+            }], fields: [{
+                type: Input
+            }], type: [{
+                type: Input
+            }], value: [{
+                type: Input
+            }] } });
+
+class TextEditSearchComponent {
+    constructor(fb) {
+        this.fb = fb;
+        this._TextEditMode = TextEditMode;
+        /**字段配置列表 */
+        this._fields = '';
+        this.cdr = inject(ChangeDetectorRef);
+        this.isObjEmpty = (obj) => Object.keys(obj).length === 0;
+    }
+    set entity(v) {
+        this._entity = v;
+        if (v)
+            this.dataLoaded();
+    }
+    set fields(v) {
+        this._fields = v;
+        if (v)
+            this.dataLoaded();
+    }
+    set parentFiledName(v) {
+        this._parentFiledName = v;
+        if (v)
+            this.dataLoaded();
+    }
+    set selected(v) {
+        this._selected = v || '';
+        if (v)
+            this.dataLoaded();
+    }
+    async dataLoaded() {
+        if (this._fields && this._entity && this._parentFiledName) {
+            this.extraProperties = this._entity.get(this._parentFiledName);
+            await this.AfterInit();
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
+        }
+    }
+    AfterInit() {
+        return new Promise((resolve, rejects) => {
+            let ValidatorsArray = [];
+            this._fields.field.formConfiguration = {
+                ...this.fb.group(new TextEditConfig()).value,
+                ...this._fields.field.formConfiguration
+            };
+            let newControl = this.fb.control(this._selected, ValidatorsArray);
+            this.extraProperties?.setControl(this._fields.field.name, newControl);
+            resolve(true);
+        });
+    }
+    ngOnDestroy() {
+        //Called once, before the instance is destroyed.
+        //Add 'implements OnDestroy' to the class.
+        this.extraProperties?.removeControl(this._fields.field.name);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: TextEditSearchComponent, deps: [{ token: i1.FormBuilder }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: TextEditSearchComponent, selector: "df-text-edit-search", inputs: { entity: "entity", fields: "fields", parentFiledName: "parentFiledName", selected: "selected" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true, static: true }], ngImport: i0, template: "<form [formGroup]=\"_entity\">\r\n    <div [formGroupName]=\"_parentFiledName\">\r\n        <div class=\"mb-3\">\r\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\r\n                <input type=\"text\" class=\"form-control\" formControlName=\"{{_fields.field.name}}\"\r\n                    [placeholder]=\"_fields.field.formConfiguration['TextEdit.Placeholder']\" />\r\n        </div>\r\n    </div>\r\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\r\n</form>", styles: [""], dependencies: [{ kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i1.FormGroupName, selector: "[formGroupName]", inputs: ["formGroupName"] }, { kind: "directive", type: i3.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "directive", type: i3.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: TextEditSearchComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-text-edit-search', template: "<form [formGroup]=\"_entity\">\r\n    <div [formGroupName]=\"_parentFiledName\">\r\n        <div class=\"mb-3\">\r\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\r\n                <input type=\"text\" class=\"form-control\" formControlName=\"{{_fields.field.name}}\"\r\n                    [placeholder]=\"_fields.field.formConfiguration['TextEdit.Placeholder']\" />\r\n        </div>\r\n    </div>\r\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\r\n</form>" }]
+        }], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { entity: [{
+                type: Input
+            }], fields: [{
+                type: Input
+            }], parentFiledName: [{
+                type: Input
+            }], selected: [{
+                type: Input
+            }], submitclick: [{
+                type: ViewChild,
+                args: ['submitclick', { static: true }]
+            }] } });
+
 class SwitchConfig {
     constructor(data) {
         /**默认值 */
@@ -188,6 +302,7 @@ class SwitchConfig {
 class SwitchConfigComponent {
     constructor(fb) {
         this.fb = fb;
+        this.cdr = inject(ChangeDetectorRef);
     }
     set type(v) {
         this._type = v;
@@ -207,7 +322,8 @@ class SwitchConfigComponent {
     async dataLoaded() {
         if (this._Entity && this._type) {
             await this.AfterInit();
-            this.submitclick.nativeElement.click();
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
         }
     }
     AfterInit() {
@@ -215,7 +331,7 @@ class SwitchConfigComponent {
             this._Entity.setControl('formConfiguration', this.fb.group(new SwitchConfig()));
             if (this._selected && this._selected.formControlName == this._type) {
                 this.formConfiguration.patchValue({
-                    ...this._selected.formConfiguration
+                    ...this._selected.formConfiguration,
                 });
             }
             resolve(true);
@@ -243,6 +359,7 @@ class SwitchControlComponent {
         this.fb = fb;
         /**字段配置列表 */
         this._fields = '';
+        this.cdr = inject(ChangeDetectorRef);
     }
     set entity(v) {
         this._entity = v;
@@ -268,7 +385,8 @@ class SwitchControlComponent {
     async dataLoaded() {
         if (this._fields && this._entity) {
             await this.AfterInit();
-            this.submitclick.nativeElement.click();
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
         }
     }
     AfterInit() {
@@ -277,7 +395,11 @@ class SwitchControlComponent {
             if (this._fields.required) {
                 ValidatorsArray.push(Validators.required);
             }
-            let newControl = this.fb.control(this._selected ? this._selected : this._selected === false ? this._selected : this._fields.field.formConfiguration['Switch.Default'], ValidatorsArray);
+            let newControl = this.fb.control(this._selected
+                ? this._selected
+                : this._selected === false
+                    ? this._selected
+                    : this._fields.field.formConfiguration['Switch.Default'], ValidatorsArray);
             this.extraProperties.setControl(this._fields.field.name, newControl);
             resolve(true);
         });
@@ -288,11 +410,11 @@ class SwitchControlComponent {
         this.extraProperties.removeControl(this._fields.field.name);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SwitchControlComponent, deps: [{ token: i1.FormBuilder }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: SwitchControlComponent, selector: "df-switch-control", inputs: { entity: "entity", fields: "fields", parentFiledName: "parentFiledName", selected: "selected" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true, static: true }], ngImport: i0, template: "<form [formGroup]=\"_entity\">\n    <div formGroupName=\"extraProperties\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n            <div class=\"form-check form-switch\">\n                <input class=\"form-check-input\" type=\"checkbox\" role=\"switch\" formControlName=\"{{_fields.field.name}}\">\n            </div>\n            <small class=\"form-text text-muted d-block\" *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\n        </div>\n\n    </div>\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\n</form>", styles: [""], dependencies: [{ kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.CheckboxControlValueAccessor, selector: "input[type=checkbox][formControlName],input[type=checkbox][formControl],input[type=checkbox][ngModel]" }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i1.FormGroupName, selector: "[formGroupName]", inputs: ["formGroupName"] }, { kind: "directive", type: i3.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "directive", type: i3.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: SwitchControlComponent, selector: "df-switch-control", inputs: { entity: "entity", fields: "fields", parentFiledName: "parentFiledName", selected: "selected" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true, static: true }], ngImport: i0, template: "<form [formGroup]=\"_entity\">\n    <div formGroupName=\"extraProperties\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n            <div class=\"form-check form-switch\">\n                <input class=\"form-check-input\" type=\"checkbox\" role=\"switch\" formControlName=\"{{_fields.field.name}}\">\n            </div>\n            <small class=\"form-text text-muted d-block\" *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\n        </div>\n    </div>\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\n</form>", styles: [""], dependencies: [{ kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.CheckboxControlValueAccessor, selector: "input[type=checkbox][formControlName],input[type=checkbox][formControl],input[type=checkbox][ngModel]" }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i1.FormGroupName, selector: "[formGroupName]", inputs: ["formGroupName"] }, { kind: "directive", type: i3.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "directive", type: i3.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SwitchControlComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'df-switch-control', template: "<form [formGroup]=\"_entity\">\n    <div formGroupName=\"extraProperties\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n            <div class=\"form-check form-switch\">\n                <input class=\"form-check-input\" type=\"checkbox\" role=\"switch\" formControlName=\"{{_fields.field.name}}\">\n            </div>\n            <small class=\"form-text text-muted d-block\" *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\n        </div>\n\n    </div>\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\n</form>" }]
+            args: [{ selector: 'df-switch-control', template: "<form [formGroup]=\"_entity\">\n    <div formGroupName=\"extraProperties\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n            <div class=\"form-check form-switch\">\n                <input class=\"form-check-input\" type=\"checkbox\" role=\"switch\" formControlName=\"{{_fields.field.name}}\">\n            </div>\n            <small class=\"form-text text-muted d-block\" *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\n        </div>\n    </div>\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\n</form>" }]
         }], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { entity: [{
                 type: Input
             }], fields: [{
@@ -306,14 +428,121 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 args: ['submitclick', { static: true }]
             }] } });
 
+class SwitchSearchComponent {
+    constructor(fb) {
+        this.fb = fb;
+        /**字段配置列表 */
+        this._fields = '';
+        this.cdr = inject(ChangeDetectorRef);
+    }
+    set entity(v) {
+        this._entity = v;
+        this.dataLoaded();
+    }
+    set fields(v) {
+        this._fields = v;
+        this.dataLoaded();
+    }
+    set parentFiledName(v) {
+        this._parentFiledName = v;
+        this.dataLoaded();
+    }
+    set selected(v) {
+        // ?v:false;
+        this._selected = v;
+        this.dataLoaded();
+    }
+    get extraProperties() {
+        return this._entity.get('extraProperties');
+    }
+    /**数据加载完成 */
+    async dataLoaded() {
+        if (this._fields && this._entity) {
+            await this.AfterInit();
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
+        }
+    }
+    AfterInit() {
+        return new Promise((resolve, rejects) => {
+            let ValidatorsArray = [];
+            let newControl = this.fb.control(this._selected
+                ? this._selected
+                : this._selected === false
+                    ? this._selected
+                    : this._fields.field.formConfiguration['Switch.Default'], ValidatorsArray);
+            this.extraProperties.setControl(this._fields.field.name, newControl);
+            resolve(true);
+        });
+    }
+    ngOnDestroy() {
+        //Called once, before the instance is destroyed.
+        //Add 'implements OnDestroy' to the class.
+        this.extraProperties.removeControl(this._fields.field.name);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SwitchSearchComponent, deps: [{ token: i1.FormBuilder }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: SwitchSearchComponent, selector: "df-switch-search", inputs: { entity: "entity", fields: "fields", parentFiledName: "parentFiledName", selected: "selected" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true, static: true }], ngImport: i0, template: "<form [formGroup]=\"_entity\">\r\n    <div formGroupName=\"extraProperties\">\r\n        <div class=\"mb-3\">\r\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\r\n            <div class=\"form-check form-switch\">\r\n                <input class=\"form-check-input\" type=\"checkbox\" role=\"switch\" formControlName=\"{{_fields.field.name}}\">\r\n            </div>\r\n            <small class=\"form-text text-muted d-block\" *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\r\n        </div>\r\n    </div>\r\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\r\n</form>", styles: [""], dependencies: [{ kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.CheckboxControlValueAccessor, selector: "input[type=checkbox][formControlName],input[type=checkbox][formControl],input[type=checkbox][ngModel]" }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i1.FormGroupName, selector: "[formGroupName]", inputs: ["formGroupName"] }, { kind: "directive", type: i3.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "directive", type: i3.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SwitchSearchComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-switch-search', template: "<form [formGroup]=\"_entity\">\r\n    <div formGroupName=\"extraProperties\">\r\n        <div class=\"mb-3\">\r\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\r\n            <div class=\"form-check form-switch\">\r\n                <input class=\"form-check-input\" type=\"checkbox\" role=\"switch\" formControlName=\"{{_fields.field.name}}\">\r\n            </div>\r\n            <small class=\"form-text text-muted d-block\" *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\r\n        </div>\r\n    </div>\r\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\r\n</form>" }]
+        }], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { entity: [{
+                type: Input
+            }], fields: [{
+                type: Input
+            }], parentFiledName: [{
+                type: Input
+            }], selected: [{
+                type: Input
+            }], submitclick: [{
+                type: ViewChild,
+                args: ['submitclick', { static: true }]
+            }] } });
+
+class SwitchViewComponent {
+    constructor() {
+        /**展示则内容 */
+        this.showValue = '';
+        /**是否显示再列表 */
+        this.showInList = false;
+        /**表单控件Value */
+        this._value = '';
+    }
+    set value(v) {
+        this._value = v;
+    }
+    async ngAfterContentInit() {
+        //Called after ngOnInit when the component's or directive's content has been initialized.
+        //Add 'implements AfterContentInit' to the class.
+        let valueOptions = this._value;
+        if (this.type) {
+            this.showValue = valueOptions;
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SwitchViewComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.1.5", type: SwitchViewComponent, selector: "df-switch-view", inputs: { showInList: "showInList", fields: "fields", type: "type", value: "value" }, ngImport: i0, template: "@if(showInList){\r\n    {{'AbpUi::'+(showValue ? 'Yes' : 'No') | abpLocalization}}\r\n} @else{\r\n<div class=\"mb-3\">\r\n    <label class=\"form-label\" *ngIf=\"fields.displayName\">{{ fields.displayName }}</label>\r\n    <div>\r\n        {{'AbpUi::'+(showValue ? 'Yes' : 'No') | abpLocalization}}\r\n    </div>\r\n</div>\r\n}", styles: [""], dependencies: [{ kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.LocalizationPipe, name: "abpLocalization" }] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SwitchViewComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-switch-view', template: "@if(showInList){\r\n    {{'AbpUi::'+(showValue ? 'Yes' : 'No') | abpLocalization}}\r\n} @else{\r\n<div class=\"mb-3\">\r\n    <label class=\"form-label\" *ngIf=\"fields.displayName\">{{ fields.displayName }}</label>\r\n    <div>\r\n        {{'AbpUi::'+(showValue ? 'Yes' : 'No') | abpLocalization}}\r\n    </div>\r\n</div>\r\n}" }]
+        }], propDecorators: { showInList: [{
+                type: Input
+            }], fields: [{
+                type: Input
+            }], type: [{
+                type: Input
+            }], value: [{
+                type: Input
+            }] } });
+
 class NumbericEditConfig {
     constructor(data) {
         /**占位符 */
         this['NumericEditField.Placeholder'] = ['', []];
         /**最小值 */
-        this['NumericEditField.Min'] = ['', []];
+        this['NumericEditField.Min'] = ['', [Validators.required]];
         //最大值
-        this['NumericEditField.Max'] = ['', []];
+        this['NumericEditField.Max'] = ['', [Validators.required]];
         // 小数位数
         this['NumericEditField.Decimals'] = [2, []];
         //步长
@@ -333,6 +562,7 @@ class NumbericEditConfig {
 class NumbericEditConfigComponent {
     constructor(fb) {
         this.fb = fb;
+        this.cdr = inject(ChangeDetectorRef);
     }
     set type(v) {
         this._type = v;
@@ -351,7 +581,8 @@ class NumbericEditConfigComponent {
     async dataLoaded() {
         if (this._Entity && this._type) {
             await this.AfterInit();
-            this.submitclick.nativeElement.click();
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
         }
     }
     AfterInit() {
@@ -366,11 +597,11 @@ class NumbericEditConfigComponent {
         });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: NumbericEditConfigComponent, deps: [{ token: i1.FormBuilder }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: NumbericEditConfigComponent, selector: "df-numberic-edit-config", inputs: { type: "type", selected: "selected", Entity: "Entity" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true, static: true }], ngImport: i0, template: "<form [formGroup]=\"_Entity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Placeholder' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Placeholder\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Min' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Min\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Max' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Max\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::NumericDecimals' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Decimals\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::NumericStep' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Step\">\n            <small class=\"form-text text-muted d-block\">{{'DigniteAbpForms::NumericStepHelp'|abpLocalization}}</small>\n        </div>\n    \n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::FormatSpecifier' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"FormatSpecifier\">\n            <small class=\"form-text text-muted d-block\">See:<a href=\"https://docs.microsoft.com/zh-cn/dotnet/standard/base-types/standard-numeric-format-strings\"  target=\"_blank\">https://docs.microsoft.com/zh-cn/dotnet/standard/base-types/standard-numeric-format-strings</a></small>\n        </div>\n        \n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\" #submitclick></button>\n    </div>\n</form>", styles: [""], dependencies: [{ kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i1.FormGroupName, selector: "[formGroupName]", inputs: ["formGroupName"] }, { kind: "directive", type: i2.InitDirective, selector: "[abpInit]", outputs: ["abpInit"] }, { kind: "directive", type: i3.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "directive", type: i3.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }, { kind: "pipe", type: i2.LocalizationPipe, name: "abpLocalization" }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: NumbericEditConfigComponent, selector: "df-numberic-edit-config", inputs: { type: "type", selected: "selected", Entity: "Entity" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true }], ngImport: i0, template: "<form [formGroup]=\"_Entity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Placeholder' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Placeholder\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Min' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Min\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Max' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Max\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::NumericDecimals' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Decimals\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::NumericStep' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Step\">\n            <small class=\"form-text text-muted d-block\">{{'DigniteAbpForms::NumericStepHelp'|abpLocalization}}</small>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::FormatSpecifier' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"FormatSpecifier\">\n            <small class=\"form-text text-muted d-block\">See:<a href=\"https://docs.microsoft.com/zh-cn/dotnet/standard/base-types/standard-numeric-format-strings\"  target=\"_blank\">https://docs.microsoft.com/zh-cn/dotnet/standard/base-types/standard-numeric-format-strings</a></small>\n        </div>\n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\" #submitclick></button>\n    </div>\n</form>", styles: [""], dependencies: [{ kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i1.FormGroupName, selector: "[formGroupName]", inputs: ["formGroupName"] }, { kind: "directive", type: i2.InitDirective, selector: "[abpInit]", outputs: ["abpInit"] }, { kind: "directive", type: i3.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "directive", type: i3.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }, { kind: "pipe", type: i2.LocalizationPipe, name: "abpLocalization" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: NumbericEditConfigComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'df-numberic-edit-config', template: "<form [formGroup]=\"_Entity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Placeholder' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Placeholder\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Min' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Min\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Max' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Max\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::NumericDecimals' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Decimals\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::NumericStep' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Step\">\n            <small class=\"form-text text-muted d-block\">{{'DigniteAbpForms::NumericStepHelp'|abpLocalization}}</small>\n        </div>\n    \n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::FormatSpecifier' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"FormatSpecifier\">\n            <small class=\"form-text text-muted d-block\">See:<a href=\"https://docs.microsoft.com/zh-cn/dotnet/standard/base-types/standard-numeric-format-strings\"  target=\"_blank\">https://docs.microsoft.com/zh-cn/dotnet/standard/base-types/standard-numeric-format-strings</a></small>\n        </div>\n        \n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\" #submitclick></button>\n    </div>\n</form>" }]
+            args: [{ selector: 'df-numberic-edit-config', template: "<form [formGroup]=\"_Entity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Placeholder' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Placeholder\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Min' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Min\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Max' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Max\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::NumericDecimals' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Decimals\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::NumericStep' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Step\">\n            <small class=\"form-text text-muted d-block\">{{'DigniteAbpForms::NumericStepHelp'|abpLocalization}}</small>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::FormatSpecifier' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"FormatSpecifier\">\n            <small class=\"form-text text-muted d-block\">See:<a href=\"https://docs.microsoft.com/zh-cn/dotnet/standard/base-types/standard-numeric-format-strings\"  target=\"_blank\">https://docs.microsoft.com/zh-cn/dotnet/standard/base-types/standard-numeric-format-strings</a></small>\n        </div>\n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\" #submitclick></button>\n    </div>\n</form>" }]
         }], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { type: [{
                 type: Input
             }], selected: [{
@@ -379,7 +610,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 type: Input
             }], submitclick: [{
                 type: ViewChild,
-                args: ['submitclick', { static: true }]
+                args: ['submitclick', { static: false }]
             }] } });
 
 function maxDecimalPlacesValidator(maxDecimalPlaces) {
@@ -419,7 +650,7 @@ class NumbericEditControlComponent {
         this.dataLoaded();
     }
     get extraProperties() {
-        return this._entity.get('extraProperties');
+        return this._entity?.get('extraProperties');
     }
     get fieldInput() { return this.extraProperties.get(this._fields.field.name); }
     /**数据加载完成 */
@@ -460,7 +691,7 @@ class NumbericEditControlComponent {
         let formConfiguration = this._fields.field.formConfiguration;
         let Decimals = formConfiguration['NumericEditField.Decimals'];
         if (decimalPart.length > Decimals) {
-            this.fieldInput.patchValue(val.slice(0, val.length - (decimalPart.length - 2)).toString());
+            this.fieldInput?.patchValue(val.slice(0, val.length - (decimalPart.length - 2)));
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: NumbericEditControlComponent, deps: [{ token: i1.FormBuilder }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
@@ -515,6 +746,7 @@ class DateEditConfigComponent {
         this._dataPipe = inject(DatePipe);
         this._DateEditInterfaces = DateEditInterfaces;
         this.dateTimeType = 'date';
+        this.cdr = inject(ChangeDetectorRef);
     }
     set type(v) {
         this._type = v;
@@ -532,7 +764,8 @@ class DateEditConfigComponent {
     async dataLoaded() {
         if (this._Entity && this._type) {
             await this.AfterInit();
-            this.submitclick.nativeElement.click();
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
         }
     }
     AfterInit() {
@@ -680,6 +913,78 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 args: ['submitclick', { static: true }]
             }] } });
 
+class DateEditViewComponent {
+    constructor() {
+        /**展示则内容 */
+        this.showValue = '';
+        /**是否显示再列表 */
+        this.showInList = false;
+        /**表单控件Value */
+        this._value = '';
+    }
+    set value(v) {
+        this._value = v;
+    }
+    async ngAfterContentInit() {
+        //Called after ngOnInit when the component's or directive's content has been initialized.
+        //Add 'implements AfterContentInit' to the class.
+        let valueOptions = this._value;
+        if (this.type && valueOptions) {
+            this.showValue = valueOptions;
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DateEditViewComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.1.5", type: DateEditViewComponent, selector: "df-date-edit-view", inputs: { showInList: "showInList", fields: "fields", type: "type", value: "value" }, ngImport: i0, template: "@if(showInList){\r\n{{showValue|shortDateTime}}\r\n} @else{\r\n<div class=\"mb-3\">\r\n    <label class=\"form-label\" *ngIf=\"fields.displayName\">{{ fields.displayName }}</label>\r\n    <div>\r\n        {{showValue|shortDateTime}}\r\n    </div>\r\n</div>\r\n}", styles: [""], dependencies: [{ kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.ShortDateTimePipe, name: "shortDateTime" }] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DateEditViewComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-date-edit-view', template: "@if(showInList){\r\n{{showValue|shortDateTime}}\r\n} @else{\r\n<div class=\"mb-3\">\r\n    <label class=\"form-label\" *ngIf=\"fields.displayName\">{{ fields.displayName }}</label>\r\n    <div>\r\n        {{showValue|shortDateTime}}\r\n    </div>\r\n</div>\r\n}" }]
+        }], propDecorators: { showInList: [{
+                type: Input
+            }], fields: [{
+                type: Input
+            }], type: [{
+                type: Input
+            }], value: [{
+                type: Input
+            }] } });
+
+class NumericEditViewComponent {
+    constructor() {
+        /**展示则内容 */
+        this.showValue = '';
+        /**是否显示再列表 */
+        this.showInList = false;
+        /**表单控件Value */
+        this._value = '';
+    }
+    set value(v) {
+        this._value = v;
+    }
+    async ngAfterContentInit() {
+        //Called after ngOnInit when the component's or directive's content has been initialized.
+        //Add 'implements AfterContentInit' to the class.
+        let valueOptions = this._value;
+        if (this.type && valueOptions) {
+            this.showValue = valueOptions;
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: NumericEditViewComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.1.5", type: NumericEditViewComponent, selector: "df-numeric-edit-view", inputs: { showInList: "showInList", fields: "fields", type: "type", value: "value" }, ngImport: i0, template: "@if(showInList){\r\n{{showValue}}\r\n} @else{\r\n<div class=\"mb-3\">\r\n    <label class=\"form-label\" *ngIf=\"fields.displayName\">{{ fields.displayName }}</label>\r\n    <div>\r\n        {{showValue}}\r\n    </div>\r\n</div>\r\n}", styles: [""], dependencies: [{ kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: NumericEditViewComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-numeric-edit-view', template: "@if(showInList){\r\n{{showValue}}\r\n} @else{\r\n<div class=\"mb-3\">\r\n    <label class=\"form-label\" *ngIf=\"fields.displayName\">{{ fields.displayName }}</label>\r\n    <div>\r\n        {{showValue}}\r\n    </div>\r\n</div>\r\n}" }]
+        }], propDecorators: { showInList: [{
+                type: Input
+            }], fields: [{
+                type: Input
+            }], type: [{
+                type: Input
+            }], value: [{
+                type: Input
+            }] } });
+
 class SelectConfig {
     constructor(data) {
         /**空值文本 */
@@ -781,6 +1086,7 @@ class SelectConfigComponent {
     constructor(fb, _DfApiService) {
         this.fb = fb;
         this._DfApiService = _DfApiService;
+        this.cdr = inject(ChangeDetectorRef);
     }
     set type(v) {
         this._type = v;
@@ -793,7 +1099,7 @@ class SelectConfigComponent {
         this.dataLoaded();
     }
     get formConfiguration() {
-        return this._Entity.get('formConfiguration');
+        return this._Entity?.get('formConfiguration');
     }
     get SelectOptions() {
         return this.formConfiguration.controls['Select.Options'];
@@ -801,7 +1107,8 @@ class SelectConfigComponent {
     async dataLoaded() {
         if (this._Entity && this._type) {
             await this.AfterInit();
-            this.submitclick.nativeElement.click();
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
         }
     }
     /**增加选项 */
@@ -818,11 +1125,16 @@ class SelectConfigComponent {
     }
     AfterInit() {
         return new Promise((resolve, rejects) => {
-            this._Entity.setControl('formConfiguration', this.fb.group(new SelectConfig()));
+            this._Entity?.setControl('formConfiguration', this.fb.group(new SelectConfig()));
             if (this._selected && this._selected.formControlName == this._type) {
-                this._selected.formConfiguration['Select.Options']?.forEach(el => {
+                for (const element of this._selected.formConfiguration['Select.Options']) {
+                    for (const key in element) {
+                        const item = element[key];
+                        const capitalizedKey = key.charAt(0).toUpperCase() + key.slice(1);
+                        element[capitalizedKey] = item;
+                    }
                     this.addSelectOptions();
-                });
+                }
                 this.formConfiguration.patchValue({
                     ...this._selected.formConfiguration,
                 });
@@ -836,7 +1148,7 @@ class SelectConfigComponent {
     textChange(event, index) {
         let SelectOptionsItem = this.SelectOptions.at(index);
         let value = event.target.value;
-        if (SelectOptionsItem.get('Value').value)
+        if (SelectOptionsItem.get('Value')?.value)
             return;
         SelectOptionsItem.patchValue({
             Value: this._DfApiService.chineseToPinyin(value),
@@ -864,6 +1176,9 @@ class SelectControlComponent {
         this.fb = fb;
         /**字段配置列表 */
         this._fields = '';
+        /**父级字段名称，用于为表单设置控件赋值 */
+        this._selected = [];
+        this.cdr = inject(ChangeDetectorRef);
         this.formConfiguration = '';
     }
     set fields(v) {
@@ -873,20 +1188,21 @@ class SelectControlComponent {
         this._parentFiledName = v;
     }
     set selected(v) {
-        this._selected = v;
+        this._selected = v || [];
     }
     set entity(v) {
         this._entity = v;
         this.dataLoaded();
     }
     get extraProperties() {
-        return this._entity.get('extraProperties');
+        return this._entity?.get('extraProperties');
     }
     /**数据加载完成 */
     async dataLoaded() {
         if (this._fields && this._entity) {
             await this.AfterInit();
-            this.submitclick.nativeElement.click();
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
         }
     }
     AfterInit() {
@@ -896,18 +1212,22 @@ class SelectControlComponent {
                 ValidatorsArray.push(Validators.required);
             }
             this.formConfiguration = this._fields.field.formConfiguration;
-            if (!this._selected) {
-                const isMultiple = this.formConfiguration['Select.Multiple'];
-                let selectValue = isMultiple ? [] : '';
-                this.formConfiguration['Select.Options'].forEach(el => {
-                    if (el.Selected) {
-                        selectValue = isMultiple
-                            ? [...selectValue, el.value || el.Value]
-                            : [el.value || el.Value];
+            const isMultiple = this.formConfiguration['Select.Multiple'];
+            let selectValue = isMultiple ? [] : [];
+            for (const element of this.formConfiguration['Select.Options']) {
+                for (const key in element) {
+                    const item = element[key];
+                    const capitalizedKey = key.charAt(0).toUpperCase() + key.slice(1);
+                    element[capitalizedKey] = item;
+                }
+                if (!this._selected) {
+                    if (Array.isArray(this._selected) && element.Selected && this._selected.length === 0) {
+                        selectValue = isMultiple ? [...selectValue, element.Value] : [element.Value];
+                        this._selected = selectValue;
                     }
-                });
-                this._selected = selectValue;
+                }
             }
+            // this._selected = selectValue;
             let newControl = this.fb.control(this._selected, ValidatorsArray);
             this.extraProperties.setControl(this._fields.field.name, newControl);
             resolve(true);
@@ -919,11 +1239,97 @@ class SelectControlComponent {
         this.extraProperties.removeControl(this._fields.field.name);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SelectControlComponent, deps: [{ token: i1.FormBuilder }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: SelectControlComponent, selector: "df-select-control", inputs: { fields: "fields", parentFiledName: "parentFiledName", selected: "selected", entity: "entity" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true, static: true }], ngImport: i0, template: "<form [formGroup]=\"_entity\">\n    <div formGroupName=\"extraProperties\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\"  *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n            <ng-container *ngIf=\"formConfiguration['Select.Multiple']; else elseTemplate\">\n                <select class=\"form-select\" multiple formControlName=\"{{_fields.field.name}}\">\n                    <ng-container *ngFor=\"let item of _fields.field.formConfiguration['Select.Options'];let i =index\">\n                        <option [value]=\"item.Value\">{{item.Text}}</option>\n                    </ng-container>\n                </select>\n            </ng-container>\n            <ng-template #elseTemplate>\n                <select class=\"form-select\" [multiple]=\"false\"\n                    formControlName=\"{{_fields.field.name}}\">\n                    <option>{{formConfiguration['Select.NullText']}}</option>\n                    <ng-container *ngFor=\"let item of _fields.field.formConfiguration['Select.Options'];let i =index\">\n                        <option [value]=\"item.Value\" >{{item.Text}}</option>\n                    </ng-container>\n                </select>\n            </ng-template>\n            <small class=\"form-text text-muted d-block\" *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\n        </div>\n\n    </div>\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\n</form>", styles: [""], dependencies: [{ kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.NgSelectOption, selector: "option", inputs: ["ngValue", "value"] }, { kind: "directive", type: i1.ɵNgSelectMultipleOption, selector: "option", inputs: ["ngValue", "value"] }, { kind: "directive", type: i1.SelectMultipleControlValueAccessor, selector: "select[multiple][formControlName],select[multiple][formControl],select[multiple][ngModel]", inputs: ["compareWith"] }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i2$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i1.FormGroupName, selector: "[formGroupName]", inputs: ["formGroupName"] }, { kind: "directive", type: i3.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "directive", type: i3.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: SelectControlComponent, selector: "df-select-control", inputs: { fields: "fields", parentFiledName: "parentFiledName", selected: "selected", entity: "entity" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true, static: true }], ngImport: i0, template: "<form [formGroup]=\"_entity\">\n    <div formGroupName=\"extraProperties\" class=\"selectcontrol\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n            <ng-container *ngIf=\"formConfiguration['Select.Multiple']; else elseTemplate\">\n                <nz-select class=\"form-select form-select-multiple\" [nzMaxTagCount]=\"1\"\n                    nzShowSearch nzMode=\"multiple\"  [nzPlaceHolder]=\"_fields.field.formConfiguration['Select.NullText']\"\n                    formControlName=\"{{_fields.field.name}}\">\n                    <nz-option *ngFor=\"let item of _fields?.field?.formConfiguration['Select.Options']\"\n                        [nzLabel]=\"item.Text\" [nzValue]=\"item.Value\"></nz-option>\n                </nz-select>\n            </ng-container>\n            <ng-template #elseTemplate>\n                <select class=\"form-select\" [multiple]=\"false\" formControlName=\"{{_fields.field.name}}\">\n                    <option [value]=\"''\">{{formConfiguration['Select.NullText']}}</option>\n                    <ng-container *ngFor=\"let item of _fields?.field?.formConfiguration['Select.Options'];let i =index\">\n                        <option [value]=\"item.Value\">{{item.Text}}</option>\n                    </ng-container>\n                </select>\n            </ng-template>\n            <small class=\"form-text text-muted d-block\"\n                *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\n        </div>\n\n    </div>\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\n</form>", styles: ["::ng-deep .selectcontrol nz-select{width:100%}::ng-deep .selectcontrol nz-select .ant-select-selector{background:transparent!important;border:none!important;padding:.475rem 1.25rem!important;box-shadow:none!important;height:auto!important}::ng-deep .selectcontrol nz-select .anticon-search,::ng-deep .selectcontrol nz-select .anticon-down{display:none}::ng-deep .selectcontrol .ant-select{color:inherit!important}::ng-deep .selectcontrol .ant-select-selection-placeholder{color:inherit!important}::ng-deep .selectcontrol .ant-select-multiple .ant-select-selection-item{max-width:40%!important}::ng-deep .was-validated .form-select-multiple{border-color:#4fbf67;padding-right:calc(1.5em + 1.35rem);background-image:url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%234fbf67' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e\");background-repeat:no-repeat;background-position:right calc(.375em + .3375rem) center;background-size:calc(.75em + .675rem) calc(.75em + .675rem)}\n"], dependencies: [{ kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.NgSelectOption, selector: "option", inputs: ["ngValue", "value"] }, { kind: "directive", type: i1.ɵNgSelectMultipleOption, selector: "option", inputs: ["ngValue", "value"] }, { kind: "directive", type: i1.SelectMultipleControlValueAccessor, selector: "select[multiple][formControlName],select[multiple][formControl],select[multiple][ngModel]", inputs: ["compareWith"] }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i2$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i1.FormGroupName, selector: "[formGroupName]", inputs: ["formGroupName"] }, { kind: "directive", type: i3.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "directive", type: i3.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }, { kind: "component", type: i4.NzOptionComponent, selector: "nz-option", inputs: ["nzTitle", "nzLabel", "nzValue", "nzKey", "nzDisabled", "nzHide", "nzCustomContent"], exportAs: ["nzOption"] }, { kind: "component", type: i4.NzSelectComponent, selector: "nz-select", inputs: ["nzId", "nzSize", "nzStatus", "nzOptionHeightPx", "nzOptionOverflowSize", "nzDropdownClassName", "nzDropdownMatchSelectWidth", "nzDropdownStyle", "nzNotFoundContent", "nzPlaceHolder", "nzPlacement", "nzMaxTagCount", "nzDropdownRender", "nzCustomTemplate", "nzSuffixIcon", "nzClearIcon", "nzRemoveIcon", "nzMenuItemSelectedIcon", "nzTokenSeparators", "nzMaxTagPlaceholder", "nzMaxMultipleCount", "nzMode", "nzFilterOption", "compareWith", "nzAllowClear", "nzBorderless", "nzShowSearch", "nzLoading", "nzAutoFocus", "nzAutoClearSearchValue", "nzServerSearch", "nzDisabled", "nzOpen", "nzSelectOnTab", "nzBackdrop", "nzOptions", "nzShowArrow"], outputs: ["nzOnSearch", "nzScrollToBottom", "nzOpenChange", "nzBlur", "nzFocus"], exportAs: ["nzSelect"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SelectControlComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'df-select-control', template: "<form [formGroup]=\"_entity\">\n    <div formGroupName=\"extraProperties\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\"  *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n            <ng-container *ngIf=\"formConfiguration['Select.Multiple']; else elseTemplate\">\n                <select class=\"form-select\" multiple formControlName=\"{{_fields.field.name}}\">\n                    <ng-container *ngFor=\"let item of _fields.field.formConfiguration['Select.Options'];let i =index\">\n                        <option [value]=\"item.Value\">{{item.Text}}</option>\n                    </ng-container>\n                </select>\n            </ng-container>\n            <ng-template #elseTemplate>\n                <select class=\"form-select\" [multiple]=\"false\"\n                    formControlName=\"{{_fields.field.name}}\">\n                    <option>{{formConfiguration['Select.NullText']}}</option>\n                    <ng-container *ngFor=\"let item of _fields.field.formConfiguration['Select.Options'];let i =index\">\n                        <option [value]=\"item.Value\" >{{item.Text}}</option>\n                    </ng-container>\n                </select>\n            </ng-template>\n            <small class=\"form-text text-muted d-block\" *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\n        </div>\n\n    </div>\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\n</form>" }]
+            args: [{ selector: 'df-select-control', template: "<form [formGroup]=\"_entity\">\n    <div formGroupName=\"extraProperties\" class=\"selectcontrol\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n            <ng-container *ngIf=\"formConfiguration['Select.Multiple']; else elseTemplate\">\n                <nz-select class=\"form-select form-select-multiple\" [nzMaxTagCount]=\"1\"\n                    nzShowSearch nzMode=\"multiple\"  [nzPlaceHolder]=\"_fields.field.formConfiguration['Select.NullText']\"\n                    formControlName=\"{{_fields.field.name}}\">\n                    <nz-option *ngFor=\"let item of _fields?.field?.formConfiguration['Select.Options']\"\n                        [nzLabel]=\"item.Text\" [nzValue]=\"item.Value\"></nz-option>\n                </nz-select>\n            </ng-container>\n            <ng-template #elseTemplate>\n                <select class=\"form-select\" [multiple]=\"false\" formControlName=\"{{_fields.field.name}}\">\n                    <option [value]=\"''\">{{formConfiguration['Select.NullText']}}</option>\n                    <ng-container *ngFor=\"let item of _fields?.field?.formConfiguration['Select.Options'];let i =index\">\n                        <option [value]=\"item.Value\">{{item.Text}}</option>\n                    </ng-container>\n                </select>\n            </ng-template>\n            <small class=\"form-text text-muted d-block\"\n                *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\n        </div>\n\n    </div>\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\n</form>", styles: ["::ng-deep .selectcontrol nz-select{width:100%}::ng-deep .selectcontrol nz-select .ant-select-selector{background:transparent!important;border:none!important;padding:.475rem 1.25rem!important;box-shadow:none!important;height:auto!important}::ng-deep .selectcontrol nz-select .anticon-search,::ng-deep .selectcontrol nz-select .anticon-down{display:none}::ng-deep .selectcontrol .ant-select{color:inherit!important}::ng-deep .selectcontrol .ant-select-selection-placeholder{color:inherit!important}::ng-deep .selectcontrol .ant-select-multiple .ant-select-selection-item{max-width:40%!important}::ng-deep .was-validated .form-select-multiple{border-color:#4fbf67;padding-right:calc(1.5em + 1.35rem);background-image:url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%234fbf67' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e\");background-repeat:no-repeat;background-position:right calc(.375em + .3375rem) center;background-size:calc(.75em + .675rem) calc(.75em + .675rem)}\n"] }]
+        }], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { fields: [{
+                type: Input
+            }], parentFiledName: [{
+                type: Input
+            }], selected: [{
+                type: Input
+            }], entity: [{
+                type: Input
+            }], submitclick: [{
+                type: ViewChild,
+                args: ['submitclick', { static: true }]
+            }] } });
+
+class SelectSearchComponent {
+    constructor(fb) {
+        this.fb = fb;
+        /**字段配置列表 */
+        this._fields = '';
+        this.cdr = inject(ChangeDetectorRef);
+        this.formConfiguration = '';
+    }
+    set fields(v) {
+        this._fields = v;
+    }
+    set parentFiledName(v) {
+        this._parentFiledName = v;
+    }
+    set selected(v) {
+        this._selected = v;
+    }
+    set entity(v) {
+        this._entity = v;
+        this.dataLoaded();
+    }
+    get extraProperties() {
+        return this._entity?.get('extraProperties');
+    }
+    /**数据加载完成 */
+    async dataLoaded() {
+        if (this._fields && this._entity) {
+            await this.AfterInit();
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
+        }
+    }
+    AfterInit() {
+        return new Promise((resolve, rejects) => {
+            let ValidatorsArray = [];
+            this.formConfiguration = this._fields.field.formConfiguration;
+            const isMultiple = this.formConfiguration['Select.Multiple'];
+            let selectValue = isMultiple ? [] : [];
+            for (const element of this.formConfiguration['Select.Options']) {
+                for (const key in element) {
+                    const item = element[key];
+                    const capitalizedKey = key.charAt(0).toUpperCase() + key.slice(1);
+                    element[capitalizedKey] = item;
+                }
+                // if (this._selected) {
+                //   if (Array.isArray(this._selected) && element.Selected && this._selected.length === 0) {
+                //     selectValue = isMultiple ? [...selectValue, element.Value] : [element.Value];
+                //   }
+                // }
+            }
+            this._selected = selectValue;
+            let newControl = this.fb.control(this._selected, ValidatorsArray);
+            this.extraProperties.setControl(this._fields.field.name, newControl);
+            resolve(true);
+        });
+    }
+    changeValue(event) {
+        let selectvalue = this.extraProperties.get(this._fields.field.name).value;
+        if (selectvalue[0] === '') {
+            this.extraProperties.get(this._fields.field.name).setValue([]);
+        }
+    }
+    ngOnDestroy() {
+        //Called once, before the instance is destroyed.
+        //Add 'implements OnDestroy' to the class.
+        this.extraProperties.removeControl(this._fields.field.name);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SelectSearchComponent, deps: [{ token: i1.FormBuilder }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: SelectSearchComponent, selector: "df-select-search", inputs: { fields: "fields", parentFiledName: "parentFiledName", selected: "selected", entity: "entity" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true, static: true }], ngImport: i0, template: "<form [formGroup]=\"_entity\">\r\n    <div formGroupName=\"extraProperties\" class=\"selectcontrol\">\r\n        <div class=\"mb-3\">\r\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\r\n            <ng-container *ngIf=\"formConfiguration['Select.Multiple']; else elseTemplate\">\r\n                <nz-select class=\"form-select form-select-multiple\" [nzMaxTagCount]=\"1\"\r\n                    nzShowSearch nzMode=\"multiple\" [nzPlaceHolder]=\"_fields.field.formConfiguration['Select.NullText']\"\r\n                    formControlName=\"{{_fields.field.name}}\">\r\n                    <nz-option *ngFor=\"let item of _fields?.field?.formConfiguration['Select.Options']\"\r\n                        [nzLabel]=\"item.Text\" [nzValue]=\"item.Value\"></nz-option>\r\n                </nz-select>\r\n            </ng-container>\r\n            <ng-template #elseTemplate>\r\n                <select class=\"form-select\" [multiple]=\"false\"  [placeholder]=\"formConfiguration['Select.NullText']\"   formControlName=\"{{_fields.field.name}}\" (change)=\"changeValue($event)\">\r\n                    <option [value]=\"''\">{{formConfiguration['Select.NullText']}}</option>\r\n                    <ng-container *ngFor=\"let item of _fields?.field?.formConfiguration['Select.Options'];let i =index\">\r\n                        <option [value]=\"item.Value\">{{item.Text}}</option>\r\n                    </ng-container>\r\n                </select>\r\n            </ng-template>\r\n            <small class=\"form-text text-muted d-block\"\r\n                *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\r\n        </div>\r\n\r\n    </div>\r\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\r\n</form>", styles: ["::ng-deep .selectcontrol nz-select{width:100%}::ng-deep .selectcontrol nz-select .ant-select-selector{background:transparent!important;border:none!important;padding:.475rem 1.25rem!important;box-shadow:none!important;height:auto!important}::ng-deep .selectcontrol nz-select .anticon-search,::ng-deep .selectcontrol nz-select .anticon-down{display:none}::ng-deep .selectcontrol .ant-select{color:inherit!important}::ng-deep .selectcontrol .ant-select-selection-placeholder{color:inherit!important}::ng-deep .selectcontrol .ant-select-multiple .ant-select-selection-item{max-width:40%!important}::ng-deep .was-validated .form-select-multiple{border-color:#4fbf67;padding-right:calc(1.5em + 1.35rem);background-image:url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%234fbf67' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e\");background-repeat:no-repeat;background-position:right calc(.375em + .3375rem) center;background-size:calc(.75em + .675rem) calc(.75em + .675rem)}\n"], dependencies: [{ kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.NgSelectOption, selector: "option", inputs: ["ngValue", "value"] }, { kind: "directive", type: i1.ɵNgSelectMultipleOption, selector: "option", inputs: ["ngValue", "value"] }, { kind: "directive", type: i1.SelectMultipleControlValueAccessor, selector: "select[multiple][formControlName],select[multiple][formControl],select[multiple][ngModel]", inputs: ["compareWith"] }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i2$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i1.FormGroupName, selector: "[formGroupName]", inputs: ["formGroupName"] }, { kind: "directive", type: i3.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "directive", type: i3.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }, { kind: "component", type: i4.NzOptionComponent, selector: "nz-option", inputs: ["nzTitle", "nzLabel", "nzValue", "nzKey", "nzDisabled", "nzHide", "nzCustomContent"], exportAs: ["nzOption"] }, { kind: "component", type: i4.NzSelectComponent, selector: "nz-select", inputs: ["nzId", "nzSize", "nzStatus", "nzOptionHeightPx", "nzOptionOverflowSize", "nzDropdownClassName", "nzDropdownMatchSelectWidth", "nzDropdownStyle", "nzNotFoundContent", "nzPlaceHolder", "nzPlacement", "nzMaxTagCount", "nzDropdownRender", "nzCustomTemplate", "nzSuffixIcon", "nzClearIcon", "nzRemoveIcon", "nzMenuItemSelectedIcon", "nzTokenSeparators", "nzMaxTagPlaceholder", "nzMaxMultipleCount", "nzMode", "nzFilterOption", "compareWith", "nzAllowClear", "nzBorderless", "nzShowSearch", "nzLoading", "nzAutoFocus", "nzAutoClearSearchValue", "nzServerSearch", "nzDisabled", "nzOpen", "nzSelectOnTab", "nzBackdrop", "nzOptions", "nzShowArrow"], outputs: ["nzOnSearch", "nzScrollToBottom", "nzOpenChange", "nzBlur", "nzFocus"], exportAs: ["nzSelect"] }] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SelectSearchComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-select-search', template: "<form [formGroup]=\"_entity\">\r\n    <div formGroupName=\"extraProperties\" class=\"selectcontrol\">\r\n        <div class=\"mb-3\">\r\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\r\n            <ng-container *ngIf=\"formConfiguration['Select.Multiple']; else elseTemplate\">\r\n                <nz-select class=\"form-select form-select-multiple\" [nzMaxTagCount]=\"1\"\r\n                    nzShowSearch nzMode=\"multiple\" [nzPlaceHolder]=\"_fields.field.formConfiguration['Select.NullText']\"\r\n                    formControlName=\"{{_fields.field.name}}\">\r\n                    <nz-option *ngFor=\"let item of _fields?.field?.formConfiguration['Select.Options']\"\r\n                        [nzLabel]=\"item.Text\" [nzValue]=\"item.Value\"></nz-option>\r\n                </nz-select>\r\n            </ng-container>\r\n            <ng-template #elseTemplate>\r\n                <select class=\"form-select\" [multiple]=\"false\"  [placeholder]=\"formConfiguration['Select.NullText']\"   formControlName=\"{{_fields.field.name}}\" (change)=\"changeValue($event)\">\r\n                    <option [value]=\"''\">{{formConfiguration['Select.NullText']}}</option>\r\n                    <ng-container *ngFor=\"let item of _fields?.field?.formConfiguration['Select.Options'];let i =index\">\r\n                        <option [value]=\"item.Value\">{{item.Text}}</option>\r\n                    </ng-container>\r\n                </select>\r\n            </ng-template>\r\n            <small class=\"form-text text-muted d-block\"\r\n                *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\r\n        </div>\r\n\r\n    </div>\r\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\r\n</form>", styles: ["::ng-deep .selectcontrol nz-select{width:100%}::ng-deep .selectcontrol nz-select .ant-select-selector{background:transparent!important;border:none!important;padding:.475rem 1.25rem!important;box-shadow:none!important;height:auto!important}::ng-deep .selectcontrol nz-select .anticon-search,::ng-deep .selectcontrol nz-select .anticon-down{display:none}::ng-deep .selectcontrol .ant-select{color:inherit!important}::ng-deep .selectcontrol .ant-select-selection-placeholder{color:inherit!important}::ng-deep .selectcontrol .ant-select-multiple .ant-select-selection-item{max-width:40%!important}::ng-deep .was-validated .form-select-multiple{border-color:#4fbf67;padding-right:calc(1.5em + 1.35rem);background-image:url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%234fbf67' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e\");background-repeat:no-repeat;background-position:right calc(.375em + .3375rem) center;background-size:calc(.75em + .675rem) calc(.75em + .675rem)}\n"] }]
         }], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { fields: [{
                 type: Input
             }], parentFiledName: [{
@@ -937,6 +1343,47 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 args: ['submitclick', { static: true }]
             }] } });
 
+class SelectViewComponent {
+    constructor() {
+        /**展示则内容 */
+        this.showValue = '';
+        /**是否显示再列表 */
+        this.showInList = false;
+        /**表单控件Value */
+        this._value = '';
+    }
+    set value(v) {
+        this._value = v;
+    }
+    async ngAfterContentInit() {
+        //Called after ngOnInit when the component's or directive's content has been initialized.
+        //Add 'implements AfterContentInit' to the class.
+        let valueOptions = this._value;
+        if (this.type && valueOptions) {
+            if (Array.isArray(valueOptions)) {
+                this.showValue = valueOptions.join(',');
+            }
+            else {
+                this.showValue = valueOptions;
+            }
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SelectViewComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.1.5", type: SelectViewComponent, selector: "df-select-view", inputs: { showInList: "showInList", fields: "fields", type: "type", value: "value" }, ngImport: i0, template: "@if(showInList){\r\n{{showValue}}\r\n} @else{\r\n<div class=\"mb-3\">\r\n    <label class=\"form-label\" *ngIf=\"fields.displayName\">{{ fields.displayName }}</label>\r\n    <div>\r\n        {{showValue}}\r\n    </div>\r\n</div>\r\n}", styles: [""], dependencies: [{ kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SelectViewComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-select-view', template: "@if(showInList){\r\n{{showValue}}\r\n} @else{\r\n<div class=\"mb-3\">\r\n    <label class=\"form-label\" *ngIf=\"fields.displayName\">{{ fields.displayName }}</label>\r\n    <div>\r\n        {{showValue}}\r\n    </div>\r\n</div>\r\n}" }]
+        }], propDecorators: { showInList: [{
+                type: Input
+            }], fields: [{
+                type: Input
+            }], type: [{
+                type: Input
+            }], value: [{
+                type: Input
+            }] } });
+
 // import { CkEditorConfigComponent, CkEditorControlComponent } from "./ck-editor";
 /**
  * 表单控件分组-包含配置，控件，显示的数组
@@ -947,54 +1394,60 @@ const FieldControlGroup = [
         name: 'TextEdit',
         fieldConfigComponent: TextEditConfigComponent,
         fieldComponent: TextEditComponent,
-        // fieldViewComponent:TextBoxViewComponent,
-    }, {
+        fieldViewComponent: TextEditViewComponent,
+        fieldSearchComponent: TextEditSearchComponent,
+    },
+    {
         displayName: '开关',
         name: 'Switch',
         fieldConfigComponent: SwitchConfigComponent,
         fieldComponent: SwitchControlComponent,
-        // fieldViewComponent:TextBoxViewComponent,
-    }, {
+        fieldViewComponent: SwitchViewComponent,
+        fieldSearchComponent: SwitchSearchComponent,
+    },
+    {
         displayName: '选择',
         name: 'Select',
         fieldConfigComponent: SelectConfigComponent,
         fieldComponent: SelectControlComponent,
-        // fieldViewComponent:TextBoxViewComponent,
-    }, {
+        fieldViewComponent: SelectViewComponent,
+        fieldSearchComponent: SelectSearchComponent,
+    },
+    {
         displayName: '数字',
         name: 'NumericEdit',
         fieldConfigComponent: NumbericEditConfigComponent,
         fieldComponent: NumbericEditControlComponent,
-        // fieldViewComponent:TextBoxViewComponent,
-    }, {
+        fieldViewComponent: NumericEditViewComponent,
+    },
+    {
         displayName: '日期',
         name: 'DateEdit',
         fieldConfigComponent: DateEditConfigComponent,
         fieldComponent: DateEditControlComponent,
-        // fieldViewComponent:TextBoxViewComponent,
+        fieldViewComponent: DateEditViewComponent,
     },
 ];
-function getExcludeAssignControl(typeName) {
-    // return FieldControlGroup.filter(el => el.name !== typeName)
-    return FieldControlGroup;
-}
 function AddFieldControlGroup(array = []) {
-    FieldControlGroup.push(...array);
+    for (const element of array) {
+        let find = FieldControlGroup.find((control) => {
+            return control.name === element.name;
+        });
+        if (!find) {
+            FieldControlGroup.push(element);
+        }
+    }
+    return FieldControlGroup;
 }
 
 class DynamicComponent {
-    constructor() {
-        /**字段配置列表 */
-        this._fields = '';
-        /**表单控件组 */
-        this._fieldControlGroup = FieldControlGroup;
-    }
     set selected(v) {
         this._selected = v === undefined ? '' : v === null ? '' : v;
     }
     set type(v) {
         this._type = v;
-        this.dataLoaded(3);
+        if (this._entity)
+            this.dataLoaded(3);
     }
     set culture(v) {
         this._culture = v;
@@ -1011,16 +1464,23 @@ class DynamicComponent {
             this.dataLoaded(3);
         }
     }
+    constructor(mergedConfig) {
+        this.mergedConfig = mergedConfig;
+        /**字段配置列表 */
+        this._fields = '';
+    }
     /**数据加载完成 */
-    dataLoaded(val) {
+    async dataLoaded(val) {
+        let _fieldControlGroup = AddFieldControlGroup(this.mergedConfig);
         if (this._entity) {
+            //加载所有的动态表单组件
             if (this._type) {
-                let fieldControlItem = this._fieldControlGroup.find(el => el.name === this._type);
+                let fieldControlItem = _fieldControlGroup.find(el => el.name === this._type);
                 this.loadfieldConfigComponent(fieldControlItem);
             }
             if (this._fields && this._parentFiledName && this._culture) {
                 /**表单控件组中的项 */
-                let fieldControlItem = this._fieldControlGroup.find(el => el.name === this._fields.field.formControlName);
+                let fieldControlItem = _fieldControlGroup.find(el => el.name === this._fields?.field?.formControlName);
                 this.loadfieldComponent(fieldControlItem);
             }
         }
@@ -1054,13 +1514,16 @@ class DynamicComponent {
         instance.culture = this._culture;
         instance.entity = this._entity;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicComponent, deps: [{ token: 'MERGED_FORM_CONFIG' }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: DynamicComponent, selector: "df-dynamic", inputs: { selected: "selected", type: "type", culture: "culture", parentFiledName: "parentFiledName", fields: "fields", entity: "entity" }, viewQueries: [{ propertyName: "FormControlRef", first: true, predicate: ["FormControlRef"], descendants: true, read: ViewContainerRef, static: true }, { propertyName: "FormComponentsRef", first: true, predicate: ["FormComponentsRef"], descendants: true, read: ViewContainerRef, static: true }], ngImport: i0, template: "<template #FormControlRef></template>\n<template #FormComponentsRef></template>", styles: [""] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicComponent, decorators: [{
             type: Component,
             args: [{ selector: 'df-dynamic', template: "<template #FormControlRef></template>\n<template #FormComponentsRef></template>" }]
-        }], propDecorators: { selected: [{
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['MERGED_FORM_CONFIG']
+                }] }], propDecorators: { selected: [{
                 type: Input
             }], type: [{
                 type: Input
@@ -1080,9 +1543,172 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 args: ['FormComponentsRef', { read: ViewContainerRef, static: true }]
             }] } });
 
+class FormControlService {
+    constructor(mergedConfig) {
+        this.mergedConfig = mergedConfig;
+        this._FieldControlGroup = FieldControlGroup;
+    }
+    AddFieldControlGroup() {
+        let array = this.mergedConfig;
+        for (const element of array) {
+            let find = FieldControlGroup.find(control => {
+                return control.name === element.name;
+            });
+            if (!find) {
+                FieldControlGroup.push(element);
+            }
+        }
+        return FieldControlGroup;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: FormControlService, deps: [{ token: 'MERGED_FORM_CONFIG' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: FormControlService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: FormControlService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['MERGED_FORM_CONFIG']
+                }] }] });
+
+class DynamicViewComponent {
+    constructor(_FormControlService) {
+        this._FormControlService = _FormControlService;
+        /**是否显示再列表 */
+        this.showInList = false;
+        /**表单控件Value */
+        this._value = '';
+    }
+    set value(v) {
+        this._value = v;
+        // if(this._value) this.dataLoaded();
+    }
+    ngAfterContentInit() {
+        //Called after ngOnInit when the component's or directive's content has been initialized.
+        //Add 'implements AfterContentInit' to the class.
+        if (this.type && this._value !== '') {
+            let _fieldControlGroup = this._FormControlService.AddFieldControlGroup();
+            let fieldControlItem = _fieldControlGroup.find(el => el.name === this.type);
+            this.loadViewComponent(fieldControlItem);
+        }
+    }
+    /**加载动态展示组件 */
+    loadViewComponent(FieldControlItem) {
+        //清空了容器中的所有组件
+        this.FormTemplateRef?.clear();
+        if (!FieldControlItem || !FieldControlItem.fieldViewComponent)
+            return;
+        //在容器中创建组件
+        const { instance } = this.FormTemplateRef?.createComponent(FieldControlItem.fieldViewComponent); //创建组件模板
+        /**向创建的组件模板中传值 */
+        instance.type = this.type;
+        instance.value = this._value;
+        instance.fields = this.fields;
+        instance.showInList = this.showInList;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicViewComponent, deps: [{ token: FormControlService }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: DynamicViewComponent, selector: "df-dynamic-view", inputs: { showInList: "showInList", fields: "fields", type: "type", value: "value" }, viewQueries: [{ propertyName: "FormTemplateRef", first: true, predicate: ["FormTemplateRef"], descendants: true, read: ViewContainerRef, static: true }], ngImport: i0, template: "<template #FormTemplateRef></template>", styles: [""] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicViewComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-dynamic-view', template: "<template #FormTemplateRef></template>" }]
+        }], ctorParameters: () => [{ type: FormControlService }], propDecorators: { showInList: [{
+                type: Input
+            }], fields: [{
+                type: Input
+            }], type: [{
+                type: Input
+            }], value: [{
+                type: Input
+            }], FormTemplateRef: [{
+                type: ViewChild,
+                args: ['FormTemplateRef', { read: ViewContainerRef, static: true }]
+            }] } });
+
+class DynamicConfigComponent {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicConfigComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: DynamicConfigComponent, selector: "df-dynamic-config", ngImport: i0, template: "<p>dynamic-config works!</p>\r\n", styles: [""] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicConfigComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-dynamic-config', template: "<p>dynamic-config works!</p>\r\n" }]
+        }] });
+
+class DynamicControlComponent {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicControlComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: DynamicControlComponent, selector: "df-dynamic-control", ngImport: i0, template: "<p>dynamic-control works!</p>\r\n", styles: [""] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicControlComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-dynamic-control', template: "<p>dynamic-control works!</p>\r\n" }]
+        }] });
+
+class DynamicSearchComponent {
+    constructor(_FormControlService) {
+        this._FormControlService = _FormControlService;
+        /**字段配置列表 */
+        this._fields = '';
+    }
+    set culture(v) {
+        this._culture = v;
+    }
+    set parentFiledName(v) {
+        this._parentFiledName = v;
+    }
+    set fields(v) {
+        this._fields = v;
+    }
+    set entity(v) {
+        if (v) {
+            this._entity = v;
+        }
+    }
+    ngAfterContentInit() {
+        //Called after ngOnInit when the component's or directive's content has been initialized.
+        //Add 'implements AfterContentInit' to the class.
+        if (this._fields && this._entity && this._culture) {
+            let _fieldControlGroup = this._FormControlService.AddFieldControlGroup();
+            let fieldControlItem = _fieldControlGroup.find(el => el.name === this._fields?.field?.formControlName);
+            this.loadComponent(fieldControlItem);
+        }
+    }
+    /**加载动态展示组件 */
+    loadComponent(FieldControlItem) {
+        //清空了容器中的所有组件
+        this.FormSearchTemplateRef?.clear();
+        if (!FieldControlItem || !FieldControlItem.fieldSearchComponent)
+            return;
+        //在容器中创建组件
+        const { instance } = this.FormSearchTemplateRef?.createComponent(FieldControlItem.fieldSearchComponent); //创建组件模板
+        /**向创建的组件模板中传值 */
+        instance.fields = this._fields;
+        instance.parentFiledName = this._parentFiledName;
+        instance.culture = this._culture;
+        instance.entity = this._entity;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicSearchComponent, deps: [{ token: FormControlService }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: DynamicSearchComponent, selector: "df-dynamic-search", inputs: { culture: "culture", parentFiledName: "parentFiledName", fields: "fields", entity: "entity" }, viewQueries: [{ propertyName: "FormSearchTemplateRef", first: true, predicate: ["FormSearchTemplateRef"], descendants: true, read: ViewContainerRef, static: true }], ngImport: i0, template: "<template #FormSearchTemplateRef></template>", styles: [""] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicSearchComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-dynamic-search', template: "<template #FormSearchTemplateRef></template>" }]
+        }], ctorParameters: () => [{ type: FormControlService }], propDecorators: { culture: [{
+                type: Input
+            }], parentFiledName: [{
+                type: Input
+            }], fields: [{
+                type: Input
+            }], entity: [{
+                type: Input
+            }], FormSearchTemplateRef: [{
+                type: ViewChild,
+                args: ['FormSearchTemplateRef', { read: ViewContainerRef, static: true }]
+            }] } });
+
 class DynamicFormModule {
     static forRoot(config) {
-        AddFieldControlGroup(config?.cmsFieldControlGroup);
         return {
             ngModule: DynamicFormModule,
             providers: []
@@ -1099,28 +1725,49 @@ class DynamicFormModule {
             DateEditControlComponent,
             SelectConfigComponent,
             SelectControlComponent,
-            DynamicComponent], imports: [FormsModule,
+            DynamicComponent,
+            DynamicConfigComponent,
+            DynamicViewComponent,
+            DynamicControlComponent,
+            SelectViewComponent,
+            SwitchViewComponent,
+            TextEditViewComponent,
+            DateEditViewComponent,
+            NumericEditViewComponent,
+            DynamicSearchComponent,
+            SelectSearchComponent,
+            TextEditSearchComponent,
+            SwitchSearchComponent], imports: [FormsModule,
             CoreModule,
             ThemeSharedModule,
             ReactiveFormsModule,
             NgbDropdownModule,
-            NzTreeModule], exports: [TextEditConfigComponent,
+            NzSelectModule], exports: [TextEditConfigComponent,
             TextEditComponent,
+            TextEditViewComponent,
             SwitchConfigComponent,
             SwitchControlComponent,
+            SwitchViewComponent,
             NumbericEditConfigComponent,
             NumbericEditControlComponent,
             DateEditConfigComponent,
             DateEditControlComponent,
+            DateEditViewComponent,
             SelectConfigComponent,
             SelectControlComponent,
-            DynamicComponent] }); }
+            SelectViewComponent,
+            SelectSearchComponent,
+            DynamicComponent,
+            DynamicConfigComponent,
+            DynamicViewComponent,
+            DynamicControlComponent,
+            DynamicSearchComponent] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicFormModule, imports: [FormsModule,
             CoreModule,
             ThemeSharedModule,
             ReactiveFormsModule,
             NgbDropdownModule,
-            NzTreeModule] }); }
+            NzSelectModule] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicFormModule, decorators: [{
             type: NgModule,
@@ -1137,6 +1784,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                         SelectConfigComponent,
                         SelectControlComponent,
                         DynamicComponent,
+                        DynamicConfigComponent,
+                        DynamicViewComponent,
+                        DynamicControlComponent,
+                        SelectViewComponent,
+                        SwitchViewComponent,
+                        TextEditViewComponent,
+                        DateEditViewComponent,
+                        NumericEditViewComponent,
+                        DynamicSearchComponent,
+                        SelectSearchComponent,
+                        TextEditSearchComponent,
+                        SwitchSearchComponent,
                     ],
                     imports: [
                         FormsModule,
@@ -1144,21 +1803,32 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                         ThemeSharedModule,
                         ReactiveFormsModule,
                         NgbDropdownModule,
-                        NzTreeModule,
+                        NzSelectModule,
+                        // NzTreeModule,
                     ],
                     exports: [
                         TextEditConfigComponent,
                         TextEditComponent,
+                        TextEditViewComponent,
                         SwitchConfigComponent,
                         SwitchControlComponent,
+                        SwitchViewComponent,
                         NumbericEditConfigComponent,
                         NumbericEditControlComponent,
                         DateEditConfigComponent,
                         DateEditControlComponent,
+                        DateEditViewComponent,
                         SelectConfigComponent,
                         SelectControlComponent,
+                        SelectViewComponent,
+                        SelectSearchComponent,
                         DynamicComponent,
+                        DynamicConfigComponent,
+                        DynamicViewComponent,
+                        DynamicControlComponent,
+                        DynamicSearchComponent
                     ],
+                    providers: [],
                 }]
         }] });
 
@@ -1170,5 +1840,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AddFieldControlGroup, DateEditConfigComponent, DateEditControlComponent, DynamicComponent, DynamicFormModule, FieldControlGroup, NumbericEditConfigComponent, NumbericEditControlComponent, SelectConfigComponent, SelectControlComponent, SwitchConfigComponent, SwitchControlComponent, TextEditComponent, TextEditConfig, TextEditConfigComponent, getExcludeAssignControl, maxDecimalPlacesValidator };
+export { AddFieldControlGroup, DateEditConfigComponent, DateEditControlComponent, DateEditViewComponent, DynamicComponent, DynamicConfigComponent, DynamicControlComponent, DynamicFormModule, DynamicSearchComponent, DynamicViewComponent, FieldControlGroup, NumbericEditConfigComponent, NumbericEditControlComponent, SelectConfigComponent, SelectControlComponent, SelectSearchComponent, SelectViewComponent, SwitchConfigComponent, SwitchControlComponent, SwitchSearchComponent, SwitchViewComponent, TextEditComponent, TextEditConfig, TextEditConfigComponent, TextEditSearchComponent, TextEditViewComponent, maxDecimalPlacesValidator };
 //# sourceMappingURL=dignite-ng-expand.dynamic-form.mjs.map