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

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

@@ -1,33 +1,28 @@
 import * as i0 from '@angular/core';
-import { inject, ChangeDetectorRef, Component, Input, ViewChild, ChangeDetectionStrategy, Injectable, ViewContainerRef, Inject, 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 { Validators, FormGroup, FormControl, FormArray, 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 { NgbDropdownModule, NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
 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 i6 from '@angular/cdk/drag-drop';
+import { moveItemInArray, DragDropModule } from '@angular/cdk/drag-drop';
 import * as i4 from 'ng-zorro-antd/select';
 import { NzSelectModule } from 'ng-zorro-antd/select';
+import { ExtensibleModule } from '@abp/ng.components/extensible';
 
 class TextEditConfig {
-    constructor(data) {
+    constructor() {
         /**占位符 */
-        this['TextEdit.Placeholder'] = ['', []];
+        this['TextEdit.Placeholder'] = [''];
         //字段类型，单行文本，多行文本
-        this['TextEdit.Mode'] = [0, []];
+        this['TextEdit.Mode'] = [0];
         // 字数限制
-        this['TextEdit.CharLimit'] = ['265', []];
-        if (data) {
-            for (const key in data) {
-                if (data.hasOwnProperty(key)) {
-                    this[key] = data[key];
-                }
-            }
-        }
+        this['TextEdit.CharLimit'] = ['265'];
     }
 }
 
@@ -39,18 +34,21 @@ var TextEditMode;
     TextEditMode[TextEditMode["MultipleLine"] = 1] = "MultipleLine";
 })(TextEditMode || (TextEditMode = {}));
 
+/* eslint-disable @angular-eslint/component-selector */
 class TextEditConfigComponent {
     constructor(fb) {
         this.fb = fb;
         this._TextEditMode = TextEditMode;
+        this.RadioIndex1 = Math.floor(Math.random() * 1001);
+        this.RadioIndex2 = Math.floor(Math.random() * 1001);
         this.cdr = inject(ChangeDetectorRef);
     }
     set type(v) {
-        this._type = v;
+        this.formControlName = v;
         this.dataLoaded();
     }
     set Entity(v) {
-        this._Entity = v;
+        this.formEntity = v;
         this.dataLoaded();
     }
     set selected(v) {
@@ -58,19 +56,19 @@ class TextEditConfigComponent {
         this.dataLoaded();
     }
     get formConfiguration() {
-        return this._Entity.get('formConfiguration');
+        return this.formEntity.get('formConfiguration');
     }
     async dataLoaded() {
-        if (this._Entity && this._type) {
+        if (this.formEntity && this.formControlName) {
             await this.AfterInit();
-            this.cdr.detectChanges(); // 手动触发变更检测
-            this.submitclick?.nativeElement?.click();
         }
     }
     AfterInit() {
         return new Promise((resolve, rejects) => {
-            this._Entity.setControl('formConfiguration', this.fb.group(new TextEditConfig()));
-            if (this._selected && this._selected.formControlName == this._type) {
+            this.formEntity.setControl('formConfiguration', this.fb.group(new TextEditConfig()));
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
+            if (this._selected && this._selected.formControlName == this.formControlName) {
                 this.formConfiguration.patchValue({
                     ...this._selected.formConfiguration,
                 });
@@ -79,11 +77,11 @@ class TextEditConfigComponent {
         });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: TextEditConfigComponent, deps: [{ token: i1.FormBuilder }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: TextEditConfigComponent, selector: "df-text-edit-config", inputs: { type: "type", Entity: "Entity", selected: "selected" }, 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=\"TextEdit.Placeholder\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::TextEditMode' | abpLocalization}}</label>\n            <div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_TextEditMode.SingleLine\" formControlName=\"TextEdit.Mode\"\n                        id=\"flexRadioDefault1\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault1\">\n                        {{'DigniteAbpForms::SingleLine' | abpLocalization}}\n                    </label>\n                </div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_TextEditMode.MultipleLine\" formControlName=\"TextEdit.Mode\"\n                        id=\"flexRadioDefault2\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault2\">\n                        {{'DigniteAbpForms::MultipleLine' | abpLocalization}}\n                    </label>\n                </div>\n            </div>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::CharLimit' | abpLocalization}}</label>\n            <input type=\"number\" class=\"form-control\" formControlName=\"TextEdit.CharLimit\">\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.NumberValueAccessor, selector: "input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]" }, { kind: "directive", type: i1.RadioControlValueAccessor, selector: "input[type=radio][formControlName],input[type=radio][formControl],input[type=radio][ngModel]", inputs: ["name", "formControlName", "value"] }, { 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: TextEditConfigComponent, selector: "df-text-edit-config", inputs: { type: "type", Entity: "Entity", selected: "selected" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true, static: true }], ngImport: i0, template: "<form [formGroup]=\"formEntity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::Placeholder' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\"   formControlName=\"TextEdit.Placeholder\" >\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::TextEditMode' | abpLocalization}}</label>\n            <div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_TextEditMode.SingleLine\" formControlName=\"TextEdit.Mode\"\n                        id=\"flexRadioDefault{{RadioIndex1}}\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault{{RadioIndex1}}\">\n                        {{'AbpDynamicForm::SingleLine' | abpLocalization}}\n                    </label>\n                </div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_TextEditMode.MultipleLine\" formControlName=\"TextEdit.Mode\"\n                        id=\"flexRadioDefault{{RadioIndex2}}\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault{{RadioIndex2}}\">\n                        {{'AbpDynamicForm::MultipleLine' | abpLocalization}}\n                    </label>\n                </div>\n            </div>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::CharLimit' | abpLocalization}}</label>\n            <input type=\"number\" class=\"form-control\" formControlName=\"TextEdit.CharLimit\">\n        </div>\n        <button type=\"submit\"  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.NumberValueAccessor, selector: "input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]" }, { kind: "directive", type: i1.RadioControlValueAccessor, selector: "input[type=radio][formControlName],input[type=radio][formControl],input[type=radio][ngModel]", inputs: ["name", "formControlName", "value"] }, { 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: 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: TextEditConfigComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'df-text-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=\"TextEdit.Placeholder\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::TextEditMode' | abpLocalization}}</label>\n            <div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_TextEditMode.SingleLine\" formControlName=\"TextEdit.Mode\"\n                        id=\"flexRadioDefault1\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault1\">\n                        {{'DigniteAbpForms::SingleLine' | abpLocalization}}\n                    </label>\n                </div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_TextEditMode.MultipleLine\" formControlName=\"TextEdit.Mode\"\n                        id=\"flexRadioDefault2\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault2\">\n                        {{'DigniteAbpForms::MultipleLine' | abpLocalization}}\n                    </label>\n                </div>\n            </div>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::CharLimit' | abpLocalization}}</label>\n            <input type=\"number\" class=\"form-control\" formControlName=\"TextEdit.CharLimit\">\n        </div>\n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\" #submitclick></button>\n    </div>\n</form>" }]
+            args: [{ selector: 'df-text-edit-config', template: "<form [formGroup]=\"formEntity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::Placeholder' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\"   formControlName=\"TextEdit.Placeholder\" >\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::TextEditMode' | abpLocalization}}</label>\n            <div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_TextEditMode.SingleLine\" formControlName=\"TextEdit.Mode\"\n                        id=\"flexRadioDefault{{RadioIndex1}}\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault{{RadioIndex1}}\">\n                        {{'AbpDynamicForm::SingleLine' | abpLocalization}}\n                    </label>\n                </div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_TextEditMode.MultipleLine\" formControlName=\"TextEdit.Mode\"\n                        id=\"flexRadioDefault{{RadioIndex2}}\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault{{RadioIndex2}}\">\n                        {{'AbpDynamicForm::MultipleLine' | abpLocalization}}\n                    </label>\n                </div>\n            </div>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::CharLimit' | abpLocalization}}</label>\n            <input type=\"number\" class=\"form-control\" formControlName=\"TextEdit.CharLimit\">\n        </div>\n        <button type=\"submit\"  style=\"display: none;\" #submitclick></button>\n    </div>\n</form>" }]
         }], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { type: [{
                 type: Input
             }], Entity: [{
@@ -95,6 +93,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 args: ['submitclick', { static: true }]
             }] } });
 
+/* eslint-disable @angular-eslint/component-selector */
 /* eslint-disable @angular-eslint/no-empty-lifecycle-method */
 /* eslint-disable @angular-eslint/use-lifecycle-interface */
 class TextEditComponent {
@@ -136,7 +135,7 @@ class TextEditComponent {
     }
     AfterInit() {
         return new Promise((resolve, rejects) => {
-            let ValidatorsArray = [];
+            const ValidatorsArray = [];
             if (this._fields.required) {
                 ValidatorsArray.push(Validators.required);
             }
@@ -147,7 +146,7 @@ class TextEditComponent {
             if (this._fields.field.formConfiguration['TextEdit.CharLimit']) {
                 ValidatorsArray.push(Validators.maxLength(this._fields.field.formConfiguration['TextEdit.CharLimit']));
             }
-            let newControl = this.fb.control(this._selected, ValidatorsArray);
+            const newControl = this.fb.control(this._selected, ValidatorsArray);
             this.extraProperties?.setControl(this._fields.field.name, newControl);
             resolve(true);
         });
@@ -176,20 +175,123 @@ 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) {
+    constructor() {
         /**默认值 */
-        this['Switch.Default'] = [false, []];
-        if (data) {
-            for (const key in data) {
-                if (data.hasOwnProperty(key)) {
-                    this[key] = data[key];
-                }
-            }
-        }
+        this['Switch.Default'] = [false];
     }
 }
 
+/* eslint-disable @angular-eslint/component-selector */
 class SwitchConfigComponent {
     constructor(fb) {
         this.fb = fb;
@@ -200,7 +302,7 @@ class SwitchConfigComponent {
         this.dataLoaded();
     }
     set Entity(v) {
-        this._Entity = v;
+        this.formEntity = v;
         this.dataLoaded();
     }
     set selected(v) {
@@ -208,18 +310,20 @@ class SwitchConfigComponent {
         this.dataLoaded();
     }
     get formConfiguration() {
-        return this._Entity.get('formConfiguration');
+        return this.formEntity.get('formConfiguration');
     }
     async dataLoaded() {
-        if (this._Entity && this._type) {
+        if (this.formEntity && this._type) {
             await this.AfterInit();
-            this.cdr.detectChanges(); // 手动触发变更检测
-            this.submitclick?.nativeElement?.click();
+            // this.cdr.detectChanges();
         }
     }
     AfterInit() {
         return new Promise((resolve, rejects) => {
-            this._Entity.setControl('formConfiguration', this.fb.group(new SwitchConfig()));
+            this.formEntity.setControl('formConfiguration', this.fb.group(new SwitchConfig()));
+            setTimeout(() => {
+                this.submitclick?.nativeElement?.click();
+            }, 0);
             if (this._selected && this._selected.formControlName == this._type) {
                 this.formConfiguration.patchValue({
                     ...this._selected.formConfiguration,
@@ -229,11 +333,11 @@ class SwitchConfigComponent {
         });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SwitchConfigComponent, deps: [{ token: i1.FormBuilder }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: SwitchConfigComponent, selector: "df-switch-config", inputs: { type: "type", Entity: "Entity", selected: "selected" }, 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            <div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"checkbox\" formControlName=\"Switch.Default\"\n                        id=\"flexRadioDefault1\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault1\">\n                        {{'DigniteAbpForms::DefaultValue' | abpLocalization}}\n                    </label>\n                </div>\n                \n            </div>\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.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: 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: SwitchConfigComponent, selector: "df-switch-config", inputs: { type: "type", Entity: "Entity", selected: "selected" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true, static: true }], ngImport: i0, template: "<form [formGroup]=\"formEntity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"checkbox\" formControlName=\"Switch.Default\"\n                        id=\"flexRadioDefault1\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault1\">\n                        {{'AbpDynamicForm::DefaultValue' | abpLocalization}}\n                    </label>\n                </div>\n                \n            </div>\n        </div>\n        <button type=\"submit\"  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.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: 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: "pipe", type: i2.LocalizationPipe, name: "abpLocalization" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SwitchConfigComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'df-switch-config', template: "<form [formGroup]=\"_Entity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"checkbox\" formControlName=\"Switch.Default\"\n                        id=\"flexRadioDefault1\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault1\">\n                        {{'DigniteAbpForms::DefaultValue' | abpLocalization}}\n                    </label>\n                </div>\n                \n            </div>\n        </div>\n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\" #submitclick></button>\n    </div>\n</form>" }]
+            args: [{ selector: 'df-switch-config', template: "<form [formGroup]=\"formEntity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"checkbox\" formControlName=\"Switch.Default\"\n                        id=\"flexRadioDefault1\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault1\">\n                        {{'AbpDynamicForm::DefaultValue' | abpLocalization}}\n                    </label>\n                </div>\n                \n            </div>\n        </div>\n        <button type=\"submit\"  style=\"display: none;\" #submitclick></button>\n    </div>\n</form>" }]
         }], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { type: [{
                 type: Input
             }], Entity: [{
@@ -301,11 +405,83 @@ 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: [{
+                type: Input
+            }], parentFiledName: [{
+                type: Input
+            }], selected: [{
+                type: Input
+            }], submitclick: [{
+                type: ViewChild,
+                args: ['submitclick', { static: true }]
+            }] } });
+
+/* eslint-disable @angular-eslint/component-selector */
+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) => {
+            const ValidatorsArray = [];
+            const newControl = this.fb.control(this._selected
+                ? this._selected
+                : this._selected === false
+                    ? 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: 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            <select class=\"form-select form-control\" formControlName=\"{{_fields.field.name}}\" role=\"switch\">\r\n                <option [value]=\"\"></option>\r\n                <option [value]=\"true\">{{'AbpUi::Yes'|abpLocalization}}</option>\r\n                <option [value]=\"false\">{{'AbpUi::No'|abpLocalization}}</option>\r\n            </select>\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.NgSelectOption, selector: "option", inputs: ["ngValue", "value"] }, { kind: "directive", type: i1.ɵNgSelectMultipleOption, selector: "option", inputs: ["ngValue", "value"] }, { kind: "directive", type: i1.SelectControlValueAccessor, selector: "select:not([multiple])[formControlName],select:not([multiple])[formControl],select:not([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.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: "pipe", type: i2.LocalizationPipe, name: "abpLocalization" }] }); }
+}
+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            <select class=\"form-select form-control\" formControlName=\"{{_fields.field.name}}\" role=\"switch\">\r\n                <option [value]=\"\"></option>\r\n                <option [value]=\"true\">{{'AbpUi::Yes'|abpLocalization}}</option>\r\n                <option [value]=\"false\">{{'AbpUi::No'|abpLocalization}}</option>\r\n            </select>\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: [{
@@ -319,6 +495,42 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 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) {
         /**占位符 */
@@ -343,6 +555,7 @@ class NumbericEditConfig {
     }
 }
 
+/* eslint-disable @angular-eslint/component-selector */
 class NumbericEditConfigComponent {
     constructor(fb) {
         this.fb = fb;
@@ -356,22 +569,22 @@ class NumbericEditConfigComponent {
         this._selected = v ? v : v == false ? v : '';
     }
     set Entity(v) {
-        this._Entity = v;
+        this.formEntity = v;
         this.dataLoaded();
     }
     get formConfiguration() {
-        return this._Entity.get('formConfiguration');
+        return this.formEntity.get('formConfiguration');
     }
     async dataLoaded() {
-        if (this._Entity && this._type) {
+        if (this.formEntity && this._type) {
             await this.AfterInit();
-            this.cdr.detectChanges(); // 手动触发变更检测
-            this.submitclick?.nativeElement?.click();
         }
     }
     AfterInit() {
         return new Promise((resolve, rejects) => {
-            this._Entity.setControl('formConfiguration', this.fb.group(new NumbericEditConfig()));
+            this.formEntity.setControl('formConfiguration', this.fb.group(new NumbericEditConfig()));
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
             if (this._selected && this._selected.formControlName == this._type) {
                 this.formConfiguration.patchValue({
                     ...this._selected.formConfiguration,
@@ -381,11 +594,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 }], 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" }] }); }
+    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]=\"formEntity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::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\">{{'AbpDynamicForm::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\">{{'AbpDynamicForm::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\">{{'AbpDynamicForm::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\">{{'AbpDynamicForm::NumericStep' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Step\">\n            <small class=\"form-text text-muted d-block\">{{'AbpDynamicForm::NumericStepHelp'|abpLocalization}}</small>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::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        <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>" }]
+            args: [{ selector: 'df-numberic-edit-config', template: "<form [formGroup]=\"formEntity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::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\">{{'AbpDynamicForm::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\">{{'AbpDynamicForm::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\">{{'AbpDynamicForm::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\">{{'AbpDynamicForm::NumericStep' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"NumericEditField.Step\">\n            <small class=\"form-text text-muted d-block\">{{'AbpDynamicForm::NumericStepHelp'|abpLocalization}}</small>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::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: [{
@@ -397,13 +610,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 args: ['submitclick', { static: false }]
             }] } });
 
+/* eslint-disable @angular-eslint/component-selector */
+/* eslint-disable @typescript-eslint/adjacent-overload-signatures */
 function maxDecimalPlacesValidator(maxDecimalPlaces) {
     return (control) => {
         const value = control.value;
         if (typeof value === 'number' && isNaN(value) === false) {
             const decimalPart = value.toString().split('.')[1];
             if (decimalPart && decimalPart.length > maxDecimalPlaces) {
-                return { 'maxDecimalPlaces': { actual: decimalPart.length, max: maxDecimalPlaces } };
+                return { maxDecimalPlaces: { actual: decimalPart.length, max: maxDecimalPlaces } };
             }
         }
         return null;
@@ -415,6 +630,7 @@ class NumbericEditControlComponent {
         this.cdr = cdr;
         /**字段配置列表 */
         this._fields = '';
+        this.formConfiguration = '';
     }
     get entity() {
         return this._entity;
@@ -427,7 +643,7 @@ class NumbericEditControlComponent {
     }
     set selected(v) {
         this._selected = v;
-        // 
+        //
     }
     set entity(v) {
         this._entity = v;
@@ -436,7 +652,9 @@ class NumbericEditControlComponent {
     get extraProperties() {
         return this._entity?.get('extraProperties');
     }
-    get fieldInput() { return this.extraProperties.get(this._fields.field.name); }
+    get fieldInput() {
+        return this.extraProperties.get(this._fields.field.name);
+    }
     /**数据加载完成 */
     async dataLoaded() {
         if (this._fields && this._entity) {
@@ -447,8 +665,9 @@ class NumbericEditControlComponent {
     }
     AfterInit() {
         return new Promise((resolve, rejects) => {
-            let ValidatorsArray = [];
-            let formConfiguration = this._fields.field.formConfiguration;
+            const ValidatorsArray = [];
+            const formConfiguration = this._fields.field.formConfiguration;
+            this.formConfiguration = formConfiguration;
             if (this._fields.required) {
                 ValidatorsArray.push(Validators.required);
             }
@@ -458,7 +677,7 @@ class NumbericEditControlComponent {
             if (formConfiguration['NumericEditField.Max']) {
                 ValidatorsArray.push(Validators.max(formConfiguration['NumericEditField.Max']));
             }
-            let newControl = this.fb.control(this._selected, ValidatorsArray);
+            const newControl = this.fb.control(this._selected, ValidatorsArray);
             this.extraProperties.setControl(this._fields.field.name, newControl);
             resolve(true);
         });
@@ -470,20 +689,22 @@ class NumbericEditControlComponent {
     }
     /**数字框输入 */
     inputchange(event) {
-        let val = event.target.value;
+        const val = event.target.value;
         const decimalPart = val.toString().split('.')[1] || '';
-        let formConfiguration = this._fields.field.formConfiguration;
-        let Decimals = formConfiguration['NumericEditField.Decimals'];
+        const formConfiguration = this._fields.field.formConfiguration;
+        const Decimals = formConfiguration['NumericEditField.Decimals'];
         if (decimalPart.length > Decimals) {
             this.fieldInput?.patchValue(val.slice(0, val.length - (decimalPart.length - 2)));
         }
+        this.extraProperties.updateValueAndValidity();
+        this.fieldInput.updateValueAndValidity();
     }
     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 }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: NumbericEditControlComponent, selector: "df-numberic-edit-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]=\"_parentFiledName\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n            <input type=\"number\" class=\"form-control\" formControlName=\"{{_fields.field.name}}\"\n                [placeholder]=\"_fields.field.formConfiguration['NumericEditField.Placeholder']||''\"\n                [step]=\"_fields.field.formConfiguration['NumericEditField.Step']\" (input)=\"inputchange($event)\" />\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.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.NumberValueAccessor, selector: "input[type=number][formControlName],input[type=number][formControl],input[type=number][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"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: NumbericEditControlComponent, selector: "df-numberic-edit-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]=\"_parentFiledName\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n            <input type=\"number\" class=\"form-control\" formControlName=\"{{_fields.field.name}}\"\n                [placeholder]=\"_fields.field.formConfiguration['NumericEditField.Placeholder']||''\"\n                [step]=\"_fields.field.formConfiguration['NumericEditField.Step']\" [min]=\"formConfiguration['NumericEditField.Min']\" [max]=\"formConfiguration['NumericEditField.Max']\" (input)=\"inputchange($event)\" />\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.NumberValueAccessor, selector: "input[type=number][formControlName],input[type=number][formControl],input[type=number][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: i1.MinValidator, selector: "input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]", inputs: ["min"] }, { kind: "directive", type: i1.MaxValidator, selector: "input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]", inputs: ["max"] }, { 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"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: NumbericEditControlComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'df-numberic-edit-control', changeDetection: ChangeDetectionStrategy.OnPush, 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            <input type=\"number\" class=\"form-control\" formControlName=\"{{_fields.field.name}}\"\n                [placeholder]=\"_fields.field.formConfiguration['NumericEditField.Placeholder']||''\"\n                [step]=\"_fields.field.formConfiguration['NumericEditField.Step']\" (input)=\"inputchange($event)\" />\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-numberic-edit-control', changeDetection: ChangeDetectionStrategy.OnPush, 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            <input type=\"number\" class=\"form-control\" formControlName=\"{{_fields.field.name}}\"\n                [placeholder]=\"_fields.field.formConfiguration['NumericEditField.Placeholder']||''\"\n                [step]=\"_fields.field.formConfiguration['NumericEditField.Step']\" [min]=\"formConfiguration['NumericEditField.Min']\" [max]=\"formConfiguration['NumericEditField.Max']\" (input)=\"inputchange($event)\" />\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 }, { type: i0.ChangeDetectorRef }], propDecorators: { fields: [{
                 type: Input
             }], parentFiledName: [{
@@ -524,6 +745,7 @@ class DateEditConfig {
     }
 }
 
+/* eslint-disable @angular-eslint/component-selector */
 class DateEditConfigComponent {
     constructor(fb) {
         this.fb = fb;
@@ -539,22 +761,22 @@ class DateEditConfigComponent {
         this._selected = v;
     }
     set Entity(v) {
-        this._Entity = v;
+        this.formEntity = v;
         this.dataLoaded();
     }
     get formConfiguration() {
-        return this._Entity.get('formConfiguration');
+        return this.formEntity.get('formConfiguration');
     }
     async dataLoaded() {
-        if (this._Entity && this._type) {
+        if (this.formEntity && this._type) {
             await this.AfterInit();
-            this.cdr.detectChanges(); // 手动触发变更检测
-            this.submitclick?.nativeElement?.click();
         }
     }
     AfterInit() {
         return new Promise((resolve, rejects) => {
-            this._Entity.setControl('formConfiguration', this.fb.group(new DateEditConfig()));
+            this.formEntity.setControl('formConfiguration', this.fb.group(new DateEditConfig()));
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
             if (this._selected && this._selected.formControlName == this._type) {
                 this.formConfiguration.patchValue({
                     ...this._selected.formConfiguration,
@@ -566,7 +788,7 @@ class DateEditConfigComponent {
     }
     /**切换时间类型 */
     timeTypeChange() {
-        let type = this.formConfiguration.value['DateEdit.InputMode'];
+        const type = this.formConfiguration.value['DateEdit.InputMode'];
         let Min = this.formConfiguration.value['DateEdit.Min'];
         let Max = this.formConfiguration.value['DateEdit.Max'];
         if (type == DateEditInterfaces.Date) {
@@ -590,11 +812,11 @@ class DateEditConfigComponent {
         });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DateEditConfigComponent, deps: [{ token: i1.FormBuilder }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: DateEditConfigComponent, selector: "df-date-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::DateEditMode' | abpLocalization}}</label>\n            <div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_DateEditInterfaces.Date\"\n                        formControlName=\"DateEdit.InputMode\" id=\"flexRadioDefault1\" (change)=\"timeTypeChange()\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault1\">\n                        {{'DigniteAbpForms::Date' | abpLocalization}}\n                    </label>\n                </div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_DateEditInterfaces.DateTime\"\n                        formControlName=\"DateEdit.InputMode\" id=\"flexRadioDefault2\" (change)=\"timeTypeChange()\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault2\">\n                        {{'DigniteAbpForms::DateTime' | abpLocalization}}\n                    </label>\n                </div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_DateEditInterfaces.Month\"\n                        formControlName=\"DateEdit.InputMode\" id=\"flexRadioDefault3\" (change)=\"timeTypeChange()\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault3\">\n                        {{'DigniteAbpForms::Month' | abpLocalization}}\n                    </label>\n                </div>\n            </div>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Min' | abpLocalization}}</label>\n            <input [type]=\"dateTimeType\" class=\"form-control\" step=\"1\" formControlName=\"DateEdit.Min\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Max' | abpLocalization}}</label>\n            <input [type]=\"dateTimeType\" class=\"form-control\" step=\"1\" formControlName=\"DateEdit.Max\">\n        </div>\n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\"\n            #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.RadioControlValueAccessor, selector: "input[type=radio][formControlName],input[type=radio][formControl],input[type=radio][ngModel]", inputs: ["name", "formControlName", "value"] }, { 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: DateEditConfigComponent, selector: "df-date-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]=\"formEntity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::DateEditMode' | abpLocalization}}</label>\n            <div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_DateEditInterfaces.Date\"\n                        formControlName=\"DateEdit.InputMode\" id=\"flexRadioDefault1\" (change)=\"timeTypeChange()\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault1\">\n                        {{'AbpDynamicForm::Date' | abpLocalization}}\n                    </label>\n                </div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_DateEditInterfaces.DateTime\"\n                        formControlName=\"DateEdit.InputMode\" id=\"flexRadioDefault2\" (change)=\"timeTypeChange()\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault2\">\n                        {{'AbpDynamicForm::DateTime' | abpLocalization}}\n                    </label>\n                </div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_DateEditInterfaces.Month\"\n                        formControlName=\"DateEdit.InputMode\" id=\"flexRadioDefault3\" (change)=\"timeTypeChange()\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault3\">\n                        {{'AbpDynamicForm::Month' | abpLocalization}}\n                    </label>\n                </div>\n            </div>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::Min' | abpLocalization}}</label>\n            <input [type]=\"dateTimeType\" class=\"form-control\" step=\"1\" formControlName=\"DateEdit.Min\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::Max' | abpLocalization}}</label>\n            <input [type]=\"dateTimeType\" class=\"form-control\" step=\"1\" formControlName=\"DateEdit.Max\">\n        </div>\n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\"\n            #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.RadioControlValueAccessor, selector: "input[type=radio][formControlName],input[type=radio][formControl],input[type=radio][ngModel]", inputs: ["name", "formControlName", "value"] }, { 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: DateEditConfigComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'df-date-edit-config', template: "<form [formGroup]=\"_Entity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::DateEditMode' | abpLocalization}}</label>\n            <div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_DateEditInterfaces.Date\"\n                        formControlName=\"DateEdit.InputMode\" id=\"flexRadioDefault1\" (change)=\"timeTypeChange()\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault1\">\n                        {{'DigniteAbpForms::Date' | abpLocalization}}\n                    </label>\n                </div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_DateEditInterfaces.DateTime\"\n                        formControlName=\"DateEdit.InputMode\" id=\"flexRadioDefault2\" (change)=\"timeTypeChange()\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault2\">\n                        {{'DigniteAbpForms::DateTime' | abpLocalization}}\n                    </label>\n                </div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_DateEditInterfaces.Month\"\n                        formControlName=\"DateEdit.InputMode\" id=\"flexRadioDefault3\" (change)=\"timeTypeChange()\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault3\">\n                        {{'DigniteAbpForms::Month' | abpLocalization}}\n                    </label>\n                </div>\n            </div>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Min' | abpLocalization}}</label>\n            <input [type]=\"dateTimeType\" class=\"form-control\" step=\"1\" formControlName=\"DateEdit.Min\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::Max' | abpLocalization}}</label>\n            <input [type]=\"dateTimeType\" class=\"form-control\" step=\"1\" formControlName=\"DateEdit.Max\">\n        </div>\n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\"\n            #submitclick></button>\n    </div>\n</form>" }]
+            args: [{ selector: 'df-date-edit-config', template: "<form [formGroup]=\"formEntity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::DateEditMode' | abpLocalization}}</label>\n            <div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_DateEditInterfaces.Date\"\n                        formControlName=\"DateEdit.InputMode\" id=\"flexRadioDefault1\" (change)=\"timeTypeChange()\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault1\">\n                        {{'AbpDynamicForm::Date' | abpLocalization}}\n                    </label>\n                </div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_DateEditInterfaces.DateTime\"\n                        formControlName=\"DateEdit.InputMode\" id=\"flexRadioDefault2\" (change)=\"timeTypeChange()\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault2\">\n                        {{'AbpDynamicForm::DateTime' | abpLocalization}}\n                    </label>\n                </div>\n                <div class=\"form-check form-check-inline\">\n                    <input class=\"form-check-input\" type=\"radio\" [value]=\"_DateEditInterfaces.Month\"\n                        formControlName=\"DateEdit.InputMode\" id=\"flexRadioDefault3\" (change)=\"timeTypeChange()\">\n                    <label class=\"form-check-label\" for=\"flexRadioDefault3\">\n                        {{'AbpDynamicForm::Month' | abpLocalization}}\n                    </label>\n                </div>\n            </div>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::Min' | abpLocalization}}</label>\n            <input [type]=\"dateTimeType\" class=\"form-control\" step=\"1\" formControlName=\"DateEdit.Min\">\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::Max' | abpLocalization}}</label>\n            <input [type]=\"dateTimeType\" class=\"form-control\" step=\"1\" formControlName=\"DateEdit.Max\">\n        </div>\n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\"\n            #submitclick></button>\n    </div>\n</form>" }]
         }], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { type: [{
                 type: Input
             }], selected: [{
@@ -606,6 +828,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 args: ['submitclick', { static: true }]
             }] } });
 
+/* eslint-disable @angular-eslint/component-selector */
 class DateEditControlComponent {
     constructor(fb, cdr) {
         this.fb = fb;
@@ -647,8 +870,8 @@ class DateEditControlComponent {
     }
     AfterInit() {
         return new Promise((resolve, rejects) => {
-            let ValidatorsArray = [];
-            let formConfiguration = this._fields.field.formConfiguration;
+            const ValidatorsArray = [];
+            const formConfiguration = this._fields.field.formConfiguration;
             if (this._fields.required) {
                 ValidatorsArray.push(Validators.required);
             }
@@ -668,7 +891,7 @@ class DateEditControlComponent {
             if (this._fields.field.formConfiguration['DateEdit.InputMode'] === DateEditInterfaces.Month) {
                 controlName = this._dataPipe.transform(this._selected, 'yyyy-MM');
             }
-            let newControl = this.fb.control(controlName, ValidatorsArray);
+            const newControl = this.fb.control(controlName, ValidatorsArray);
             this.extraProperties.setControl(this._fields.field.name, newControl);
             resolve(true);
         });
@@ -679,11 +902,11 @@ class DateEditControlComponent {
         this.extraProperties.removeControl(this._fields.field.name);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DateEditControlComponent, deps: [{ token: i1.FormBuilder }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: DateEditControlComponent, selector: "df-date-edit-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]=\"_parentFiledName\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\"  *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n\n            <ng-container *ngIf=\"_fields.field.formConfiguration['DateEdit.InputMode'] === _DateEditInterfaces.Date\">\n                <input type=\"date\" class=\"form-control\" step=\"1\" formControlName=\"{{_fields.field.name}}\"\n                    [min]=\"_fields.field.formConfiguration['DateEdit.Min']\"\n                    [max]=\"_fields.field.formConfiguration['DateEdit.Max']\" />\n            </ng-container>\n            <ng-container\n                *ngIf=\"_fields.field.formConfiguration['DateEdit.InputMode'] === _DateEditInterfaces.DateTime\">\n                <input type=\"datetime-local\" class=\"form-control\" step=\"1\" formControlName=\"{{_fields.field.name}}\"\n                    [min]=\"_fields.field.formConfiguration['DateEdit.Min']\"\n                    [max]=\"_fields.field.formConfiguration['DateEdit.Max']\" />\n            </ng-container>\n            <ng-container *ngIf=\"_fields.field.formConfiguration['DateEdit.InputMode'] === _DateEditInterfaces.Month\">\n                <input type=\"month\" class=\"form-control\" step=\"1\" formControlName=\"{{_fields.field.name}}\"\n                    [min]=\"_fields.field.formConfiguration['DateEdit.Min']\"\n                    [max]=\"_fields.field.formConfiguration['DateEdit.Max']\" />\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"] }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: DateEditControlComponent, selector: "df-date-edit-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]=\"_parentFiledName\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\"  *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n\n            <ng-container *ngIf=\"_fields.field.formConfiguration['DateEdit.InputMode'] === _DateEditInterfaces.Date\">\n                <input type=\"date\" class=\"form-control\" step=\"1\" formControlName=\"{{_fields.field.name}}\"\n                    [min]=\"_fields.field.formConfiguration['DateEdit.Min']\"\n                    [max]=\"_fields.field.formConfiguration['DateEdit.Max']\" />\n            </ng-container>\n            <ng-container\n                *ngIf=\"_fields.field.formConfiguration['DateEdit.InputMode'] === _DateEditInterfaces.DateTime\">\n                <input type=\"datetime-local\" #dateTime (focus)=\"dateTime.focus()\" class=\"form-control\" step=\"1\" formControlName=\"{{_fields.field.name}}\"\n                    [min]=\"_fields.field.formConfiguration['DateEdit.Min']\"\n                    [max]=\"_fields.field.formConfiguration['DateEdit.Max']\" />\n            </ng-container>\n            <ng-container *ngIf=\"_fields.field.formConfiguration['DateEdit.InputMode'] === _DateEditInterfaces.Month\">\n                <input type=\"month\" class=\"form-control\"  step=\"1\" formControlName=\"{{_fields.field.name}}\"\n                    [min]=\"_fields.field.formConfiguration['DateEdit.Min']\"\n                    [max]=\"_fields.field.formConfiguration['DateEdit.Max']\" />\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"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DateEditControlComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'df-date-edit-control', 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\n            <ng-container *ngIf=\"_fields.field.formConfiguration['DateEdit.InputMode'] === _DateEditInterfaces.Date\">\n                <input type=\"date\" class=\"form-control\" step=\"1\" formControlName=\"{{_fields.field.name}}\"\n                    [min]=\"_fields.field.formConfiguration['DateEdit.Min']\"\n                    [max]=\"_fields.field.formConfiguration['DateEdit.Max']\" />\n            </ng-container>\n            <ng-container\n                *ngIf=\"_fields.field.formConfiguration['DateEdit.InputMode'] === _DateEditInterfaces.DateTime\">\n                <input type=\"datetime-local\" class=\"form-control\" step=\"1\" formControlName=\"{{_fields.field.name}}\"\n                    [min]=\"_fields.field.formConfiguration['DateEdit.Min']\"\n                    [max]=\"_fields.field.formConfiguration['DateEdit.Max']\" />\n            </ng-container>\n            <ng-container *ngIf=\"_fields.field.formConfiguration['DateEdit.InputMode'] === _DateEditInterfaces.Month\">\n                <input type=\"month\" class=\"form-control\" step=\"1\" formControlName=\"{{_fields.field.name}}\"\n                    [min]=\"_fields.field.formConfiguration['DateEdit.Min']\"\n                    [max]=\"_fields.field.formConfiguration['DateEdit.Max']\" />\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>" }]
+            args: [{ selector: 'df-date-edit-control', 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\n            <ng-container *ngIf=\"_fields.field.formConfiguration['DateEdit.InputMode'] === _DateEditInterfaces.Date\">\n                <input type=\"date\" class=\"form-control\" step=\"1\" formControlName=\"{{_fields.field.name}}\"\n                    [min]=\"_fields.field.formConfiguration['DateEdit.Min']\"\n                    [max]=\"_fields.field.formConfiguration['DateEdit.Max']\" />\n            </ng-container>\n            <ng-container\n                *ngIf=\"_fields.field.formConfiguration['DateEdit.InputMode'] === _DateEditInterfaces.DateTime\">\n                <input type=\"datetime-local\" #dateTime (focus)=\"dateTime.focus()\" class=\"form-control\" step=\"1\" formControlName=\"{{_fields.field.name}}\"\n                    [min]=\"_fields.field.formConfiguration['DateEdit.Min']\"\n                    [max]=\"_fields.field.formConfiguration['DateEdit.Max']\" />\n            </ng-container>\n            <ng-container *ngIf=\"_fields.field.formConfiguration['DateEdit.InputMode'] === _DateEditInterfaces.Month\">\n                <input type=\"month\" class=\"form-control\"  step=\"1\" formControlName=\"{{_fields.field.name}}\"\n                    [min]=\"_fields.field.formConfiguration['DateEdit.Min']\"\n                    [max]=\"_fields.field.formConfiguration['DateEdit.Max']\" />\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>" }]
         }], ctorParameters: () => [{ type: i1.FormBuilder }, { type: i0.ChangeDetectorRef }], propDecorators: { fields: [{
                 type: Input
             }], parentFiledName: [{
@@ -697,6 +920,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 args: ['submitclick', { static: true }]
             }] } });
 
+/* eslint-disable @angular-eslint/component-selector */
 class DateEditViewComponent {
     constructor() {
         /**展示则内容 */
@@ -712,7 +936,7 @@ class DateEditViewComponent {
     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;
+        const valueOptions = this._value;
         if (this.type && valueOptions) {
             this.showValue = valueOptions;
         }
@@ -733,22 +957,124 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 type: Input
             }] } });
 
-class NumericEditViewComponent {
-    constructor() {
-        /**展示则内容 */
-        this.showValue = '';
-        /**是否显示再列表 */
-        this.showInList = false;
-        /**表单控件Value */
-        this._value = '';
-    }
-    set value(v) {
+/* eslint-disable @angular-eslint/component-selector */
+class NumericEditSearchComponent {
+    constructor(fb) {
+        this.fb = fb;
+        /**字段配置列表 */
+        this._fields = '';
+        this.cdr = inject(ChangeDetectorRef);
+        /**定义number表单用于获取最小值最大值 */
+        this.numberForm = new FormGroup({
+            min: new FormControl(''),
+            max: new FormControl(''),
+        });
+        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();
+        }
+    }
+    /**定义动态字符 */
+    get numberInput() {
+        return this.extraProperties.get(this._fields.field.name);
+    }
+    get minInput() {
+        return this.numberForm.get('min');
+    }
+    get maxInput() {
+        return this.numberForm.get('max');
+    }
+    AfterInit() {
+        return new Promise(resolve => {
+            const ValidatorsArray = [];
+            this.formConfiguration = this._fields.field.formConfiguration;
+            const newControl = this.fb.control(this._selected, ValidatorsArray);
+            this.extraProperties.setControl(this._fields.field.name, newControl);
+            this.numberForm.valueChanges.subscribe(res => {
+                if (res.min < Number(this.formConfiguration['NumericEditField.Min'])) {
+                    this.minInput.patchValue(this.formConfiguration['NumericEditField.Min']);
+                }
+                if (res.min > Number(this.formConfiguration['NumericEditField.Max'])) {
+                    this.minInput.patchValue(this.formConfiguration['NumericEditField.Max']);
+                }
+                if ((res.min > res.max) && res.max) {
+                    this.minInput.patchValue(res.max);
+                }
+                if (res.max > Number(this.formConfiguration['NumericEditField.Max'])) {
+                    this.maxInput.patchValue(this.formConfiguration['NumericEditField.Max']);
+                }
+                if (this.numberForm.valid && res.min && res.max) {
+                    this.numberInput.patchValue(`${res.min}-${res.max}`);
+                }
+                else {
+                    this.numberInput.patchValue('');
+                }
+            });
+            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: NumericEditSearchComponent, deps: [{ token: i1.FormBuilder }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: NumericEditSearchComponent, selector: "df-numeric-edit-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]=\"numberForm\">\r\n    <div class=\"selectcontrol\">\r\n        <div class=\"mb-3\">\r\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\r\n            <div class=\"input-group\" >\r\n                <input class=\"form-control\" type=\"number\" formControlName=\"min\">\r\n                <span class=\"input-group-text px-1\">-</span>\r\n                <input class=\"form-control\" type=\"number\"  formControlName=\"max\">\r\n            </div>\r\n        </div>\r\n\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.NumberValueAccessor, selector: "input[type=number][formControlName],input[type=number][formControl],input[type=number][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: 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: NumericEditSearchComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'df-numeric-edit-search', template: "<form [formGroup]=\"numberForm\">\r\n    <div class=\"selectcontrol\">\r\n        <div class=\"mb-3\">\r\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\r\n            <div class=\"input-group\" >\r\n                <input class=\"form-control\" type=\"number\" formControlName=\"min\">\r\n                <span class=\"input-group-text px-1\">-</span>\r\n                <input class=\"form-control\" type=\"number\"  formControlName=\"max\">\r\n            </div>\r\n        </div>\r\n\r\n    </div>\r\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\r\n</form>" }]
+        }], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { fields: [{
+                type: Input
+            }], parentFiledName: [{
+                type: Input
+            }], selected: [{
+                type: Input
+            }], entity: [{
+                type: Input
+            }], submitclick: [{
+                type: ViewChild,
+                args: ['submitclick', { static: true }]
+            }] } });
+
+/* eslint-disable @angular-eslint/component-selector */
+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;
+        const valueOptions = this._value;
         if (this.type && valueOptions) {
             this.showValue = valueOptions;
         }
@@ -770,55 +1096,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
             }] } });
 
 class SelectConfig {
-    constructor(data) {
+    constructor() {
         /**空值文本 */
-        this['Select.NullText'] = ['', []];
+        this['Select.NullText'] = [''];
         //多选
-        this['Select.Multiple'] = [false, []];
+        this['Select.Multiple'] = [false];
         // 选项
         this['Select.Options'] = new FormArray([]);
-        if (data) {
-            for (const key in data) {
-                if (data.hasOwnProperty(key)) {
-                    this[key] = data[key];
-                }
-            }
-        }
     }
 }
 
 class DfApiService {
-    constructor() { }
-    /**
-     * 识别中文转化为拼音，固定返回类型
-     * 汉字转拼音
-     * 大写转小写
-     *
-     *  */
-    chineseToPinyin(value) {
-        //去除字符串中所有的空格
-        // let val = value
-        let val = value.replaceAll(' ', "-");
-        let array = val.split('');
-        let newArray = [];
-        array.forEach((el, index) => {
-            //转化为小写
-            let elChange = el.toLowerCase();
-            let isChinese = (str) => {
-                return /^[\u4e00-\u9fa5]+$/.test(str);
-            };
-            if (isChinese(elChange)) {
-                const resultWithoutTone = pinyin(elChange, { toneType: 'none', type: 'array' });
-                elChange = resultWithoutTone.toString();
-                if (index < array.length - 1)
-                    elChange += '-';
-            }
-            ;
-            newArray.push(elChange);
-        });
-        let pinyinstr = newArray.join('');
-        return pinyinstr || val;
-    }
     /**获取图片的本地连接 */
     getImageLacolBase64Url(file) {
         return new Promise((resolve, rejects) => {
@@ -830,32 +1118,6 @@ class DfApiService {
             reader.onerror = error => rejects(error);
         });
     }
-    /**
-      * 深拷贝--方法  */
-    deepClone(obj) {
-        if (typeof obj !== 'object' || obj === null)
-            return obj;
-        const result = Array.isArray(obj) ? [] : {};
-        for (let key in obj) {
-            if (obj.hasOwnProperty(key)) {
-                if (typeof obj[key] === 'object' && obj[key] !== null) {
-                    if (obj[key] instanceof Date) {
-                        result[key] = new Date(obj[key].getTime());
-                    }
-                    else if (obj[key] instanceof RegExp) {
-                        result[key] = new RegExp(obj[key]);
-                    }
-                    else {
-                        result[key] = this.deepClone(obj[key]);
-                    }
-                }
-                else {
-                    result[key] = obj[key];
-                }
-            }
-        }
-        return result;
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DfApiService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DfApiService, providedIn: 'root' }); }
 }
@@ -864,8 +1126,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [] });
+        }] });
 
+/* eslint-disable @angular-eslint/component-selector */
 class SelectConfigComponent {
     constructor(fb, _DfApiService) {
         this.fb = fb;
@@ -879,20 +1142,18 @@ class SelectConfigComponent {
         this._selected = v;
     }
     set Entity(v) {
-        this._Entity = v;
+        this.formEntity = v;
         this.dataLoaded();
     }
     get formConfiguration() {
-        return this._Entity.get('formConfiguration');
+        return this.formEntity?.get('formConfiguration');
     }
     get SelectOptions() {
         return this.formConfiguration.controls['Select.Options'];
     }
     async dataLoaded() {
-        if (this._Entity && this._type) {
+        if (this.formEntity && this._type) {
             await this.AfterInit();
-            this.cdr.detectChanges(); // 手动触发变更检测
-            this.submitclick?.nativeElement?.click();
         }
     }
     /**增加选项 */
@@ -909,11 +1170,18 @@ class SelectConfigComponent {
     }
     AfterInit() {
         return new Promise((resolve, rejects) => {
-            this._Entity.setControl('formConfiguration', this.fb.group(new SelectConfig()));
+            this.formEntity?.setControl('formConfiguration', this.fb.group(new SelectConfig()));
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
             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,
                 });
@@ -924,21 +1192,32 @@ class SelectConfigComponent {
             resolve(true);
         });
     }
+    /**
+     * 当选择项的文本发生变化时，更新对应的值
+     * @param event 输入事件对象
+     * @param index 选择项的索引位置
+     * @description 如果选择项已有Value值则不处理，否则将中文文本转换为拼音作为Value值
+     */
     textChange(event, index) {
-        let SelectOptionsItem = this.SelectOptions.at(index);
-        let value = event.target.value;
-        if (SelectOptionsItem.get('Value').value)
+        const SelectOptionsItem = this.SelectOptions.at(index);
+        const value = event.target.value;
+        if (SelectOptionsItem.get('Value')?.value)
             return;
         SelectOptionsItem.patchValue({
-            Value: this._DfApiService.chineseToPinyin(value),
+            Value: structuredClone(value),
         });
     }
+    /**调整表格位置 */
+    drop(event) {
+        moveItemInArray(this.SelectOptions.controls, event.previousIndex, event.currentIndex);
+        this.SelectOptions.updateValueAndValidity();
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SelectConfigComponent, deps: [{ token: i1.FormBuilder }, { token: DfApiService }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: SelectConfigComponent, selector: "df-select-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::SelectListItem' | abpLocalization}}</label>\n            <table class=\"table\">\n                <thead>\n                    <tr>\n                        <th scope=\"col\">{{'DigniteAbpForms::SelectListItemText' | abpLocalization}}</th>\n                        <th scope=\"col\">{{'DigniteAbpForms::SelectListItemValue' | abpLocalization}}</th>\n                        <th scope=\"col\">{{'DigniteAbpForms::Selected' | abpLocalization}}</th>\n                        <th scope=\"col\" style=\"width: 1%;\">\n                            <button class=\"btn btn-light btn-sm\" (click.stop)=\"addSelectOptions()\">\n                                <i class=\"fas fa-plus-circle\"></i>\n                            </button>\n                        </th>\n                    </tr>\n                </thead>\n                <tbody formArrayName=\"Select.Options\">\n                    <ng-container *ngFor=\"let item of SelectOptions.controls;let i=index\">\n                        <tr [formGroupName]=\"i\">\n                            <td><input type=\"text\" class=\"form-control\" formControlName=\"Text\" (change)=\"textChange($event,i)\"></td>\n                            <td><input type=\"text\" class=\"form-control\" formControlName=\"Value\"></td>\n                            <td>\n                                <div class=\"form-check form-check-inline\">\n                                    <input class=\"form-check-input\" type=\"checkbox\"  formControlName=\"Selected\" id=\"selected\">\n                                </div>\n                            </td>\n                            <td scope=\"row\" style=\"width: 1%;\">\n                                <button class=\"btn btn-light btn-sm\" (click.stop)=\"deleteSelectOptions(i)\">\n                                    <i class=\"fas fa-minus\"></i>\n                                </button>\n                            </td>\n                        </tr> \n                    </ng-container>\n                    \n                    \n                </tbody>\n            </table>\n        </div>\n\n\n\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::NullText' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"Select.NullText\">\n        </div>\n        <div class=\"mb-3\">\n            <div class=\"form-check form-check-inline\">\n                <input class=\"form-check-input\" type=\"checkbox\" formControlName=\"Select.Multiple\"\n                    id=\"Multiple\">\n                <label class=\"form-check-label\" for=\"Multiple\">\n                    {{'DigniteAbpForms::Multiple' | abpLocalization}}\n                </label>\n            </div>\n        </div>\n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\"\n            #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.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.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { 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: i1.FormArrayName, selector: "[formArrayName]", inputs: ["formArrayName"] }, { kind: "directive", type: i2.InitDirective, selector: "[abpInit]", outputs: ["abpInit"] }, { kind: "directive", type: i2.StopPropagationDirective, selector: "[click.stop]", outputs: ["click.stop"] }, { 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: SelectConfigComponent, selector: "df-select-config", inputs: { type: "type", selected: "selected", Entity: "Entity" }, viewQueries: [{ propertyName: "submitclick", first: true, predicate: ["submitclick"], descendants: true, static: true }], ngImport: i0, template: "<form [formGroup]=\"formEntity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::SelectListItem' | abpLocalization}}</label>\n            <table class=\"table drag-table\" cdkDropList (cdkDropListDropped)=\"drop($event)\">\n                <thead>\n                    <tr>\n                        <th scope=\"col\"></th>\n                        <th scope=\"col\">{{'AbpDynamicForm::SelectListItemText' | abpLocalization}}</th>\n                        <th scope=\"col\">{{'AbpDynamicForm::SelectListItemValue' | abpLocalization}}</th>\n                        <th scope=\"col\">{{'AbpDynamicForm::Selected' | abpLocalization}}</th>\n                        <th scope=\"col\" style=\"width: 1%;\">\n                            <button class=\"btn btn-light btn-sm\" type=\"button\" (click.stop)=\"addSelectOptions()\">\n                                <i class=\"fas fa-plus-circle\"></i>\n                            </button>\n                        </th>\n                    </tr>\n                </thead>\n                <tbody formArrayName=\"Select.Options\">\n                    <ng-container *ngFor=\"let item of SelectOptions.controls;let i=index\">\n                        <tr [formGroupName]=\"i\" cdkDrag cdkDragLockAxis=\"y\" [cdkDragData]=\"item\">\n                            <td>\n                                <div class=\"drag-handle\" cdkDragHandle>\n                                    <span class=\"bi bi-arrows-move fs-5\"></span>\n                                </div>\n                            </td>\n                            <td><input type=\"text\" class=\"form-control\" formControlName=\"Text\" required\n                                    (change)=\"textChange($event,i)\"></td>\n                            <td><input type=\"text\" class=\"form-control\" required formControlName=\"Value\"></td>\n                            <td>\n                                <div class=\"form-check form-check-inline\">\n                                    <input class=\"form-check-input\" type=\"checkbox\"  formControlName=\"Selected\"\n                                        id=\"selected\">\n                                </div>\n                            </td>\n                            <td scope=\"row\" style=\"width: 1%;\">\n                                <button class=\"btn btn-light btn-sm\" type=\"button\"  (click.stop)=\"deleteSelectOptions(i)\">\n                                    <i class=\"fas fa-minus\"></i>\n                                </button>\n                            </td>\n                        </tr>\n                    </ng-container>\n                </tbody>\n            </table>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::NullText' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"Select.NullText\">\n        </div>\n        <div class=\"mb-3\">\n            <div class=\"form-check form-check-inline\">\n                <input class=\"form-check-input\" type=\"checkbox\" formControlName=\"Select.Multiple\" id=\"Multiple\">\n                <label class=\"form-check-label\" for=\"Multiple\">\n                    {{'AbpDynamicForm::Multiple' | abpLocalization}}\n                </label>\n            </div>\n        </div>\n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\"\n            #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.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: i1.RequiredValidator, selector: ":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]", inputs: ["required"] }, { kind: "directive", type: i2$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { 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: i1.FormArrayName, selector: "[formArrayName]", inputs: ["formArrayName"] }, { kind: "directive", type: i2.InitDirective, selector: "[abpInit]", outputs: ["abpInit"] }, { kind: "directive", type: i2.StopPropagationDirective, selector: "[click.stop]", outputs: ["click.stop"] }, { kind: "directive", type: i3.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "directive", type: i3.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }, { kind: "directive", type: i6.CdkDropList, selector: "[cdkDropList], cdk-drop-list", inputs: ["cdkDropListConnectedTo", "cdkDropListData", "cdkDropListOrientation", "id", "cdkDropListLockAxis", "cdkDropListDisabled", "cdkDropListSortingDisabled", "cdkDropListEnterPredicate", "cdkDropListSortPredicate", "cdkDropListAutoScrollDisabled", "cdkDropListAutoScrollStep"], outputs: ["cdkDropListDropped", "cdkDropListEntered", "cdkDropListExited", "cdkDropListSorted"], exportAs: ["cdkDropList"] }, { kind: "directive", type: i6.CdkDrag, selector: "[cdkDrag]", inputs: ["cdkDragData", "cdkDragLockAxis", "cdkDragRootElement", "cdkDragBoundary", "cdkDragStartDelay", "cdkDragFreeDragPosition", "cdkDragDisabled", "cdkDragConstrainPosition", "cdkDragPreviewClass", "cdkDragPreviewContainer"], outputs: ["cdkDragStarted", "cdkDragReleased", "cdkDragEnded", "cdkDragEntered", "cdkDragExited", "cdkDragDropped", "cdkDragMoved"], exportAs: ["cdkDrag"] }, { kind: "directive", type: i6.CdkDragHandle, selector: "[cdkDragHandle]", inputs: ["cdkDragHandleDisabled"] }, { kind: "pipe", type: i2.LocalizationPipe, name: "abpLocalization" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SelectConfigComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'df-select-config', template: "<form [formGroup]=\"_Entity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::SelectListItem' | abpLocalization}}</label>\n            <table class=\"table\">\n                <thead>\n                    <tr>\n                        <th scope=\"col\">{{'DigniteAbpForms::SelectListItemText' | abpLocalization}}</th>\n                        <th scope=\"col\">{{'DigniteAbpForms::SelectListItemValue' | abpLocalization}}</th>\n                        <th scope=\"col\">{{'DigniteAbpForms::Selected' | abpLocalization}}</th>\n                        <th scope=\"col\" style=\"width: 1%;\">\n                            <button class=\"btn btn-light btn-sm\" (click.stop)=\"addSelectOptions()\">\n                                <i class=\"fas fa-plus-circle\"></i>\n                            </button>\n                        </th>\n                    </tr>\n                </thead>\n                <tbody formArrayName=\"Select.Options\">\n                    <ng-container *ngFor=\"let item of SelectOptions.controls;let i=index\">\n                        <tr [formGroupName]=\"i\">\n                            <td><input type=\"text\" class=\"form-control\" formControlName=\"Text\" (change)=\"textChange($event,i)\"></td>\n                            <td><input type=\"text\" class=\"form-control\" formControlName=\"Value\"></td>\n                            <td>\n                                <div class=\"form-check form-check-inline\">\n                                    <input class=\"form-check-input\" type=\"checkbox\"  formControlName=\"Selected\" id=\"selected\">\n                                </div>\n                            </td>\n                            <td scope=\"row\" style=\"width: 1%;\">\n                                <button class=\"btn btn-light btn-sm\" (click.stop)=\"deleteSelectOptions(i)\">\n                                    <i class=\"fas fa-minus\"></i>\n                                </button>\n                            </td>\n                        </tr> \n                    </ng-container>\n                    \n                    \n                </tbody>\n            </table>\n        </div>\n\n\n\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'DigniteAbpForms::NullText' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"Select.NullText\">\n        </div>\n        <div class=\"mb-3\">\n            <div class=\"form-check form-check-inline\">\n                <input class=\"form-check-input\" type=\"checkbox\" formControlName=\"Select.Multiple\"\n                    id=\"Multiple\">\n                <label class=\"form-check-label\" for=\"Multiple\">\n                    {{'DigniteAbpForms::Multiple' | abpLocalization}}\n                </label>\n            </div>\n        </div>\n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\"\n            #submitclick></button>\n    </div>\n</form>" }]
+            args: [{ selector: 'df-select-config', template: "<form [formGroup]=\"formEntity\">\n    <div formGroupName=\"formConfiguration\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::SelectListItem' | abpLocalization}}</label>\n            <table class=\"table drag-table\" cdkDropList (cdkDropListDropped)=\"drop($event)\">\n                <thead>\n                    <tr>\n                        <th scope=\"col\"></th>\n                        <th scope=\"col\">{{'AbpDynamicForm::SelectListItemText' | abpLocalization}}</th>\n                        <th scope=\"col\">{{'AbpDynamicForm::SelectListItemValue' | abpLocalization}}</th>\n                        <th scope=\"col\">{{'AbpDynamicForm::Selected' | abpLocalization}}</th>\n                        <th scope=\"col\" style=\"width: 1%;\">\n                            <button class=\"btn btn-light btn-sm\" type=\"button\" (click.stop)=\"addSelectOptions()\">\n                                <i class=\"fas fa-plus-circle\"></i>\n                            </button>\n                        </th>\n                    </tr>\n                </thead>\n                <tbody formArrayName=\"Select.Options\">\n                    <ng-container *ngFor=\"let item of SelectOptions.controls;let i=index\">\n                        <tr [formGroupName]=\"i\" cdkDrag cdkDragLockAxis=\"y\" [cdkDragData]=\"item\">\n                            <td>\n                                <div class=\"drag-handle\" cdkDragHandle>\n                                    <span class=\"bi bi-arrows-move fs-5\"></span>\n                                </div>\n                            </td>\n                            <td><input type=\"text\" class=\"form-control\" formControlName=\"Text\" required\n                                    (change)=\"textChange($event,i)\"></td>\n                            <td><input type=\"text\" class=\"form-control\" required formControlName=\"Value\"></td>\n                            <td>\n                                <div class=\"form-check form-check-inline\">\n                                    <input class=\"form-check-input\" type=\"checkbox\"  formControlName=\"Selected\"\n                                        id=\"selected\">\n                                </div>\n                            </td>\n                            <td scope=\"row\" style=\"width: 1%;\">\n                                <button class=\"btn btn-light btn-sm\" type=\"button\"  (click.stop)=\"deleteSelectOptions(i)\">\n                                    <i class=\"fas fa-minus\"></i>\n                                </button>\n                            </td>\n                        </tr>\n                    </ng-container>\n                </tbody>\n            </table>\n        </div>\n        <div class=\"mb-3\">\n            <label class=\"form-label\">{{'AbpDynamicForm::NullText' | abpLocalization}}</label>\n            <input type=\"text\" class=\"form-control\" formControlName=\"Select.NullText\">\n        </div>\n        <div class=\"mb-3\">\n            <div class=\"form-check form-check-inline\">\n                <input class=\"form-check-input\" type=\"checkbox\" formControlName=\"Select.Multiple\" id=\"Multiple\">\n                <label class=\"form-check-label\" for=\"Multiple\">\n                    {{'AbpDynamicForm::Multiple' | abpLocalization}}\n                </label>\n            </div>\n        </div>\n        <button type=\"submit\" (abpInit)=\"submitclick?.nativeElement?.click()\" style=\"display: none;\"\n            #submitclick></button>\n    </div>\n</form>" }]
         }], ctorParameters: () => [{ type: i1.FormBuilder }, { type: DfApiService }], propDecorators: { type: [{
                 type: Input
             }], selected: [{
@@ -950,11 +1229,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 args: ['submitclick', { static: true }]
             }] } });
 
+/* eslint-disable @angular-eslint/component-selector */
 class SelectControlComponent {
     constructor(fb) {
         this.fb = fb;
         /**字段配置列表 */
         this._fields = '';
+        /**父级字段名称，用于为表单设置控件赋值 */
+        this._selected = [];
         this.cdr = inject(ChangeDetectorRef);
         this.formConfiguration = '';
     }
@@ -965,7 +1247,7 @@ class SelectControlComponent {
         this._parentFiledName = v;
     }
     set selected(v) {
-        this._selected = v;
+        this._selected = v || [];
     }
     set entity(v) {
         this._entity = v;
@@ -984,24 +1266,28 @@ class SelectControlComponent {
     }
     AfterInit() {
         return new Promise((resolve, rejects) => {
-            let ValidatorsArray = [];
+            const ValidatorsArray = [];
             if (this._fields.required) {
                 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;
+                }
             }
-            let newControl = this.fb.control(this._selected, ValidatorsArray);
+            // this._selected = selectValue;
+            const newControl = this.fb.control(this._selected, ValidatorsArray);
             this.extraProperties.setControl(this._fields.field.name, newControl);
             resolve(true);
         });
@@ -1012,11 +1298,11 @@ 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\" 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\"\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:.275rem 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-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"] }] }); }
+    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 dignite-form-select\" [nzMaxTagCount]=\"1\"\n                    nzShowSearch nzMode=\"multiple\"  [nzPlaceHolder]=\"_fields.field.formConfiguration['Select.NullText']\"\n                    formControlName=\"{{_fields.field.name}}\" [nzDropdownMatchSelectWidth]=\"true\" [nzDropdownClassName]=\"'dignite-form-select-dropdown'\">\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: [""], 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\" 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\"\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:.275rem 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-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"] }]
+            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 dignite-form-select\" [nzMaxTagCount]=\"1\"\n                    nzShowSearch nzMode=\"multiple\"  [nzPlaceHolder]=\"_fields.field.formConfiguration['Select.NullText']\"\n                    formControlName=\"{{_fields.field.name}}\" [nzDropdownMatchSelectWidth]=\"true\" [nzDropdownClassName]=\"'dignite-form-select-dropdown'\">\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>" }]
         }], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { fields: [{
                 type: Input
             }], parentFiledName: [{
@@ -1030,84 +1316,95 @@ 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 = '';
+/* eslint-disable @angular-eslint/component-selector */
+class SelectSearchComponent {
+    constructor(fb) {
+        this.fb = fb;
+        /**字段配置列表 */
+        this._fields = '';
+        this.cdr = inject(ChangeDetectorRef);
+        this.formConfiguration = '';
     }
-    set value(v) {
-        this._value = v;
+    set fields(v) {
+        this._fields = 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;
-            }
-        }
+    set parentFiledName(v) {
+        this._parentFiledName = v;
     }
-    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
-            }] } });
-
-class SwitchViewComponent {
-    constructor() {
-        /**展示则内容 */
-        this.showValue = '';
-        /**是否显示再列表 */
-        this.showInList = false;
-        /**表单控件Value */
-        this._value = '';
+    set selected(v) {
+        this._selected = v;
     }
-    set value(v) {
-        this._value = v;
+    set entity(v) {
+        this._entity = v;
+        this.dataLoaded();
     }
-    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;
+    get extraProperties() {
+        return this._entity?.get('extraProperties');
+    }
+    /**数据加载完成 */
+    async dataLoaded() {
+        if (this._fields && this._entity) {
+            await this.AfterInit();
+            this.cdr.detectChanges(); // 手动触发变更检测
+            this.submitclick?.nativeElement?.click();
         }
     }
-    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" }] }); }
+    AfterInit() {
+        return new Promise((resolve, rejects) => {
+            const ValidatorsArray = [];
+            this.formConfiguration = this._fields.field.formConfiguration;
+            const isMultiple = this.formConfiguration['Select.Multiple'];
+            const 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;
+            const newControl = this.fb.control(this._selected, ValidatorsArray);
+            this.extraProperties.setControl(this._fields.field.name, newControl);
+            resolve(true);
+        });
+    }
+    changeValue(event) {
+        const 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 dignite-form-select\" [nzMaxTagCount]=\"1\"\r\n                    nzShowSearch nzMode=\"multiple\" [nzPlaceHolder]=\"_fields.field.formConfiguration['Select.NullText']\"\r\n                    formControlName=\"{{_fields.field.name}}\" [nzDropdownMatchSelectWidth]=\"true\" [nzDropdownClassName]=\"'dignite-form-select-dropdown'\">\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: [""], 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: SwitchViewComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SelectSearchComponent, 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: [{
+            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 dignite-form-select\" [nzMaxTagCount]=\"1\"\r\n                    nzShowSearch nzMode=\"multiple\" [nzPlaceHolder]=\"_fields.field.formConfiguration['Select.NullText']\"\r\n                    formControlName=\"{{_fields.field.name}}\" [nzDropdownMatchSelectWidth]=\"true\" [nzDropdownClassName]=\"'dignite-form-select-dropdown'\">\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>" }]
+        }], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { fields: [{
                 type: Input
-            }], fields: [{
+            }], parentFiledName: [{
                 type: Input
-            }], type: [{
+            }], selected: [{
                 type: Input
-            }], value: [{
+            }], entity: [{
                 type: Input
+            }], submitclick: [{
+                type: ViewChild,
+                args: ['submitclick', { static: true }]
             }] } });
 
-class TextEditViewComponent {
+/* eslint-disable @angular-eslint/component-selector */
+class SelectViewComponent {
     constructor() {
         /**展示则内容 */
         this.showValue = '';
@@ -1122,17 +1419,22 @@ class TextEditViewComponent {
     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;
+        const valueOptions = this._value;
         if (this.type && valueOptions) {
-            this.showValue = 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: 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"] }] }); }
+    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: TextEditViewComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: SelectViewComponent, 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}" }]
+            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: [{
@@ -1154,6 +1456,7 @@ const FieldControlGroup = [
         fieldConfigComponent: TextEditConfigComponent,
         fieldComponent: TextEditComponent,
         fieldViewComponent: TextEditViewComponent,
+        fieldSearchComponent: TextEditSearchComponent,
     },
     {
         displayName: '开关',
@@ -1161,6 +1464,7 @@ const FieldControlGroup = [
         fieldConfigComponent: SwitchConfigComponent,
         fieldComponent: SwitchControlComponent,
         fieldViewComponent: SwitchViewComponent,
+        fieldSearchComponent: SwitchSearchComponent,
     },
     {
         displayName: '选择',
@@ -1168,6 +1472,7 @@ const FieldControlGroup = [
         fieldConfigComponent: SelectConfigComponent,
         fieldComponent: SelectControlComponent,
         fieldViewComponent: SelectViewComponent,
+        fieldSearchComponent: SelectSearchComponent,
     },
     {
         displayName: '数字',
@@ -1175,6 +1480,7 @@ const FieldControlGroup = [
         fieldConfigComponent: NumbericEditConfigComponent,
         fieldComponent: NumbericEditControlComponent,
         fieldViewComponent: NumericEditViewComponent,
+        fieldSearchComponent: NumericEditSearchComponent,
     },
     {
         displayName: '日期',
@@ -1184,9 +1490,9 @@ const FieldControlGroup = [
         fieldViewComponent: DateEditViewComponent,
     },
 ];
-function AddFieldControlGroup(array = []) {
+function addFieldControlGroup(array = []) {
     for (const element of array) {
-        let find = FieldControlGroup.find((control) => {
+        const find = FieldControlGroup.find((control) => {
             return control.name === element.name;
         });
         if (!find) {
@@ -1196,6 +1502,12 @@ function AddFieldControlGroup(array = []) {
     return FieldControlGroup;
 }
 
+/* eslint-disable no-unsafe-optional-chaining */
+/* eslint-disable @angular-eslint/component-selector */
+/**
+ * 丢弃
+ * @deprecated
+ */
 class DynamicComponent {
     set selected(v) {
         this._selected = v === undefined ? '' : v === null ? '' : v;
@@ -1227,16 +1539,16 @@ class DynamicComponent {
     }
     /**数据加载完成 */
     async dataLoaded(val) {
-        let _fieldControlGroup = AddFieldControlGroup(this.mergedConfig);
+        const _fieldControlGroup = addFieldControlGroup(this.mergedConfig);
         if (this._entity) {
             //加载所有的动态表单组件
             if (this._type) {
-                let fieldControlItem = _fieldControlGroup.find(el => el.name === this._type);
+                const fieldControlItem = _fieldControlGroup.find(el => el.name === this._type);
                 this.loadfieldConfigComponent(fieldControlItem);
             }
             if (this._fields && this._parentFiledName && this._culture) {
                 /**表单控件组中的项 */
-                let fieldControlItem = _fieldControlGroup.find(el => el.name === this._fields?.field?.formControlName);
+                const fieldControlItem = _fieldControlGroup.find(el => el.name === this._fields?.field?.formControlName);
                 this.loadfieldComponent(fieldControlItem);
             }
         }
@@ -1271,11 +1583,11 @@ class DynamicComponent {
         instance.entity = this._entity;
     }
     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: [""] }); }
+    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: "\n<div [formGroup]=\"_entity\">\n    <template #FormControlRef></template>\n    <template #FormComponentsRef></template>\n</div>\n\n", styles: [""], dependencies: [{ 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: i3.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }] }); }
 }
 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>" }]
+            args: [{ selector: 'df-dynamic', template: "\n<div [formGroup]=\"_entity\">\n    <template #FormControlRef></template>\n    <template #FormComponentsRef></template>\n</div>\n\n" }]
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['MERGED_FORM_CONFIG']
@@ -1299,15 +1611,19 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 args: ['FormComponentsRef', { read: ViewContainerRef, static: true }]
             }] } });
 
+/**
+ * 表单控件服务
+ * @description 用于获取表单所有控件的配置信息
+ */
 class FormControlService {
     constructor(mergedConfig) {
         this.mergedConfig = mergedConfig;
         this._FieldControlGroup = FieldControlGroup;
     }
-    AddFieldControlGroup() {
-        let array = this.mergedConfig;
+    addFieldControlGroup() {
+        const array = this.mergedConfig;
         for (const element of array) {
-            let find = FieldControlGroup.find(control => {
+            const find = FieldControlGroup.find(control => {
                 return control.name === element.name;
             });
             if (!find) {
@@ -1329,6 +1645,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                     args: ['MERGED_FORM_CONFIG']
                 }] }] });
 
+/* eslint-disable no-unsafe-optional-chaining */
+/* eslint-disable @angular-eslint/component-selector */
 class DynamicViewComponent {
     constructor(_FormControlService) {
         this._FormControlService = _FormControlService;
@@ -1344,9 +1662,9 @@ class DynamicViewComponent {
     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);
+        if (this.type && this._value !== '') {
+            const _fieldControlGroup = this._FormControlService.addFieldControlGroup();
+            const fieldControlItem = _fieldControlGroup.find(el => el.name === this.type);
             this.loadViewComponent(fieldControlItem);
         }
     }
@@ -1383,23 +1701,213 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                 args: ['FormTemplateRef', { read: ViewContainerRef, static: true }]
             }] } });
 
+/* eslint-disable no-unsafe-optional-chaining */
+/* eslint-disable @angular-eslint/component-selector */
 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: [""] }); }
+    constructor(mergedConfig) {
+        this.mergedConfig = mergedConfig;
+        this.formControlName = '';
+    }
+    set type(v) {
+        this.formControlName = v;
+    }
+    set form(v) {
+        this.formEntity = v;
+    }
+    get formControlNameInput() {
+        return this.formEntity.get('formControlName');
+    }
+    ngAfterContentInit() {
+        this.loadfieldConfigComponent(this.formControlName);
+        this.formControlNameInput?.valueChanges.subscribe((res) => {
+            this.loadfieldConfigComponent(res);
+        });
+    }
+    /**加载动态表单配置组件 */
+    loadfieldConfigComponent(formControlName) {
+        const _fieldControlGroup = addFieldControlGroup(this.mergedConfig);
+        const fieldControlItem = _fieldControlGroup.find(el => el.name === formControlName);
+        //清空了容器中的所有组件
+        this.FormconfigRef?.clear();
+        if (!fieldControlItem || !fieldControlItem.fieldConfigComponent)
+            return;
+        //在容器中创建组件
+        const { instance } = this.FormconfigRef?.createComponent(fieldControlItem.fieldConfigComponent); //创建组件模板
+        // /**向创建的组件模板中传值 */
+        instance.selected = this.selected;
+        instance.type = formControlName;
+        instance.Entity = this.formEntity;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicConfigComponent, deps: [{ token: 'MERGED_FORM_CONFIG' }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: DynamicConfigComponent, selector: "df-dynamic-config", inputs: { type: "type", selected: "selected", form: "form" }, viewQueries: [{ propertyName: "FormconfigRef", first: true, predicate: ["FormconfigRef"], descendants: true, read: ViewContainerRef, static: true }], ngImport: i0, template: "    <template #FormconfigRef></template>", 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" }]
-        }] });
+            args: [{ selector: 'df-dynamic-config', template: "    <template #FormconfigRef></template>" }]
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['MERGED_FORM_CONFIG']
+                }] }], propDecorators: { type: [{
+                type: Input
+            }], selected: [{
+                type: Input
+            }], form: [{
+                type: Input
+            }], FormconfigRef: [{
+                type: ViewChild,
+                args: ['FormconfigRef', { read: ViewContainerRef, static: true }]
+            }] } });
 
+/* eslint-disable no-unsafe-optional-chaining */
+/* eslint-disable @angular-eslint/component-selector */
 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: [""] }); }
+    set selected(v) {
+        this._selected = v === undefined ? '' : v === null ? '' : v;
+    }
+    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;
+            // this.dataLoaded(3);
+        }
+    }
+    constructor(mergedConfig) {
+        this.mergedConfig = mergedConfig;
+        /**字段配置列表 */
+        this._fields = '';
+    }
+    ngAfterContentInit() {
+        this.loadfieldComponent(this._fields?.field?.formControlName);
+    }
+    // /**数据加载完成 */
+    // async dataLoaded() {
+    //   const _fieldControlGroup: any[] = addFieldControlGroup(this.mergedConfig);
+    //   if (this._entity) {
+    //     //加载所有的动态表单组件
+    //     if (this._fields && this._parentFiledName && this._culture) {
+    //       /**表单控件组中的项 */
+    //       const fieldControlItem = _fieldControlGroup.find(
+    //         el => el.name === this._fields?.field?.formControlName,
+    //       );
+    //       this.loadfieldComponent(fieldControlItem);
+    //     }
+    //   }
+    // }
+    /**加载动态表单组件 */
+    loadfieldComponent(formControlName) {
+        const _fieldControlGroup = addFieldControlGroup(this.mergedConfig);
+        /**表单控件组中的项 */
+        const fieldControlItem = _fieldControlGroup.find(el => el.name === formControlName);
+        //清空了容器中的所有组件
+        this.FormComponentsRef?.clear();
+        if (!fieldControlItem || !fieldControlItem.fieldComponent)
+            return;
+        //在容器中创建组件
+        const { instance } = this.FormComponentsRef?.createComponent(fieldControlItem.fieldComponent); //创建组件模板
+        /**向创建的组件模板中传值 */
+        instance.fields = this._fields;
+        instance.parentFiledName = this._parentFiledName;
+        instance.selected = this._selected;
+        instance.culture = this._culture;
+        instance.entity = this._entity;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicControlComponent, deps: [{ token: 'MERGED_FORM_CONFIG' }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.5", type: DynamicControlComponent, selector: "df-dynamic-control", inputs: { selected: "selected", 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 #FormComponentsRef></template>", 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" }]
-        }] });
+            args: [{ selector: 'df-dynamic-control', template: "<template #FormComponentsRef></template>" }]
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['MERGED_FORM_CONFIG']
+                }] }], propDecorators: { selected: [{
+                type: Input
+            }], culture: [{
+                type: Input
+            }], parentFiledName: [{
+                type: Input
+            }], fields: [{
+                type: Input
+            }], entity: [{
+                type: Input
+            }], FormControlRef: [{
+                type: ViewChild,
+                args: ['FormControlRef', { read: ViewContainerRef, static: true }]
+            }], FormComponentsRef: [{
+                type: ViewChild,
+                args: ['FormComponentsRef', { read: ViewContainerRef, static: true }]
+            }] } });
+
+/* eslint-disable @angular-eslint/component-selector */
+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) {
@@ -1427,31 +1935,52 @@ class DynamicFormModule {
             SwitchViewComponent,
             TextEditViewComponent,
             DateEditViewComponent,
-            NumericEditViewComponent], imports: [FormsModule,
+            NumericEditViewComponent,
+            DynamicSearchComponent,
+            SelectSearchComponent,
+            TextEditSearchComponent,
+            SwitchSearchComponent,
+            NumericEditSearchComponent], imports: [FormsModule,
             CoreModule,
             ThemeSharedModule,
             ReactiveFormsModule,
             NgbDropdownModule,
-            NzSelectModule], exports: [TextEditConfigComponent,
+            NzSelectModule,
+            DragDropModule,
+            NgbDatepickerModule,
+            ExtensibleModule
+            // NzTreeModule,
+        ], exports: [TextEditConfigComponent,
             TextEditComponent,
+            TextEditViewComponent,
             SwitchConfigComponent,
             SwitchControlComponent,
+            SwitchViewComponent,
             NumbericEditConfigComponent,
             NumbericEditControlComponent,
             DateEditConfigComponent,
             DateEditControlComponent,
+            DateEditViewComponent,
             SelectConfigComponent,
             SelectControlComponent,
+            SelectViewComponent,
+            SelectSearchComponent,
             DynamicComponent,
             DynamicConfigComponent,
             DynamicViewComponent,
-            DynamicControlComponent] }); }
+            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,
-            NzSelectModule] }); }
+            NzSelectModule,
+            DragDropModule,
+            NgbDatepickerModule,
+            ExtensibleModule
+            // NzTreeModule,
+        ] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicFormModule, decorators: [{
             type: NgModule,
@@ -1476,6 +2005,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                         TextEditViewComponent,
                         DateEditViewComponent,
                         NumericEditViewComponent,
+                        DynamicSearchComponent,
+                        SelectSearchComponent,
+                        TextEditSearchComponent,
+                        SwitchSearchComponent,
+                        NumericEditSearchComponent,
                     ],
                     imports: [
                         FormsModule,
@@ -1484,23 +2018,32 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
                         ReactiveFormsModule,
                         NgbDropdownModule,
                         NzSelectModule,
+                        DragDropModule,
+                        NgbDatepickerModule,
+                        ExtensibleModule
                         // NzTreeModule,
                     ],
                     exports: [
                         TextEditConfigComponent,
                         TextEditComponent,
+                        TextEditViewComponent,
                         SwitchConfigComponent,
                         SwitchControlComponent,
+                        SwitchViewComponent,
                         NumbericEditConfigComponent,
                         NumbericEditControlComponent,
                         DateEditConfigComponent,
                         DateEditControlComponent,
+                        DateEditViewComponent,
                         SelectConfigComponent,
                         SelectControlComponent,
+                        SelectViewComponent,
+                        SelectSearchComponent,
                         DynamicComponent,
                         DynamicConfigComponent,
                         DynamicViewComponent,
                         DynamicControlComponent,
+                        DynamicSearchComponent
                     ],
                     providers: [],
                 }]
@@ -1514,5 +2057,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AddFieldControlGroup, DateEditConfigComponent, DateEditControlComponent, DynamicComponent, DynamicConfigComponent, DynamicControlComponent, DynamicFormModule, DynamicViewComponent, FieldControlGroup, NumbericEditConfigComponent, NumbericEditControlComponent, SelectConfigComponent, SelectControlComponent, SwitchConfigComponent, SwitchControlComponent, TextEditComponent, TextEditConfig, TextEditConfigComponent, maxDecimalPlacesValidator };
+export { 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, addFieldControlGroup, maxDecimalPlacesValidator };
 //# sourceMappingURL=dignite-ng-expand.dynamic-form.mjs.map