raise-common-lib 0.0.129 → 0.0.130

package/bundles/raise-common-lib.umd.js

@@ -3209,16 +3209,6 @@
          */
         function () {
             var _this = this;
-            this.subscriptions.push(this.cf.closeTab$.subscribe((/**
-             * @param {?} idx
-             * @return {?}
-             */
-            function (idx) {
-                if (idx === undefined) {
-                    idx = _this.selectedTab;
-                }
-                _this.closeTab(idx);
-            })));
             this.initTab();
             // 解决刷新页面后，选中的 tab 丢失问题
             /** @type {?} */
@@ -3227,7 +3217,8 @@
              * @return {?}
              */
             function (ele) {
-                return _this.urlWithoutQuery(ele.url) === _this.urlWithoutQuery(_this.router.url);
+                return _this.urlWithoutQuery(ele.url) ===
+                    _this.urlWithoutQuery(_this.router.url);
             }));
             if (isExistIdx !== -1) {
                 this.selectedTab = isExistIdx;
@@ -3245,6 +3236,18 @@
                 /** @type {?} */
                 var navigation = _this.router.getCurrentNavigation();
                 if (navigation) {
+                    /** @type {?} */
+                    var tooltipElements = document.querySelectorAll(".e-popup-open");
+                    // 删除tooltips
+                    tooltipElements.forEach((/**
+                     * @param {?} element
+                     * @return {?}
+                     */
+                    function (element) {
+                        /** @type {?} */
+                        var htmlElement = (/** @type {?} */ (element));
+                        htmlElement.style.display = "none";
+                    }));
                     /** @type {?} */
                     var state = navigation.extras.state;
                     // 获取传递的 state
@@ -3258,12 +3261,15 @@
                     /** @type {?} */
                     var title = (state && state.title) ||
                         navigationInfo.title ||
-                        navigationInfo.subTitle;
+                        navigationInfo.subTitle ||
+                        navigationInfo.name;
+                    /** @type {?} */
+                    var noReused = (state && state.noReused) || false;
                     if (currentRoute && !skipLocationChange) {
                         if (_this.noGenerateTabUrls.includes(_this.urlWithoutQuery(_this.router.url))) {
                             return; // 排除不生成tab的url
                         }
-                        _this.setTab(_this.router.url, currentRoute.snapshot.routeConfig.path, title);
+                        _this.setTab(_this.router.url, currentRoute.snapshot.routeConfig.path, title, noReused);
                     }
                 }
             })));
@@ -3391,13 +3397,15 @@
         };
         /**
          * @param {?} idx
+         * @param {?=} isExternal
          * @return {?}
          */
         MultiTabComponent.prototype.closeTab = /**
          * @param {?} idx
+         * @param {?=} isExternal
          * @return {?}
          */
-        function (idx) {
+        function (idx, isExternal) {
             /** @type {?} */
             var tab = this.tabList[idx];
             this.tabList = this.tabList.filter((/**
@@ -3406,11 +3414,14 @@
              */
             function (ele) { return ele.url !== tab.url; }));
             this.clearCache(this.urlWithoutQuery(tab.url));
-            if (this.selectedTab === idx) {
+            if (!isExternal && this.selectedTab === idx) {
                 /** @type {?} */
                 var targetIdx = Math.max(0, idx - 1);
                 this.changeTab(this.tabList[targetIdx], targetIdx);
             }
+            if (idx < this.selectedTab) {
+                this.selectedTab = this.selectedTab - 1; // 如果关闭的tab在当前选中的tab之前，选中tab索引减1
+            }
             this.setEllipsisTitle();
             sessionStorage.setItem("TabCache", JSON.stringify(this.tabList));
             this.ref.markForCheck();
@@ -3427,6 +3438,15 @@
          */
         function (tab, idx) {
             this.router.navigateByUrl(tab.url);
+            if (tab.navigationInfo) {
+                sessionStorage.setItem("navigationInfo", JSON.stringify(tab.navigationInfo));
+            }
+            if (tab.fromUrl) {
+                sessionStorage.setItem("fromUrl", tab.fromUrl);
+            }
+            if (tab.permissions) {
+                sessionStorage.setItem("permissions", JSON.stringify(tab.permissions));
+            }
             this.selectedTab = idx;
             this.ref.markForCheck();
         };
@@ -3442,12 +3462,24 @@
          */
         function (url, title) {
             if (this.tabList.length >= this.maxTabs) {
-                this.closeTab(0); // 删除第一个
+                this.closeTab(1); // 删除第二个，第一个固定
             }
+            /** @type {?} */
+            var localPermissions = sessionStorage.getItem("permissions") ||
+                localStorage.getItem("permissions");
+            /** @type {?} */
+            var navigationInfo = JSON.parse(sessionStorage.getItem("navigationInfo"));
+            /** @type {?} */
+            var fromUrl = sessionStorage.getItem("fromUrl");
+            /** @type {?} */
+            var permissions = JSON.parse(localPermissions);
             this.tabList.push({
                 url: url,
                 title: title || "default",
                 displayTitle: title,
+                navigationInfo: navigationInfo,
+                permissions: permissions,
+                fromUrl: fromUrl,
             });
             this.selectedTab = this.tabList.length - 1;
             this.setEllipsisTitle();
@@ -3456,17 +3488,19 @@
         };
         /**
          * @param {?} url
-         * @param {?=} pureUrl
-         * @param {?=} title
+         * @param {?} pureUrl
+         * @param {?} title
+         * @param {?} noReused
          * @return {?}
          */
         MultiTabComponent.prototype.setTab = /**
          * @param {?} url
-         * @param {?=} pureUrl
-         * @param {?=} title
+         * @param {?} pureUrl
+         * @param {?} title
+         * @param {?} noReused
          * @return {?}
          */
-        function (url, pureUrl, title) {
+        function (url, pureUrl, title, noReused) {
             var _this = this;
             /** @type {?} */
             var isExistIdx = this.tabList.findIndex((/**
@@ -3493,7 +3527,16 @@
                 this.addTab(url, title);
             }
             else {
-                this.selectedTab = isExistIdx;
+                /** @type {?} */
+                var targetTabUrl = this.tabList[isExistIdx].url;
+                if (targetTabUrl !== url || noReused) {
+                    // 当缓存一致时候，但是url不一致，重新按照新的url生成tab
+                    this.closeTab(isExistIdx, true);
+                    this.addTab(url, title);
+                }
+                else {
+                    this.changeTab(this.tabList[isExistIdx], isExistIdx);
+                }
                 this.ref.markForCheck();
             }
         };
@@ -3556,8 +3599,8 @@
         MultiTabComponent.decorators = [
             { type: core.Component, args: [{
                         selector: "rs-multi-tab",
-                        template: "<div class=\"rs-multi-tab\" [ngClass]=\"{ 'b-line': tabList.length > 0 }\">\r\n  <ul>\r\n    <ng-container *ngFor=\"let tab of tabList; let i = index\">\r\n      <li\r\n        [ngClass]=\"selectedTab === i ? 'isSelect' : 'notSelect'\"\r\n        (click)=\"changeTab(tab, i)\"\r\n      >\r\n        <ejs-tooltip\r\n          id=\"notSelectTooltip\"\r\n          [showTipPointer]=\"false\"\r\n          [openDelay]=\"500\"\r\n          *ngIf=\"tab.displayTitle !== tab.title; else originText\"\r\n          style=\"height: 27px\"\r\n        >\r\n          <ng-template #content>\r\n            <div class=\"tooltip-content\">\r\n              {{ tab.title }}\r\n            </div>\r\n          </ng-template>\r\n          <span class=\"tabTitle\">{{ tab.displayTitle }}</span>\r\n        </ejs-tooltip>\r\n        <ng-template #originText>\r\n          <span class=\"tabTitle\">\r\n            {{ tab.displayTitle }}\r\n          </span>\r\n        </ng-template>\r\n        <span class=\"img-block\" *ngIf=\"selectedTab !== i\"></span>\r\n        <img\r\n          *ngIf=\"tabList.length !== 1\"\r\n          src=\"../../../assets/img/close-url.svg\"\r\n          (click)=\"closeTab(i)\"\r\n        />\r\n      </li>\r\n    </ng-container>\r\n  </ul>\r\n  <div class=\"refresh-tab\" (click)=\"refreshTab()\" *ngIf=\"tabList.length > 0\">\r\n    <ejs-tooltip\r\n      id=\"notSelectTooltip\"\r\n      [showTipPointer]=\"false\"\r\n      [openDelay]=\"500\"\r\n      style=\"height: 27px\"\r\n    >\r\n      <ng-template #content>\r\n        <div class=\"tooltip-content\">Refresh Current Tab</div>\r\n      </ng-template>\r\n      <img\r\n        id=\"loadingIcon\"\r\n        alt\r\n        class=\"refresh-btn\"\r\n        src=\"../../../assets/img/desktop-refresh-btn.svg\"\r\n      />\r\n    </ejs-tooltip>\r\n    <span>Refresh Current Tab</span>\r\n  </div>\r\n</div>\r\n",
-                        styles: [".rs-multi-tab{width:100%;display:flex;justify-content:space-between;margin:0 auto;max-width:1886px}.rs-multi-tab.b-line{border-bottom:1px solid #e5eaef}.rs-multi-tab ul{display:flex;margin:0 8px;padding:0;overflow:hidden;height:100%}.rs-multi-tab ul li{max-width:164px;padding:0 12px;display:flex;align-items:center;flex:auto;border:1px solid #e5eaef;border-bottom:none;color:#5f6f81;font-family:Arial;font-size:11px;font-style:normal;font-weight:400;line-height:28px;height:28px;background:#f8fafb;vertical-align:top;position:relative;cursor:default}.rs-multi-tab ul li .tabTitle{display:inline-block;white-space:nowrap;font-size:11px;font-family:Arial;font-style:normal;font-weight:400;line-height:16px;transition:width .3s}.rs-multi-tab ul li img{border-radius:4px;padding:4px;margin-left:6px;margin-top:1px;vertical-align:top;cursor:pointer}.rs-multi-tab ul li img:hover{background:#dce8f6}.rs-multi-tab ul li:not(:last-child){border-right:none}.rs-multi-tab ul li:first-of-type{border-top-left-radius:8px}.rs-multi-tab ul li:last-child{border-top-right-radius:8px}.rs-multi-tab ul .isSelect{color:#1f3f5c;background:#fff}.rs-multi-tab ul .notSelect img{display:none}.rs-multi-tab ul .notSelect .img-block{display:inline-block;width:22px}.rs-multi-tab ul .notSelect:hover{color:#1f3f5c;background-color:rgba(31,123,255,.04)}.rs-multi-tab ul .notSelect:hover .img-block{display:none}.rs-multi-tab ul .notSelect:hover img{display:inline-block}.rs-multi-tab .refresh-tab{cursor:pointer;text-align:right;color:#6c7c90;font-family:Arial;font-size:11px;font-style:normal;font-weight:400;line-height:28px;padding-right:12px}.rs-multi-tab .refresh-tab img{vertical-align:middle;margin-right:4px}.refresh-tab-loading{-webkit-animation:1s linear infinite spin;animation:1s linear infinite spin}@-webkit-keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}.tooltip-content{padding:4px;color:#f8fafb;font-family:Arial;font-size:11px;font-style:normal;font-weight:400;line-height:14px}@media (max-width:1400px){.refresh-tab{padding-right:0!important}.refresh-tab span{display:none!important}}@media (max-width:1100px){.rs-multi-tab ul li img{position:absolute;right:3px;background-color:#fff}.notSelect:hover img{position:absolute;right:3px;background-color:#eff5fb}.img-block{display:none!important}}@media (max-width:600px){.rs-multi-tab ul li{padding:0 8px}.rs-multi-tab ul .notSelect .img-block{width:0!important}}"]
+                        template: "<div class=\"rs-multi-tab\" [ngClass]=\"{ 'b-line': tabList.length > 0 }\">\r\n\t<ul>\r\n\t\t<ng-container *ngFor=\"let tab of tabList; let i = index\">\r\n\t\t\t<li\r\n\t\t\t\t[ngClass]=\"selectedTab === i ? 'isSelect' : 'notSelect'\"\r\n\t\t\t\t(click)=\"changeTab(tab, i)\"\r\n\t\t\t>\r\n\t\t\t\t<ejs-tooltip\r\n\t\t\t\t\tid=\"notSelectTooltip\"\r\n\t\t\t\t\t[showTipPointer]=\"false\"\r\n\t\t\t\t\t[openDelay]=\"500\"\r\n\t\t\t\t\t*ngIf=\"tab.displayTitle !== tab.title; else originText\"\r\n\t\t\t\t\tstyle=\"height: 27px\"\r\n\t\t\t\t>\r\n\t\t\t\t\t<ng-template #content>\r\n\t\t\t\t\t\t<div class=\"tooltip-content\">\r\n\t\t\t\t\t\t\t{{ tab.title }}\r\n\t\t\t\t\t\t</div>\r\n\t\t\t\t\t</ng-template>\r\n\t\t\t\t\t<span class=\"tabTitle\">{{ tab.displayTitle }}</span>\r\n\t\t\t\t</ejs-tooltip>\r\n\t\t\t\t<ng-template #originText>\r\n\t\t\t\t\t<span class=\"tabTitle\">\r\n\t\t\t\t\t\t{{ tab.displayTitle }}\r\n\t\t\t\t\t</span>\r\n\t\t\t\t</ng-template>\r\n\t\t\t\t<span\r\n\t\t\t\t\tclass=\"img-block\"\r\n\t\t\t\t\t*ngIf=\"selectedTab !== i && i !== 0\"\r\n\t\t\t\t></span>\r\n\t\t\t\t<img\r\n\t\t\t\t\t*ngIf=\"i !== 0\"\r\n\t\t\t\t\tsrc=\"../../../assets/img/close-url.svg\"\r\n\t\t\t\t\t(click)=\"closeTab(i)\"\r\n\t\t\t\t/>\r\n\t\t\t</li>\r\n\t\t</ng-container>\r\n\t</ul>\r\n\t<div class=\"refresh-tab\" (click)=\"refreshTab()\" *ngIf=\"tabList.length > 0\">\r\n\t\t<ejs-tooltip\r\n\t\t\tid=\"notSelectTooltip\"\r\n\t\t\tcssClass=\"notSelectTooltip\"\r\n\t\t\t[showTipPointer]=\"false\"\r\n\t\t\t[openDelay]=\"500\"\r\n\t\t\tstyle=\"height: 27px\"\r\n\t\t>\r\n\t\t\t<ng-template #content>\r\n\t\t\t\t<div class=\"tooltip-content\">Refresh Current Tab</div>\r\n\t\t\t</ng-template>\r\n\t\t\t<img\r\n\t\t\t\tid=\"loadingIcon\"\r\n\t\t\t\talt\r\n\t\t\t\tclass=\"refresh-btn\"\r\n\t\t\t\tsrc=\"../../../assets/img/desktop-refresh-btn.svg\"\r\n\t\t\t/>\r\n\t\t</ejs-tooltip>\r\n\t</div>\r\n</div>\r\n",
+                        styles: [".rs-multi-tab{width:100%;display:flex;justify-content:space-between;margin:0 auto;max-width:1886px}.rs-multi-tab.b-line{border-bottom:1px solid #e5eaef}.rs-multi-tab ul{display:flex;margin:0 8px;padding:0;overflow:hidden;height:100%}.rs-multi-tab ul li{max-width:164px;padding:0 12px;display:flex;align-items:center;flex:auto;border:1px solid #e5eaef;border-bottom:none;color:#5f6f81;font-family:Arial;font-size:11px;font-style:normal;font-weight:400;line-height:28px;height:28px;background:#f8fafb;vertical-align:top;position:relative;cursor:default}.rs-multi-tab ul li .tabTitle{display:inline-block;white-space:nowrap;font-size:11px;font-family:Arial;font-style:normal;font-weight:400;line-height:16px;transition:width .3s}.rs-multi-tab ul li img{border-radius:4px;padding:4px;margin-left:6px;margin-top:1px;vertical-align:top;cursor:pointer}.rs-multi-tab ul li img:hover{background:#dce8f6}.rs-multi-tab ul li:not(:last-child){border-right:none}.rs-multi-tab ul li:first-of-type{border-top-left-radius:8px}.rs-multi-tab ul li:last-child{border-top-right-radius:8px}.rs-multi-tab ul .isSelect{color:#1f3f5c;background:#fff}.rs-multi-tab ul .notSelect img{display:none}.rs-multi-tab ul .notSelect .img-block{display:inline-block;width:22px}.rs-multi-tab ul .notSelect:hover{color:#1f3f5c;background-color:rgba(31,123,255,.04)}.rs-multi-tab ul .notSelect:hover .img-block{display:none}.rs-multi-tab ul .notSelect:hover img{display:inline-block}.rs-multi-tab .refresh-tab{cursor:pointer;text-align:right;color:#6c7c90;font-family:Arial;font-size:11px;font-style:normal;font-weight:400;line-height:28px;padding-right:12px}.rs-multi-tab .refresh-tab img{vertical-align:middle;margin-right:4px}.refresh-tab-loading{-webkit-animation:1s linear infinite spin;animation:1s linear infinite spin}.notSelectTooltip{transform:translateX(-12px)}@-webkit-keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}.tooltip-content{padding:4px;color:#f8fafb;font-family:Arial;font-size:11px;font-style:normal;font-weight:400;line-height:14px}@media (max-width:1400px){.refresh-tab{padding-right:0!important}.refresh-tab span{display:none!important}}@media (max-width:1100px){.rs-multi-tab ul li img{position:absolute;right:3px;background-color:#fff}.notSelect:hover img{position:absolute;right:3px;background-color:#eff5fb}.img-block{display:none!important}.isSelect:not(:first-child){padding-right:20px!important}}@media (max-width:600px){.rs-multi-tab ul li{padding:0 8px}.rs-multi-tab ul .notSelect .img-block{width:0!important}}"]
                     }] }
         ];
         /** @nocollapse */
@@ -4114,7 +4157,7 @@
         RSToolbarComponent.decorators = [
             { type: core.Component, args: [{
                         selector: "rs-toolbar",
-                        template: "<div #toolbarContainer class=\"rs-toolbar-container\">\r\n  <!-- \u53EF\u89C1\u6309\u94AE -->\r\n  <ng-container *ngFor=\"let button of buttons\">\r\n    <div class=\"temp-hidden\" #toolbarItem>\r\n      <rs-toolbar-item\r\n        [image]=\"button.image\"\r\n        [text]=\"button.text\"\r\n        [disabled]=\"(button.key && disabledOptions[button.key]) || false\"\r\n        (click)=\"button.action && button.action()\"\r\n        [children]=\"button.children || []\"\r\n        [disabledOptions]=\"disabledOptions\"\r\n      >\r\n      </rs-toolbar-item>\r\n    </div>\r\n  </ng-container>\r\n\r\n  <!-- \u4E0B\u62C9\u83DC\u5355\uFF08\u5982\u679C\u6709\u9690\u85CF\u6309\u94AE\uFF09 -->\r\n  <button\r\n    *ngIf=\"hiddenButtons.length > 0\"\r\n    mat-button\r\n    [matMenuTriggerFor]=\"menu\"\r\n    #menuTrigger=\"matMenuTrigger\"\r\n    class=\"action-toggle\"\r\n  >\r\n    <mat-icon svgIcon=\"more\"></mat-icon>\r\n  </button>\r\n\r\n  <mat-menu #menu=\"matMenu\">\r\n    <ng-container *ngFor=\"let button of hiddenButtons\">\r\n      <rs-toolbar-item\r\n        [image]=\"button.image\"\r\n        [text]=\"button.text\"\r\n        (click)=\"button.action && button.action()\"\r\n        [disabled]=\"disabledOptions[button.key] || false\"\r\n        [children]=\"button.children || []\"\r\n      >\r\n      </rs-toolbar-item>\r\n    </ng-container>\r\n  </mat-menu>\r\n</div>\r\n",
+                        template: "<div #toolbarContainer class=\"rs-toolbar-container\">\r\n  <!-- \u53EF\u89C1\u6309\u94AE -->\r\n  <ng-container *ngFor=\"let button of buttons\">\r\n    <div class=\"temp-hidden\" #toolbarItem>\r\n      <rs-toolbar-item\r\n        [image]=\"button.image\"\r\n        [text]=\"button.text\"\r\n        [disabled]=\"(button.key && disabledOptions[button.key]) || false\"\r\n        (click)=\"button.action && button.action()\"\r\n        [children]=\"button.children || []\"\r\n        [disabledOptions]=\"disabledOptions\"\r\n      >\r\n      </rs-toolbar-item>\r\n    </div>\r\n  </ng-container>\r\n\r\n  <!-- \u4E0B\u62C9\u83DC\u5355\uFF08\u5982\u679C\u6709\u9690\u85CF\u6309\u94AE\uFF09 -->\r\n  <button\r\n    *ngIf=\"hiddenButtons.length > 0\"\r\n    mat-button\r\n    [matMenuTriggerFor]=\"menu\"\r\n    #menuTrigger=\"matMenuTrigger\"\r\n    class=\"action-toggle\"\r\n  >\r\n    <mat-icon svgIcon=\"more\"></mat-icon>\r\n  </button>\r\n\r\n  <mat-menu #menu=\"matMenu\">\r\n    <ng-container *ngFor=\"let button of hiddenButtons\">\r\n      <rs-toolbar-item\r\n        [image]=\"button.image\"\r\n        [text]=\"button.text\"\r\n        (click)=\"button.action && button.action()\"\r\n        [disabled]=\"disabledOptions[button.key] || false\"\r\n        [children]=\"button.children || []\"\r\n        [disabledOptions]=\"disabledOptions\"\r\n      >\r\n      </rs-toolbar-item>\r\n    </ng-container>\r\n  </mat-menu>\r\n</div>\r\n",
                         styles: [":host{display:block;width:100%}.rs-toolbar-container{width:100%;display:flex;align-items:center}.rs-toolbar-container .temp-hidden{visibility:hidden;position:absolute}.rs-toolbar-container .action-toggle{width:24px;height:24px;min-width:24px;max-width:24px;padding:0;border-radius:4px;display:flex;flex-flow:row nowrap;justify-content:center;align-items:center;background:0 0}.rs-toolbar-container .action-toggle:hover{background:rgba(214,227,245,.2)}.rs-toolbar-container .action-toggle .mat-button-wrapper{max-height:24px;height:24px}.rs-toolbar-container .action-toggle ::ng-deep .mat-icon{width:16px;height:16px;display:flex;flex-flow:row nowrap;justify-content:center;align-items:center}"]
                     }] }
         ];