raise-common-lib 0.0.22 → 0.0.23

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

@@ -1822,11 +1822,16 @@
          * @return {?}
          */
         function (future, curr) {
-            console.log("shouldReuseRoute");
-            // return this.getRoutePath(future) === this.getRoutePath(curr); // 复用相同的路由
-            return (future.routeConfig === curr.routeConfig &&
-                JSON.stringify(future.params) === JSON.stringify(curr.params) &&
-                JSON.stringify(future.queryParams) === JSON.stringify(curr.queryParams));
+            if (future.routeConfig === curr.routeConfig) {
+                if (future.children.length === 0 && curr.children.length === 0) {
+                    // 无子路由时, 通过params和queryParams判断是否复用路由
+                    return (JSON.stringify(future.params) === JSON.stringify(curr.params) &&
+                        JSON.stringify(future.queryParams) ===
+                            JSON.stringify(curr.queryParams));
+                }
+                return true;
+            }
+            return false;
         };
         /**
          * @param {?} route
@@ -2228,26 +2233,37 @@
      */
     var RSHeaderComponent = /** @class */ (function () {
         function RSHeaderComponent() {
-            this.toggleMenu = new core.EventEmitter();
             this.isCollapsed = false; // 接收输入属性
             // 接收输入属性
             this.lastLoginTime = new Date();
-            this.langOptions = [
-                {
-                    value: 1,
-                    text: "English",
-                },
-                {
-                    value: 2,
-                    text: "繁體中文",
-                },
-                {
-                    value: 3,
-                    text: "简体中文",
-                },
-            ];
-            this.currentLang = this.langOptions[0];
+            this.toggleMenu = new core.EventEmitter();
+            this.changeLanguage = new core.EventEmitter();
+            this._langOptions = [];
         }
+        Object.defineProperty(RSHeaderComponent.prototype, "langOptions", {
+            get: /**
+             * @return {?}
+             */
+            function () {
+                return this._langOptions;
+            },
+            set: /**
+             * @param {?} options
+             * @return {?}
+             */
+            function (options) {
+                this._langOptions = options;
+                if (options && options.length > 0) {
+                    this.currentLang = options.find((/**
+                     * @param {?} e
+                     * @return {?}
+                     */
+                    function (e) { return e.defaultLang; }));
+                }
+            },
+            enumerable: true,
+            configurable: true
+        });
         /**
          * @return {?}
          */
@@ -2255,7 +2271,7 @@
          * @return {?}
          */
         function () {
-            this.translation = JSON.parse(localStorage.getItem("translation"));
+            this.translation = JSON.parse(localStorage.getItem("translation")) || {};
         };
         /**
          * @return {?}
@@ -2280,6 +2296,7 @@
              * @return {?}
              */
             function (item) { return item.text === event.item.text; }));
+            this.changeLanguage.emit(this.currentLang.languageCode);
         };
         RSHeaderComponent.decorators = [
             { type: core.Component, args: [{
@@ -2289,25 +2306,32 @@
                     }] }
         ];
         RSHeaderComponent.propDecorators = {
-            toggleMenu: [{ type: core.Output }],
             isCollapsed: [{ type: core.Input }],
-            lastLoginTime: [{ type: core.Input }]
+            lastLoginTime: [{ type: core.Input }],
+            langOptions: [{ type: core.Input }],
+            toggleMenu: [{ type: core.Output }],
+            changeLanguage: [{ type: core.Output }]
         };
         return RSHeaderComponent;
     }());
     if (false) {
-        /** @type {?} */
-        RSHeaderComponent.prototype.toggleMenu;
         /** @type {?} */
         RSHeaderComponent.prototype.isCollapsed;
         /** @type {?} */
         RSHeaderComponent.prototype.lastLoginTime;
         /** @type {?} */
-        RSHeaderComponent.prototype.translation;
+        RSHeaderComponent.prototype.toggleMenu;
         /** @type {?} */
-        RSHeaderComponent.prototype.langOptions;
+        RSHeaderComponent.prototype.changeLanguage;
+        /**
+         * @type {?}
+         * @private
+         */
+        RSHeaderComponent.prototype._langOptions;
         /** @type {?} */
         RSHeaderComponent.prototype.currentLang;
+        /** @type {?} */
+        RSHeaderComponent.prototype.translation;
     }
 
     /**
@@ -2410,7 +2434,7 @@
             this.isCollapsed = false; // 接收输入属性
             // 接收输入属性
             this.navList = [];
-            this.currentNav = null;
+            this.currentNav = "";
         }
         /**
          * @return {?}
@@ -2418,7 +2442,22 @@
         RSAsideComponent.prototype.ngOnInit = /**
          * @return {?}
          */
-        function () { };
+        function () {
+            var _this = this;
+            // 监听路由变化
+            this.router.events
+                .pipe(operators.filter((/**
+             * @param {?} event
+             * @return {?}
+             */
+            function (event) { return event instanceof router.NavigationEnd; })))
+                .subscribe((/**
+             * @return {?}
+             */
+            function () {
+                _this.currentNav = _this.router.url;
+            }));
+        };
         /**
          * @param {?} item
          * @return {?}
@@ -2428,8 +2467,8 @@
          * @return {?}
          */
         function (item) {
-            this.currentNav = item.title;
-            this.router.navigate([item.url], { state: { title: item.title } });
+            this.currentNav = item.url;
+            this.router.navigate([item.url], { state: { title: item.label } });
             /** @type {?} */
             var screenWidth = window.innerWidth;
             if (screenWidth <= 992 && this.isCollapsed) {
@@ -2439,7 +2478,7 @@
         RSAsideComponent.decorators = [
             { type: core.Component, args: [{
                         selector: "rs-aside",
-                        template: "<div class=\"rs-aside\" [ngClass]=\"{ isCollapsed: isCollapsed }\">\r\n  <div class=\"nav-list\">\r\n    <div\r\n      class=\"nav-item\"\r\n      [ngClass]=\"{ isCurrent: currentNav === nav.title }\"\r\n      *ngFor=\"let nav of navList\"\r\n      (click)=\"onNavClick(nav)\"\r\n    >\r\n      <div class=\"nav-item-inner\">\r\n        <mat-icon class=\"menu-icon\" [svgIcon]=\"nav.icon\"></mat-icon>\r\n        <span class=\"nav-text\" [ngClass]=\"{ isCollapsed: isCollapsed }\">{{\r\n          nav.title\r\n        }}</span>\r\n      </div>\r\n    </div>\r\n  </div>\r\n  <div class=\"bottom-iconbox\" [ngClass]=\"{ isCollapsed: isCollapsed }\">\r\n    <ng-content select=\"[bottomIconBox]\"></ng-content>\r\n  </div>\r\n</div>\r\n",
+                        template: "<div class=\"rs-aside\" [ngClass]=\"{ isCollapsed: isCollapsed }\">\r\n  <div class=\"nav-list\">\r\n    <div\r\n      class=\"nav-item\"\r\n      [ngClass]=\"{ isCurrent: currentNav === nav.url }\"\r\n      *ngFor=\"let nav of navList\"\r\n      (click)=\"onNavClick(nav)\"\r\n    >\r\n      <div class=\"nav-item-inner\">\r\n        <mat-icon class=\"menu-icon\" [svgIcon]=\"nav.iconCode\"></mat-icon>\r\n        <span class=\"nav-text\" [ngClass]=\"{ isCollapsed: isCollapsed }\">{{\r\n          nav.label\r\n        }}</span>\r\n      </div>\r\n    </div>\r\n  </div>\r\n  <div class=\"bottom-iconbox\" [ngClass]=\"{ isCollapsed: isCollapsed }\">\r\n    <ng-content select=\"[bottomIconBox]\"></ng-content>\r\n  </div>\r\n</div>\r\n",
                         styles: [".rs-aside{display:flex;flex-direction:column;height:100%;width:240px;will-change:width;transition:width .3s;padding-right:16px}.rs-aside.isCollapsed{width:64px;padding-right:0}.rs-aside .nav-list{padding-top:12px;flex:1;overflow:auto;height:0}.rs-aside .nav-list .nav-item{height:32px;cursor:pointer;padding-left:11px}.rs-aside .nav-list .nav-item .nav-item-inner{display:flex;align-items:center;padding:8px 8px 8px 12px}.rs-aside .nav-list .nav-item .nav-item-inner ::ng-deep .menu-icon{width:33px;height:16px}.rs-aside .nav-list .nav-item .nav-item-inner ::ng-deep .menu-icon svg{width:16px;height:16px;color:#6c7c90;stroke:#6c7c90}.rs-aside .nav-list .nav-item:hover .nav-item-inner{border-radius:6px;background:rgba(31,123,255,.04)}.rs-aside .nav-list .nav-item:hover .nav-item-inner ::ng-deep .menu-icon svg{color:#44566c;stroke:#44566c}.rs-aside .nav-list .nav-item .nav-text{color:#5f6f81;font-family:Arial;font-size:12px;font-weight:400;line-height:16px;transition:.3s;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:relative;top:1px}@media (min-width:992px){.rs-aside .nav-list .nav-item .nav-text.isCollapsed{opacity:0;width:0}}.rs-aside .nav-list .nav-item.isCurrent{position:relative}.rs-aside .nav-list .nav-item.isCurrent .nav-text{color:#44566c;font-weight:700}.rs-aside .nav-list .nav-item.isCurrent::before{content:\"\";position:absolute;left:4px;top:8px;width:3px;height:16px;background-color:#1364b3;border-radius:2px}.rs-aside .bottom-iconbox{padding:12px 20px;height:48px;display:flex;gap:12px}.rs-aside .bottom-iconbox ::ng-deep .menu-bottom-icon{width:24px;height:24px;display:flex;justify-content:center;align-items:center;border:1px solid #eaedf0;border-radius:24px;cursor:pointer}.rs-aside .bottom-iconbox ::ng-deep .menu-bottom-icon svg{width:16px;height:16px;color:#6c7c90;stroke:#6c7c90}.rs-aside .bottom-iconbox ::ng-deep .menu-bottom-icon.disabled{cursor:default;opacity:.5}.rs-aside .bottom-iconbox ::ng-deep .menu-bottom-icon:not(.disabled):hover{background-color:#fff}.rs-aside .bottom-iconbox ::ng-deep .menu-bottom-icon:not(.disabled):hover svg{color:#1f7bff;stroke:#1f7bff}@media (min-width:992px){.rs-aside .bottom-iconbox.isCollapsed{flex-direction:column;height:auto}}@media (max-width:992px){.rs-aside{width:0;overflow:hidden;position:absolute;height:calc(100% - 50px);z-index:10;background-color:var(--rs-container-bg);padding-right:0}.rs-aside.isCollapsed{width:240px;padding-right:16px}}"]
                     }] }
         ];
@@ -3038,7 +3077,7 @@
          * @return {?}
          */
         function () {
-            this.translation = JSON.parse(localStorage.getItem("translation"));
+            this.translation = JSON.parse(localStorage.getItem("translation")) || {};
             this.title =
                 this.data.title || this.translation["DELETE_RECORD"] || ".DELETE_RECORD";
             this.saveBtnLabel =
@@ -3122,7 +3161,7 @@
              * @param dialog: MatDialog
              */
             this.translation = null;
-            this.translation = JSON.parse(localStorage.getItem("translation"));
+            this.translation = JSON.parse(localStorage.getItem("translation")) || {};
         }
         /**
          * @param {?} config
@@ -3422,7 +3461,7 @@
          * @return {?}
          */
         function () {
-            this.translation = JSON.parse(localStorage.getItem("translation"));
+            this.translation = JSON.parse(localStorage.getItem("translation")) || {};
             this.saveBtnLabel =
                 this.saveBtnLabel || this.translation.SAVE || ".SAVE";
             this.cancelBtnLabel =