raise-common-lib 0.0.48 → 0.0.51

package/fesm5/raise-common-lib.js

@@ -1984,7 +1984,9 @@ var MultiTabComponent = /** @class */ (function () {
                     if (_this.noGenerateTabUrls.includes(_this.router.url)) {
                         return; // 排除不生成tab的url
                     }
-                    _this.setTab(_this.router.url, currentRoute.snapshot.routeConfig.path, title);
+                    /** @type {?} */
+                    var urlWithoutQuery = _this.router.url.split('?')[0];
+                    _this.setTab(urlWithoutQuery, currentRoute.snapshot.routeConfig.path, title);
                 }
             }
         })));
@@ -2339,7 +2341,6 @@ var DrawerComponent = /** @class */ (function () {
         this.config = DefaultDrawerConfig;
         this.useTransition = "yes";
         this.$isOpened = new BehaviorSubject(false);
-        this.showToolbarContainer = true;
         this.componentRefMap = new Map();
     }
     /**
@@ -2404,39 +2405,53 @@ var DrawerComponent = /** @class */ (function () {
     /**
      * @private
      * @param {?} componentRef
+     * @param {?} selector
      * @return {?}
      */
-    DrawerComponent.prototype.getToolbarElement = /**
+    DrawerComponent.prototype.getSlotElement = /**
      * @private
      * @param {?} componentRef
+     * @param {?} selector
      * @return {?}
      */
-    function (componentRef) {
+    function (componentRef, selector) {
         /** @type {?} */
         var componentEl = componentRef.location.nativeElement;
-        /** @type {?} */
-        var toolbarEl = componentEl.querySelector("[drawer-toolbar]");
-        return toolbarEl;
+        return (/** @type {?} */ (componentEl.querySelector(selector)));
     };
     /**
      * @private
-     * @param {?} toolbarEl
+     * @param {?} slotEl
+     * @param {?} containerEl
      * @return {?}
      */
-    DrawerComponent.prototype.setToolbarElement = /**
+    DrawerComponent.prototype.setSlotElement = /**
      * @private
-     * @param {?} toolbarEl
+     * @param {?} slotEl
+     * @param {?} containerEl
      * @return {?}
      */
-    function (toolbarEl) {
-        /** @type {?} */
-        var toolbarContainerEl = this.toolbar.nativeElement;
-        toolbarContainerEl.innerHTML = "";
-        this.showToolbarContainer = !!toolbarEl;
-        if (toolbarEl) {
-            toolbarContainerEl.append(toolbarEl);
+    function (slotEl, containerEl) {
+        containerEl.innerHTML = "";
+        if (slotEl) {
+            containerEl.append(slotEl);
         }
     };
+    /**
+     * @param {?} cache
+     * @return {?}
+     */
+    DrawerComponent.prototype.setCache = /**
+     * @param {?} cache
+     * @return {?}
+     */
+    function (cache) {
+        this.setSlotElement(cache.toolbarEl, this.toolbar.nativeElement);
+        this.setSlotElement(cache.headerEl, this.header.nativeElement);
+        /** @type {?} */
+        var drawerTop = cache.config.top ? cache.config.top + "px" : "";
+        this.element.nativeElement.style.setProperty("--drawer-top", drawerTop);
+    };
     /**
      * @template T
      * @param {?} component
@@ -2457,14 +2472,19 @@ var DrawerComponent = /** @class */ (function () {
         /** @type {?} */
         var componentRef = this.createDynamicComponent(component);
         /** @type {?} */
-        var toolbarEl = this.getToolbarElement(componentRef);
-        this.setComponentData(componentRef, data);
-        this.setToolbarElement(toolbarEl);
-        this.componentRefMap.set(this.service.cacheKey, {
+        var toolbarEl = this.getSlotElement(componentRef, "[drawer-toolbar]");
+        /** @type {?} */
+        var headerEl = this.getSlotElement(componentRef, "[drawer-header]");
+        /** @type {?} */
+        var cache = {
             config: showConfig,
             ref: componentRef,
             toolbarEl: toolbarEl,
-        });
+            headerEl: headerEl,
+        };
+        this.setComponentData(componentRef, data);
+        this.componentRefMap.set(this.service.cacheKey, cache);
+        this.setCache(cache);
         this.config = showConfig;
         this.$isOpened.next(true);
         this.useTransition = "yes";
@@ -2525,7 +2545,7 @@ var DrawerComponent = /** @class */ (function () {
         if (cache) {
             cache.ref.location.nativeElement.style.display = "";
             this.config = cache.config;
-            this.setToolbarElement(cache.toolbarEl);
+            this.setCache(cache);
             this.$isOpened.next(true);
         }
         else {
@@ -2536,8 +2556,8 @@ var DrawerComponent = /** @class */ (function () {
     DrawerComponent.decorators = [
         { type: Component, args: [{
                     selector: "rs-drawer",
-                    template: "<div #element id=\"rs-drawer-container\" class=\"rs-drawer-container\">\r\n  <div class=\"rs-drawer-content\">\r\n    <ng-content></ng-content>\r\n  </div>\r\n  <div\r\n    class=\"rs-drawer\"\r\n    [attr.data-mode]=\"config.mode\"\r\n    [attr.data-opened]=\"($isOpened | async) ? 'yes' : 'no'\"\r\n    [attr.data-transition]=\"useTransition\"\r\n  >\r\n    <div class=\"drawer-header\">\r\n      <button class=\"drawer-return-button\" (click)=\"hide()\">\r\n        <span class=\"drawer-sub-title\" *ngIf=\"config.subTitle\">\r\n          {{ config.subTitle }}\r\n        </span>\r\n      </button>\r\n      <div class=\"drawer-title\">{{ config.title }}</div>\r\n    </div>\r\n    <div class=\"drawer-content\">\r\n      <div class=\"drawer-content-container\">\r\n        <ng-template #dynamicComponentContainer></ng-template>\r\n      </div>\r\n    </div>\r\n    <div\r\n      class=\"drawer-footer\"\r\n      [attr.data-show-footer]=\"showToolbarContainer ? 'yes' : 'no'\"\r\n    >\r\n      <div class=\"drawer-toolbar\" #toolbar></div>\r\n    </div>\r\n  </div>\r\n</div>\r\n",
-                    styles: [":host{display:block;height:100%}#rs-drawer-container{height:100%}.rs-drawer-container{height:100%;background-color:transparent;overflow:hidden;position:relative}.rs-drawer-container .rs-drawer-content{width:100%;height:100%;overflow:auto;margin-right:0!important}.rs-drawer-container .rs-drawer-content::-webkit-scrollbar{width:5px;height:5px;background:#fff;position:static;z-index:999;border-radius:10px}.rs-drawer-container .rs-drawer-content::-webkit-scrollbar-thumb{background:#eaedf0}.rs-drawer-container .rs-drawer{width:100%;height:100%;border-left:none;background-color:transparent;overflow:visible;pointer-events:none;opacity:0;display:flex;flex-flow:column nowrap;position:absolute;top:0;left:100%}.rs-drawer-container .rs-drawer[data-opened=yes]{left:0;opacity:1;pointer-events:auto}.rs-drawer-container .rs-drawer[data-transition=yes]{transition:opacity .5s ease-in-out,left .5s ease-in-out}.rs-drawer-container .rs-drawer .drawer-header{flex:none;display:flex;flex-flow:row nowrap;justify-content:flex-start;align-items:center;box-sizing:content-box}.rs-drawer-container .rs-drawer .drawer-header .drawer-return-button{flex:none;display:flex;flex-flow:row nowrap;align-items:center;padding:0;border:none;background-color:transparent;cursor:pointer}.rs-drawer-container .rs-drawer .drawer-header .drawer-return-button::before{content:url(../../assets/img/drawer-back.svg);width:24px;height:24px;margin-right:8px;transition:transform 125ms ease-in-out}.rs-drawer-container .rs-drawer .drawer-header .drawer-return-button:hover::before{transform:translateX(-2px)}.rs-drawer-container .rs-drawer .drawer-header .drawer-return-button .drawer-sub-title{margin-right:12px;font-family:Arial;font-style:normal;font-weight:400}.rs-drawer-container .rs-drawer .drawer-header .drawer-title{flex:none;padding-left:12px;border-left:1px solid #bdc4ca;font-family:Arial;font-style:normal;font-weight:400}.rs-drawer-container .rs-drawer .drawer-content{flex:auto;overflow:hidden}.rs-drawer-container .rs-drawer .drawer-content .drawer-content-container{height:100%;overflow:hidden auto}.rs-drawer-container .rs-drawer .drawer-footer{flex:none;height:32px;padding:16px 0;box-sizing:content-box;border-top:1px solid #eaedf0;display:flex;flex-flow:row nowrap;justify-content:flex-end;align-items:center}.rs-drawer-container .rs-drawer .drawer-footer[data-show-footer=no]{display:none}.rs-drawer-container .rs-drawer .drawer-footer .drawer-toolbar{height:32px;display:flex;flex-flow:row nowrap;justify-content:flex-end;align-items:center}.rs-drawer-container .rs-drawer[data-mode=inner],.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-content{padding:0 20px;border:1px solid #ebedf0;border-radius:15px;background-color:#fff}.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-header{height:46px;padding:0 24px 0 8px;background-color:#f7fafb}.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-header .drawer-sub-title,.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-header .drawer-title{color:#1f3f5c;font-size:15px;font-weight:700;line-height:18px}.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-content{padding-bottom:20px}.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-content .drawer-content-container{margin-right:-20px;padding-right:20px}.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-footer{height:0;padding:0;border:none}.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-footer .drawer-toolbar{position:absolute;top:7px;right:0;z-index:1}.rs-drawer-container .rs-drawer[data-mode=inner]{height:calc(100% - 16px);margin-top:16px;box-shadow:0 -16px #f8fafb}.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-header{height:24px;padding:6px 0;border-bottom:1px solid #eaedf0}.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-header .drawer-sub-title,.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-header .drawer-title{color:#44566c;font-size:12px;line-height:14px}.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-header .drawer-title{font-weight:700}.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-content{padding:0 20px 0 8px}.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-content .drawer-content-container{margin-right:-20px;padding-right:20px}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar [drawer-toolbar]{display:flex;flex-flow:row nowrap;justify-content:flex-end;align-items:center;gap:12px}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar [drawer-toolbar] button{display:flex;flex-flow:row nowrap;justify-content:center;align-items:center;gap:6px;min-width:80px;height:32px;padding:0 12px;border:1px solid #adb5bd;border-radius:4px;background-color:#fff;cursor:pointer;color:#44566c;font-size:13px;font-family:Arial;font-style:normal;font-weight:400;line-height:16px}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar [drawer-toolbar] button:hover{border-color:#6c7c90}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar [drawer-toolbar] button:disabled{opacity:1!important;border-color:#6c7c9066;color:#44566c66;cursor:unset}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar [drawer-toolbar] button.primary{border:none;background-color:#1364b3;color:#fff}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar [drawer-toolbar] button.primary:hover{background-color:#176bca}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar [drawer-toolbar] button.primary:disabled{background-color:#1364b366}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar [drawer-toolbar] button img{width:16px;height:16px}::ng-deep .rs-drawer-container .rs-drawer[data-mode=outer] .drawer-toolbar [drawer-toolbar] button{height:26px;font-size:12px;line-height:14px}::ng-deep .rs-drawer-container .rs-drawer[data-mode=inner] .drawer-toolbar [drawer-toolbar] button img{display:none}"]
+                    template: "<div #element id=\"rs-drawer-container\" class=\"rs-drawer-container\">\r\n  <div class=\"rs-drawer-content\">\r\n    <ng-content></ng-content>\r\n  </div>\r\n  <div\r\n    class=\"rs-drawer\"\r\n    [attr.data-mode]=\"config.mode\"\r\n    [attr.data-opened]=\"($isOpened | async) ? 'yes' : 'no'\"\r\n    [attr.data-transition]=\"useTransition\"\r\n  >\r\n    <div class=\"drawer-header\">\r\n      <button class=\"drawer-return-button\" (click)=\"hide()\">\r\n        <span class=\"drawer-sub-title\" *ngIf=\"config.subTitle\">\r\n          {{ config.subTitle }}\r\n        </span>\r\n      </button>\r\n      <div class=\"drawer-title\">{{ config.title }}</div>\r\n      <div class=\"drawer-header-slot\" #header></div>\r\n    </div>\r\n    <div class=\"drawer-content\">\r\n      <div class=\"drawer-content-container\">\r\n        <ng-template #dynamicComponentContainer></ng-template>\r\n      </div>\r\n    </div>\r\n    <div class=\"drawer-toolbar-slot\" #toolbar></div>\r\n  </div>\r\n</div>\r\n",
+                    styles: [":host{display:block;height:100%}#rs-drawer-container{height:100%}.rs-drawer-container{height:100%;background-color:transparent;overflow:hidden;position:relative}.rs-drawer-container .rs-drawer-content{width:100%;height:100%;overflow:auto;margin-right:0!important}.rs-drawer-container .rs-drawer-content::-webkit-scrollbar{width:5px;height:5px;background:#fff;position:static;z-index:999;border-radius:10px}.rs-drawer-container .rs-drawer-content::-webkit-scrollbar-thumb{background:#eaedf0}.rs-drawer-container .rs-drawer{width:100%;height:100%;border-left:none;background-color:transparent;overflow:visible;pointer-events:none;opacity:0;display:flex;flex-flow:column nowrap;position:absolute;top:0;left:100%}.rs-drawer-container .rs-drawer[data-opened=yes]{left:0;opacity:1}.rs-drawer-container .rs-drawer[data-transition=yes]{transition:opacity .5s ease-in-out,left .5s ease-in-out}.rs-drawer-container .rs-drawer .drawer-header{flex:none;display:flex;flex-flow:row nowrap;justify-content:flex-start;align-items:center;box-sizing:content-box;pointer-events:auto}.rs-drawer-container .rs-drawer .drawer-header .drawer-return-button{flex:none;display:flex;flex-flow:row nowrap;align-items:center;padding:0;border:none;background-color:transparent;cursor:pointer}.rs-drawer-container .rs-drawer .drawer-header .drawer-return-button::before{content:url(../../assets/img/drawer-back.svg);width:24px;height:24px;margin-right:8px;transition:transform 125ms ease-in-out}.rs-drawer-container .rs-drawer .drawer-header .drawer-return-button:hover::before{transform:translateX(-2px)}.rs-drawer-container .rs-drawer .drawer-header .drawer-return-button .drawer-sub-title{margin-right:12px;font-family:Arial;font-style:normal;font-weight:400}.rs-drawer-container .rs-drawer .drawer-header .drawer-title{flex:none;padding:0 12px;border-left:1px solid #bdc4ca;font-family:Arial;font-style:normal;font-weight:400}.rs-drawer-container .rs-drawer .drawer-header .drawer-header-slot{margin-left:20px}.rs-drawer-container .rs-drawer .drawer-content{flex:auto;overflow:hidden;pointer-events:auto}.rs-drawer-container .rs-drawer .drawer-content .drawer-content-container{height:100%;overflow:hidden auto}.rs-drawer-container .rs-drawer .drawer-toolbar-slot{flex:none;height:32px;display:flex;flex-flow:row nowrap;justify-content:flex-end;align-items:center;pointer-events:auto}.rs-drawer-container .rs-drawer .drawer-toolbar-slot:empty{display:none}.rs-drawer-container .rs-drawer[data-mode=inner],.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-content{padding:0 20px;border:1px solid #ebedf0;border-radius:15px;background-color:#fff}.rs-drawer-container .rs-drawer[data-mode=outer]{margin-top:var(--drawer-top,0);background-color:#f8fafb}.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-header{height:46px;padding:0 24px 0 8px;background-color:#f7fafb}.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-header .drawer-sub-title,.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-header .drawer-title{color:#1f3f5c;font-size:15px;font-weight:700;line-height:18px}.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-content{padding-bottom:20px}.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-content .drawer-content-container{margin-right:-20px;padding-right:20px}.rs-drawer-container .rs-drawer[data-mode=outer] .drawer-toolbar-slot{position:absolute;top:7px;right:0;z-index:1}.rs-drawer-container .rs-drawer[data-mode=inner]{height:calc(100% - var(--drawer-top,16px));margin-top:var(--drawer-top,16px);box-shadow:0 min(0,var(--drawer-top,-16px)) #f8fafb}.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-header{height:24px;padding:6px 0;border-bottom:1px solid #eaedf0}.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-header .drawer-sub-title,.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-header .drawer-title{color:#44566c;font-size:12px;line-height:14px}.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-header .drawer-title{font-weight:700}.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-content{padding:0 20px 0 8px}.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-content .drawer-content-container{margin-right:-20px;padding-right:20px}.rs-drawer-container .rs-drawer[data-mode=inner] .drawer-toolbar-slot{padding:16px 0;box-sizing:content-box;border-top:1px solid #eaedf0}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar-slot [drawer-toolbar]{display:flex;flex-flow:row nowrap;justify-content:flex-end;align-items:center;gap:12px}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar-slot [drawer-toolbar] button{display:flex;flex-flow:row nowrap;justify-content:center;align-items:center;gap:6px;min-width:80px;height:32px;padding:0 12px;border:1px solid #adb5bd;border-radius:4px;background-color:#fff;cursor:pointer;color:#44566c;font-size:13px;font-family:Arial;font-style:normal;font-weight:400;line-height:16px}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar-slot [drawer-toolbar] button:hover{border-color:#6c7c90}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar-slot [drawer-toolbar] button:disabled{opacity:1!important;border-color:#6c7c9066;color:#44566c66;cursor:unset}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar-slot [drawer-toolbar] button.primary{border:none;background-color:#1364b3;color:#fff}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar-slot [drawer-toolbar] button.primary:hover{background-color:#176bca}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar-slot [drawer-toolbar] button.primary:disabled{background-color:#1364b366}::ng-deep .rs-drawer-container .rs-drawer .drawer-toolbar-slot [drawer-toolbar] button img{width:16px;height:16px}::ng-deep .rs-drawer-container .rs-drawer[data-mode=outer] .drawer-toolbar-slot [drawer-toolbar] button{height:26px;font-size:12px;line-height:14px}::ng-deep .rs-drawer-container .rs-drawer[data-mode=inner] .drawer-toolbar-slot [drawer-toolbar] button img{display:none}"]
                 }] }
     ];
     /** @nocollapse */
@@ -2548,6 +2568,7 @@ var DrawerComponent = /** @class */ (function () {
     DrawerComponent.propDecorators = {
         element: [{ type: ViewChild, args: ["element", { static: false },] }],
         toolbar: [{ type: ViewChild, args: ["toolbar", { static: false },] }],
+        header: [{ type: ViewChild, args: ["header", { static: false },] }],
         container: [{ type: ViewChild, args: ["dynamicComponentContainer", {
                         read: ViewContainerRef,
                         static: false,
@@ -2560,6 +2581,8 @@ if (false) {
     DrawerComponent.prototype.element;
     /** @type {?} */
     DrawerComponent.prototype.toolbar;
+    /** @type {?} */
+    DrawerComponent.prototype.header;
     /**
      * @type {?}
      * @private
@@ -2571,8 +2594,6 @@ if (false) {
     DrawerComponent.prototype.useTransition;
     /** @type {?} */
     DrawerComponent.prototype.$isOpened;
-    /** @type {?} */
-    DrawerComponent.prototype.showToolbarContainer;
     /**
      * @type {?}
      * @private
@@ -20098,6 +20119,9 @@ var DrawerFormComponent = /** @class */ (function () {
         if (changes.sections) {
             this.formatForm(changes.sections.currentValue);
         }
+        if (changes.form && !changes.form.firstChange) {
+            this.checkFormChange(changes.form.previousValue, changes.form.currentValue);
+        }
     };
     /**
      * @return {?}
@@ -20202,6 +20226,31 @@ var DrawerFormComponent = /** @class */ (function () {
             }));
         }
     };
+    /**
+     * @param {?} previous
+     * @param {?} current
+     * @return {?}
+     */
+    DrawerFormComponent.prototype.checkFormChange = /**
+     * @param {?} previous
+     * @param {?} current
+     * @return {?}
+     */
+    function (previous, current) {
+        var _this = this;
+        Object.entries(current).forEach((/**
+         * @param {?} __0
+         * @return {?}
+         */
+        function (_a) {
+            var _b = __read(_a, 2), key = _b[0], currentValue = _b[1];
+            if (previous[key] !== currentValue) {
+                /** @type {?} */
+                var field = _this.getField(key);
+                _this.formItemValidator(field);
+            }
+        }));
+    };
     /**
      * @param {?} sections
      * @return {?}
@@ -21301,9 +21350,7 @@ var KeepAliveService = /** @class */ (function () {
         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 (JSON.stringify(future.params) === JSON.stringify(curr.params));
             }
             return true;
         }
@@ -21320,15 +21367,14 @@ var KeepAliveService = /** @class */ (function () {
     function (route) {
         if (route.routeConfig) {
             // const pathParams = JSON.stringify(route.params);
-            /** @type {?} */
-            var queryParams = new URLSearchParams(route.queryParams).toString();
+            // const queryParams = new URLSearchParams(route.queryParams).toString();
             /** @type {?} */
             var url = route._urlSegment.segments.map((/**
              * @param {?} v
              * @return {?}
              */
             function (v) { return v.path; })).join("/");
-            return "/" + url + (queryParams ? "?" + queryParams : "");
+            return "/" + url;
         }
         return "";
     };