cmat 0.0.34 → 0.0.36

package/components/custom-formly/index.d.ts

@@ -9,7 +9,7 @@ import { FieldType as FieldType$1 } from '@ngx-formly/material';
 import { CmatCalendarView, CmatDatetimepickerMode, CmatDatetimepickerType } from 'cmat/components/material-datetimepicker';
 import { MatCheckbox } from '@angular/material/checkbox';
 import { MatRadioGroup } from '@angular/material/radio';
-import { FormControl, FormGroup } from '@angular/forms';
+import { FormControl, FormGroup, UntypedFormGroup } from '@angular/forms';
 import { FormlyFieldSelectProps } from '@ngx-formly/core/select';
 import { CmatSelectTableDataSource, CmatSelectTableRow } from 'cmat/components/select-table';
 import { MatTable } from '@angular/material/table';
@@ -579,7 +579,7 @@ interface UploadProps extends CustomFormFieldProps {
     editMode: boolean;
     autoUpload: boolean;
 }
-declare class CmatUploadTypeComponent extends FieldType<FieldTypeConfig<UploadProps>> {
+declare class CmatUploadTypeComponent extends FieldType<FieldTypeConfig<UploadProps>> implements AfterViewInit {
     defaultOptions: {
         props: {
             fileAlias: string;
@@ -591,9 +591,12 @@ declare class CmatUploadTypeComponent extends FieldType<FieldTypeConfig<UploadPr
             autoUpload: boolean;
         };
     };
+    baseGroup: UntypedFormGroup;
+    ngAfterViewInit(): void;
     upload(id: string): void;
     remove(id: string): void;
     updateData(i: any): void;
+    private _getRootControl;
     static ɵfac: i0.ɵɵFactoryDeclaration<CmatUploadTypeComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<CmatUploadTypeComponent, "cmat-upload-type", never, {}, {}, never, never, true, never>;
 }
@@ -602,7 +605,7 @@ interface QuillProps extends CustomFormFieldProps {
     fileAlias: string;
     filePath: string;
 }
-declare class CmatQuillTypeComponent extends FieldType<FieldTypeConfig<QuillProps>> implements OnDestroy {
+declare class CmatQuillTypeComponent extends FieldType<FieldTypeConfig<QuillProps>> implements OnDestroy, AfterViewInit {
     private imgInput;
     private videoInput;
     quillModules: QuillModules;
@@ -612,6 +615,7 @@ declare class CmatQuillTypeComponent extends FieldType<FieldTypeConfig<QuillProp
             filePath: string;
         };
     };
+    baseGroup: UntypedFormGroup;
     private _fileService;
     private _urlStateConfigService;
     private _changeDetectorRef;
@@ -621,6 +625,7 @@ declare class CmatQuillTypeComponent extends FieldType<FieldTypeConfig<QuillProp
     private _unsubscribeAll;
     constructor();
     ngOnDestroy(): void;
+    ngAfterViewInit(): void;
     fileChangeEvent(file: any): void;
     editorCreated(editorInstance: any): void;
     contentChanged(editorInstance: any): void;
@@ -629,6 +634,7 @@ declare class CmatQuillTypeComponent extends FieldType<FieldTypeConfig<QuillProp
     private _dropFileHandler;
     private _upload;
     private _getMediaType;
+    private _getRootControl;
     static ɵfac: i0.ɵɵFactoryDeclaration<CmatQuillTypeComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<CmatQuillTypeComponent, "cmat-quill-type", never, {}, {}, never, never, true, never>;
 }

package/fesm2022/cmat-components-custom-formly.mjs

@@ -1405,20 +1405,24 @@ class CmatUploadTypeComponent extends FieldType {
             }
         };
     }
-    upload(id) {
-        if (this.model['uploadId']) {
-            this.model['uploadId'].push(id);
+    ngAfterViewInit() {
+        if (!this.baseGroup)
+            this.baseGroup = this._getRootControl(this.formControl);
+        if (!this.baseGroup.contains('uploadId')) {
+            this.baseGroup.addControl('uploadId', new FormControl([]));
+            this.baseGroup.addControl('removeId', new FormControl([]));
         }
-        else {
-            this.model['uploadId'] = [id];
+    }
+    upload(id) {
+        var rootValue = this.baseGroup.get('uploadId')?.value;
+        if (rootValue && !isNil(id)) {
+            this.baseGroup.get('uploadId')?.setValue([id, ...rootValue]);
         }
     }
     remove(id) {
-        if (this.model['removeId']) {
-            this.model['removeId'].push(id);
-        }
-        else {
-            this.model['removeId'] = [id];
+        var rootValue = this.baseGroup.get('removeId')?.value;
+        if (rootValue && !isNil(id)) {
+            this.baseGroup.get('removeId')?.setValue([id, ...rootValue]);
         }
     }
     updateData(i) {
@@ -1435,6 +1439,12 @@ class CmatUploadTypeComponent extends FieldType {
                 return j;
         }));
     }
+    _getRootControl(baseControl) {
+        if (baseControl.parent) {
+            return this._getRootControl(baseControl.parent);
+        }
+        return baseControl;
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: CmatUploadTypeComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.3", type: CmatUploadTypeComponent, isStandalone: true, selector: "cmat-upload-type", usesInheritance: true, ngImport: i0, template: "<cmat-upload-queue [tabindex]=\"props.tabindex\" [fileAlias]=\"props.fileAlias\"\r\n    [filePath]=\"props.filePath\" [required]=\"required\" [fileCategory]=\"props.fileCategory\" [multiple]=\"props.multiple\"\r\n    [accept]=\"props.accept\" [title]=\"props.label??'\u9644\u4EF6'\" [editMode]=\"props.editMode&&!disabled\" [filesData]=\"formControl.value\"\r\n    [autoUpload]=\"props.autoUpload\" (outputUploadIdEvent)=\"upload($event)\" (outputRemoveIdEvent)=\"remove($event)\" (outputFilesDataEvent)=\"updateData($event)\">\r\n</cmat-upload-queue>", styles: [":host{width:100%}\n"], dependencies: [{ kind: "component", type: CmatUploadQueueComponent, selector: "cmat-upload-queue", inputs: ["fileAlias", "filePath", "fileCategory", "required", "autoUpload", "multiple", "accept", "title", "editMode", "filesData"], outputs: ["outputRemoveIdEvent", "outputUploadIdEvent", "outputFilesDataEvent"], exportAs: ["cmatUploadQueue"] }, { kind: "ngmodule", type: ReactiveFormsModule }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
@@ -1494,6 +1504,14 @@ class CmatQuillTypeComponent extends FieldType {
         this._unsubscribeAll.next(void 0);
         this._unsubscribeAll.complete();
     }
+    ngAfterViewInit() {
+        if (!this.baseGroup)
+            this.baseGroup = this._getRootControl(this.formControl);
+        if (!this.baseGroup.contains('uploadId')) {
+            this.baseGroup.addControl('uploadId', new FormControl([]));
+            this.baseGroup.addControl('removeId', new FormControl([]));
+        }
+    }
     fileChangeEvent(file) {
         const fileModel = {
             id: null,
@@ -1542,11 +1560,9 @@ class CmatQuillTypeComponent extends FieldType {
             }
         });
         this._imgIds.forEach((i) => {
-            if (this.model['removeId']) {
-                this.model['removeId'].push(i);
-            }
-            else {
-                this.model['removeId'] = [i];
+            var rootValue = this.baseGroup.get('removeId')?.value;
+            if (rootValue && !isNil(i)) {
+                this.baseGroup.get('removeId')?.setValue([i, ...rootValue]);
             }
         });
         this._imgIds = arr;
@@ -1561,11 +1577,9 @@ class CmatQuillTypeComponent extends FieldType {
         this.fileChangeEvent(fileData.toFile());
     }
     _upload(id) {
-        if (this.model['uploadId']) {
-            this.model['uploadId'].push(id);
-        }
-        else {
-            this.model['uploadId'] = [id];
+        var rootValue = this.baseGroup.get('uploadId')?.value;
+        if (rootValue && !isNil(id)) {
+            this.baseGroup.get('uploadId')?.setValue([id, ...rootValue]);
         }
     }
     _getMediaType(accept) {
@@ -1585,6 +1599,12 @@ class CmatQuillTypeComponent extends FieldType {
         }
         return fileType;
     }
+    _getRootControl(baseControl) {
+        if (baseControl.parent) {
+            return this._getRootControl(baseControl.parent);
+        }
+        return baseControl;
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: CmatQuillTypeComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.3", type: CmatQuillTypeComponent, isStandalone: true, selector: "cmat-quill-type", viewQueries: [{ propertyName: "imgInput", first: true, predicate: ["imgInput"], descendants: true }, { propertyName: "videoInput", first: true, predicate: ["videoInput"], descendants: true }], usesInheritance: true, ngImport: i0, template: "<quill-editor class=\"w-full\" defaultEmptyValue=\"\" [formControl]=\"formControl\" [required]=\"required\"  [placeholder]=\"placeholder\" [tabindex]=\"props.tabindex\"\r\n    [readOnly]=\"disabled\" [modules]=\"quillModules\" (onEditorCreated)=\"editorCreated($event)\"\r\n    (onContentChanged)=\"contentChanged($event)\">\r\n    <input #imgInput type=\"file\" accept=\"image/png,image/jpeg,image/jpg,image/gif\" class=\"hidden\" (change)=\"fileChangeEvent(imgInput.files?.[0])\" />\r\n    <input #videoInput type=\"file\" accept=\"video/mpeg,video/mp4,audio/mp4\" class=\"hidden\" (change)=\"fileChangeEvent(videoInput.files?.[0])\" />\r\n</quill-editor>", styles: [":host{display:block;width:100%}\n"], dependencies: [{ kind: "ngmodule", type: ReactiveFormsModule }, { kind: "directive", type: i1$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$4.RequiredValidator, selector: ":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]", inputs: ["required"] }, { kind: "directive", type: i1$4.FormControlDirective, selector: "[formControl]", inputs: ["formControl", "disabled", "ngModel"], outputs: ["ngModelChange"], exportAs: ["ngForm"] }, { kind: "ngmodule", type: QuillModule }, { kind: "component", type: i2$4.QuillEditorComponent, selector: "quill-editor" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }