@delon/abc 12.2.1 → 12.4.0

package/bundles/reuseTab.umd.js

@@ -1,13 +1,13 @@
 /**
- * @license ng-alain(cipchk@qq.com) v12.2.1
+ * @license ng-alain(cipchk@qq.com) v12.4.0
  * (c) 2020 cipchk https://ng-alain.com/
  * License: MIT
  */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@delon/theme'), require('rxjs'), require('@angular/cdk/overlay'), require('@angular/cdk/portal'), require('@angular/cdk/platform'), require('@angular/common'), require('@angular/router'), require('rxjs/operators'), require('@delon/util/decorator'), require('@delon/util/browser'), require('ng-zorro-antd/icon'), require('ng-zorro-antd/menu'), require('ng-zorro-antd/tabs')) :
     typeof define === 'function' && define.amd ? define('@delon/abc/reuse-tab', ['exports', '@angular/core', '@delon/theme', 'rxjs', '@angular/cdk/overlay', '@angular/cdk/portal', '@angular/cdk/platform', '@angular/common', '@angular/router', 'rxjs/operators', '@delon/util/decorator', '@delon/util/browser', 'ng-zorro-antd/icon', 'ng-zorro-antd/menu', 'ng-zorro-antd/tabs'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.delon = global.delon || {}, global.delon.abc = global.delon.abc || {}, global.delon.abc['reuse-tab'] = {}), global.ng.core, global.delon.theme, global.rxjs, global.ng.cdk.overlay, global.ng.cdk.portal, global.ng.cdk.platform, global.ng.common, global.ng.router, global.rxjs.operators, global.decorator, global.browser, global['ng-zorro-antd/icon'], global['ng-zorro-antd/menu'], global['ng-zorro-antd/tabs']));
-}(this, (function (exports, i0, i1, rxjs, overlay, portal, platform, common, router, operators, decorator, browser, icon, menu, tabs) { 'use strict';
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.delon = global.delon || {}, global.delon.abc = global.delon.abc || {}, global.delon.abc["reuse-tab"] = {}), global.ng.core, global.delon.theme, global.rxjs, global.ng.cdk.overlay, global.ng.cdk.portal, global.ng.cdk.platform, global.ng.common, global.ng.router, global.rxjs.operators, global.decorator, global.browser, global["ng-zorro-antd/icon"], global["ng-zorro-antd/menu"], global["ng-zorro-antd/tabs"]));
+})(this, (function (exports, i0, i1, rxjs, overlay, portal, platform, common, router, operators, decorator, browser, icon, menu, tabs) { 'use strict';
 
     function _interopNamespace(e) {
         if (e && e.__esModule) return e;
@@ -18,14 +18,12 @@
                     var d = Object.getOwnPropertyDescriptor(e, k);
                     Object.defineProperty(n, k, d.get ? d : {
                         enumerable: true,
-                        get: function () {
-                            return e[k];
-                        }
+                        get: function () { return e[k]; }
                     });
                 }
             });
         }
-        n['default'] = e;
+        n["default"] = e;
         return Object.freeze(n);
     }
 
@@ -92,7 +90,7 @@
     ReuseTabContextMenuComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'reuse-tab-context-menu',
-                    template: "<ul nz-menu>\n  <li nz-menu-item (click)=\"click($event, 'refresh')\" data-type=\"refresh\" [innerHTML]=\"i18n.refresh\"></li>\n  <li\n    nz-menu-item\n    (click)=\"click($event, 'close')\"\n    data-type=\"close\"\n    [nzDisabled]=\"!item.closable\"\n    [innerHTML]=\"i18n.close\"\n  ></li>\n  <li nz-menu-item (click)=\"click($event, 'closeOther')\" data-type=\"closeOther\" [innerHTML]=\"i18n.closeOther\"></li>\n  <li\n    nz-menu-item\n    (click)=\"click($event, 'closeRight')\"\n    data-type=\"closeRight\"\n    [nzDisabled]=\"item.last\"\n    [innerHTML]=\"i18n.closeRight\"\n  ></li>\n  <ng-container *ngIf=\"customContextMenu!.length > 0\">\n    <li nz-menu-divider></li>\n    <li\n      *ngFor=\"let i of customContextMenu\"\n      nz-menu-item\n      [attr.data-type]=\"i.id\"\n      [nzDisabled]=\"isDisabled(i)\"\n      (click)=\"click($event, 'custom', i)\"\n      [innerHTML]=\"i.title\"\n    ></li>\n  </ng-container>\n</ul>\n",
+                    template: "<ul nz-menu>\n  <li\n    *ngIf=\"item.active\"\n    nz-menu-item\n    (click)=\"click($event, 'refresh')\"\n    data-type=\"refresh\"\n    [innerHTML]=\"i18n.refresh\"\n  ></li>\n  <li\n    nz-menu-item\n    (click)=\"click($event, 'close')\"\n    data-type=\"close\"\n    [nzDisabled]=\"!item.closable\"\n    [innerHTML]=\"i18n.close\"\n  ></li>\n  <li nz-menu-item (click)=\"click($event, 'closeOther')\" data-type=\"closeOther\" [innerHTML]=\"i18n.closeOther\"></li>\n  <li\n    nz-menu-item\n    (click)=\"click($event, 'closeRight')\"\n    data-type=\"closeRight\"\n    [nzDisabled]=\"item.last\"\n    [innerHTML]=\"i18n.closeRight\"\n  ></li>\n  <ng-container *ngIf=\"customContextMenu!.length > 0\">\n    <li nz-menu-divider></li>\n    <li\n      *ngFor=\"let i of customContextMenu\"\n      nz-menu-item\n      [attr.data-type]=\"i.id\"\n      [nzDisabled]=\"isDisabled(i)\"\n      (click)=\"click($event, 'custom', i)\"\n      [innerHTML]=\"i.title\"\n    ></li>\n  </ng-container>\n</ul>\n",
                     host: {
                         '(document:click)': 'closeMenu($event)',
                         '(document:contextmenu)': 'closeMenu($event)'
@@ -130,21 +128,12 @@
             var _this = this;
             this.remove();
             var event = context.event, item = context.item, customContextMenu = context.customContextMenu;
-            var fakeElement = new i0.ElementRef({
-                getBoundingClientRect: function () { return ({
-                    bottom: event.clientY,
-                    height: 0,
-                    left: event.clientX,
-                    right: event.clientX,
-                    top: event.clientY,
-                    width: 0
-                }); }
-            });
+            var x = event.x, y = event.y;
             var positions = [
                 new overlay.ConnectionPositionPair({ originX: 'start', originY: 'bottom' }, { overlayX: 'start', overlayY: 'top' }),
                 new overlay.ConnectionPositionPair({ originX: 'start', originY: 'top' }, { overlayX: 'start', overlayY: 'bottom' })
             ];
-            var positionStrategy = this.overlay.position().flexibleConnectedTo(fakeElement).withPositions(positions);
+            var positionStrategy = this.overlay.position().flexibleConnectedTo({ x: x, y: y }).withPositions(positions);
             this.ref = this.overlay.create({
                 positionStrategy: positionStrategy,
                 panelClass: 'reuse-tab__cm',
@@ -1186,7 +1175,7 @@
             this.i18nSrv = i18nSrv;
             this.doc = doc;
             this.platform = platform;
-            this.unsubscribe$ = new rxjs.Subject();
+            this.destroy$ = new rxjs.Subject();
             this.updatePos$ = new rxjs.Subject();
             this.list = [];
             this.pos = 0;
@@ -1258,7 +1247,7 @@
                 this.router.navigateByUrl(ls[toPos].url);
             }
             if (addCurrent) {
-                ls.push(this.genCurItem());
+                ls.splice(this.pos + 1, 0, this.genCurItem());
             }
             ls.forEach(function (item, index) { return (item.index = index); });
             if (ls.length === 1) {
@@ -1346,7 +1335,7 @@
             if (!this.platform.isBrowser) {
                 return;
             }
-            this.updatePos$.pipe(operators.takeUntil(this.unsubscribe$), operators.debounceTime(50)).subscribe(function () {
+            this.updatePos$.pipe(operators.takeUntil(this.destroy$), operators.debounceTime(50)).subscribe(function () {
                 var url = _this.srv.getUrl(_this.route.snapshot);
                 var ls = _this.list.filter(function (w) { return w.url === url || !_this.srv.isExclude(w.url); });
                 if (ls.length === 0) {
@@ -1364,7 +1353,7 @@
                 _this.list = ls;
                 _this.cdr.detectChanges();
             });
-            this.srv.change.pipe(operators.takeUntil(this.unsubscribe$)).subscribe(function (res) {
+            this.srv.change.pipe(operators.takeUntil(this.destroy$)).subscribe(function (res) {
                 var _a;
                 switch (res === null || res === void 0 ? void 0 : res.active) {
                     case 'title':
@@ -1380,7 +1369,7 @@
                 _this.genList(res);
             });
             this.i18nSrv.change
-                .pipe(operators.filter(function () { return _this.srv.inited; }), operators.takeUntil(this.unsubscribe$), operators.debounceTime(100))
+                .pipe(operators.filter(function () { return _this.srv.inited; }), operators.takeUntil(this.destroy$), operators.debounceTime(100))
                 .subscribe(function () { return _this.genList({ active: 'title' }); });
             this.srv.init();
         };
@@ -1404,7 +1393,7 @@
             this.cdr.detectChanges();
         };
         ReuseTabComponent.prototype.ngOnDestroy = function () {
-            var unsubscribe$ = this.unsubscribe$;
+            var unsubscribe$ = this.destroy$;
             unsubscribe$.next();
             unsubscribe$.complete();
         };
@@ -1529,5 +1518,5 @@
 
     Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
 //# sourceMappingURL=reuseTab.umd.js.map