raise-common-lib 0.0.138 → 0.0.140

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

@@ -3328,6 +3328,8 @@
             //只能单个缓存的url
             this.noGenerateTabUrls = []; //不生成tab的url
             //不生成tab的url
+            this.flattenMenu = [];
+            this.defaultTabUrl = "";
             this.onRefreshTab = new core.EventEmitter();
             this.subscriptions = [];
             this.TAB_WIDTH = 164;
@@ -3412,12 +3414,12 @@
                     /** @type {?} */
                     var navigationInfo = JSON.parse(sessionStorage.getItem("navigationInfo") || "{}");
                     /** @type {?} */
-                    var title = (state && state.title) ||
+                    var title = (state && state["title"]) ||
                         navigationInfo.title ||
                         navigationInfo.subTitle ||
                         navigationInfo.name;
                     /** @type {?} */
-                    var noReused = (state && state.noReused) || false;
+                    var noReused = (state && state["noReused"]) || false;
                     if (currentRoute && !skipLocationChange) {
                         if (_this.noGenerateTabUrls.includes(_this.urlWithoutQuery(_this.router.url))) {
                             return; // 排除不生成tab的url
@@ -3538,6 +3540,8 @@
          * @return {?}
          */
         function () {
+            var _this = this;
+            // console.log("this.flattenMenu", this.flattenMenu);
             /** @type {?} */
             var TabCache = JSON.parse(sessionStorage.getItem("TabCache"));
             this.tabList = TabCache || [];
@@ -3550,6 +3554,30 @@
                     var url = this.router.url;
                     this.addTab(url, title);
                 }
+                else {
+                    /** @type {?} */
+                    var target = this.flattenMenu.find((/**
+                     * @param {?} ele
+                     * @return {?}
+                     */
+                    function (ele) { return ele.url === _this.router.url; }));
+                    if (target) {
+                        if (target.url !== this.defaultTabUrl) {
+                            /** @type {?} */
+                            var defaultTab = this.flattenMenu.find((/**
+                             * @param {?} ele
+                             * @return {?}
+                             */
+                            function (ele) { return ele.url === _this.defaultTabUrl; }));
+                            this.tabList.push({
+                                url: defaultTab.url,
+                                title: defaultTab.label,
+                                displayTitle: defaultTab.label,
+                            });
+                        }
+                        this.addTab(target.url, target.label);
+                    }
+                }
             }
         };
         /**
@@ -3796,6 +3824,8 @@
         MultiTabComponent.propDecorators = {
             singleReuseUrls: [{ type: core.Input }],
             noGenerateTabUrls: [{ type: core.Input }],
+            flattenMenu: [{ type: core.Input }],
+            defaultTabUrl: [{ type: core.Input }],
             onRefreshTab: [{ type: core.Output }],
             onResize: [{ type: core.HostListener, args: ["window:resize", ["$event"],] }]
         };
@@ -3809,6 +3839,10 @@
         /** @type {?} */
         MultiTabComponent.prototype.noGenerateTabUrls;
         /** @type {?} */
+        MultiTabComponent.prototype.flattenMenu;
+        /** @type {?} */
+        MultiTabComponent.prototype.defaultTabUrl;
+        /** @type {?} */
         MultiTabComponent.prototype.onRefreshTab;
         /**
          * @type {?}
@@ -21297,7 +21331,7 @@
             { type: core.Component, args: [{
                         selector: "rs-main-container",
                         template: "<div class=\"app-main-container-wrap\">\r\n  <div class=\"app-main-container\">\r\n    <ng-content select=\"[headerSlot]\"></ng-content>\r\n    <div class=\"main-page\">\r\n      <div class=\"left-aside\">\r\n        <ng-content select=\"[leftAsideSlot]\"></ng-content>\r\n      </div>\r\n      <div\r\n        class=\"right-aside\"\r\n        [ngClass]=\"{ isCollapsed: isCollapsed }\"\r\n        (click)=\"onRightAsideClick()\"\r\n      >\r\n        <ng-content select=\"[multiTabSlot]\"></ng-content>\r\n        <!-- <rs-multi-tab [singleReuseUrls]=\"singleReuseUrls\"></rs-multi-tab> -->\r\n        <div class=\"router-content\">\r\n          <rs-drawer #drawer>\r\n            <ng-content select=\"[routerSlot]\"></ng-content>\r\n          </rs-drawer>\r\n        </div>\r\n        <rs-footer></rs-footer>\r\n      </div>\r\n    </div>\r\n  </div>\r\n</div>\r\n",
-                        styles: [".app-main-container-wrap{width:100%;overflow:auto;height:100vh}@media (max-width:768px){.app-main-container-wrap{height:calc(100vh - 40px)}}.app-main-container{display:flex;flex-direction:column;height:100%;min-width:768px}.app-main-container .main-page{flex:1;height:0;display:flex;background-color:var(--rs-container-bg)}.app-main-container .left-aside{height:100%}.app-main-container .right-aside{width:0;flex:1;display:flex;flex-direction:column;padding-right:12px}.app-main-container .right-aside .router-content{flex:1;overflow:auto;max-width:1886px;width:100%;margin:0 auto}@media (max-width:992px){.app-main-container .right-aside.isCollapsed{position:relative}.app-main-container .right-aside.isCollapsed::after{content:\" \";position:absolute;z-index:5;inset:0;background-color:rgba(0,0,0,.2)}}"]
+                        styles: [".app-main-container-wrap{width:100%;overflow:auto;height:100vh}@media (max-width:768px){.app-main-container-wrap{height:calc(100vh - 40px)}}.app-main-container{display:flex;flex-direction:column;height:100%;min-width:768px}.app-main-container .main-page{flex:1;height:0;display:flex;background-color:var(--rs-container-bg)}.app-main-container .left-aside{height:100%}.app-main-container .right-aside{width:0;flex:1;display:flex;flex-direction:column;padding-right:12px}.app-main-container .right-aside .router-content{flex:1;overflow:auto;max-width:1886px;width:100%;margin:0 auto}@media (max-width:992px){.app-main-container .right-aside{padding-left:12px}.app-main-container .right-aside.isCollapsed{position:relative}.app-main-container .right-aside.isCollapsed::after{content:\" \";position:absolute;z-index:5;inset:0;background-color:rgba(0,0,0,.2)}}"]
                     }] }
         ];
         /** @nocollapse */