ngx-rs-ant 0.10.7 → 0.10.9

package/fesm2020/ngx-rs-ant.mjs

@@ -138,14 +138,14 @@ class PluginActiveComponent {
         this.itemRemove.emit();
     }
     splitItem(direction) {
-        // 在布局型组件中实例化时重写
+        // 上层实例化时重写
     }
 }
 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-item\"\r\n     dDraggable\r\n     [disabled]=\"!showClose || showDivider\"\r\n     [dragData]=\"dragData\"\r\n     dragScope=\"plugin-item\"\r\n>\r\n  <div class=\"active-bar\">\r\n    <i *ngIf=\"showClose && !showDivider\" class=\"icon-drag\"></i>\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</div>\r\n", styles: [":host{display:none;position:absolute;border:1px solid var(--devui-brand, #5e7ce0);pointer-events:none}:host .active-item{width:100%;height:100%}:host .active-item .active-bar{padding:2px 4px;color:#fff;background-color:var(--devui-brand, #5e7ce0);position:absolute;top:-23px;right:-1px;display:flex;flex-flow:row nowrap;align-items:center;pointer-events:all;white-space:nowrap}:host .active-item .active-bar i.icon-drag{flex:none;margin-right:8px;cursor:move}:host .active-item .active-bar span{flex:1}:host .active-item .active-bar i.icon-close{flex:none;margin-left:8px;cursor:pointer}:host .active-item .active-bar i.icon-close: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: "directive", type: i2.DraggableDirective, selector: "[dDraggable]", inputs: ["dragData", "dragHandle", "dragEffect", "dragScope", "dragHandleClass", "dragOverClass", "disabled", "enableDragFollow", "dragFollowOptions", "originPlaceholder", "dragIdentity", "dragItemParentName", "dragItemChildrenName"], outputs: ["dragStartEvent", "dragEvent", "dragEndEvent", "dropEndEvent"] }, { 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-item\"\r\n     dDraggable\r\n     [disabled]=\"!showClose || showDivider\"\r\n     [dragData]=\"dragData\"\r\n     dragScope=\"plugin-item\"\r\n>\r\n  <div class=\"active-bar\">\r\n    <i *ngIf=\"showClose && !showDivider\" class=\"icon-drag\"></i>\r\n    <span>{{name}}</span>\r\n    <i class=\"coast-icon-add-row\" title=\"\u6DFB\u52A0\u884C\" (click)=\"splitItem('column')\"></i>\r\n    <i class=\"coast-icon-add-column\" title=\"\u6DFB\u52A0\u5217\" (click)=\"splitItem('row')\"></i>\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</div>\r\n", styles: [":host{display:none;position:absolute;border:1px solid var(--devui-brand, #5e7ce0);pointer-events:none}:host .active-item{width:100%;height:100%}:host .active-item .active-bar{padding:2px 4px;color:#fff;background-color:var(--devui-brand, #5e7ce0);position:absolute;top:-23px;right:-1px;display:flex;flex-flow:row nowrap;align-items:center;pointer-events:all;white-space:nowrap}:host .active-item .active-bar i{flex:none;cursor:pointer}:host .active-item .active-bar i:not(:last-child){margin-right:8px}:host .active-item .active-bar i.icon-drag{cursor:move}:host .active-item .active-bar i.icon-close:hover{color:var(--devui-danger, #f66f6a)}:host .active-item .active-bar span{flex:1;margin-right:8px}.plugin-active>:host{display:block}\n"], dependencies: [{ kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2.DraggableDirective, selector: "[dDraggable]", inputs: ["dragData", "dragHandle", "dragEffect", "dragScope", "dragHandleClass", "dragOverClass", "disabled", "enableDragFollow", "dragFollowOptions", "originPlaceholder", "dragIdentity", "dragItemParentName", "dragItemChildrenName"], outputs: ["dragStartEvent", "dragEvent", "dragEndEvent", "dropEndEvent"] }, { 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-item\"\r\n     dDraggable\r\n     [disabled]=\"!showClose || showDivider\"\r\n     [dragData]=\"dragData\"\r\n     dragScope=\"plugin-item\"\r\n>\r\n  <div class=\"active-bar\">\r\n    <i *ngIf=\"showClose && !showDivider\" class=\"icon-drag\"></i>\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</div>\r\n", styles: [":host{display:none;position:absolute;border:1px solid var(--devui-brand, #5e7ce0);pointer-events:none}:host .active-item{width:100%;height:100%}:host .active-item .active-bar{padding:2px 4px;color:#fff;background-color:var(--devui-brand, #5e7ce0);position:absolute;top:-23px;right:-1px;display:flex;flex-flow:row nowrap;align-items:center;pointer-events:all;white-space:nowrap}:host .active-item .active-bar i.icon-drag{flex:none;margin-right:8px;cursor:move}:host .active-item .active-bar span{flex:1}:host .active-item .active-bar i.icon-close{flex:none;margin-left:8px;cursor:pointer}:host .active-item .active-bar i.icon-close:hover{color:var(--devui-danger, #f66f6a)}.plugin-active>:host{display:block}\n"] }]
+            args: [{ selector: 'rs-plugin-active', template: "<div class=\"active-item\"\r\n     dDraggable\r\n     [disabled]=\"!showClose || showDivider\"\r\n     [dragData]=\"dragData\"\r\n     dragScope=\"plugin-item\"\r\n>\r\n  <div class=\"active-bar\">\r\n    <i *ngIf=\"showClose && !showDivider\" class=\"icon-drag\"></i>\r\n    <span>{{name}}</span>\r\n    <i class=\"coast-icon-add-row\" title=\"\u6DFB\u52A0\u884C\" (click)=\"splitItem('column')\"></i>\r\n    <i class=\"coast-icon-add-column\" title=\"\u6DFB\u52A0\u5217\" (click)=\"splitItem('row')\"></i>\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</div>\r\n", styles: [":host{display:none;position:absolute;border:1px solid var(--devui-brand, #5e7ce0);pointer-events:none}:host .active-item{width:100%;height:100%}:host .active-item .active-bar{padding:2px 4px;color:#fff;background-color:var(--devui-brand, #5e7ce0);position:absolute;top:-23px;right:-1px;display:flex;flex-flow:row nowrap;align-items:center;pointer-events:all;white-space:nowrap}:host .active-item .active-bar i{flex:none;cursor:pointer}:host .active-item .active-bar i:not(:last-child){margin-right:8px}:host .active-item .active-bar i.icon-drag{cursor:move}:host .active-item .active-bar i.icon-close:hover{color:var(--devui-danger, #f66f6a)}:host .active-item .active-bar span{flex:1;margin-right:8px}.plugin-active>:host{display:block}\n"] }]
         }], propDecorators: { _style: [{
                 type: HostBinding,
                 args: ['style']
@@ -210,6 +210,7 @@ class PluginManager {
                 boxItem.config.list.splice(index, 1, { type: 'blank', style: boxItem.config.list[index].style });
                 boxItem.load();
             };
+            componentRef.location.nativeElement.style.margin = '16px';
             componentRef.location.nativeElement.style.pointerEvents = 'all';
             for (let child of componentRef.location.nativeElement.children) {
                 child.style.pointerEvents = 'none';
@@ -267,6 +268,34 @@ class PluginManager {
             this.activeItem.next({ boxItem, index, style, config: config.config, componentRef });
             $event.target.classList.add('plugin-active');
         });
+        activeComponentRef.instance.splitItem = (direction) => {
+            if (boxItem.config.direction === direction) {
+                boxItem.config.list.splice(index + 1, 0, { type: 'blank', style: {} });
+                boxItem.load();
+            }
+            else {
+                if (boxItem.config.list.length === 1) {
+                    boxItem.config.direction = direction;
+                    boxItem.config.list.push({ type: 'blank', style: {} });
+                }
+                else {
+                    if (boxItem.config.list[index].type === 'item' && boxItem.config.list[index].config.direction === direction) {
+                        boxItem.config.list[index].config.list.push({ type: 'blank', style: {} });
+                    }
+                    else {
+                        boxItem.config.list.splice(index, 1, {
+                            type: 'item',
+                            style: boxItem.config.list[index].style,
+                            config: {
+                                direction,
+                                list: [boxItem.config.list[index], { type: 'blank', style: {} }]
+                            }
+                        });
+                    }
+                }
+                boxItem.load();
+            }
+        };
         activeComponentRef.instance.itemRemove.subscribe(() => {
             this.activeItem.next('');
             viewContainerRef.clear();
@@ -540,7 +569,7 @@ class BoxItemComponent {
         activeComponentRef.instance.showDivider = true;
         activeComponentRef.instance.splitItem = (direction) => {
             if (this.config.direction === direction) {
-                this.config.list.splice(index, 0, { type: 'blank', style: {} });
+                this.config.list.splice(index + 1, 0, { type: 'blank', style: {} });
                 this.load();
             }
             else {
@@ -551,10 +580,10 @@ class BoxItemComponent {
                 else {
                     this.config.list.splice(index, 1, {
                         type: 'item',
-                        style: this.config.list[index].style,
+                        style: {},
                         config: {
                             direction,
-                            list: [{ type: 'blank', style: {} }, { type: 'blank', style: {} }]
+                            list: [this.config.list[index], { type: 'blank', style: {} }]
                         }
                     });
                 }
@@ -1000,6 +1029,7 @@ class DataGridComponent {
                             caption: field.caption,
                             dataType: 'string',
                             alignment: 'center',
+                            cssClass: 'cell-vertical-middle',
                             allowHeaderFiltering: false,
                             allowFiltering: false,
                             allowSorting: false,
@@ -1014,6 +1044,7 @@ class DataGridComponent {
                             caption: field.caption,
                             dataType: this.typeMap[field.dataType].dataType,
                             alignment: 'left',
+                            cssClass: 'cell-vertical-middle',
                             allowHeaderFiltering: true,
                             headerFilter: {
                                 allowSelectAll: false
@@ -1235,6 +1266,7 @@ class DataGridComponent {
                                     caption: field.caption,
                                     dataType: 'string',
                                     alignment: 'left',
+                                    cssClass: 'cell-vertical-middle',
                                     allowHeaderFiltering: false,
                                     allowFiltering: false,
                                     visible: field.visible,
@@ -1248,6 +1280,7 @@ class DataGridComponent {
                                     caption: field.caption,
                                     dataType: 'string',
                                     alignment: 'left',
+                                    cssClass: 'cell-vertical-middle',
                                     allowHeaderFiltering: false,
                                     filterOperations: ['='],
                                     visible: field.visible,
@@ -1454,12 +1487,13 @@ class FormService {
             }
         });
     }
-    getOne(tenant, className, oid, template) {
+    getOne(tenant, className, oid, template, isCopy) {
         let api = 'api/data/' + className + '/' + oid;
         return this.http.get(api, {
             params: {
                 tenant,
-                template: template || ''
+                template: template || '',
+                isCopy: !!isCopy
             }
         });
     }
@@ -1505,11 +1539,8 @@ class FormComponent {
         this.service.getFormTemplateConfig(this.tenant, this.className, this.template).subscribe(response => {
             this.config = response.data.template;
             if (this.copyOid || this.oid) {
-                this.service.getOne(this.tenant, this.className, this.copyOid || this.oid, this.template)
+                this.service.getOne(this.tenant, this.className, this.copyOid || this.oid, this.template, this.copyOid)
                     .subscribe(response => {
-                    if (this.copyOid) {
-                        delete response.data.oid;
-                    }
                     this.model = response.data;
                     this.loaded = true;
                     this.loading = false;