@dignite-ng/expand.dynamic-form 3.0.0-rc.1 → 3.0.0-rc.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/components/dynamic/dynamic.component.mjs +10 -8
- package/esm2022/lib/components/form/date-edit/date-edit-config.component.mjs +5 -3
- package/esm2022/lib/components/form/form-control-group.mjs +26 -14
- package/esm2022/lib/components/form/numeric-edit/numberic-edit-config.component.mjs +8 -6
- package/esm2022/lib/components/form/select/select-config.component.mjs +5 -3
- package/esm2022/lib/components/form/select/select-control.component.mjs +5 -3
- package/esm2022/lib/components/form/switch/switch-config.component.mjs +6 -4
- package/esm2022/lib/components/form/switch/switch-control.component.mjs +10 -4
- package/esm2022/lib/components/form/text-edit/text-edit-config.component.mjs +6 -4
- package/esm2022/lib/components/form/text-edit/text-edit.component.mjs +4 -2
- package/esm2022/lib/dynamic-form.module.mjs +6 -7
- package/fesm2022/dignite-ng-expand.dynamic-form.mjs +64 -32
- package/fesm2022/dignite-ng-expand.dynamic-form.mjs.map +1 -1
- package/lib/components/dynamic/dynamic.component.d.ts +4 -6
- package/lib/components/form/date-edit/date-edit-config.component.d.ts +1 -0
- package/lib/components/form/form-control-group.d.ts +2 -2
- package/lib/components/form/numeric-edit/numberic-edit-config.component.d.ts +2 -1
- package/lib/components/form/select/select-config.component.d.ts +1 -0
- package/lib/components/form/select/select-control.component.d.ts +1 -0
- package/lib/components/form/switch/switch-config.component.d.ts +1 -0
- package/lib/components/form/switch/switch-control.component.d.ts +1 -0
- package/lib/components/form/text-edit/text-edit-config.component.d.ts +1 -0
- package/lib/components/form/text-edit/text-edit.component.d.ts +1 -0
- package/lib/dynamic-form.module.d.ts +1 -2
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Component, Input, ViewChild } from '@angular/core';
|
|
1
|
+
import { ChangeDetectorRef, Component, inject, Input, ViewChild } from '@angular/core';
|
|
2
2
|
import { Validators } from '@angular/forms';
|
|
3
3
|
import * as i0 from "@angular/core";
|
|
4
4
|
import * as i1 from "@angular/forms";
|
|
@@ -9,6 +9,7 @@ export class SwitchControlComponent {
|
|
|
9
9
|
this.fb = fb;
|
|
10
10
|
/**字段配置列表 */
|
|
11
11
|
this._fields = '';
|
|
12
|
+
this.cdr = inject(ChangeDetectorRef);
|
|
12
13
|
}
|
|
13
14
|
set entity(v) {
|
|
14
15
|
this._entity = v;
|
|
@@ -34,7 +35,8 @@ export class SwitchControlComponent {
|
|
|
34
35
|
async dataLoaded() {
|
|
35
36
|
if (this._fields && this._entity) {
|
|
36
37
|
await this.AfterInit();
|
|
37
|
-
this.
|
|
38
|
+
this.cdr.detectChanges(); // 手动触发变更检测
|
|
39
|
+
this.submitclick?.nativeElement?.click();
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
42
|
AfterInit() {
|
|
@@ -43,7 +45,11 @@ export class SwitchControlComponent {
|
|
|
43
45
|
if (this._fields.required) {
|
|
44
46
|
ValidatorsArray.push(Validators.required);
|
|
45
47
|
}
|
|
46
|
-
let newControl = this.fb.control(this._selected
|
|
48
|
+
let newControl = this.fb.control(this._selected
|
|
49
|
+
? this._selected
|
|
50
|
+
: this._selected === false
|
|
51
|
+
? this._selected
|
|
52
|
+
: this._fields.field.formConfiguration['Switch.Default'], ValidatorsArray);
|
|
47
53
|
this.extraProperties.setControl(this._fields.field.name, newControl);
|
|
48
54
|
resolve(true);
|
|
49
55
|
});
|
|
@@ -71,4 +77,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
|
|
|
71
77
|
type: ViewChild,
|
|
72
78
|
args: ['submitclick', { static: true }]
|
|
73
79
|
}] } });
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3dpdGNoLWNvbnRyb2wuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvZHluYW1pYy1mb3JtL3NyYy9saWIvY29tcG9uZW50cy9mb3JtL3N3aXRjaC9zd2l0Y2gtY29udHJvbC5jb21wb25lbnQudHMiLCIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9keW5hbWljLWZvcm0vc3JjL2xpYi9jb21wb25lbnRzL2Zvcm0vc3dpdGNoL3N3aXRjaC1jb250cm9sLmNvbXBvbmVudC5odG1sIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxTQUFTLEVBQWMsTUFBTSxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDbkcsT0FBTyxFQUEwQixVQUFVLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7Ozs7QUFPcEUsTUFBTSxPQUFPLHNCQUFzQjtJQUNqQyxZQUFvQixFQUFlO1FBQWYsT0FBRSxHQUFGLEVBQUUsQ0FBYTtRQVVuQyxZQUFZO1FBQ1osWUFBTyxHQUFRLEVBQUUsQ0FBQztRQTJCVixRQUFHLEdBQUcsTUFBTSxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUF0Q0YsQ0FBQztJQUl2QyxJQUNXLE1BQU0sQ0FBQyxDQUFNO1FBQ3RCLElBQUksQ0FBQyxPQUFPLEdBQUcsQ0FBQyxDQUFDO1FBQ2pCLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNwQixDQUFDO0lBSUQsSUFDVyxNQUFNLENBQUMsQ0FBTTtRQUN0QixJQUFJLENBQUMsT0FBTyxHQUFHLENBQUMsQ0FBQztRQUNqQixJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7SUFDcEIsQ0FBQztJQUlELElBQ1csZUFBZSxDQUFDLENBQU07UUFDL0IsSUFBSSxDQUFDLGdCQUFnQixHQUFHLENBQUMsQ0FBQztRQUMxQixJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7SUFDcEIsQ0FBQztJQUdELElBQ1csUUFBUSxDQUFDLENBQU07UUFDeEIsWUFBWTtRQUNaLElBQUksQ0FBQyxTQUFTLEdBQUcsQ0FBQyxDQUFDO1FBQ25CLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNwQixDQUFDO0lBR0QsSUFBSSxlQUFlO1FBQ2pCLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQWMsQ0FBQztJQUMxRCxDQUFDO0lBRUQsWUFBWTtJQUNaLEtBQUssQ0FBQyxVQUFVO1FBQ2QsSUFBSSxJQUFJLENBQUMsT0FBTyxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNqQyxNQUFNLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUN2QixJQUFJLENBQUMsR0FBRyxDQUFDLGFBQWEsRUFBRSxDQUFDLENBQUMsV0FBVztZQUNyQyxJQUFJLENBQUMsV0FBVyxFQUFFLGFBQWEsRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUMzQyxDQUFDO0lBQ0gsQ0FBQztJQUVELFNBQVM7UUFDUCxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxFQUFFO1lBQ3RDLElBQUksZUFBZSxHQUFHLEVBQUUsQ0FBQztZQUN6QixJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUM7Z0JBQzFCLGVBQWUsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQzVDLENBQUM7WUFDRCxJQUFJLFVBQVUsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FDOUIsSUFBSSxDQUFDLFNBQVM7Z0JBQ1osQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTO2dCQUNoQixDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsS0FBSyxLQUFLO29CQUMxQixDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVM7b0JBQ2hCLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUMxRCxlQUFlLENBQ2hCLENBQUM7WUFDRixJQUFJLENBQUMsZUFBZSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFDckUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUNELFdBQVc7UUFDVCxnREFBZ0Q7UUFDaEQsMENBQTBDO1FBQzFDLElBQUksQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzlELENBQUM7OEdBdkVVLHNCQUFzQjtrR0FBdEIsc0JBQXNCLDZSQ1JuQyxzcEJBWU87OzJGREpNLHNCQUFzQjtrQkFMbEMsU0FBUzsrQkFDRSxtQkFBbUI7Z0ZBVWxCLE1BQU07c0JBRGhCLEtBQUs7Z0JBU0ssTUFBTTtzQkFEaEIsS0FBSztnQkFTSyxlQUFlO3NCQUR6QixLQUFLO2dCQVFLLFFBQVE7c0JBRGxCLEtBQUs7Z0JBTXNDLFdBQVc7c0JBQXRELFNBQVM7dUJBQUMsYUFBYSxFQUFFLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENoYW5nZURldGVjdG9yUmVmLCBDb21wb25lbnQsIEVsZW1lbnRSZWYsIGluamVjdCwgSW5wdXQsIFZpZXdDaGlsZCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgRm9ybUJ1aWxkZXIsIEZvcm1Hcm91cCwgVmFsaWRhdG9ycyB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcblxuQENvbXBvbmVudCh7XG4gIHNlbGVjdG9yOiAnZGYtc3dpdGNoLWNvbnRyb2wnLFxuICB0ZW1wbGF0ZVVybDogJy4vc3dpdGNoLWNvbnRyb2wuY29tcG9uZW50Lmh0bWwnLFxuICBzdHlsZVVybHM6IFsnLi9zd2l0Y2gtY29udHJvbC5jb21wb25lbnQuc2NzcyddLFxufSlcbmV4cG9ydCBjbGFzcyBTd2l0Y2hDb250cm9sQ29tcG9uZW50IHtcbiAgY29uc3RydWN0b3IocHJpdmF0ZSBmYjogRm9ybUJ1aWxkZXIpIHt9XG5cbiAgLyoq6KGo5Y2V5a6e5L2TICovXG4gIF9lbnRpdHk6IEZvcm1Hcm91cCB8IHVuZGVmaW5lZDtcbiAgQElucHV0KClcbiAgcHVibGljIHNldCBlbnRpdHkodjogYW55KSB7XG4gICAgdGhpcy5fZW50aXR5ID0gdjtcbiAgICB0aGlzLmRhdGFMb2FkZWQoKTtcbiAgfVxuXG4gIC8qKuWtl+autemFjee9ruWIl+ihqCAqL1xuICBfZmllbGRzOiBhbnkgPSAnJztcbiAgQElucHV0KClcbiAgcHVibGljIHNldCBmaWVsZHModjogYW55KSB7XG4gICAgdGhpcy5fZmllbGRzID0gdjtcbiAgICB0aGlzLmRhdGFMb2FkZWQoKTtcbiAgfVxuXG4gIC8qKueItue6p+Wtl+auteWQjeensO+8jOeUqOS6juS4uuihqOWNleiuvue9ruaOp+S7tui1i+WAvCAqL1xuICBfcGFyZW50RmlsZWROYW1lOiBhbnk7XG4gIEBJbnB1dCgpXG4gIHB1YmxpYyBzZXQgcGFyZW50RmlsZWROYW1lKHY6IGFueSkge1xuICAgIHRoaXMuX3BhcmVudEZpbGVkTmFtZSA9IHY7XG4gICAgdGhpcy5kYXRhTG9hZGVkKCk7XG4gIH1cbiAgLyoqICovXG4gIF9zZWxlY3RlZDogYW55O1xuICBASW5wdXQoKVxuICBwdWJsaWMgc2V0IHNlbGVjdGVkKHY6IGFueSkge1xuICAgIC8vID92OmZhbHNlO1xuICAgIHRoaXMuX3NlbGVjdGVkID0gdjtcbiAgICB0aGlzLmRhdGFMb2FkZWQoKTtcbiAgfVxuICBAVmlld0NoaWxkKCdzdWJtaXRjbGljaycsIHsgc3RhdGljOiB0cnVlIH0pIHN1Ym1pdGNsaWNrOiBFbGVtZW50UmVmO1xuXG4gIGdldCBleHRyYVByb3BlcnRpZXMoKSB7XG4gICAgcmV0dXJuIHRoaXMuX2VudGl0eS5nZXQoJ2V4dHJhUHJvcGVydGllcycpIGFzIEZvcm1Hcm91cDtcbiAgfVxuICBwcml2YXRlIGNkciA9IGluamVjdChDaGFuZ2VEZXRlY3RvclJlZik7XG4gIC8qKuaVsOaNruWKoOi9veWujOaIkCAqL1xuICBhc3luYyBkYXRhTG9hZGVkKCkge1xuICAgIGlmICh0aGlzLl9maWVsZHMgJiYgdGhpcy5fZW50aXR5KSB7XG4gICAgICBhd2FpdCB0aGlzLkFmdGVySW5pdCgpO1xuICAgICAgdGhpcy5jZHIuZGV0ZWN0Q2hhbmdlcygpOyAvLyDmiYvliqjop6blj5Hlj5jmm7Tmo4DmtYtcbiAgICAgIHRoaXMuc3VibWl0Y2xpY2s/Lm5hdGl2ZUVsZW1lbnQ/LmNsaWNrKCk7XG4gICAgfVxuICB9XG5cbiAgQWZ0ZXJJbml0KCkge1xuICAgIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0cykgPT4ge1xuICAgICAgbGV0IFZhbGlkYXRvcnNBcnJheSA9IFtdO1xuICAgICAgaWYgKHRoaXMuX2ZpZWxkcy5yZXF1aXJlZCkge1xuICAgICAgICBWYWxpZGF0b3JzQXJyYXkucHVzaChWYWxpZGF0b3JzLnJlcXVpcmVkKTtcbiAgICAgIH1cbiAgICAgIGxldCBuZXdDb250cm9sID0gdGhpcy5mYi5jb250cm9sKFxuICAgICAgICB0aGlzLl9zZWxlY3RlZFxuICAgICAgICAgID8gdGhpcy5fc2VsZWN0ZWRcbiAgICAgICAgICA6IHRoaXMuX3NlbGVjdGVkID09PSBmYWxzZVxuICAgICAgICAgID8gdGhpcy5fc2VsZWN0ZWRcbiAgICAgICAgICA6IHRoaXMuX2ZpZWxkcy5maWVsZC5mb3JtQ29uZmlndXJhdGlvblsnU3dpdGNoLkRlZmF1bHQnXSxcbiAgICAgICAgVmFsaWRhdG9yc0FycmF5XG4gICAgICApO1xuICAgICAgdGhpcy5leHRyYVByb3BlcnRpZXMuc2V0Q29udHJvbCh0aGlzLl9maWVsZHMuZmllbGQubmFtZSwgbmV3Q29udHJvbCk7XG4gICAgICByZXNvbHZlKHRydWUpO1xuICAgIH0pO1xuICB9XG4gIG5nT25EZXN0cm95KCk6IHZvaWQge1xuICAgIC8vQ2FsbGVkIG9uY2UsIGJlZm9yZSB0aGUgaW5zdGFuY2UgaXMgZGVzdHJveWVkLlxuICAgIC8vQWRkICdpbXBsZW1lbnRzIE9uRGVzdHJveScgdG8gdGhlIGNsYXNzLlxuICAgIHRoaXMuZXh0cmFQcm9wZXJ0aWVzLnJlbW92ZUNvbnRyb2wodGhpcy5fZmllbGRzLmZpZWxkLm5hbWUpO1xuICB9XG59XG4iLCI8Zm9ybSBbZm9ybUdyb3VwXT1cIl9lbnRpdHlcIj5cbiAgICA8ZGl2IGZvcm1Hcm91cE5hbWU9XCJleHRyYVByb3BlcnRpZXNcIj5cbiAgICAgICAgPGRpdiBjbGFzcz1cIm1iLTNcIj5cbiAgICAgICAgICAgIDxsYWJlbCBjbGFzcz1cImZvcm0tbGFiZWxcIiAqbmdJZj1cIl9maWVsZHMuZGlzcGxheU5hbWVcIj57eyBfZmllbGRzLmRpc3BsYXlOYW1lIH19PC9sYWJlbD5cbiAgICAgICAgICAgIDxkaXYgY2xhc3M9XCJmb3JtLWNoZWNrIGZvcm0tc3dpdGNoXCI+XG4gICAgICAgICAgICAgICAgPGlucHV0IGNsYXNzPVwiZm9ybS1jaGVjay1pbnB1dFwiIHR5cGU9XCJjaGVja2JveFwiIHJvbGU9XCJzd2l0Y2hcIiBmb3JtQ29udHJvbE5hbWU9XCJ7e19maWVsZHMuZmllbGQubmFtZX19XCI+XG4gICAgICAgICAgICA8L2Rpdj5cbiAgICAgICAgICAgIDxzbWFsbCBjbGFzcz1cImZvcm0tdGV4dCB0ZXh0LW11dGVkIGQtYmxvY2tcIiAqbmdJZj1cIl9maWVsZHMuZmllbGQuZGVzY3JpcHRpb25cIj57e19maWVsZHMuZmllbGQuZGVzY3JpcHRpb259fTwvc21hbGw+XG4gICAgICAgIDwvZGl2PlxuXG4gICAgPC9kaXY+XG4gICAgPGJ1dHRvbiB0eXBlPVwic3VibWl0XCIgc3R5bGU9XCJkaXNwbGF5OiBub25lO1wiICNzdWJtaXRjbGljaz48L2J1dHRvbj5cbjwvZm9ybT4iXX0=
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Component, Input, ViewChild } from '@angular/core';
|
|
1
|
+
import { ChangeDetectorRef, Component, inject, Input, ViewChild } from '@angular/core';
|
|
2
2
|
import { TextEditConfig } from './text-edit-config';
|
|
3
3
|
import { TextEditMode } from '../../../enums/text-edit-mode';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
@@ -9,6 +9,7 @@ export class TextEditConfigComponent {
|
|
|
9
9
|
constructor(fb) {
|
|
10
10
|
this.fb = fb;
|
|
11
11
|
this._TextEditMode = TextEditMode;
|
|
12
|
+
this.cdr = inject(ChangeDetectorRef);
|
|
12
13
|
}
|
|
13
14
|
set type(v) {
|
|
14
15
|
this._type = v;
|
|
@@ -28,7 +29,8 @@ export class TextEditConfigComponent {
|
|
|
28
29
|
async dataLoaded() {
|
|
29
30
|
if (this._Entity && this._type) {
|
|
30
31
|
await this.AfterInit();
|
|
31
|
-
this.
|
|
32
|
+
this.cdr.detectChanges(); // 手动触发变更检测
|
|
33
|
+
this.submitclick?.nativeElement?.click();
|
|
32
34
|
}
|
|
33
35
|
}
|
|
34
36
|
AfterInit() {
|
|
@@ -36,7 +38,7 @@ export class TextEditConfigComponent {
|
|
|
36
38
|
this._Entity.setControl('formConfiguration', this.fb.group(new TextEditConfig()));
|
|
37
39
|
if (this._selected && this._selected.formControlName == this._type) {
|
|
38
40
|
this.formConfiguration.patchValue({
|
|
39
|
-
...this._selected.formConfiguration
|
|
41
|
+
...this._selected.formConfiguration,
|
|
40
42
|
});
|
|
41
43
|
}
|
|
42
44
|
resolve(true);
|
|
@@ -58,4 +60,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
|
|
|
58
60
|
type: ViewChild,
|
|
59
61
|
args: ['submitclick', { static: true }]
|
|
60
62
|
}] } });
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGV4dC1lZGl0LWNvbmZpZy5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9keW5hbWljLWZvcm0vc3JjL2xpYi9jb21wb25lbnRzL2Zvcm0vdGV4dC1lZGl0L3RleHQtZWRpdC1jb25maWcuY29tcG9uZW50LnRzIiwiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvZHluYW1pYy1mb3JtL3NyYy9saWIvY29tcG9uZW50cy9mb3JtL3RleHQtZWRpdC90ZXh0LWVkaXQtY29uZmlnLmNvbXBvbmVudC5odG1sIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxTQUFTLEVBQWMsTUFBTSxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbkcsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQzs7Ozs7QUFPN0QsTUFBTSxPQUFPLHVCQUF1QjtJQUNsQyxZQUFvQixFQUFlO1FBQWYsT0FBRSxHQUFGLEVBQUUsQ0FBYTtRQUNuQyxrQkFBYSxHQUFHLFlBQVksQ0FBQztRQTBCckIsUUFBRyxHQUFHLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBM0JGLENBQUM7SUFJdkMsSUFDVyxJQUFJLENBQUMsQ0FBTTtRQUNwQixJQUFJLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQztRQUNmLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNwQixDQUFDO0lBR0QsSUFDVyxNQUFNLENBQUMsQ0FBWTtRQUM1QixJQUFJLENBQUMsT0FBTyxHQUFHLENBQUMsQ0FBQztRQUNqQixJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7SUFDcEIsQ0FBQztJQUdELElBQ1csUUFBUSxDQUFDLENBQU07UUFDeEIsSUFBSSxDQUFDLFNBQVMsR0FBRyxDQUFDLENBQUM7UUFDbkIsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO0lBQ3BCLENBQUM7SUFDRCxJQUFJLGlCQUFpQjtRQUNuQixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFjLENBQUM7SUFDNUQsQ0FBQztJQUdELEtBQUssQ0FBQyxVQUFVO1FBQ2QsSUFBSSxJQUFJLENBQUMsT0FBTyxJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUMvQixNQUFNLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUN2QixJQUFJLENBQUMsR0FBRyxDQUFDLGFBQWEsRUFBRSxDQUFDLENBQUMsV0FBVztZQUNyQyxJQUFJLENBQUMsV0FBVyxFQUFFLGFBQWEsRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUMzQyxDQUFDO0lBQ0gsQ0FBQztJQUVELFNBQVM7UUFDUCxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxFQUFFO1lBQ3RDLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLG1CQUFtQixFQUFFLElBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksY0FBYyxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQ2xGLElBQUksSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLGVBQWUsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ25FLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxVQUFVLENBQUM7b0JBQ2hDLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxpQkFBaUI7aUJBQ3BDLENBQUMsQ0FBQztZQUNMLENBQUM7WUFDRCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDaEIsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDOzhHQS9DVSx1QkFBdUI7a0dBQXZCLHVCQUF1Qix1UENWcEMseXpEQStCTzs7MkZEckJNLHVCQUF1QjtrQkFMbkMsU0FBUzsrQkFDRSxxQkFBcUI7Z0ZBVXBCLElBQUk7c0JBRGQsS0FBSztnQkFRSyxNQUFNO3NCQURoQixLQUFLO2dCQVFLLFFBQVE7c0JBRGxCLEtBQUs7Z0JBUXNDLFdBQVc7c0JBQXRELFNBQVM7dUJBQUMsYUFBYSxFQUFFLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENoYW5nZURldGVjdG9yUmVmLCBDb21wb25lbnQsIEVsZW1lbnRSZWYsIGluamVjdCwgSW5wdXQsIFZpZXdDaGlsZCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgRm9ybUJ1aWxkZXIsIEZvcm1Hcm91cCB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IFRleHRFZGl0Q29uZmlnIH0gZnJvbSAnLi90ZXh0LWVkaXQtY29uZmlnJztcbmltcG9ydCB7IFRleHRFZGl0TW9kZSB9IGZyb20gJy4uLy4uLy4uL2VudW1zL3RleHQtZWRpdC1tb2RlJztcblxuQENvbXBvbmVudCh7XG4gIHNlbGVjdG9yOiAnZGYtdGV4dC1lZGl0LWNvbmZpZycsXG4gIHRlbXBsYXRlVXJsOiAnLi90ZXh0LWVkaXQtY29uZmlnLmNvbXBvbmVudC5odG1sJyxcbiAgc3R5bGVVcmxzOiBbJy4vdGV4dC1lZGl0LWNvbmZpZy5jb21wb25lbnQuc2NzcyddLFxufSlcbmV4cG9ydCBjbGFzcyBUZXh0RWRpdENvbmZpZ0NvbXBvbmVudCB7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgZmI6IEZvcm1CdWlsZGVyKSB7fVxuICBfVGV4dEVkaXRNb2RlID0gVGV4dEVkaXRNb2RlO1xuICAvKirooajljZXmjqfku7bnsbvlnosgKi9cbiAgX3R5cGU6IGFueTtcbiAgQElucHV0KClcbiAgcHVibGljIHNldCB0eXBlKHY6IGFueSkge1xuICAgIHRoaXMuX3R5cGUgPSB2O1xuICAgIHRoaXMuZGF0YUxvYWRlZCgpO1xuICB9XG4gIC8qKuihqOWNleWunuS9kyAqL1xuICBfRW50aXR5OiBGb3JtR3JvdXAgfCB1bmRlZmluZWQ7XG4gIEBJbnB1dCgpXG4gIHB1YmxpYyBzZXQgRW50aXR5KHY6IEZvcm1Hcm91cCkge1xuICAgIHRoaXMuX0VudGl0eSA9IHY7XG4gICAgdGhpcy5kYXRhTG9hZGVkKCk7XG4gIH1cbiAgLyoq6YCJ5oup55qE6KGo5Y2V5L+h5oGvICovXG4gIF9zZWxlY3RlZDogYW55O1xuICBASW5wdXQoKVxuICBwdWJsaWMgc2V0IHNlbGVjdGVkKHY6IGFueSkge1xuICAgIHRoaXMuX3NlbGVjdGVkID0gdjtcbiAgICB0aGlzLmRhdGFMb2FkZWQoKTtcbiAgfVxuICBnZXQgZm9ybUNvbmZpZ3VyYXRpb24oKSB7XG4gICAgcmV0dXJuIHRoaXMuX0VudGl0eS5nZXQoJ2Zvcm1Db25maWd1cmF0aW9uJykgYXMgRm9ybUdyb3VwO1xuICB9XG4gIEBWaWV3Q2hpbGQoJ3N1Ym1pdGNsaWNrJywgeyBzdGF0aWM6IHRydWUgfSkgc3VibWl0Y2xpY2s6IEVsZW1lbnRSZWY7XG4gIHByaXZhdGUgY2RyID0gaW5qZWN0KENoYW5nZURldGVjdG9yUmVmKTtcbiAgYXN5bmMgZGF0YUxvYWRlZCgpIHtcbiAgICBpZiAodGhpcy5fRW50aXR5ICYmIHRoaXMuX3R5cGUpIHtcbiAgICAgIGF3YWl0IHRoaXMuQWZ0ZXJJbml0KCk7XG4gICAgICB0aGlzLmNkci5kZXRlY3RDaGFuZ2VzKCk7IC8vIOaJi+WKqOinpuWPkeWPmOabtOajgOa1i1xuICAgICAgdGhpcy5zdWJtaXRjbGljaz8ubmF0aXZlRWxlbWVudD8uY2xpY2soKTtcbiAgICB9XG4gIH1cblxuICBBZnRlckluaXQoKSB7XG4gICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3RzKSA9PiB7XG4gICAgICB0aGlzLl9FbnRpdHkuc2V0Q29udHJvbCgnZm9ybUNvbmZpZ3VyYXRpb24nLCB0aGlzLmZiLmdyb3VwKG5ldyBUZXh0RWRpdENvbmZpZygpKSk7XG4gICAgICBpZiAodGhpcy5fc2VsZWN0ZWQgJiYgdGhpcy5fc2VsZWN0ZWQuZm9ybUNvbnRyb2xOYW1lID09IHRoaXMuX3R5cGUpIHtcbiAgICAgICAgdGhpcy5mb3JtQ29uZmlndXJhdGlvbi5wYXRjaFZhbHVlKHtcbiAgICAgICAgICAuLi50aGlzLl9zZWxlY3RlZC5mb3JtQ29uZmlndXJhdGlvbixcbiAgICAgICAgfSk7XG4gICAgICB9XG4gICAgICByZXNvbHZlKHRydWUpO1xuICAgIH0pO1xuICB9XG59XG4iLCI8Zm9ybSBbZm9ybUdyb3VwXT1cIl9FbnRpdHlcIj5cbiAgICA8ZGl2IGZvcm1Hcm91cE5hbWU9XCJmb3JtQ29uZmlndXJhdGlvblwiPlxuICAgICAgICA8ZGl2IGNsYXNzPVwibWItM1wiPlxuICAgICAgICAgICAgPGxhYmVsIGNsYXNzPVwiZm9ybS1sYWJlbFwiPnt7J0RpZ25pdGVBYnBGb3Jtczo6UGxhY2Vob2xkZXInIHwgYWJwTG9jYWxpemF0aW9ufX08L2xhYmVsPlxuICAgICAgICAgICAgPGlucHV0IHR5cGU9XCJ0ZXh0XCIgY2xhc3M9XCJmb3JtLWNvbnRyb2xcIiBmb3JtQ29udHJvbE5hbWU9XCJUZXh0RWRpdC5QbGFjZWhvbGRlclwiPlxuICAgICAgICA8L2Rpdj5cbiAgICAgICAgPGRpdiBjbGFzcz1cIm1iLTNcIj5cbiAgICAgICAgICAgIDxsYWJlbCBjbGFzcz1cImZvcm0tbGFiZWxcIj57eydEaWduaXRlQWJwRm9ybXM6OlRleHRFZGl0TW9kZScgfCBhYnBMb2NhbGl6YXRpb259fTwvbGFiZWw+XG4gICAgICAgICAgICA8ZGl2PlxuICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9XCJmb3JtLWNoZWNrIGZvcm0tY2hlY2staW5saW5lXCI+XG4gICAgICAgICAgICAgICAgICAgIDxpbnB1dCBjbGFzcz1cImZvcm0tY2hlY2staW5wdXRcIiB0eXBlPVwicmFkaW9cIiBbdmFsdWVdPVwiX1RleHRFZGl0TW9kZS5TaW5nbGVMaW5lXCIgZm9ybUNvbnRyb2xOYW1lPVwiVGV4dEVkaXQuTW9kZVwiXG4gICAgICAgICAgICAgICAgICAgICAgICBpZD1cImZsZXhSYWRpb0RlZmF1bHQxXCI+XG4gICAgICAgICAgICAgICAgICAgIDxsYWJlbCBjbGFzcz1cImZvcm0tY2hlY2stbGFiZWxcIiBmb3I9XCJmbGV4UmFkaW9EZWZhdWx0MVwiPlxuICAgICAgICAgICAgICAgICAgICAgICAge3snRGlnbml0ZUFicEZvcm1zOjpTaW5nbGVMaW5lJyB8IGFicExvY2FsaXphdGlvbn19XG4gICAgICAgICAgICAgICAgICAgIDwvbGFiZWw+XG4gICAgICAgICAgICAgICAgPC9kaXY+XG4gICAgICAgICAgICAgICAgPGRpdiBjbGFzcz1cImZvcm0tY2hlY2sgZm9ybS1jaGVjay1pbmxpbmVcIj5cbiAgICAgICAgICAgICAgICAgICAgPGlucHV0IGNsYXNzPVwiZm9ybS1jaGVjay1pbnB1dFwiIHR5cGU9XCJyYWRpb1wiIFt2YWx1ZV09XCJfVGV4dEVkaXRNb2RlLk11bHRpcGxlTGluZVwiIGZvcm1Db250cm9sTmFtZT1cIlRleHRFZGl0Lk1vZGVcIlxuICAgICAgICAgICAgICAgICAgICAgICAgaWQ9XCJmbGV4UmFkaW9EZWZhdWx0MlwiPlxuICAgICAgICAgICAgICAgICAgICA8bGFiZWwgY2xhc3M9XCJmb3JtLWNoZWNrLWxhYmVsXCIgZm9yPVwiZmxleFJhZGlvRGVmYXVsdDJcIj5cbiAgICAgICAgICAgICAgICAgICAgICAgIHt7J0RpZ25pdGVBYnBGb3Jtczo6TXVsdGlwbGVMaW5lJyB8IGFicExvY2FsaXphdGlvbn19XG4gICAgICAgICAgICAgICAgICAgIDwvbGFiZWw+XG4gICAgICAgICAgICAgICAgPC9kaXY+XG4gICAgICAgICAgICA8L2Rpdj5cbiAgICAgICAgPC9kaXY+XG4gICAgICAgIDxkaXYgY2xhc3M9XCJtYi0zXCI+XG4gICAgICAgICAgICA8bGFiZWwgY2xhc3M9XCJmb3JtLWxhYmVsXCI+e3snRGlnbml0ZUFicEZvcm1zOjpDaGFyTGltaXQnIHwgYWJwTG9jYWxpemF0aW9ufX08L2xhYmVsPlxuICAgICAgICAgICAgPGlucHV0IHR5cGU9XCJudW1iZXJcIiBjbGFzcz1cImZvcm0tY29udHJvbFwiIGZvcm1Db250cm9sTmFtZT1cIlRleHRFZGl0LkNoYXJMaW1pdFwiPlxuICAgICAgICA8L2Rpdj5cbiAgICAgICAgPGJ1dHRvbiB0eXBlPVwic3VibWl0XCIgKGFicEluaXQpPVwic3VibWl0Y2xpY2s/Lm5hdGl2ZUVsZW1lbnQ/LmNsaWNrKClcIiBzdHlsZT1cImRpc3BsYXk6IG5vbmU7XCIgI3N1Ym1pdGNsaWNrPjwvYnV0dG9uPlxuICAgIDwvZGl2PlxuPC9mb3JtPiJdfQ==
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/* eslint-disable @angular-eslint/no-empty-lifecycle-method */
|
|
2
2
|
/* eslint-disable @angular-eslint/use-lifecycle-interface */
|
|
3
|
-
import { Component, Input, ViewChild } from '@angular/core';
|
|
3
|
+
import { ChangeDetectorRef, Component, inject, Input, ViewChild } from '@angular/core';
|
|
4
4
|
import { Validators } from '@angular/forms';
|
|
5
5
|
import { TextEditMode } from '../../../enums/text-edit-mode';
|
|
6
6
|
import { TextEditConfig } from './text-edit-config';
|
|
@@ -14,6 +14,7 @@ export class TextEditComponent {
|
|
|
14
14
|
this._TextEditMode = TextEditMode;
|
|
15
15
|
/**字段配置列表 */
|
|
16
16
|
this._fields = '';
|
|
17
|
+
this.cdr = inject(ChangeDetectorRef);
|
|
17
18
|
this.isObjEmpty = (obj) => Object.keys(obj).length === 0;
|
|
18
19
|
}
|
|
19
20
|
set entity(v) {
|
|
@@ -40,6 +41,7 @@ export class TextEditComponent {
|
|
|
40
41
|
if (this._fields && this._entity && this._parentFiledName) {
|
|
41
42
|
this.extraProperties = this._entity.get(this._parentFiledName);
|
|
42
43
|
await this.AfterInit();
|
|
44
|
+
this.cdr.detectChanges(); // 手动触发变更检测
|
|
43
45
|
this.submitclick?.nativeElement?.click();
|
|
44
46
|
}
|
|
45
47
|
}
|
|
@@ -84,4 +86,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
|
|
|
84
86
|
type: ViewChild,
|
|
85
87
|
args: ['submitclick', { static: true }]
|
|
86
88
|
}] } });
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"text-edit.component.js","sourceRoot":"","sources":["../../../../../../../projects/dynamic-form/src/lib/components/form/text-edit/text-edit.component.ts","../../../../../../../projects/dynamic-form/src/lib/components/form/text-edit/text-edit.component.html"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @angular-eslint/no-empty-lifecycle-method */\n/* eslint-disable @angular-eslint/use-lifecycle-interface */\nimport { ChangeDetectorRef, Component, ElementRef, inject, Input, ViewChild } from '@angular/core';\nimport { FormBuilder, FormGroup, Validators } from '@angular/forms';\nimport { TextEditMode } from '../../../enums/text-edit-mode';\nimport { TextEditConfig } from './text-edit-config';\n\n@Component({\n  selector: 'df-text-edit',\n  templateUrl: './text-edit.component.html',\n  styleUrls: ['./text-edit.component.scss']\n})\nexport class TextEditComponent {\n\n  constructor(\n    private fb: FormBuilder,\n  ) {\n  }\n\n  _TextEditMode = TextEditMode\n  /**表单实体 */\n  _entity: FormGroup | undefined\n  @Input()\n  public set entity(v: any) {\n    this._entity = v;\n    if (v) this.dataLoaded()\n  }\n\n  /**字段配置列表 */\n  _fields: any = ''\n  @Input()\n  public set fields(v: any) {\n    this._fields = v;\n    if (v) this.dataLoaded()\n  }\n\n  /**父级字段名称，用于为表单设置控件赋值 */\n  _parentFiledName: any\n  @Input()\n  public set parentFiledName(v: any) {\n    this._parentFiledName = v;\n    if (v) this.dataLoaded()\n  }\n  /**父级字段名称，用于为表单设置控件赋值 */\n  _selected: any\n  @Input()\n  public set selected(v: any) {\n    this._selected = v || '';\n    if (v) this.dataLoaded()\n  }\n  @ViewChild('submitclick', { static: true }) submitclick: ElementRef;\n\n  extraProperties: FormGroup | undefined;\n  private cdr = inject(ChangeDetectorRef);\n  async dataLoaded() {\n    if (this._fields && this._entity && this._parentFiledName) {\n      this.extraProperties = this._entity.get(this._parentFiledName) as FormGroup\n      await this.AfterInit()\n      this.cdr.detectChanges(); // 手动触发变更检测\n      this.submitclick?.nativeElement?.click();\n    }\n  }\n\n\n  AfterInit() {\n    return new Promise((resolve, rejects) => {\n      let ValidatorsArray = []\n      if (this._fields.required) {\n        ValidatorsArray.push(Validators.required)\n      }\n      this._fields.field.formConfiguration={\n        ...this.fb.group(new TextEditConfig()).value,\n        ...this._fields.field.formConfiguration\n      }\n      if (this._fields.field.formConfiguration['TextEdit.CharLimit']) {\n        ValidatorsArray.push(Validators.maxLength(this._fields.field.formConfiguration['TextEdit.CharLimit']))\n      }\n     \n      let newControl = this.fb.control(this._selected, ValidatorsArray)\n      this.extraProperties.setControl(this._fields.field.name, newControl)\n      resolve(true)\n    })\n  }\n  ngOnDestroy(): void {\n    //Called once, before the instance is destroyed.\n    //Add 'implements OnDestroy' to the class.\n    this.extraProperties.removeControl(this._fields.field.name)\n  }\n\n  isObjEmpty = (obj) => Object.keys(obj).length === 0\n}\n","<form [formGroup]=\"_entity\">\n    <div [formGroupName]=\"_parentFiledName\">\n        <div class=\"mb-3\">\n            <label class=\"form-label\" *ngIf=\"_fields.displayName\">{{ _fields.displayName }}</label>\n            <ng-container *ngIf=\"_fields.field.formConfiguration['TextEdit.Mode'] ===_TextEditMode.SingleLine\">\n                <input type=\"text\" class=\"form-control\" formControlName=\"{{_fields.field.name}}\"\n                    [placeholder]=\"_fields.field.formConfiguration['TextEdit.Placeholder']\" />\n            </ng-container>\n            <ng-container *ngIf=\"_fields.field.formConfiguration['TextEdit.Mode'] === _TextEditMode.MultipleLine\">\n                <textarea class=\"form-control\" formControlName=\"{{_fields.field.name}}\"\n                    [placeholder]=\"_fields.field.formConfiguration['TextEdit.Placeholder']\" rows=\"3\"></textarea>\n            </ng-container>\n            <small class=\"form-text text-muted d-block\" *ngIf=\"_fields.field.description\">{{_fields.field.description}}</small>\n        </div>\n    </div>\n    <button type=\"submit\" style=\"display: none;\" #submitclick></button>\n</form>"]}
|
|
@@ -3,7 +3,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
|
|
3
3
|
import { CoreModule } from '@abp/ng.core';
|
|
4
4
|
import { ThemeSharedModule } from '@abp/ng.theme.shared';
|
|
5
5
|
import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
|
|
6
|
-
import { NzTreeModule } from 'ng-zorro-antd/tree';
|
|
6
|
+
// import { NzTreeModule } from 'ng-zorro-antd/tree';
|
|
7
7
|
import { TextEditConfigComponent, TextEditComponent, SwitchConfigComponent, SwitchControlComponent, NumbericEditConfigComponent, NumbericEditControlComponent, DateEditConfigComponent, DateEditControlComponent, SelectConfigComponent, SelectControlComponent, AddFieldControlGroup, DynamicComponent, } from './components';
|
|
8
8
|
import * as i0 from "@angular/core";
|
|
9
9
|
export class DynamicFormModule {
|
|
@@ -29,8 +29,7 @@ export class DynamicFormModule {
|
|
|
29
29
|
CoreModule,
|
|
30
30
|
ThemeSharedModule,
|
|
31
31
|
ReactiveFormsModule,
|
|
32
|
-
NgbDropdownModule,
|
|
33
|
-
NzTreeModule], exports: [TextEditConfigComponent,
|
|
32
|
+
NgbDropdownModule], exports: [TextEditConfigComponent,
|
|
34
33
|
TextEditComponent,
|
|
35
34
|
SwitchConfigComponent,
|
|
36
35
|
SwitchControlComponent,
|
|
@@ -45,8 +44,7 @@ export class DynamicFormModule {
|
|
|
45
44
|
CoreModule,
|
|
46
45
|
ThemeSharedModule,
|
|
47
46
|
ReactiveFormsModule,
|
|
48
|
-
NgbDropdownModule
|
|
49
|
-
NzTreeModule] }); }
|
|
47
|
+
NgbDropdownModule] }); }
|
|
50
48
|
}
|
|
51
49
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicFormModule, decorators: [{
|
|
52
50
|
type: NgModule,
|
|
@@ -70,7 +68,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
|
|
|
70
68
|
ThemeSharedModule,
|
|
71
69
|
ReactiveFormsModule,
|
|
72
70
|
NgbDropdownModule,
|
|
73
|
-
NzTreeModule,
|
|
71
|
+
// NzTreeModule,
|
|
74
72
|
],
|
|
75
73
|
exports: [
|
|
76
74
|
TextEditConfigComponent,
|
|
@@ -85,6 +83,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
|
|
|
85
83
|
SelectControlComponent,
|
|
86
84
|
DynamicComponent,
|
|
87
85
|
],
|
|
86
|
+
providers: [],
|
|
88
87
|
}]
|
|
89
88
|
}] });
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHluYW1pYy1mb3JtLm1vZHVsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL2R5bmFtaWMtZm9ybS9zcmMvbGliL2R5bmFtaWMtZm9ybS5tb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUF3QyxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDL0UsT0FBTyxFQUFFLFdBQVcsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDMUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDekQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDL0QscURBQXFEO0FBQ3JELE9BQU8sRUFDTCx1QkFBdUIsRUFDdkIsaUJBQWlCLEVBQ2pCLHFCQUFxQixFQUNyQixzQkFBc0IsRUFDdEIsMkJBQTJCLEVBQzNCLDRCQUE0QixFQUM1Qix1QkFBdUIsRUFDdkIsd0JBQXdCLEVBQ3hCLHFCQUFxQixFQUNyQixzQkFBc0IsRUFDdEIsb0JBQW9CLEVBQ3BCLGdCQUFnQixHQUNqQixNQUFNLGNBQWMsQ0FBQzs7QUEyQ3RCLE1BQU0sT0FBTyxpQkFBaUI7SUFDNUIsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFZO1FBQ3pCLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxvQkFBb0IsQ0FBQyxDQUFBO1FBQ2xELE9BQU87WUFDTCxRQUFRLEVBQUUsaUJBQWlCO1lBQzNCLFNBQVMsRUFBRSxFQUNWO1NBQ0YsQ0FBQztJQUNKLENBQUM7OEdBUlUsaUJBQWlCOytHQUFqQixpQkFBaUIsaUJBckMxQix1QkFBdUI7WUFDdkIsaUJBQWlCO1lBQ2pCLHFCQUFxQjtZQUNyQixzQkFBc0I7WUFDdEIsMkJBQTJCO1lBQzNCLDRCQUE0QjtZQUM1Qix1QkFBdUI7WUFDdkIsd0JBQXdCO1lBQ3hCLHFCQUFxQjtZQUNyQixzQkFBc0I7WUFDdEIsZ0JBQWdCLGFBSWhCLFdBQVc7WUFDWCxVQUFVO1lBQ1YsaUJBQWlCO1lBQ2pCLG1CQUFtQjtZQUNuQixpQkFBaUIsYUFJakIsdUJBQXVCO1lBQ3ZCLGlCQUFpQjtZQUNqQixxQkFBcUI7WUFDckIsc0JBQXNCO1lBQ3RCLDJCQUEyQjtZQUMzQiw0QkFBNEI7WUFDNUIsdUJBQXVCO1lBQ3ZCLHdCQUF3QjtZQUN4QixxQkFBcUI7WUFDckIsc0JBQXNCO1lBQ3RCLGdCQUFnQjsrR0FLUCxpQkFBaUIsWUF2QjFCLFdBQVc7WUFDWCxVQUFVO1lBQ1YsaUJBQWlCO1lBQ2pCLG1CQUFtQjtZQUNuQixpQkFBaUI7OzJGQW1CUixpQkFBaUI7a0JBdkM3QixRQUFRO21CQUFDO29CQUNSLFlBQVksRUFBRTt3QkFDWix1QkFBdUI7d0JBQ3ZCLGlCQUFpQjt3QkFDakIscUJBQXFCO3dCQUNyQixzQkFBc0I7d0JBQ3RCLDJCQUEyQjt3QkFDM0IsNEJBQTRCO3dCQUM1Qix1QkFBdUI7d0JBQ3ZCLHdCQUF3Qjt3QkFDeEIscUJBQXFCO3dCQUNyQixzQkFBc0I7d0JBQ3RCLGdCQUFnQjtxQkFFakI7b0JBQ0QsT0FBTyxFQUFFO3dCQUNQLFdBQVc7d0JBQ1gsVUFBVTt3QkFDVixpQkFBaUI7d0JBQ2pCLG1CQUFtQjt3QkFDbkIsaUJBQWlCO3dCQUNqQixnQkFBZ0I7cUJBQ2pCO29CQUNELE9BQU8sRUFBRTt3QkFDUCx1QkFBdUI7d0JBQ3ZCLGlCQUFpQjt3QkFDakIscUJBQXFCO3dCQUNyQixzQkFBc0I7d0JBQ3RCLDJCQUEyQjt3QkFDM0IsNEJBQTRCO3dCQUM1Qix1QkFBdUI7d0JBQ3ZCLHdCQUF3Qjt3QkFDeEIscUJBQXFCO3dCQUNyQixzQkFBc0I7d0JBQ3RCLGdCQUFnQjtxQkFDakI7b0JBQ0QsU0FBUyxFQUFFLEVBQ1Y7aUJBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBUFBfSU5JVElBTElaRVIsIE1vZHVsZVdpdGhQcm92aWRlcnMsIE5nTW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBGb3Jtc01vZHVsZSwgUmVhY3RpdmVGb3Jtc01vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IENvcmVNb2R1bGUgfSBmcm9tICdAYWJwL25nLmNvcmUnO1xuaW1wb3J0IHsgVGhlbWVTaGFyZWRNb2R1bGUgfSBmcm9tICdAYWJwL25nLnRoZW1lLnNoYXJlZCc7XG5pbXBvcnQgeyBOZ2JEcm9wZG93bk1vZHVsZSB9IGZyb20gJ0BuZy1ib290c3RyYXAvbmctYm9vdHN0cmFwJztcbi8vIGltcG9ydCB7IE56VHJlZU1vZHVsZSB9IGZyb20gJ25nLXpvcnJvLWFudGQvdHJlZSc7XG5pbXBvcnQge1xuICBUZXh0RWRpdENvbmZpZ0NvbXBvbmVudCxcbiAgVGV4dEVkaXRDb21wb25lbnQsXG4gIFN3aXRjaENvbmZpZ0NvbXBvbmVudCxcbiAgU3dpdGNoQ29udHJvbENvbXBvbmVudCxcbiAgTnVtYmVyaWNFZGl0Q29uZmlnQ29tcG9uZW50LFxuICBOdW1iZXJpY0VkaXRDb250cm9sQ29tcG9uZW50LFxuICBEYXRlRWRpdENvbmZpZ0NvbXBvbmVudCxcbiAgRGF0ZUVkaXRDb250cm9sQ29tcG9uZW50LFxuICBTZWxlY3RDb25maWdDb21wb25lbnQsXG4gIFNlbGVjdENvbnRyb2xDb21wb25lbnQsXG4gIEFkZEZpZWxkQ29udHJvbEdyb3VwLFxuICBEeW5hbWljQ29tcG9uZW50LFxufSBmcm9tICcuL2NvbXBvbmVudHMnO1xuXG5cblxuQE5nTW9kdWxlKHtcbiAgZGVjbGFyYXRpb25zOiBbXG4gICAgVGV4dEVkaXRDb25maWdDb21wb25lbnQsXG4gICAgVGV4dEVkaXRDb21wb25lbnQsXG4gICAgU3dpdGNoQ29uZmlnQ29tcG9uZW50LFxuICAgIFN3aXRjaENvbnRyb2xDb21wb25lbnQsXG4gICAgTnVtYmVyaWNFZGl0Q29uZmlnQ29tcG9uZW50LFxuICAgIE51bWJlcmljRWRpdENvbnRyb2xDb21wb25lbnQsXG4gICAgRGF0ZUVkaXRDb25maWdDb21wb25lbnQsXG4gICAgRGF0ZUVkaXRDb250cm9sQ29tcG9uZW50LFxuICAgIFNlbGVjdENvbmZpZ0NvbXBvbmVudCxcbiAgICBTZWxlY3RDb250cm9sQ29tcG9uZW50LFxuICAgIER5bmFtaWNDb21wb25lbnQsXG5cbiAgXSxcbiAgaW1wb3J0czogW1xuICAgIEZvcm1zTW9kdWxlLFxuICAgIENvcmVNb2R1bGUsXG4gICAgVGhlbWVTaGFyZWRNb2R1bGUsXG4gICAgUmVhY3RpdmVGb3Jtc01vZHVsZSxcbiAgICBOZ2JEcm9wZG93bk1vZHVsZSxcbiAgICAvLyBOelRyZWVNb2R1bGUsXG4gIF0sXG4gIGV4cG9ydHM6IFtcbiAgICBUZXh0RWRpdENvbmZpZ0NvbXBvbmVudCxcbiAgICBUZXh0RWRpdENvbXBvbmVudCxcbiAgICBTd2l0Y2hDb25maWdDb21wb25lbnQsXG4gICAgU3dpdGNoQ29udHJvbENvbXBvbmVudCxcbiAgICBOdW1iZXJpY0VkaXRDb25maWdDb21wb25lbnQsXG4gICAgTnVtYmVyaWNFZGl0Q29udHJvbENvbXBvbmVudCxcbiAgICBEYXRlRWRpdENvbmZpZ0NvbXBvbmVudCxcbiAgICBEYXRlRWRpdENvbnRyb2xDb21wb25lbnQsXG4gICAgU2VsZWN0Q29uZmlnQ29tcG9uZW50LFxuICAgIFNlbGVjdENvbnRyb2xDb21wb25lbnQsXG4gICAgRHluYW1pY0NvbXBvbmVudCxcbiAgXSxcbiAgcHJvdmlkZXJzOiBbXG4gIF0sXG59KVxuZXhwb3J0IGNsYXNzIER5bmFtaWNGb3JtTW9kdWxlIHtcbiAgc3RhdGljIGZvclJvb3QoY29uZmlnPzogYW55KTogTW9kdWxlV2l0aFByb3ZpZGVyczxEeW5hbWljRm9ybU1vZHVsZT4ge1xuICAgIEFkZEZpZWxkQ29udHJvbEdyb3VwKGNvbmZpZz8uY21zRmllbGRDb250cm9sR3JvdXApXG4gICAgcmV0dXJuIHtcbiAgICAgIG5nTW9kdWxlOiBEeW5hbWljRm9ybU1vZHVsZSxcbiAgICAgIHByb3ZpZGVyczogW1xuICAgICAgXVxuICAgIH07XG4gIH1cblxufVxuIl19
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
|
-
import { Component, Input, ViewChild, ChangeDetectionStrategy,
|
|
2
|
+
import { inject, ChangeDetectorRef, Component, Input, ViewChild, ChangeDetectionStrategy, Injectable, ViewContainerRef, NgModule } from '@angular/core';
|
|
3
3
|
import * as i1 from '@angular/forms';
|
|
4
4
|
import { Validators, FormArray, FormGroup, FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
|
|
5
5
|
import * as i2 from '@abp/ng.core';
|
|
6
6
|
import { CoreModule } from '@abp/ng.core';
|
|
7
7
|
import { ThemeSharedModule } from '@abp/ng.theme.shared';
|
|
8
8
|
import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
|
|
9
|
-
import { NzTreeModule } from 'ng-zorro-antd/tree';
|
|
10
9
|
import * as i3 from '@ngx-validate/core';
|
|
11
10
|
import * as i2$1 from '@angular/common';
|
|
12
11
|
import { DatePipe } from '@angular/common';
|
|
@@ -42,6 +41,7 @@ class TextEditConfigComponent {
|
|
|
42
41
|
constructor(fb) {
|
|
43
42
|
this.fb = fb;
|
|
44
43
|
this._TextEditMode = TextEditMode;
|
|
44
|
+
this.cdr = inject(ChangeDetectorRef);
|
|
45
45
|
}
|
|
46
46
|
set type(v) {
|
|
47
47
|
this._type = v;
|
|
@@ -61,7 +61,8 @@ class TextEditConfigComponent {
|
|
|
61
61
|
async dataLoaded() {
|
|
62
62
|
if (this._Entity && this._type) {
|
|
63
63
|
await this.AfterInit();
|
|
64
|
-
this.
|
|
64
|
+
this.cdr.detectChanges(); // 手动触发变更检测
|
|
65
|
+
this.submitclick?.nativeElement?.click();
|
|
65
66
|
}
|
|
66
67
|
}
|
|
67
68
|
AfterInit() {
|
|
@@ -69,7 +70,7 @@ class TextEditConfigComponent {
|
|
|
69
70
|
this._Entity.setControl('formConfiguration', this.fb.group(new TextEditConfig()));
|
|
70
71
|
if (this._selected && this._selected.formControlName == this._type) {
|
|
71
72
|
this.formConfiguration.patchValue({
|
|
72
|
-
...this._selected.formConfiguration
|
|
73
|
+
...this._selected.formConfiguration,
|
|
73
74
|
});
|
|
74
75
|
}
|
|
75
76
|
resolve(true);
|
|
@@ -100,6 +101,7 @@ class TextEditComponent {
|
|
|
100
101
|
this._TextEditMode = TextEditMode;
|
|
101
102
|
/**字段配置列表 */
|
|
102
103
|
this._fields = '';
|
|
104
|
+
this.cdr = inject(ChangeDetectorRef);
|
|
103
105
|
this.isObjEmpty = (obj) => Object.keys(obj).length === 0;
|
|
104
106
|
}
|
|
105
107
|
set entity(v) {
|
|
@@ -126,6 +128,7 @@ class TextEditComponent {
|
|
|
126
128
|
if (this._fields && this._entity && this._parentFiledName) {
|
|
127
129
|
this.extraProperties = this._entity.get(this._parentFiledName);
|
|
128
130
|
await this.AfterInit();
|
|
131
|
+
this.cdr.detectChanges(); // 手动触发变更检测
|
|
129
132
|
this.submitclick?.nativeElement?.click();
|
|
130
133
|
}
|
|
131
134
|
}
|
|
@@ -188,6 +191,7 @@ class SwitchConfig {
|
|
|
188
191
|
class SwitchConfigComponent {
|
|
189
192
|
constructor(fb) {
|
|
190
193
|
this.fb = fb;
|
|
194
|
+
this.cdr = inject(ChangeDetectorRef);
|
|
191
195
|
}
|
|
192
196
|
set type(v) {
|
|
193
197
|
this._type = v;
|
|
@@ -207,7 +211,8 @@ class SwitchConfigComponent {
|
|
|
207
211
|
async dataLoaded() {
|
|
208
212
|
if (this._Entity && this._type) {
|
|
209
213
|
await this.AfterInit();
|
|
210
|
-
this.
|
|
214
|
+
this.cdr.detectChanges(); // 手动触发变更检测
|
|
215
|
+
this.submitclick?.nativeElement?.click();
|
|
211
216
|
}
|
|
212
217
|
}
|
|
213
218
|
AfterInit() {
|
|
@@ -215,7 +220,7 @@ class SwitchConfigComponent {
|
|
|
215
220
|
this._Entity.setControl('formConfiguration', this.fb.group(new SwitchConfig()));
|
|
216
221
|
if (this._selected && this._selected.formControlName == this._type) {
|
|
217
222
|
this.formConfiguration.patchValue({
|
|
218
|
-
...this._selected.formConfiguration
|
|
223
|
+
...this._selected.formConfiguration,
|
|
219
224
|
});
|
|
220
225
|
}
|
|
221
226
|
resolve(true);
|
|
@@ -243,6 +248,7 @@ class SwitchControlComponent {
|
|
|
243
248
|
this.fb = fb;
|
|
244
249
|
/**字段配置列表 */
|
|
245
250
|
this._fields = '';
|
|
251
|
+
this.cdr = inject(ChangeDetectorRef);
|
|
246
252
|
}
|
|
247
253
|
set entity(v) {
|
|
248
254
|
this._entity = v;
|
|
@@ -268,7 +274,8 @@ class SwitchControlComponent {
|
|
|
268
274
|
async dataLoaded() {
|
|
269
275
|
if (this._fields && this._entity) {
|
|
270
276
|
await this.AfterInit();
|
|
271
|
-
this.
|
|
277
|
+
this.cdr.detectChanges(); // 手动触发变更检测
|
|
278
|
+
this.submitclick?.nativeElement?.click();
|
|
272
279
|
}
|
|
273
280
|
}
|
|
274
281
|
AfterInit() {
|
|
@@ -277,7 +284,11 @@ class SwitchControlComponent {
|
|
|
277
284
|
if (this._fields.required) {
|
|
278
285
|
ValidatorsArray.push(Validators.required);
|
|
279
286
|
}
|
|
280
|
-
let newControl = this.fb.control(this._selected
|
|
287
|
+
let newControl = this.fb.control(this._selected
|
|
288
|
+
? this._selected
|
|
289
|
+
: this._selected === false
|
|
290
|
+
? this._selected
|
|
291
|
+
: this._fields.field.formConfiguration['Switch.Default'], ValidatorsArray);
|
|
281
292
|
this.extraProperties.setControl(this._fields.field.name, newControl);
|
|
282
293
|
resolve(true);
|
|
283
294
|
});
|
|
@@ -333,6 +344,7 @@ class NumbericEditConfig {
|
|
|
333
344
|
class NumbericEditConfigComponent {
|
|
334
345
|
constructor(fb) {
|
|
335
346
|
this.fb = fb;
|
|
347
|
+
this.cdr = inject(ChangeDetectorRef);
|
|
336
348
|
}
|
|
337
349
|
set type(v) {
|
|
338
350
|
this._type = v;
|
|
@@ -351,7 +363,8 @@ class NumbericEditConfigComponent {
|
|
|
351
363
|
async dataLoaded() {
|
|
352
364
|
if (this._Entity && this._type) {
|
|
353
365
|
await this.AfterInit();
|
|
354
|
-
this.
|
|
366
|
+
this.cdr.detectChanges(); // 手动触发变更检测
|
|
367
|
+
this.submitclick?.nativeElement?.click();
|
|
355
368
|
}
|
|
356
369
|
}
|
|
357
370
|
AfterInit() {
|
|
@@ -366,11 +379,11 @@ class NumbericEditConfigComponent {
|
|
|
366
379
|
});
|
|
367
380
|
}
|
|
368
381
|
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 }); }
|
|
369
|
-
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
|
|
382
|
+
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" }] }); }
|
|
370
383
|
}
|
|
371
384
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: NumbericEditConfigComponent, decorators: [{
|
|
372
385
|
type: Component,
|
|
373
|
-
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
|
|
386
|
+
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>" }]
|
|
374
387
|
}], ctorParameters: () => [{ type: i1.FormBuilder }], propDecorators: { type: [{
|
|
375
388
|
type: Input
|
|
376
389
|
}], selected: [{
|
|
@@ -379,7 +392,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
|
|
|
379
392
|
type: Input
|
|
380
393
|
}], submitclick: [{
|
|
381
394
|
type: ViewChild,
|
|
382
|
-
args: ['submitclick', { static:
|
|
395
|
+
args: ['submitclick', { static: false }]
|
|
383
396
|
}] } });
|
|
384
397
|
|
|
385
398
|
function maxDecimalPlacesValidator(maxDecimalPlaces) {
|
|
@@ -515,6 +528,7 @@ class DateEditConfigComponent {
|
|
|
515
528
|
this._dataPipe = inject(DatePipe);
|
|
516
529
|
this._DateEditInterfaces = DateEditInterfaces;
|
|
517
530
|
this.dateTimeType = 'date';
|
|
531
|
+
this.cdr = inject(ChangeDetectorRef);
|
|
518
532
|
}
|
|
519
533
|
set type(v) {
|
|
520
534
|
this._type = v;
|
|
@@ -532,7 +546,8 @@ class DateEditConfigComponent {
|
|
|
532
546
|
async dataLoaded() {
|
|
533
547
|
if (this._Entity && this._type) {
|
|
534
548
|
await this.AfterInit();
|
|
535
|
-
this.
|
|
549
|
+
this.cdr.detectChanges(); // 手动触发变更检测
|
|
550
|
+
this.submitclick?.nativeElement?.click();
|
|
536
551
|
}
|
|
537
552
|
}
|
|
538
553
|
AfterInit() {
|
|
@@ -781,6 +796,7 @@ class SelectConfigComponent {
|
|
|
781
796
|
constructor(fb, _DfApiService) {
|
|
782
797
|
this.fb = fb;
|
|
783
798
|
this._DfApiService = _DfApiService;
|
|
799
|
+
this.cdr = inject(ChangeDetectorRef);
|
|
784
800
|
}
|
|
785
801
|
set type(v) {
|
|
786
802
|
this._type = v;
|
|
@@ -801,7 +817,8 @@ class SelectConfigComponent {
|
|
|
801
817
|
async dataLoaded() {
|
|
802
818
|
if (this._Entity && this._type) {
|
|
803
819
|
await this.AfterInit();
|
|
804
|
-
this.
|
|
820
|
+
this.cdr.detectChanges(); // 手动触发变更检测
|
|
821
|
+
this.submitclick?.nativeElement?.click();
|
|
805
822
|
}
|
|
806
823
|
}
|
|
807
824
|
/**增加选项 */
|
|
@@ -864,6 +881,7 @@ class SelectControlComponent {
|
|
|
864
881
|
this.fb = fb;
|
|
865
882
|
/**字段配置列表 */
|
|
866
883
|
this._fields = '';
|
|
884
|
+
this.cdr = inject(ChangeDetectorRef);
|
|
867
885
|
this.formConfiguration = '';
|
|
868
886
|
}
|
|
869
887
|
set fields(v) {
|
|
@@ -886,7 +904,8 @@ class SelectControlComponent {
|
|
|
886
904
|
async dataLoaded() {
|
|
887
905
|
if (this._fields && this._entity) {
|
|
888
906
|
await this.AfterInit();
|
|
889
|
-
this.
|
|
907
|
+
this.cdr.detectChanges(); // 手动触发变更检测
|
|
908
|
+
this.submitclick?.nativeElement?.click();
|
|
890
909
|
}
|
|
891
910
|
}
|
|
892
911
|
AfterInit() {
|
|
@@ -948,25 +967,29 @@ const FieldControlGroup = [
|
|
|
948
967
|
fieldConfigComponent: TextEditConfigComponent,
|
|
949
968
|
fieldComponent: TextEditComponent,
|
|
950
969
|
// fieldViewComponent:TextBoxViewComponent,
|
|
951
|
-
},
|
|
970
|
+
},
|
|
971
|
+
{
|
|
952
972
|
displayName: '开关',
|
|
953
973
|
name: 'Switch',
|
|
954
974
|
fieldConfigComponent: SwitchConfigComponent,
|
|
955
975
|
fieldComponent: SwitchControlComponent,
|
|
956
976
|
// fieldViewComponent:TextBoxViewComponent,
|
|
957
|
-
},
|
|
977
|
+
},
|
|
978
|
+
{
|
|
958
979
|
displayName: '选择',
|
|
959
980
|
name: 'Select',
|
|
960
981
|
fieldConfigComponent: SelectConfigComponent,
|
|
961
982
|
fieldComponent: SelectControlComponent,
|
|
962
983
|
// fieldViewComponent:TextBoxViewComponent,
|
|
963
|
-
},
|
|
984
|
+
},
|
|
985
|
+
{
|
|
964
986
|
displayName: '数字',
|
|
965
987
|
name: 'NumericEdit',
|
|
966
988
|
fieldConfigComponent: NumbericEditConfigComponent,
|
|
967
989
|
fieldComponent: NumbericEditControlComponent,
|
|
968
990
|
// fieldViewComponent:TextBoxViewComponent,
|
|
969
|
-
},
|
|
991
|
+
},
|
|
992
|
+
{
|
|
970
993
|
displayName: '日期',
|
|
971
994
|
name: 'DateEdit',
|
|
972
995
|
fieldConfigComponent: DateEditConfigComponent,
|
|
@@ -974,8 +997,16 @@ const FieldControlGroup = [
|
|
|
974
997
|
// fieldViewComponent:TextBoxViewComponent,
|
|
975
998
|
},
|
|
976
999
|
];
|
|
977
|
-
|
|
978
|
-
|
|
1000
|
+
let fielFieldControlGroup = [];
|
|
1001
|
+
let ckEditorFieldControlGroup = [];
|
|
1002
|
+
async function getExcludeAssignControl(typeName) {
|
|
1003
|
+
if (fielFieldControlGroup.length === 0) {
|
|
1004
|
+
fielFieldControlGroup = await import('@dignite-ng/expand.file-explorer').then((module) => module.fielFieldControlGroup);
|
|
1005
|
+
}
|
|
1006
|
+
if (ckEditorFieldControlGroup.length === 0) {
|
|
1007
|
+
ckEditorFieldControlGroup = await import('@dignite-ng/expand.ck-editor').then((module) => module.ckEditorFieldControlGroup);
|
|
1008
|
+
}
|
|
1009
|
+
AddFieldControlGroup([...fielFieldControlGroup, ...ckEditorFieldControlGroup]);
|
|
979
1010
|
return FieldControlGroup;
|
|
980
1011
|
}
|
|
981
1012
|
function AddFieldControlGroup(array = []) {
|
|
@@ -986,15 +1017,14 @@ class DynamicComponent {
|
|
|
986
1017
|
constructor() {
|
|
987
1018
|
/**字段配置列表 */
|
|
988
1019
|
this._fields = '';
|
|
989
|
-
/**表单控件组 */
|
|
990
|
-
this._fieldControlGroup = FieldControlGroup;
|
|
991
1020
|
}
|
|
992
1021
|
set selected(v) {
|
|
993
1022
|
this._selected = v === undefined ? '' : v === null ? '' : v;
|
|
994
1023
|
}
|
|
995
1024
|
set type(v) {
|
|
996
1025
|
this._type = v;
|
|
997
|
-
this.
|
|
1026
|
+
if (this._entity)
|
|
1027
|
+
this.dataLoaded(3);
|
|
998
1028
|
}
|
|
999
1029
|
set culture(v) {
|
|
1000
1030
|
this._culture = v;
|
|
@@ -1012,15 +1042,18 @@ class DynamicComponent {
|
|
|
1012
1042
|
}
|
|
1013
1043
|
}
|
|
1014
1044
|
/**数据加载完成 */
|
|
1015
|
-
dataLoaded(val) {
|
|
1045
|
+
async dataLoaded(val) {
|
|
1046
|
+
// let _fieldControlGroup:any[] = FieldControlGroup;
|
|
1047
|
+
let _fieldControlGroup = new Array(...await getExcludeAssignControl());
|
|
1016
1048
|
if (this._entity) {
|
|
1049
|
+
//加载所有的动态表单组件
|
|
1017
1050
|
if (this._type) {
|
|
1018
|
-
let fieldControlItem =
|
|
1051
|
+
let fieldControlItem = _fieldControlGroup.find(el => el.name === this._type);
|
|
1019
1052
|
this.loadfieldConfigComponent(fieldControlItem);
|
|
1020
1053
|
}
|
|
1021
1054
|
if (this._fields && this._parentFiledName && this._culture) {
|
|
1022
1055
|
/**表单控件组中的项 */
|
|
1023
|
-
let fieldControlItem =
|
|
1056
|
+
let fieldControlItem = _fieldControlGroup.find(el => el.name === this._fields.field.formControlName);
|
|
1024
1057
|
this.loadfieldComponent(fieldControlItem);
|
|
1025
1058
|
}
|
|
1026
1059
|
}
|
|
@@ -1103,8 +1136,7 @@ class DynamicFormModule {
|
|
|
1103
1136
|
CoreModule,
|
|
1104
1137
|
ThemeSharedModule,
|
|
1105
1138
|
ReactiveFormsModule,
|
|
1106
|
-
NgbDropdownModule,
|
|
1107
|
-
NzTreeModule], exports: [TextEditConfigComponent,
|
|
1139
|
+
NgbDropdownModule], exports: [TextEditConfigComponent,
|
|
1108
1140
|
TextEditComponent,
|
|
1109
1141
|
SwitchConfigComponent,
|
|
1110
1142
|
SwitchControlComponent,
|
|
@@ -1119,8 +1151,7 @@ class DynamicFormModule {
|
|
|
1119
1151
|
CoreModule,
|
|
1120
1152
|
ThemeSharedModule,
|
|
1121
1153
|
ReactiveFormsModule,
|
|
1122
|
-
NgbDropdownModule
|
|
1123
|
-
NzTreeModule] }); }
|
|
1154
|
+
NgbDropdownModule] }); }
|
|
1124
1155
|
}
|
|
1125
1156
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImport: i0, type: DynamicFormModule, decorators: [{
|
|
1126
1157
|
type: NgModule,
|
|
@@ -1144,7 +1175,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
|
|
|
1144
1175
|
ThemeSharedModule,
|
|
1145
1176
|
ReactiveFormsModule,
|
|
1146
1177
|
NgbDropdownModule,
|
|
1147
|
-
NzTreeModule,
|
|
1178
|
+
// NzTreeModule,
|
|
1148
1179
|
],
|
|
1149
1180
|
exports: [
|
|
1150
1181
|
TextEditConfigComponent,
|
|
@@ -1159,6 +1190,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.5", ngImpor
|
|
|
1159
1190
|
SelectControlComponent,
|
|
1160
1191
|
DynamicComponent,
|
|
1161
1192
|
],
|
|
1193
|
+
providers: [],
|
|
1162
1194
|
}]
|
|
1163
1195
|
}] });
|
|
1164
1196
|
|