ngx-rs-ant 0.3.9 → 0.4.2

package/fesm2020/ngx-rs-ant.mjs

@@ -6,7 +6,7 @@ import { CommonModule } from '@angular/common';
 import { Subject, lastValueFrom } from 'rxjs';
 import * as i2 from 'ng-devui/input-number';
 import * as i3 from '@angular/forms';
-import { UntypedFormControl, FormsModule, UntypedFormGroup, ReactiveFormsModule } from '@angular/forms';
+import { FormsModule, UntypedFormGroup, ReactiveFormsModule } from '@angular/forms';
 import * as i1$1 from 'ng-devui/dragdrop';
 import { DevUIModule, FormLayout } from 'ng-devui';
 import CustomStore from 'devextreme/data/custom_store';
@@ -138,10 +138,10 @@ class PluginActiveComponent {
     }
 }
 PluginActiveComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PluginActiveComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-PluginActiveComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.7", type: PluginActiveComponent, selector: "rs-plugin-active", host: { properties: { "style": "this._style" } }, ngImport: i0, template: "<div class=\"active-bar\">\r\n  <span>{{name}}</span>\r\n  <i *ngIf=\"showClose\" class=\"icon-close\" (click)=\"onItemCloseIconClick($event)\"></i>\r\n</div>\r\n<rs-divider *ngIf=\"showDivider\" [targetElement]=\"targetElement\" direction=\"row\"\r\n               (dividerClick)=\"splitItem('column')\"></rs-divider>\r\n<rs-divider *ngIf=\"showDivider\" [targetElement]=\"targetElement\" direction=\"column\"\r\n               (dividerClick)=\"splitItem('row')\"></rs-divider>\r\n", styles: [":host{display:none;position:absolute;border:1px solid var(--devui-brand, #5e7ce0);pointer-events:none}:host .active-bar{padding:2px 4px;color:#fff;background-color:var(--devui-brand, #5e7ce0);position:absolute;top:-23px;right:-1px;display:flex;align-items:center;pointer-events:all;white-space:nowrap}:host .active-bar span{flex:auto}:host .active-bar i{flex:none;margin-left:8px;cursor:pointer}:host .active-bar i:hover{color:var(--devui-danger, #f66f6a)}.plugin-active>:host{display:block}\n"], dependencies: [{ kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: DividerComponent, selector: "rs-divider", inputs: ["direction", "targetElement"], outputs: ["dividerClick"] }] });
+PluginActiveComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.7", type: PluginActiveComponent, selector: "rs-plugin-active", host: { properties: { "style": "this._style" } }, ngImport: i0, template: "<div class=\"active-bar\">\r\n  <span>{{name}}</span>\r\n  <i *ngIf=\"showClose\" class=\"icon-close\" (click)=\"onItemCloseIconClick($event)\"></i>\r\n</div>\r\n<rs-divider *ngIf=\"showDivider\" [targetElement]=\"targetElement\" direction=\"row\"\r\n            (dividerClick)=\"splitItem('column')\"></rs-divider>\r\n<rs-divider *ngIf=\"showDivider\" [targetElement]=\"targetElement\" direction=\"column\"\r\n            (dividerClick)=\"splitItem('row')\"></rs-divider>\r\n", styles: [":host{display:none;position:absolute;border:1px solid var(--devui-brand, #5e7ce0);pointer-events:none}:host .active-bar{padding:2px 4px;color:#fff;background-color:var(--devui-brand, #5e7ce0);position:absolute;top:-23px;right:-1px;display:flex;align-items:center;pointer-events:all;white-space:nowrap}:host .active-bar span{flex:auto}:host .active-bar i{flex:none;margin-left:8px;cursor:pointer}:host .active-bar i:hover{color:var(--devui-danger, #f66f6a)}.plugin-active>:host{display:block}\n"], dependencies: [{ kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: DividerComponent, selector: "rs-divider", inputs: ["direction", "targetElement"], outputs: ["dividerClick"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PluginActiveComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'rs-plugin-active', template: "<div class=\"active-bar\">\r\n  <span>{{name}}</span>\r\n  <i *ngIf=\"showClose\" class=\"icon-close\" (click)=\"onItemCloseIconClick($event)\"></i>\r\n</div>\r\n<rs-divider *ngIf=\"showDivider\" [targetElement]=\"targetElement\" direction=\"row\"\r\n               (dividerClick)=\"splitItem('column')\"></rs-divider>\r\n<rs-divider *ngIf=\"showDivider\" [targetElement]=\"targetElement\" direction=\"column\"\r\n               (dividerClick)=\"splitItem('row')\"></rs-divider>\r\n", styles: [":host{display:none;position:absolute;border:1px solid var(--devui-brand, #5e7ce0);pointer-events:none}:host .active-bar{padding:2px 4px;color:#fff;background-color:var(--devui-brand, #5e7ce0);position:absolute;top:-23px;right:-1px;display:flex;align-items:center;pointer-events:all;white-space:nowrap}:host .active-bar span{flex:auto}:host .active-bar i{flex:none;margin-left:8px;cursor:pointer}:host .active-bar i:hover{color:var(--devui-danger, #f66f6a)}.plugin-active>:host{display:block}\n"] }]
+            args: [{ selector: 'rs-plugin-active', template: "<div class=\"active-bar\">\r\n  <span>{{name}}</span>\r\n  <i *ngIf=\"showClose\" class=\"icon-close\" (click)=\"onItemCloseIconClick($event)\"></i>\r\n</div>\r\n<rs-divider *ngIf=\"showDivider\" [targetElement]=\"targetElement\" direction=\"row\"\r\n            (dividerClick)=\"splitItem('column')\"></rs-divider>\r\n<rs-divider *ngIf=\"showDivider\" [targetElement]=\"targetElement\" direction=\"column\"\r\n            (dividerClick)=\"splitItem('row')\"></rs-divider>\r\n", styles: [":host{display:none;position:absolute;border:1px solid var(--devui-brand, #5e7ce0);pointer-events:none}:host .active-bar{padding:2px 4px;color:#fff;background-color:var(--devui-brand, #5e7ce0);position:absolute;top:-23px;right:-1px;display:flex;align-items:center;pointer-events:all;white-space:nowrap}:host .active-bar span{flex:auto}:host .active-bar i{flex:none;margin-left:8px;cursor:pointer}:host .active-bar i:hover{color:var(--devui-danger, #f66f6a)}.plugin-active>:host{display:block}\n"] }]
         }], propDecorators: { _style: [{
                 type: HostBinding,
                 args: ['style']
@@ -250,7 +250,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
             }] } });
 
 class PluginManager {
-    static createComponent(boxItem, index, style, config, editMode = false, control) {
+    static createComponent(boxItem, index, style, config, editMode = false, formGroup) {
         const plugin = PluginFactory.get(config.name);
         if (!plugin) {
             console.error('undefined plugin: ' + config.name);
@@ -262,12 +262,7 @@ class PluginManager {
         const instance = componentRef.instance;
         Object.assign(instance, config.pluginConfig);
         if (plugin.category === 'form') {
-            if (editMode) {
-                instance.control = new UntypedFormControl('');
-            }
-            else {
-                instance.control = control.get(config.pluginConfig.field);
-            }
+            instance.formGroup = formGroup;
         }
         if (editMode) {
             instance.onRemove = () => {
@@ -440,7 +435,7 @@ class BoxItemComponent {
                 const item = this.config.list[i];
                 switch (item.type) {
                     case 'plugin':
-                        PluginManager.createComponent(this, i, item.style, item.config, this.editMode, this.control);
+                        PluginManager.createComponent(this, i, item.style, item.config, this.editMode, this.formGroup);
                         break;
                     case 'item':
                         const boxItemComponentRef = itemHost.viewContainerRef.createComponent(BoxItemComponent);
@@ -448,7 +443,7 @@ class BoxItemComponent {
                         instance.editMode = this.editMode;
                         instance.style = item.style;
                         instance.config = item.config;
-                        instance.control = this.control;
+                        instance.formGroup = this.formGroup;
                         instance.pDirection = this.config.direction;
                         if (this.editMode) {
                             instance.leaveOneItem.subscribe((item) => {
@@ -586,7 +581,7 @@ class BoxContainerComponent {
         const instance = boxItemComponentRef.instance;
         instance.editMode = this.editMode;
         instance.config = this.config;
-        instance.control = this.control;
+        instance.formGroup = this.formGroup;
         instance.leaveOneItem?.subscribe((item) => {
             if (item.type === 'item') {
                 Object.assign(instance.config, item);
@@ -599,7 +594,7 @@ class BoxContainerComponent {
     }
 }
 BoxContainerComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: BoxContainerComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-BoxContainerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.7", type: BoxContainerComponent, selector: "rs-box-container", inputs: { editMode: "editMode", config: "config", control: "control" }, viewQueries: [{ propertyName: "boxContainerContent", first: true, predicate: ["boxContainerContent"], descendants: true, read: ViewContainerRef, static: true }], ngImport: i0, template: "<ng-container #boxContainerContent></ng-container>\n", styles: [":host{flex:auto;position:relative;display:flex;overflow:auto}\n"] });
+BoxContainerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.7", type: BoxContainerComponent, selector: "rs-box-container", inputs: { editMode: "editMode", config: "config", formGroup: "formGroup" }, viewQueries: [{ propertyName: "boxContainerContent", first: true, predicate: ["boxContainerContent"], descendants: true, read: ViewContainerRef, static: true }], ngImport: i0, template: "<ng-container #boxContainerContent></ng-container>\n", styles: [":host{flex:auto;position:relative;display:flex;overflow:auto}\n"] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: BoxContainerComponent, decorators: [{
             type: Component,
             args: [{ selector: 'rs-box-container', template: "<ng-container #boxContainerContent></ng-container>\n", styles: [":host{flex:auto;position:relative;display:flex;overflow:auto}\n"] }]
@@ -607,7 +602,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
                 type: Input
             }], config: [{
                 type: Input
-            }], control: [{
+            }], formGroup: [{
                 type: Input
             }], boxContainerContent: [{
                 type: ViewChild,
@@ -721,6 +716,24 @@ class DataGridComponent {
                         format: this.typeMap[column.dataType].format
                     });
                 }
+                else if (column.type === 'FILE') {
+                    this.columns.push({
+                        dataField: column.name,
+                        caption: column.caption,
+                        dataType: 'string',
+                        alignment: 'left',
+                        filterOperations: []
+                    });
+                }
+                else if (column.type === 'RELATION') {
+                    this.columns.push({
+                        dataField: column.name,
+                        caption: column.caption,
+                        dataType: 'string',
+                        alignment: 'left',
+                        filterOperations: ['=']
+                    });
+                }
             }
         });
         this.dataSource = new CustomStore({
@@ -820,37 +833,49 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
 class FormComponent {
     constructor() {
         this.layoutDirection = FormLayout.Vertical;
-        this.model = {};
-        this.items = [];
         this.formGroup = new UntypedFormGroup({});
-        this.submitted = new EventEmitter();
+        this.submitCallback = new EventEmitter();
     }
     ngOnInit() {
-        this.formGroup.valueChanges.subscribe(model => {
-            this.model = model;
-        });
         this.service.getMetadataByTemplate(this.tenant, this.className, this.template).subscribe((response) => {
-            this.config = JSON.parse(response.data.template);
-            this.items = ["modifier", "createTime", "modifyTime", "creator", "number"];
-            for (let item of this.items) {
-                this.formGroup.addControl(item, new UntypedFormControl(this.model[item]));
-            }
+            this.config = response.data.template;
         });
+        if (this.copyOid || this.oid) {
+            const attributes = encodeURIComponent(Object.keys(this.formGroup.controls).join(';'));
+            this.service.getOne(this.tenant, this.className, this.copyOid || this.oid, attributes).subscribe((response) => {
+                if (this.copyOid) {
+                    delete response.data.oid;
+                }
+                this.formGroup.patchValue(response.data);
+            });
+        }
     }
     submit($event) {
-        console.log($event);
-        console.log(this.model);
+        if (!$event.valid) {
+            this.submitCallback.emit();
+            return;
+        }
+        this.service.createOrUpdate(this.tenant, this.className, {
+            oid: this.oid,
+            ...this.formGroup.value
+        }).subscribe((response) => {
+            this.submitCallback.emit(response);
+        });
     }
 }
 FormComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: FormComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-FormComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.7", type: FormComponent, selector: "rs-form", inputs: { tenant: "tenant", className: "className", template: "template", service: "service" }, outputs: { submitted: "submitted" }, viewQueries: [{ propertyName: "formSubmitter", first: true, predicate: ["formSubmitter"], descendants: true }], ngImport: i0, template: "<form dForm [formGroup]=\"formGroup\" [layout]=\"layoutDirection\" (dSubmit)=\"submit($event)\">\n  <ng-container *ngIf=\"config && formGroup\">\n    <rs-box-container [config]=\"config\" [control]=\"formGroup\"></rs-box-container>\n  </ng-container>\n  <button #formSubmitter dFormSubmit=\"click\"></button>\n</form>\n", styles: [""], dependencies: [{ kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2$2.FormDirective, selector: "[dForm]", inputs: ["layout", "labelSize", "labelAlign", "dFeedbackType", "dHasFeedback"], outputs: ["dSubmit"], exportAs: ["dForm"] }, { kind: "directive", type: i2$2.DFormSubmitDirective, selector: "[dFormSubmit]", inputs: ["dFormSubmit", "dFormSubmitData"] }, { kind: "directive", type: i3.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i3.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i3.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "component", type: BoxContainerComponent, selector: "rs-box-container", inputs: ["editMode", "config", "control"] }] });
+FormComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.7", type: FormComponent, selector: "rs-form", inputs: { tenant: "tenant", className: "className", oid: "oid", copyOid: "copyOid", template: "template", service: "service" }, outputs: { submitCallback: "submitCallback" }, viewQueries: [{ propertyName: "formSubmitter", first: true, predicate: ["formSubmitter"], descendants: true }], ngImport: i0, template: "<form dForm [formGroup]=\"formGroup\" [layout]=\"layoutDirection\" (dSubmit)=\"submit($event)\">\n  <ng-container *ngIf=\"config\">\n    <rs-box-container [config]=\"config\" [formGroup]=\"formGroup\"></rs-box-container>\n  </ng-container>\n  <button #formSubmitter dFormSubmit=\"click\"></button>\n</form>\n", styles: [""], dependencies: [{ kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2$2.FormDirective, selector: "[dForm]", inputs: ["layout", "labelSize", "labelAlign", "dFeedbackType", "dHasFeedback"], outputs: ["dSubmit"], exportAs: ["dForm"] }, { kind: "directive", type: i2$2.DFormSubmitDirective, selector: "[dFormSubmit]", inputs: ["dFormSubmit", "dFormSubmitData"] }, { kind: "directive", type: i3.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i3.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i3.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "component", type: BoxContainerComponent, selector: "rs-box-container", inputs: ["editMode", "config", "formGroup"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: FormComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'rs-form', template: "<form dForm [formGroup]=\"formGroup\" [layout]=\"layoutDirection\" (dSubmit)=\"submit($event)\">\n  <ng-container *ngIf=\"config && formGroup\">\n    <rs-box-container [config]=\"config\" [control]=\"formGroup\"></rs-box-container>\n  </ng-container>\n  <button #formSubmitter dFormSubmit=\"click\"></button>\n</form>\n" }]
+            args: [{ selector: 'rs-form', template: "<form dForm [formGroup]=\"formGroup\" [layout]=\"layoutDirection\" (dSubmit)=\"submit($event)\">\n  <ng-container *ngIf=\"config\">\n    <rs-box-container [config]=\"config\" [formGroup]=\"formGroup\"></rs-box-container>\n  </ng-container>\n  <button #formSubmitter dFormSubmit=\"click\"></button>\n</form>\n" }]
         }], propDecorators: { tenant: [{
                 type: Input
             }], className: [{
                 type: Input
+            }], oid: [{
+                type: Input
+            }], copyOid: [{
+                type: Input
             }], template: [{
                 type: Input
             }], service: [{
@@ -858,7 +883,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
             }], formSubmitter: [{
                 type: ViewChild,
                 args: ['formSubmitter']
-            }], submitted: [{
+            }], submitCallback: [{
                 type: Output
             }] } });