@yelon/bis 16.0.2 → 16.0.4

package/esm2022/layout/widgets/yunzai-theme-btn.component.mjs

@@ -89,8 +89,8 @@ class YunzaiThemBtnComponent {
         this.destroy$.next();
         this.destroy$.complete();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.2", ngImport: i0, type: YunzaiThemBtnComponent, deps: [{ token: i0.Renderer2 }, { token: i1.YunzaiConfigService }, { token: i2.Platform }, { token: DOCUMENT }, { token: i3.Directionality, optional: true }, { token: YUNZAI_THEME_BTN_KEYS }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.2", type: YunzaiThemBtnComponent, selector: "yunzai-theme-btn", inputs: { types: "types", devTips: "devTips", deployUrl: "deployUrl" }, ngImport: i0, template: `
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: YunzaiThemBtnComponent, deps: [{ token: i0.Renderer2 }, { token: i1.YunzaiConfigService }, { token: i2.Platform }, { token: DOCUMENT }, { token: i3.Directionality, optional: true }, { token: YUNZAI_THEME_BTN_KEYS }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.8", type: YunzaiThemBtnComponent, selector: "yunzai-theme-btn", inputs: { types: "types", devTips: "devTips", deployUrl: "deployUrl" }, ngImport: i0, template: `
     <div
       data-event-id="_nav_theme"
       class="yunzai-default__nav-item"
@@ -135,7 +135,7 @@ class YunzaiThemBtnComponent {
   `, isInline: true, dependencies: [{ kind: "directive", type: i4.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i5.ɵNzTransitionPatchDirective, selector: "[nz-button], nz-button-group, [nz-icon], [nz-menu-item], [nz-submenu], nz-select-top-control, nz-select-placeholder, nz-input-group", inputs: ["hidden"] }, { kind: "directive", type: i6.NzMenuDirective, selector: "[nz-menu]", inputs: ["nzInlineIndent", "nzTheme", "nzMode", "nzInlineCollapsed", "nzSelectable"], outputs: ["nzClick"], exportAs: ["nzMenu"] }, { kind: "directive", type: i6.NzMenuItemDirective, selector: "[nz-menu-item]", inputs: ["nzPaddingLeft", "nzDisabled", "nzSelected", "nzDanger", "nzMatchRouterExact", "nzMatchRouter"], exportAs: ["nzMenuItem"] }, { kind: "directive", type: i7.NzDropDownDirective, selector: "[nz-dropdown]", inputs: ["nzDropdownMenu", "nzTrigger", "nzMatchWidthElement", "nzBackdrop", "nzClickHide", "nzDisabled", "nzVisible", "nzOverlayClassName", "nzOverlayStyle", "nzPlacement"], outputs: ["nzVisibleChange"], exportAs: ["nzDropdown"] }, { kind: "component", type: i7.NzDropdownMenuComponent, selector: "nz-dropdown-menu", exportAs: ["nzDropdownMenu"] }, { kind: "directive", type: i8.NzTooltipDirective, selector: "[nz-tooltip]", inputs: ["nzTooltipTitle", "nzTooltipTitleContext", "nz-tooltip", "nzTooltipTrigger", "nzTooltipPlacement", "nzTooltipOrigin", "nzTooltipVisible", "nzTooltipMouseEnterDelay", "nzTooltipMouseLeaveDelay", "nzTooltipOverlayClassName", "nzTooltipOverlayStyle", "nzTooltipArrowPointAtCenter", "nzTooltipColor"], outputs: ["nzTooltipVisibleChange"], exportAs: ["nzTooltip"] }, { kind: "directive", type: i9.NzIconDirective, selector: "[nz-icon]", inputs: ["nzSpin", "nzRotate", "nzType", "nzTheme", "nzTwotoneColor", "nzIconfont"], exportAs: ["nzIcon"] }, { kind: "pipe", type: i10.I18nPipe, name: "i18n" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 export { YunzaiThemBtnComponent };
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.2", ngImport: i0, type: YunzaiThemBtnComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: YunzaiThemBtnComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'yunzai-theme-btn',

package/esm2022/layout/widgets/yunzai-user.component.mjs

@@ -1,35 +1,35 @@
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
 import { YA_SERVICE_TOKEN } from '@yelon/auth';
-import { WINDOW } from '@yelon/util';
+import { useLocalStorageProjectInfo, useLocalStorageUser, WINDOW } from '@yelon/util';
 import { mergeBisConfig } from '../bis.config';
 import * as i0 from "@angular/core";
 import * as i1 from "ng-zorro-antd/message";
 import * as i2 from "@yelon/util";
-import * as i3 from "@yelon/cache";
-import * as i4 from "@angular/common";
-import * as i5 from "ng-zorro-antd/core/transition-patch";
-import * as i6 from "ng-zorro-antd/menu";
-import * as i7 from "ng-zorro-antd/dropdown";
-import * as i8 from "ng-zorro-antd/icon";
-import * as i9 from "ng-zorro-antd/avatar";
-import * as i10 from "@yelon/theme";
+import * as i3 from "@angular/common";
+import * as i4 from "ng-zorro-antd/core/transition-patch";
+import * as i5 from "ng-zorro-antd/menu";
+import * as i6 from "ng-zorro-antd/dropdown";
+import * as i7 from "ng-zorro-antd/icon";
+import * as i8 from "ng-zorro-antd/avatar";
+import * as i9 from "@yelon/theme";
 class YunzaiUserComponent {
     constructor(injector, msg, tokenService, 
     // @ts-ignore
-    configService, cacheService) {
+    configService) {
         this.injector = injector;
         this.msg = msg;
         this.tokenService = tokenService;
         this.configService = configService;
-        this.cacheService = cacheService;
         this.icon = '';
         this.username = '';
         this.menus = [];
         this.config = mergeBisConfig(configService);
     }
     ngOnInit() {
-        const projectInfo = this.cacheService.get('_yz_project_info', { mode: 'none' });
-        const user = this.cacheService.get('_yz_user', { mode: 'none' });
+        const [, getProjectInfo] = useLocalStorageProjectInfo();
+        const [, getUser] = useLocalStorageUser();
+        const projectInfo = getProjectInfo();
+        const user = getUser();
         this.username = user.realname ? user.realname : '未命名';
         this.icon = user.avatarId
             ? `${this.config.baseUrl}/filecenter/file/${user.avatarId}`
@@ -49,8 +49,8 @@ class YunzaiUserComponent {
             this.msg.error('该菜单没有配置链接!');
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.2", ngImport: i0, type: YunzaiUserComponent, deps: [{ token: i0.Injector }, { token: i1.NzMessageService }, { token: YA_SERVICE_TOKEN }, { token: i2.YunzaiConfigService }, { token: i3.CacheService }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.2", type: YunzaiUserComponent, selector: "yunzai-user", ngImport: i0, template: `
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: YunzaiUserComponent, deps: [{ token: i0.Injector }, { token: i1.NzMessageService }, { token: YA_SERVICE_TOKEN }, { token: i2.YunzaiConfigService }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.1.8", type: YunzaiUserComponent, selector: "yunzai-user", ngImport: i0, template: `
     <div
       class="yunzai-default__nav-item d-flex align-items-center px-sm"
       data-event-id="_nav_user"
@@ -82,10 +82,10 @@ class YunzaiUserComponent {
         </div>
       </div>
     </nz-dropdown-menu>
-  `, isInline: true, dependencies: [{ kind: "directive", type: i4.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i5.ɵNzTransitionPatchDirective, selector: "[nz-button], nz-button-group, [nz-icon], [nz-menu-item], [nz-submenu], nz-select-top-control, nz-select-placeholder, nz-input-group", inputs: ["hidden"] }, { kind: "directive", type: i6.NzMenuDirective, selector: "[nz-menu]", inputs: ["nzInlineIndent", "nzTheme", "nzMode", "nzInlineCollapsed", "nzSelectable"], outputs: ["nzClick"], exportAs: ["nzMenu"] }, { kind: "directive", type: i6.NzMenuItemDirective, selector: "[nz-menu-item]", inputs: ["nzPaddingLeft", "nzDisabled", "nzSelected", "nzDanger", "nzMatchRouterExact", "nzMatchRouter"], exportAs: ["nzMenuItem"] }, { kind: "directive", type: i6.NzMenuDividerDirective, selector: "[nz-menu-divider]", exportAs: ["nzMenuDivider"] }, { kind: "directive", type: i7.NzDropDownDirective, selector: "[nz-dropdown]", inputs: ["nzDropdownMenu", "nzTrigger", "nzMatchWidthElement", "nzBackdrop", "nzClickHide", "nzDisabled", "nzVisible", "nzOverlayClassName", "nzOverlayStyle", "nzPlacement"], outputs: ["nzVisibleChange"], exportAs: ["nzDropdown"] }, { kind: "component", type: i7.NzDropdownMenuComponent, selector: "nz-dropdown-menu", exportAs: ["nzDropdownMenu"] }, { kind: "directive", type: i8.NzIconDirective, selector: "[nz-icon]", inputs: ["nzSpin", "nzRotate", "nzType", "nzTheme", "nzTwotoneColor", "nzIconfont"], exportAs: ["nzIcon"] }, { kind: "component", type: i9.NzAvatarComponent, selector: "nz-avatar", inputs: ["nzShape", "nzSize", "nzGap", "nzText", "nzSrc", "nzSrcSet", "nzAlt", "nzIcon"], outputs: ["nzError"], exportAs: ["nzAvatar"] }, { kind: "pipe", type: i10.I18nPipe, name: "i18n" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "directive", type: i3.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i4.ɵNzTransitionPatchDirective, selector: "[nz-button], nz-button-group, [nz-icon], [nz-menu-item], [nz-submenu], nz-select-top-control, nz-select-placeholder, nz-input-group", inputs: ["hidden"] }, { kind: "directive", type: i5.NzMenuDirective, selector: "[nz-menu]", inputs: ["nzInlineIndent", "nzTheme", "nzMode", "nzInlineCollapsed", "nzSelectable"], outputs: ["nzClick"], exportAs: ["nzMenu"] }, { kind: "directive", type: i5.NzMenuItemDirective, selector: "[nz-menu-item]", inputs: ["nzPaddingLeft", "nzDisabled", "nzSelected", "nzDanger", "nzMatchRouterExact", "nzMatchRouter"], exportAs: ["nzMenuItem"] }, { kind: "directive", type: i5.NzMenuDividerDirective, selector: "[nz-menu-divider]", exportAs: ["nzMenuDivider"] }, { kind: "directive", type: i6.NzDropDownDirective, selector: "[nz-dropdown]", inputs: ["nzDropdownMenu", "nzTrigger", "nzMatchWidthElement", "nzBackdrop", "nzClickHide", "nzDisabled", "nzVisible", "nzOverlayClassName", "nzOverlayStyle", "nzPlacement"], outputs: ["nzVisibleChange"], exportAs: ["nzDropdown"] }, { kind: "component", type: i6.NzDropdownMenuComponent, selector: "nz-dropdown-menu", exportAs: ["nzDropdownMenu"] }, { kind: "directive", type: i7.NzIconDirective, selector: "[nz-icon]", inputs: ["nzSpin", "nzRotate", "nzType", "nzTheme", "nzTwotoneColor", "nzIconfont"], exportAs: ["nzIcon"] }, { kind: "component", type: i8.NzAvatarComponent, selector: "nz-avatar", inputs: ["nzShape", "nzSize", "nzGap", "nzText", "nzSrc", "nzSrcSet", "nzAlt", "nzIcon"], outputs: ["nzError"], exportAs: ["nzAvatar"] }, { kind: "pipe", type: i9.I18nPipe, name: "i18n" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 export { YunzaiUserComponent };
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.2", ngImport: i0, type: YunzaiUserComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: YunzaiUserComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'yunzai-user',
@@ -127,5 +127,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.2", ngImpor
         }], ctorParameters: function () { return [{ type: i0.Injector }, { type: i1.NzMessageService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [YA_SERVICE_TOKEN]
-                }] }, { type: i2.YunzaiConfigService }, { type: i3.CacheService }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoieXVuemFpLXVzZXIuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYmlzL2xheW91dC93aWRnZXRzL3l1bnphaS11c2VyLmNvbXBvbmVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBb0IsTUFBTSxlQUFlLENBQUM7QUFFN0YsT0FBTyxFQUFFLGdCQUFnQixFQUFpQixNQUFNLGFBQWEsQ0FBQztBQUU5RCxPQUFPLEVBQUUsTUFBTSxFQUE2QyxNQUFNLGFBQWEsQ0FBQztBQUdoRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sZUFBZSxDQUFDOzs7Ozs7Ozs7Ozs7QUFRL0MsTUFxQ2EsbUJBQW1CO0lBRzlCLFlBQ1UsUUFBa0IsRUFDbEIsR0FBcUIsRUFDSyxZQUEyQjtJQUM3RCxhQUFhO0lBQ0wsYUFBa0MsRUFDbEMsWUFBMEI7UUFMMUIsYUFBUSxHQUFSLFFBQVEsQ0FBVTtRQUNsQixRQUFHLEdBQUgsR0FBRyxDQUFrQjtRQUNLLGlCQUFZLEdBQVosWUFBWSxDQUFlO1FBRXJELGtCQUFhLEdBQWIsYUFBYSxDQUFxQjtRQUNsQyxpQkFBWSxHQUFaLFlBQVksQ0FBYztRQUtwQyxTQUFJLEdBQVcsRUFBRSxDQUFDO1FBQ2xCLGFBQVEsR0FBVyxFQUFFLENBQUM7UUFDdEIsVUFBSyxHQUFlLEVBQUUsQ0FBQztRQUxyQixJQUFJLENBQUMsTUFBTSxHQUFHLGNBQWMsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBTUQsUUFBUTtRQUNOLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLGtCQUFrQixFQUFFLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDaEYsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDakUsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7UUFDdEQsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsUUFBUTtZQUN2QixDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sb0JBQW9CLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDM0QsQ0FBQyxDQUFDLDZCQUE2QixDQUFDO1FBQ2xDLElBQUksQ0FBQyxLQUFLLEdBQUcsV0FBVyxDQUFDLFdBQVcsQ0FBQztJQUN2QyxDQUFDO0lBRUQsTUFBTTtRQUNKLFlBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNyQixJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzFCLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sdUJBQXVCLENBQUM7SUFDMUYsQ0FBQztJQUVELEVBQUUsQ0FBQyxJQUFZO1FBQ2IsSUFBSSxJQUFJLEVBQUU7WUFDUixJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDdEM7YUFBTTtZQUNMLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO1NBQzlCO0lBQ0gsQ0FBQzs4R0F4Q1UsbUJBQW1CLDBFQU1wQixnQkFBZ0I7a0dBTmYsbUJBQW1CLG1EQW5DcEI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBZ0NUOztTQUdVLG1CQUFtQjsyRkFBbkIsbUJBQW1CO2tCQXJDL0IsU0FBUzttQkFBQztvQkFDVCxRQUFRLEVBQUUsYUFBYTtvQkFDdkIsUUFBUSxFQUFFOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWdDVDtvQkFDRCxlQUFlLEVBQUUsdUJBQXVCLENBQUMsTUFBTTtpQkFDaEQ7OzBCQU9JLE1BQU07MkJBQUMsZ0JBQWdCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3ksIENvbXBvbmVudCwgSW5qZWN0LCBJbmplY3RvciwgT25Jbml0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbmltcG9ydCB7IFlBX1NFUlZJQ0VfVE9LRU4sIElUb2tlblNlcnZpY2UgfSBmcm9tICdAeWVsb24vYXV0aCc7XG5pbXBvcnQgeyBDYWNoZVNlcnZpY2UgfSBmcm9tICdAeWVsb24vY2FjaGUnO1xuaW1wb3J0IHsgV0lORE9XLCBZdW56YWlCdXNpbmVzc0NvbmZpZywgWXVuemFpQ29uZmlnU2VydmljZSB9IGZyb20gJ0B5ZWxvbi91dGlsJztcbmltcG9ydCB7IE56TWVzc2FnZVNlcnZpY2UgfSBmcm9tICduZy16b3Jyby1hbnRkL21lc3NhZ2UnO1xuXG5pbXBvcnQgeyBtZXJnZUJpc0NvbmZpZyB9IGZyb20gJy4uL2Jpcy5jb25maWcnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFVzZXJMaW5rIHtcbiAgaWNvbjogc3RyaW5nO1xuICBuYW1lOiBzdHJpbmc7XG4gIHVybDogc3RyaW5nO1xufVxuXG5AQ29tcG9uZW50KHtcbiAgc2VsZWN0b3I6ICd5dW56YWktdXNlcicsXG4gIHRlbXBsYXRlOiBgXG4gICAgPGRpdlxuICAgICAgY2xhc3M9XCJ5dW56YWktZGVmYXVsdF9fbmF2LWl0ZW0gZC1mbGV4IGFsaWduLWl0ZW1zLWNlbnRlciBweC1zbVwiXG4gICAgICBkYXRhLWV2ZW50LWlkPVwiX25hdl91c2VyXCJcbiAgICAgIG56LWRyb3Bkb3duXG4gICAgICBuelBsYWNlbWVudD1cImJvdHRvbVJpZ2h0XCJcbiAgICAgIFtuekRyb3Bkb3duTWVudV09XCJ1c2VyTWVudVwiXG4gICAgPlxuICAgICAgPGRpdiBjbGFzcz1cInl6LXVzZXItbmFtZVwiPlxuICAgICAgICA8bnotYXZhdGFyIFtuelNyY109XCJpY29uXCIgbnpTaXplPVwic21hbGxcIiBjbGFzcz1cIm1yLXNtXCI+PC9uei1hdmF0YXI+XG4gICAgICAgIHt7IHVzZXJuYW1lIH19XG4gICAgICA8L2Rpdj5cbiAgICA8L2Rpdj5cbiAgICA8bnotZHJvcGRvd24tbWVudSAjdXNlck1lbnU9XCJuekRyb3Bkb3duTWVudVwiPlxuICAgICAgPGRpdiBuei1tZW51IGNsYXNzPVwid2lkdGgtc21cIj5cbiAgICAgICAgPGRpdlxuICAgICAgICAgIGRhdGEtZXZlbnQtaWQ9XCJfbmF2X3VzZXJcIlxuICAgICAgICAgIFthdHRyLmRhdGEtbmFtZV09XCJtLm5hbWUgfCBpMThuXCJcbiAgICAgICAgICBuei1tZW51LWl0ZW1cbiAgICAgICAgICAqbmdGb3I9XCJsZXQgbSBvZiBtZW51c1wiXG4gICAgICAgICAgKGNsaWNrKT1cInRvKG0udXJsKVwiXG4gICAgICAgID5cbiAgICAgICAgICA8aSBuei1pY29uIFtuelR5cGVdPVwibS5pY29uXCIgY2xhc3M9XCJtci1zbVwiPjwvaT5cbiAgICAgICAgICB7eyBtLm5hbWUgfCBpMThuIH19XG4gICAgICAgIDwvZGl2PlxuICAgICAgICA8bGkgbnotbWVudS1kaXZpZGVyPjwvbGk+XG4gICAgICAgIDxkaXYgZGF0YS1ldmVudC1pZD1cIl9uYXZfdXNlclwiIGRhdGEtbmFtZT1cIuazqOmUgOeZu+W9lVwiIG56LW1lbnUtaXRlbSAoY2xpY2spPVwibG9nb3V0KClcIj5cbiAgICAgICAgICA8aSBuei1pY29uIG56VHlwZT1cImxvZ291dFwiIGNsYXNzPVwibXItc21cIj48L2k+XG4gICAgICAgICAge3sgJ2xvZ291dCcgfCBpMThuIH19XG4gICAgICAgIDwvZGl2PlxuICAgICAgPC9kaXY+XG4gICAgPC9uei1kcm9wZG93bi1tZW51PlxuICBgLFxuICBjaGFuZ2VEZXRlY3Rpb246IENoYW5nZURldGVjdGlvblN0cmF0ZWd5Lk9uUHVzaFxufSlcbmV4cG9ydCBjbGFzcyBZdW56YWlVc2VyQ29tcG9uZW50IGltcGxlbWVudHMgT25Jbml0IHtcbiAgcHJpdmF0ZSBjb25maWc6IFl1bnphaUJ1c2luZXNzQ29uZmlnO1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgaW5qZWN0b3I6IEluamVjdG9yLFxuICAgIHByaXZhdGUgbXNnOiBOek1lc3NhZ2VTZXJ2aWNlLFxuICAgIEBJbmplY3QoWUFfU0VSVklDRV9UT0tFTikgcHJpdmF0ZSB0b2tlblNlcnZpY2U6IElUb2tlblNlcnZpY2UsXG4gICAgLy8gQHRzLWlnbm9yZVxuICAgIHByaXZhdGUgY29uZmlnU2VydmljZTogWXVuemFpQ29uZmlnU2VydmljZSxcbiAgICBwcml2YXRlIGNhY2hlU2VydmljZTogQ2FjaGVTZXJ2aWNlXG4gICkge1xuICAgIHRoaXMuY29uZmlnID0gbWVyZ2VCaXNDb25maWcoY29uZmlnU2VydmljZSk7XG4gIH1cblxuICBpY29uOiBzdHJpbmcgPSAnJztcbiAgdXNlcm5hbWU6IHN0cmluZyA9ICcnO1xuICBtZW51czogVXNlckxpbmtbXSA9IFtdO1xuXG4gIG5nT25Jbml0KCk6IHZvaWQge1xuICAgIGNvbnN0IHByb2plY3RJbmZvID0gdGhpcy5jYWNoZVNlcnZpY2UuZ2V0KCdfeXpfcHJvamVjdF9pbmZvJywgeyBtb2RlOiAnbm9uZScgfSk7XG4gICAgY29uc3QgdXNlciA9IHRoaXMuY2FjaGVTZXJ2aWNlLmdldCgnX3l6X3VzZXInLCB7IG1vZGU6ICdub25lJyB9KTtcbiAgICB0aGlzLnVzZXJuYW1lID0gdXNlci5yZWFsbmFtZSA/IHVzZXIucmVhbG5hbWUgOiAn5pyq5ZG95ZCNJztcbiAgICB0aGlzLmljb24gPSB1c2VyLmF2YXRhcklkXG4gICAgICA/IGAke3RoaXMuY29uZmlnLmJhc2VVcmx9L2ZpbGVjZW50ZXIvZmlsZS8ke3VzZXIuYXZhdGFySWR9YFxuICAgICAgOiBgLi9hc3NldHMvdG1wL2ltZy9hdmF0YXIuanBnYDtcbiAgICB0aGlzLm1lbnVzID0gcHJvamVjdEluZm8ucHJvZmlsZUxpc3Q7XG4gIH1cblxuICBsb2dvdXQoKTogdm9pZCB7XG4gICAgbG9jYWxTdG9yYWdlLmNsZWFyKCk7XG4gICAgdGhpcy50b2tlblNlcnZpY2UuY2xlYXIoKTtcbiAgICB0aGlzLmluamVjdG9yLmdldChXSU5ET1cpLmxvY2F0aW9uLmhyZWYgPSBgJHt0aGlzLmNvbmZpZy5iYXNlVXJsfS9jYXMtcHJveHkvYXBwL2xvZ291dGA7XG4gIH1cblxuICB0byhocmVmOiBzdHJpbmcpOiB2b2lkIHtcbiAgICBpZiAoaHJlZikge1xuICAgICAgdGhpcy5pbmplY3Rvci5nZXQoV0lORE9XKS5vcGVuKGhyZWYpO1xuICAgIH0gZWxzZSB7XG4gICAgICB0aGlzLm1zZy5lcnJvcign6K+l6I+c5Y2V5rKh5pyJ6YWN572u6ZO+5o6lIScpO1xuICAgIH1cbiAgfVxufVxuIl19
+                }] }, { type: i2.YunzaiConfigService }]; } });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoieXVuemFpLXVzZXIuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYmlzL2xheW91dC93aWRnZXRzL3l1bnphaS11c2VyLmNvbXBvbmVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBb0IsTUFBTSxlQUFlLENBQUM7QUFFN0YsT0FBTyxFQUFFLGdCQUFnQixFQUFpQixNQUFNLGFBQWEsQ0FBQztBQUM5RCxPQUFPLEVBQ0wsMEJBQTBCLEVBQzFCLG1CQUFtQixFQUNuQixNQUFNLEVBR1AsTUFBTSxhQUFhLENBQUM7QUFHckIsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7Ozs7Ozs7Ozs7QUFRL0MsTUFxQ2EsbUJBQW1CO0lBRzlCLFlBQ1UsUUFBa0IsRUFDbEIsR0FBcUIsRUFDSyxZQUEyQjtJQUM3RCxhQUFhO0lBQ0wsYUFBa0M7UUFKbEMsYUFBUSxHQUFSLFFBQVEsQ0FBVTtRQUNsQixRQUFHLEdBQUgsR0FBRyxDQUFrQjtRQUNLLGlCQUFZLEdBQVosWUFBWSxDQUFlO1FBRXJELGtCQUFhLEdBQWIsYUFBYSxDQUFxQjtRQUs1QyxTQUFJLEdBQVcsRUFBRSxDQUFDO1FBQ2xCLGFBQVEsR0FBVyxFQUFFLENBQUM7UUFDdEIsVUFBSyxHQUFlLEVBQUUsQ0FBQztRQUxyQixJQUFJLENBQUMsTUFBTSxHQUFHLGNBQWMsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBTUQsUUFBUTtRQUNOLE1BQU0sQ0FBQyxFQUFDLGNBQWMsQ0FBQyxHQUFDLDBCQUEwQixFQUFFLENBQUE7UUFDcEQsTUFBTSxDQUFDLEVBQUMsT0FBTyxDQUFDLEdBQUMsbUJBQW1CLEVBQUUsQ0FBQTtRQUN0QyxNQUFNLFdBQVcsR0FBRyxjQUFjLEVBQUcsQ0FBQTtRQUNyQyxNQUFNLElBQUksR0FBRyxPQUFPLEVBQUcsQ0FBQTtRQUN2QixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztRQUN0RCxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxRQUFRO1lBQ3ZCLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxvQkFBb0IsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUMzRCxDQUFDLENBQUMsNkJBQTZCLENBQUM7UUFDbEMsSUFBSSxDQUFDLEtBQUssR0FBRyxXQUFXLENBQUMsV0FBeUIsQ0FBQztJQUNyRCxDQUFDO0lBRUQsTUFBTTtRQUNKLFlBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNyQixJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzFCLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sdUJBQXVCLENBQUM7SUFDMUYsQ0FBQztJQUVELEVBQUUsQ0FBQyxJQUFZO1FBQ2IsSUFBSSxJQUFJLEVBQUU7WUFDUixJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDdEM7YUFBTTtZQUNMLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO1NBQzlCO0lBQ0gsQ0FBQzs4R0F6Q1UsbUJBQW1CLDBFQU1wQixnQkFBZ0I7a0dBTmYsbUJBQW1CLG1EQW5DcEI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBZ0NUOztTQUdVLG1CQUFtQjsyRkFBbkIsbUJBQW1CO2tCQXJDL0IsU0FBUzttQkFBQztvQkFDVCxRQUFRLEVBQUUsYUFBYTtvQkFDdkIsUUFBUSxFQUFFOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWdDVDtvQkFDRCxlQUFlLEVBQUUsdUJBQXVCLENBQUMsTUFBTTtpQkFDaEQ7OzBCQU9JLE1BQU07MkJBQUMsZ0JBQWdCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3ksIENvbXBvbmVudCwgSW5qZWN0LCBJbmplY3RvciwgT25Jbml0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbmltcG9ydCB7IFlBX1NFUlZJQ0VfVE9LRU4sIElUb2tlblNlcnZpY2UgfSBmcm9tICdAeWVsb24vYXV0aCc7XG5pbXBvcnQge1xuICB1c2VMb2NhbFN0b3JhZ2VQcm9qZWN0SW5mbyxcbiAgdXNlTG9jYWxTdG9yYWdlVXNlcixcbiAgV0lORE9XLFxuICBZdW56YWlCdXNpbmVzc0NvbmZpZyxcbiAgWXVuemFpQ29uZmlnU2VydmljZVxufSBmcm9tICdAeWVsb24vdXRpbCc7XG5pbXBvcnQgeyBOek1lc3NhZ2VTZXJ2aWNlIH0gZnJvbSAnbmctem9ycm8tYW50ZC9tZXNzYWdlJztcblxuaW1wb3J0IHsgbWVyZ2VCaXNDb25maWcgfSBmcm9tICcuLi9iaXMuY29uZmlnJztcblxuZXhwb3J0IGludGVyZmFjZSBVc2VyTGluayB7XG4gIGljb246IHN0cmluZztcbiAgbmFtZTogc3RyaW5nO1xuICB1cmw6IHN0cmluZztcbn1cblxuQENvbXBvbmVudCh7XG4gIHNlbGVjdG9yOiAneXVuemFpLXVzZXInLFxuICB0ZW1wbGF0ZTogYFxuICAgIDxkaXZcbiAgICAgIGNsYXNzPVwieXVuemFpLWRlZmF1bHRfX25hdi1pdGVtIGQtZmxleCBhbGlnbi1pdGVtcy1jZW50ZXIgcHgtc21cIlxuICAgICAgZGF0YS1ldmVudC1pZD1cIl9uYXZfdXNlclwiXG4gICAgICBuei1kcm9wZG93blxuICAgICAgbnpQbGFjZW1lbnQ9XCJib3R0b21SaWdodFwiXG4gICAgICBbbnpEcm9wZG93bk1lbnVdPVwidXNlck1lbnVcIlxuICAgID5cbiAgICAgIDxkaXYgY2xhc3M9XCJ5ei11c2VyLW5hbWVcIj5cbiAgICAgICAgPG56LWF2YXRhciBbbnpTcmNdPVwiaWNvblwiIG56U2l6ZT1cInNtYWxsXCIgY2xhc3M9XCJtci1zbVwiPjwvbnotYXZhdGFyPlxuICAgICAgICB7eyB1c2VybmFtZSB9fVxuICAgICAgPC9kaXY+XG4gICAgPC9kaXY+XG4gICAgPG56LWRyb3Bkb3duLW1lbnUgI3VzZXJNZW51PVwibnpEcm9wZG93bk1lbnVcIj5cbiAgICAgIDxkaXYgbnotbWVudSBjbGFzcz1cIndpZHRoLXNtXCI+XG4gICAgICAgIDxkaXZcbiAgICAgICAgICBkYXRhLWV2ZW50LWlkPVwiX25hdl91c2VyXCJcbiAgICAgICAgICBbYXR0ci5kYXRhLW5hbWVdPVwibS5uYW1lIHwgaTE4blwiXG4gICAgICAgICAgbnotbWVudS1pdGVtXG4gICAgICAgICAgKm5nRm9yPVwibGV0IG0gb2YgbWVudXNcIlxuICAgICAgICAgIChjbGljayk9XCJ0byhtLnVybClcIlxuICAgICAgICA+XG4gICAgICAgICAgPGkgbnotaWNvbiBbbnpUeXBlXT1cIm0uaWNvblwiIGNsYXNzPVwibXItc21cIj48L2k+XG4gICAgICAgICAge3sgbS5uYW1lIHwgaTE4biB9fVxuICAgICAgICA8L2Rpdj5cbiAgICAgICAgPGxpIG56LW1lbnUtZGl2aWRlcj48L2xpPlxuICAgICAgICA8ZGl2IGRhdGEtZXZlbnQtaWQ9XCJfbmF2X3VzZXJcIiBkYXRhLW5hbWU9XCLms6jplIDnmbvlvZVcIiBuei1tZW51LWl0ZW0gKGNsaWNrKT1cImxvZ291dCgpXCI+XG4gICAgICAgICAgPGkgbnotaWNvbiBuelR5cGU9XCJsb2dvdXRcIiBjbGFzcz1cIm1yLXNtXCI+PC9pPlxuICAgICAgICAgIHt7ICdsb2dvdXQnIHwgaTE4biB9fVxuICAgICAgICA8L2Rpdj5cbiAgICAgIDwvZGl2PlxuICAgIDwvbnotZHJvcGRvd24tbWVudT5cbiAgYCxcbiAgY2hhbmdlRGV0ZWN0aW9uOiBDaGFuZ2VEZXRlY3Rpb25TdHJhdGVneS5PblB1c2hcbn0pXG5leHBvcnQgY2xhc3MgWXVuemFpVXNlckNvbXBvbmVudCBpbXBsZW1lbnRzIE9uSW5pdCB7XG4gIHByaXZhdGUgY29uZmlnOiBZdW56YWlCdXNpbmVzc0NvbmZpZztcblxuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGluamVjdG9yOiBJbmplY3RvcixcbiAgICBwcml2YXRlIG1zZzogTnpNZXNzYWdlU2VydmljZSxcbiAgICBASW5qZWN0KFlBX1NFUlZJQ0VfVE9LRU4pIHByaXZhdGUgdG9rZW5TZXJ2aWNlOiBJVG9rZW5TZXJ2aWNlLFxuICAgIC8vIEB0cy1pZ25vcmVcbiAgICBwcml2YXRlIGNvbmZpZ1NlcnZpY2U6IFl1bnphaUNvbmZpZ1NlcnZpY2UsXG4gICkge1xuICAgIHRoaXMuY29uZmlnID0gbWVyZ2VCaXNDb25maWcoY29uZmlnU2VydmljZSk7XG4gIH1cblxuICBpY29uOiBzdHJpbmcgPSAnJztcbiAgdXNlcm5hbWU6IHN0cmluZyA9ICcnO1xuICBtZW51czogVXNlckxpbmtbXSA9IFtdO1xuXG4gIG5nT25Jbml0KCk6IHZvaWQge1xuICAgIGNvbnN0IFssZ2V0UHJvamVjdEluZm9dPXVzZUxvY2FsU3RvcmFnZVByb2plY3RJbmZvKClcbiAgICBjb25zdCBbLGdldFVzZXJdPXVzZUxvY2FsU3RvcmFnZVVzZXIoKVxuICAgIGNvbnN0IHByb2plY3RJbmZvID0gZ2V0UHJvamVjdEluZm8oKSFcbiAgICBjb25zdCB1c2VyID0gZ2V0VXNlcigpIVxuICAgIHRoaXMudXNlcm5hbWUgPSB1c2VyLnJlYWxuYW1lID8gdXNlci5yZWFsbmFtZSA6ICfmnKrlkb3lkI0nO1xuICAgIHRoaXMuaWNvbiA9IHVzZXIuYXZhdGFySWRcbiAgICAgID8gYCR7dGhpcy5jb25maWcuYmFzZVVybH0vZmlsZWNlbnRlci9maWxlLyR7dXNlci5hdmF0YXJJZH1gXG4gICAgICA6IGAuL2Fzc2V0cy90bXAvaW1nL2F2YXRhci5qcGdgO1xuICAgIHRoaXMubWVudXMgPSBwcm9qZWN0SW5mby5wcm9maWxlTGlzdCBhcyBVc2VyTGlua1tdO1xuICB9XG5cbiAgbG9nb3V0KCk6IHZvaWQge1xuICAgIGxvY2FsU3RvcmFnZS5jbGVhcigpO1xuICAgIHRoaXMudG9rZW5TZXJ2aWNlLmNsZWFyKCk7XG4gICAgdGhpcy5pbmplY3Rvci5nZXQoV0lORE9XKS5sb2NhdGlvbi5ocmVmID0gYCR7dGhpcy5jb25maWcuYmFzZVVybH0vY2FzLXByb3h5L2FwcC9sb2dvdXRgO1xuICB9XG5cbiAgdG8oaHJlZjogc3RyaW5nKTogdm9pZCB7XG4gICAgaWYgKGhyZWYpIHtcbiAgICAgIHRoaXMuaW5qZWN0b3IuZ2V0KFdJTkRPVykub3BlbihocmVmKTtcbiAgICB9IGVsc2Uge1xuICAgICAgdGhpcy5tc2cuZXJyb3IoJ+ivpeiPnOWNleayoeaciemFjee9rumTvuaOpSEnKTtcbiAgICB9XG4gIH1cbn1cbiJdfQ==

package/esm2022/layout/yunzai-act.guard.mjs

@@ -1,14 +1,12 @@
 import { Injectable } from '@angular/core';
-import { deepCopy, log } from '@yelon/util';
+import { deepCopy, log, useLocalStorageUser } from '@yelon/util';
 import { BUSINESS_DEFAULT_CONFIG, mergeBisConfig } from './bis.config';
 import * as i0 from "@angular/core";
 import * as i1 from "@yelon/util";
-import * as i2 from "@yelon/cache";
-import * as i3 from "@angular/router";
+import * as i2 from "@angular/router";
 class ActGuard {
-    constructor(configService, cacheService, pathToRegexp, router) {
+    constructor(configService, pathToRegexp, router) {
         this.configService = configService;
-        this.cacheService = cacheService;
         this.pathToRegexp = pathToRegexp;
         this.router = router;
         this.bis = BUSINESS_DEFAULT_CONFIG;
@@ -17,9 +15,11 @@ class ActGuard {
         log('act: ');
         this.bis = mergeBisConfig(this.configService);
         log('act: config ', this.bis);
-        const user = this.cacheService.get('_yz_user', { mode: 'none' });
+        const [, getUser] = useLocalStorageUser();
+        const user = getUser();
         log('act: user ', user);
-        this.menus = deepCopy(user.menu).filter((m) => m.systemCode && m.systemCode === this.bis.systemCode);
+        // @ts-ignore
+        this.menus = deepCopy(user.menu || []).filter((m) => m.systemCode && m.systemCode === this.bis.systemCode);
         log('act: menus ', this.menus);
         this.getAllLinks(this.menus, this.links);
         log('act: links ', this.links);
@@ -95,14 +95,14 @@ class ActGuard {
             }
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.2", ngImport: i0, type: ActGuard, deps: [{ token: i1.YunzaiConfigService }, { token: i2.CacheService }, { token: i1.PathToRegexpService }, { token: i3.Router }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.2", ngImport: i0, type: ActGuard, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: ActGuard, deps: [{ token: i1.YunzaiConfigService }, { token: i1.PathToRegexpService }, { token: i2.Router }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: ActGuard, providedIn: 'root' }); }
 }
 export { ActGuard };
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.2", ngImport: i0, type: ActGuard, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: ActGuard, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.YunzaiConfigService }, { type: i2.CacheService }, { type: i1.PathToRegexpService }, { type: i3.Router }]; } });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"yunzai-act.guard.js","sourceRoot":"","sources":["../../../../../packages/bis/layout/yunzai-act.guard.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport {\n  ActivatedRouteSnapshot,\n  CanActivate,\n  CanActivateChild,\n  Router,\n  RouterStateSnapshot,\n  UrlTree\n} from '@angular/router';\nimport { Observable } from 'rxjs';\n\nimport { CacheService } from '@yelon/cache';\nimport { Menu, User } from '@yelon/theme';\nimport { deepCopy, log, YunzaiBusinessConfig, YunzaiConfigService, PathToRegexpService } from '@yelon/util';\nimport { NzSafeAny } from 'ng-zorro-antd/core/types';\n\nimport { BUSINESS_DEFAULT_CONFIG, mergeBisConfig } from './bis.config';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class ActGuard implements CanActivate, CanActivateChild {\n  private bis: YunzaiBusinessConfig = BUSINESS_DEFAULT_CONFIG;\n  private menus: NzSafeAny[] = [];\n  private links: string[] = [];\n\n  constructor(\n    private configService: YunzaiConfigService,\n    private cacheService: CacheService,\n    private pathToRegexp: PathToRegexpService,\n    private router: Router\n  ) {\n    log('act: ');\n    this.bis = mergeBisConfig(this.configService);\n    log('act: config ', this.bis);\n    const user: User = this.cacheService.get('_yz_user', { mode: 'none' });\n    log('act: user ', user);\n    this.menus = deepCopy(user.menu).filter(\n      (m: Menu) => m.systemCode && m.systemCode === this.bis.systemCode\n    ) as Menu[];\n    log('act: menus ', this.menus);\n    this.getAllLinks(this.menus, this.links);\n    log('act: links ', this.links);\n  }\n\n  canActivate(\n    _: ActivatedRouteSnapshot,\n    state: RouterStateSnapshot\n  ): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {\n    log('act: can activate ', state);\n    if (this.preHandle(state)) {\n      return true;\n    }\n    log('act: can activate child prehandle success');\n    let canactivate = false;\n    this.links.forEach((link: string) => {\n      const regexp: RegExp = this.pathToRegexp.stringToRegexp(link, null, null);\n      log(`act: ${link} test ${state.url.split('?')[0]}`);\n      if (regexp.test(state.url.split('?')[0])) {\n        canactivate = true;\n        log(`act: test value ${canactivate}`);\n        return;\n      }\n    });\n    if (canactivate) {\n      log(`act: test sucess`);\n      return true;\n    } else {\n      log(`act: test error`);\n      this.router.navigate(['displayIndex']);\n      return false;\n    }\n  }\n\n  canActivateChild(\n    _: ActivatedRouteSnapshot,\n    state: RouterStateSnapshot\n  ): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {\n    log('act: can activate child ', state);\n    if (this.preHandle(state)) {\n      return true;\n    }\n    log('act: can activate child prehandle success');\n\n    let canactivate = false;\n    this.links.forEach((link: string) => {\n      const regexp: RegExp = this.pathToRegexp.stringToRegexp(link, null, null);\n      if (regexp.test(state.url.split('?')[0])) {\n        log(`act: ${link} test ${state.url.split('?')[0]}`);\n        canactivate = true;\n        log(`act: test value ${canactivate}`);\n        return;\n      }\n    });\n    if (canactivate) {\n      log(`act: test sucess`);\n      return true;\n    } else {\n      log(`act: test error`);\n      this.router.navigate(['displayIndex']);\n      return false;\n    }\n  }\n\n  preHandle(state: RouterStateSnapshot): boolean {\n    return (\n      state.url.includes('error') ||\n      state.url.includes('exception') ||\n      state.url.includes('displayIndex') ||\n      state.url === '' ||\n      state.url === null ||\n      state.url === '/' ||\n      state.url.includes('iframePage')\n    );\n  }\n\n  getAllLinks(menu: Menu[], links: string[]): void {\n    menu.forEach((sider: Menu) => {\n      if (sider.link) {\n        links.push(sider.link);\n      }\n      if (sider.children && sider.children.length > 0) {\n        this.getAllLinks(sider.children, links);\n      }\n    });\n  }\n}\n"]}
+        }], ctorParameters: function () { return [{ type: i1.YunzaiConfigService }, { type: i1.PathToRegexpService }, { type: i2.Router }]; } });
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"yunzai-act.guard.js","sourceRoot":"","sources":["../../../../../packages/bis/layout/yunzai-act.guard.ts"],"names":[],"mappings":"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","sourcesContent":["import {Injectable} from '@angular/core';\nimport {\n    ActivatedRouteSnapshot,\n    CanActivate,\n    CanActivateChild,\n    Router,\n    RouterStateSnapshot,\n    UrlTree\n} from '@angular/router';\nimport {Observable} from 'rxjs';\n\nimport {Menu} from '@yelon/theme';\nimport {\n    deepCopy,\n    log,\n    YunzaiBusinessConfig,\n    YunzaiConfigService,\n    PathToRegexpService,\n    useLocalStorageUser, YunzaiUser\n} from '@yelon/util';\nimport {NzSafeAny} from 'ng-zorro-antd/core/types';\n\nimport {BUSINESS_DEFAULT_CONFIG, mergeBisConfig} from './bis.config';\n\n@Injectable({\n    providedIn: 'root'\n})\nexport class ActGuard implements CanActivate, CanActivateChild {\n    private bis: YunzaiBusinessConfig = BUSINESS_DEFAULT_CONFIG;\n    private menus: NzSafeAny[] = [];\n    private links: string[] = [];\n\n    constructor(\n        private configService: YunzaiConfigService,\n        private pathToRegexp: PathToRegexpService,\n        private router: Router\n    ) {\n        log('act: ');\n        this.bis = mergeBisConfig(this.configService);\n        log('act: config ', this.bis);\n        const [, getUser] = useLocalStorageUser()\n        const user: YunzaiUser = getUser()!;\n        log('act: user ', user);\n        // @ts-ignore\n        this.menus = deepCopy(user.menu as any || []).filter(\n            (m: Menu) => m.systemCode && m.systemCode === this.bis.systemCode\n        ) as Menu[];\n        log('act: menus ', this.menus);\n        this.getAllLinks(this.menus, this.links);\n        log('act: links ', this.links);\n    }\n\n    canActivate(\n        _: ActivatedRouteSnapshot,\n        state: RouterStateSnapshot\n    ): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {\n        log('act: can activate ', state);\n        if (this.preHandle(state)) {\n            return true;\n        }\n        log('act: can activate child prehandle success');\n        let canactivate = false;\n        this.links.forEach((link: string) => {\n            const regexp: RegExp = this.pathToRegexp.stringToRegexp(link, null, null);\n            log(`act: ${link} test ${state.url.split('?')[0]}`);\n            if (regexp.test(state.url.split('?')[0])) {\n                canactivate = true;\n                log(`act: test value ${canactivate}`);\n                return;\n            }\n        });\n        if (canactivate) {\n            log(`act: test sucess`);\n            return true;\n        } else {\n            log(`act: test error`);\n            this.router.navigate(['displayIndex']);\n            return false;\n        }\n    }\n\n    canActivateChild(\n        _: ActivatedRouteSnapshot,\n        state: RouterStateSnapshot\n    ): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {\n        log('act: can activate child ', state);\n        if (this.preHandle(state)) {\n            return true;\n        }\n        log('act: can activate child prehandle success');\n\n        let canactivate = false;\n        this.links.forEach((link: string) => {\n            const regexp: RegExp = this.pathToRegexp.stringToRegexp(link, null, null);\n            if (regexp.test(state.url.split('?')[0])) {\n                log(`act: ${link} test ${state.url.split('?')[0]}`);\n                canactivate = true;\n                log(`act: test value ${canactivate}`);\n                return;\n            }\n        });\n        if (canactivate) {\n            log(`act: test sucess`);\n            return true;\n        } else {\n            log(`act: test error`);\n            this.router.navigate(['displayIndex']);\n            return false;\n        }\n    }\n\n    preHandle(state: RouterStateSnapshot): boolean {\n        return (\n            state.url.includes('error') ||\n            state.url.includes('exception') ||\n            state.url.includes('displayIndex') ||\n            state.url === '' ||\n            state.url === null ||\n            state.url === '/' ||\n            state.url.includes('iframePage')\n        );\n    }\n\n    getAllLinks(menu: Menu[], links: string[]): void {\n        menu.forEach((sider: Menu) => {\n            if (sider.link) {\n                links.push(sider.link);\n            }\n            if (sider.children && sider.children.length > 0) {\n                this.getAllLinks(sider.children, links);\n            }\n        });\n    }\n}\n"]}

package/esm2022/layout/yunzai-auth.service.mjs

@@ -1,9 +1,8 @@
 import { Injectable } from '@angular/core';
-import { forkJoin, map, mergeAll, mergeMap, of } from 'rxjs';
+import { combineLatest, map, mergeMap, of } from 'rxjs';
 import { YA_SERVICE_TOKEN } from '@yelon/auth';
-import { CacheService } from '@yelon/cache';
 import { _HttpClient } from '@yelon/theme';
-import { log, WINDOW, YunzaiConfigService } from '@yelon/util';
+import { log, useLocalStorageHeader, useLocalStorageProjectInfo, useLocalStorageTenant, useLocalStorageUser, WINDOW, YunzaiConfigService } from '@yelon/util';
 import { mergeBisConfig } from './bis.config';
 import * as i0 from "@angular/core";
 class YunzaiAuthService {
@@ -20,46 +19,19 @@ class YunzaiAuthService {
     get httpClient() {
         return this.injector.get(_HttpClient);
     }
-    get cacheService() {
-        return this.injector.get(CacheService);
-    }
     askToken() {
         log('yz.auth.service: ', 'askToken');
-        // if (this.tokenService.get()?.token) {
-        //   const notCovertToken = this.tokenService.get();
-        //   let convertedToken: ITokenModel;
-        //   if (notCovertToken && notCovertToken['access_token']) {
-        //     convertedToken = {
-        //       token: notCovertToken['access_token'],
-        //       expired: notCovertToken['expires_in'],
-        //       refreshToken: notCovertToken['refresh_token'],
-        //       scope: notCovertToken['scope'],
-        //       tokenType: notCovertToken['token_type']
-        //     };
-        //     return of(convertedToken);
-        //   } else {
-        //     return of(this.tokenService.get()!);
-        //   }
-        // } else {
         if (this.config.loginForm) {
             return this.fetchTokenByUP();
         }
         else {
             return this.fetchTokenByCas();
         }
-        // }
     }
     fetchTokenByUP() {
         log('yz.auth.service: ', 'fetchTokenByUP');
         return this.httpClient.post(`/auth/oauth/token?_allow_anonymous=true`, this.config.loginForm).pipe(map((response) => {
-            const { access_token, expires_in, refresh_token, scope, token_type } = response;
-            return {
-                token: access_token,
-                expired: expires_in,
-                refreshToken: refresh_token,
-                tokenType: token_type,
-                scope
-            };
+            return response;
         }));
     }
     fetchTokenByCas() {
@@ -68,23 +40,9 @@ class YunzaiAuthService {
         return this.httpClient
             .get(`/cas-proxy/app/validate_full?callback=${uri}&_allow_anonymous=true&timestamp=${new Date().getTime()}`)
             .pipe(map((response) => {
-            // 查看缓存中的用户是否与token验证回的用户id相同，如果不同则缓存为过期缓存，进行清除
-            if (response && response.userId) {
-                const user = this.cacheService.get('_yz_user', { mode: 'none' });
-                if (user && user.id && user.id !== response.userId) {
-                    this.cacheService.clear();
-                }
-            }
             switch (response.errcode) {
                 case 2000:
-                    const { access_token, expires_in, refresh_token, scope, token_type } = response.data;
-                    return {
-                        token: access_token,
-                        expired: expires_in,
-                        refreshToken: refresh_token,
-                        tokenType: token_type,
-                        scope
-                    };
+                    return response.data;
                 case 2001:
                     this.injector.get(WINDOW).location.href = response.msg;
                     throw Error("Cookie Error: Can't find Cas Cookie,So jump to login!");
@@ -110,65 +68,39 @@ class YunzaiAuthService {
             log('yz.auth.service: get token->', token);
             this.configService.set('auth', {
                 token_send_key: 'Authorization',
-                token_send_template: `${token.tokenType} \${token}`,
+                token_send_template: `${token.token_type} \${access_token}`,
                 token_send_place: 'header'
             });
             log('yz.auth.service: ', 'set token');
             this.tokenService.set(token);
-            return this.cacheInit();
-        }), mergeAll());
+            return of(null);
+        }), mergeMap(() => this.cacheInit()));
     }
     cacheInit() {
         log('yz.auth.service: ', 'cacheInit');
-        const tenant = this.cacheService.get('_yz_tenant', { mode: 'none' });
-        const user = this.cacheService.get('_yz_user', { mode: 'none' });
-        const header = this.cacheService.get('_yz_header', { mode: 'none' });
-        const project = this.cacheService.get('_yz_project_info', { mode: 'none' });
-        return forkJoin(of(user), of(header), of(project)).pipe(mergeMap(([u, h, p]) => {
-            let list = [];
-            // user cache
-            if (!u || !tenant) {
-                log('yz.auth.service: ', 'fetch user cache');
-                list.push(this.httpClient.get(`/auth/user`).pipe(map((user) => {
-                    this.cacheService.set('_yz_tenant', user.tenantId);
-                    this.cacheService.set('_yz_user', user.principal);
-                })));
-            }
-            else {
-                log('yz.auth.service: ', 'user recache');
-                list.push(of(() => { }));
-            }
-            // header cache
-            if (!h) {
-                log('yz.auth.service: ', 'fetch header cache');
-                list.push(this.httpClient.get(`/auth/allheader/v2`).pipe(map((header) => {
-                    this.cacheService.set('_yz_header', header.data);
-                })));
-            }
-            else {
-                log('yz.auth.service: ', 'header recache');
-                list.push(of(() => { }));
-            }
-            // project cache
-            if (!p) {
-                log('yz.auth.service: ', 'fetch project cache');
-                list.push(this.httpClient.get(`/app-manager/project/info`).pipe(map((info) => {
-                    this.cacheService.set('_yz_project_info', info.data);
-                })));
-            }
-            else {
-                log('yz.auth.service: ', 'project recache');
-                list.push(of(() => { }));
-            }
-            return forkJoin(list);
+        const [setTenant,] = useLocalStorageTenant();
+        const [setUser,] = useLocalStorageUser();
+        const [setHeader,] = useLocalStorageHeader();
+        const [setProject,] = useLocalStorageProjectInfo();
+        return combineLatest([this.httpClient.get(`/auth/user`), this.httpClient.get(`/auth/allheader/v2`), this.httpClient.get(`/app-manager/project/info`)])
+            .pipe(map(([user, header, project]) => {
+            log('yz.auth.service: ', 'set user');
+            setUser(user.principal);
+            log('yz.auth.service: ', 'set tenant');
+            setTenant(user.tenantId);
+            log('yz.auth.service: ', 'set header');
+            setHeader(header.data);
+            log('yz.auth.service: ', 'set project');
+            setProject(project.data);
+            return void 0;
         }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.2", ngImport: i0, type: YunzaiAuthService, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.2", ngImport: i0, type: YunzaiAuthService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: YunzaiAuthService, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: YunzaiAuthService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.2", ngImport: i0, type: YunzaiAuthService, decorators: [{
+export { YunzaiAuthService };
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: YunzaiAuthService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: function () { return [{ type: i0.Injector }]; } });
-export { YunzaiAuthService as YzAuthService, YunzaiAuthService };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"yunzai-auth.service.js","sourceRoot":"","sources":["../../../../../packages/bis/layout/yunzai-auth.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Injector } from '@angular/core';\nimport { forkJoin, map, mergeAll, mergeMap, Observable, of } from 'rxjs';\n\nimport { ITokenModel, ITokenService, YA_SERVICE_TOKEN } from '@yelon/auth';\nimport { CacheService } from '@yelon/cache';\nimport { _HttpClient } from '@yelon/theme';\nimport { log, WINDOW, YunzaiBusinessConfig, YunzaiConfigService } from '@yelon/util';\n\nimport { mergeBisConfig } from './bis.config';\n\n@Injectable({ providedIn: 'root' })\nclass YunzaiAuthService {\n  private config: YunzaiBusinessConfig;\n\n  constructor(private injector: Injector) {\n    this.config = mergeBisConfig(this.configService);\n  }\n\n  private get configService(): YunzaiConfigService {\n    return this.injector.get(YunzaiConfigService);\n  }\n\n  private get tokenService(): ITokenService {\n    return this.injector.get(YA_SERVICE_TOKEN);\n  }\n\n  private get httpClient(): _HttpClient {\n    return this.injector.get(_HttpClient);\n  }\n\n  private get cacheService(): CacheService {\n    return this.injector.get(CacheService);\n  }\n\n  askToken(): Observable<ITokenModel> {\n    log('yz.auth.service: ', 'askToken');\n    // if (this.tokenService.get()?.token) {\n    //   const notCovertToken = this.tokenService.get();\n    //   let convertedToken: ITokenModel;\n    //   if (notCovertToken && notCovertToken['access_token']) {\n    //     convertedToken = {\n    //       token: notCovertToken['access_token'],\n    //       expired: notCovertToken['expires_in'],\n    //       refreshToken: notCovertToken['refresh_token'],\n    //       scope: notCovertToken['scope'],\n    //       tokenType: notCovertToken['token_type']\n    //     };\n    //     return of(convertedToken);\n    //   } else {\n    //     return of(this.tokenService.get()!);\n    //   }\n    // } else {\n    if (this.config.loginForm) {\n      return this.fetchTokenByUP();\n    } else {\n      return this.fetchTokenByCas();\n    }\n    // }\n  }\n\n  fetchTokenByUP(): Observable<ITokenModel> {\n    log('yz.auth.service: ', 'fetchTokenByUP');\n    return this.httpClient.post(`/auth/oauth/token?_allow_anonymous=true`, this.config.loginForm).pipe(\n      map((response: any) => {\n        const { access_token, expires_in, refresh_token, scope, token_type } = response;\n        return {\n          token: access_token,\n          expired: expires_in,\n          refreshToken: refresh_token,\n          tokenType: token_type,\n          scope\n        };\n      })\n    );\n  }\n\n  fetchTokenByCas(): Observable<ITokenModel> {\n    log('yz.auth.service: ', 'fetchTokenByCas');\n    const uri = encodeURIComponent(this.injector.get(WINDOW).location.href);\n    return this.httpClient\n      .get(`/cas-proxy/app/validate_full?callback=${uri}&_allow_anonymous=true&timestamp=${new Date().getTime()}`)\n      .pipe(\n        map((response: any) => {\n          // 查看缓存中的用户是否与token验证回的用户id相同，如果不同则缓存为过期缓存，进行清除\n          if (response && response.userId) {\n            const user = this.cacheService.get('_yz_user', { mode: 'none' });\n            if (user && user.id && user.id !== response.userId) {\n              this.cacheService.clear();\n            }\n          }\n          switch (response.errcode) {\n            case 2000:\n              const { access_token, expires_in, refresh_token, scope, token_type } = response.data;\n              return {\n                token: access_token,\n                expired: expires_in,\n                refreshToken: refresh_token,\n                tokenType: token_type,\n                scope\n              } as ITokenModel;\n            case 2001:\n              this.injector.get(WINDOW).location.href = response.msg;\n              throw Error(\"Cookie Error: Can't find Cas Cookie,So jump to login!\");\n            default:\n              if (response.data) {\n                console.error(response.data);\n                throw Error(response.data);\n              } else if (response.msg) {\n                console.error(response.msg);\n                throw Error(response.msg);\n              } else {\n                console.error('cas unknown error');\n                throw Error('Unknown Error: Cas auth exception!');\n              }\n          }\n        })\n      );\n  }\n\n  login(): Observable<void> {\n    log('yz.auth.service: ', 'login white login form->', this.config.loginForm);\n    return this.askToken().pipe(\n      mergeMap(token => {\n        log('yz.auth.service: get token->', token);\n        this.configService.set('auth', {\n          token_send_key: 'Authorization',\n          token_send_template: `${token.tokenType} \\${token}`,\n          token_send_place: 'header'\n        });\n        log('yz.auth.service: ', 'set token');\n        this.tokenService.set(token);\n        return this.cacheInit();\n      }),\n      mergeAll()\n    );\n  }\n\n  cacheInit(): Observable<void[]> {\n    log('yz.auth.service: ', 'cacheInit');\n    const tenant = this.cacheService.get('_yz_tenant', { mode: 'none' });\n    const user = this.cacheService.get('_yz_user', { mode: 'none' });\n    const header = this.cacheService.get('_yz_header', { mode: 'none' });\n    const project = this.cacheService.get('_yz_project_info', { mode: 'none' });\n    return forkJoin(of(user), of(header), of(project)).pipe(\n      mergeMap(([u, h, p]) => {\n        let list = [];\n        // user cache\n        if (!u || !tenant) {\n          log('yz.auth.service: ', 'fetch user cache');\n          list.push(\n            this.httpClient.get(`/auth/user`).pipe(\n              map((user: any) => {\n                this.cacheService.set('_yz_tenant', user.tenantId);\n                this.cacheService.set('_yz_user', user.principal);\n              })\n            )\n          );\n        } else {\n          log('yz.auth.service: ', 'user recache');\n          list.push(of<any>(() => {}));\n        }\n        // header cache\n        if (!h) {\n          log('yz.auth.service: ', 'fetch header cache');\n          list.push(\n            this.httpClient.get(`/auth/allheader/v2`).pipe(\n              map((header: any) => {\n                this.cacheService.set('_yz_header', header.data);\n              })\n            )\n          );\n        } else {\n          log('yz.auth.service: ', 'header recache');\n          list.push(of<any>(() => {}));\n        }\n        // project cache\n        if (!p) {\n          log('yz.auth.service: ', 'fetch project cache');\n          list.push(\n            this.httpClient.get(`/app-manager/project/info`).pipe(\n              map((info: any) => {\n                this.cacheService.set('_yz_project_info', info.data);\n              })\n            )\n          );\n        } else {\n          log('yz.auth.service: ', 'project recache');\n          list.push(of<any>(() => {}));\n        }\n        return forkJoin(list);\n      })\n    );\n  }\n}\n\nexport { YunzaiAuthService as YzAuthService, YunzaiAuthService };\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"yunzai-auth.service.js","sourceRoot":"","sources":["../../../../../packages/bis/layout/yunzai-auth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAW,MAAM,eAAe,CAAC;AACnD,OAAO,EAAC,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAc,EAAE,EAAC,MAAM,MAAM,CAAC;AAElE,OAAO,EAA6B,gBAAgB,EAAC,MAAM,aAAa,CAAC;AACzE,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AACzC,OAAO,EACH,GAAG,EACH,qBAAqB,EACrB,0BAA0B,EAC1B,qBAAqB,EACrB,mBAAmB,EACnB,MAAM,EAEN,mBAAmB,EACtB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;;AAE5C,MACa,iBAAiB;IAG1B,YAAoB,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;QAClC,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACrD,CAAC;IAED,IAAY,aAAa;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAClD,CAAC;IAED,IAAY,YAAY;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC/C,CAAC;IAED,IAAY,UAAU;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC;IAED,QAAQ;QACJ,GAAG,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YACvB,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;SAChC;aAAM;YACH,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;SACjC;IACL,CAAC;IAED,cAAc;QACV,GAAG,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,yCAAyC,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAC9F,GAAG,CAAC,CAAC,QAAa,EAAE,EAAE;YAClB,OAAO,QAAQ,CAAC;QACpB,CAAC,CAAC,CACL,CAAC;IACN,CAAC;IAED,eAAe;QACX,GAAG,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,UAAU;aACjB,GAAG,CAAC,yCAAyC,GAAG,oCAAoC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC;aAC3G,IAAI,CACD,GAAG,CAAC,CAAC,QAAa,EAAE,EAAE;YAClB,QAAQ,QAAQ,CAAC,OAAO,EAAE;gBACtB,KAAK,IAAI;oBACL,OAAO,QAAQ,CAAC,IAAI,CAAC;gBACzB,KAAK,IAAI;oBACL,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC;oBACvD,MAAM,KAAK,CAAC,uDAAuD,CAAC,CAAC;gBACzE;oBACI,IAAI,QAAQ,CAAC,IAAI,EAAE;wBACf,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;wBAC7B,MAAM,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;qBAC9B;yBAAM,IAAI,QAAQ,CAAC,GAAG,EAAE;wBACrB,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;wBAC5B,MAAM,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;qBAC7B;yBAAM;wBACH,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;wBACnC,MAAM,KAAK,CAAC,oCAAoC,CAAC,CAAC;qBACrD;aACR;QACL,CAAC,CAAC,CACL,CAAC;IACV,CAAC;IAED,KAAK;QACD,GAAG,CAAC,mBAAmB,EAAE,0BAA0B,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,CACvB,QAAQ,CAAC,KAAK,CAAC,EAAE;YACb,GAAG,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;YAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE;gBAC3B,cAAc,EAAE,eAAe;gBAC/B,mBAAmB,EAAE,GAAG,KAAK,CAAC,UAAU,mBAAmB;gBAC3D,gBAAgB,EAAE,QAAQ;aAC7B,CAAC,CAAC;YACH,GAAG,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;YACtC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO,EAAE,CAAC,IAAI,CAAC,CAAA;QACnB,CAAC,CAAC,EACF,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CACnC,CAAC;IACN,CAAC;IAED,SAAS;QACL,GAAG,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;QACtC,MAAM,CAAC,SAAS,EAAE,GAAG,qBAAqB,EAAE,CAAA;QAC5C,MAAM,CAAC,OAAO,EAAE,GAAG,mBAAmB,EAAE,CAAA;QACxC,MAAM,CAAC,SAAS,EAAE,GAAG,qBAAqB,EAAE,CAAA;QAC5C,MAAM,CAAC,UAAU,EAAE,GAAG,0BAA0B,EAAE,CAAA;QAClD,OAAO,aAAa,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,CAAC;aACjJ,IAAI,CACD,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE;YAC5B,GAAG,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;YACrC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACvB,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAC;YACvC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACxB,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAC;YACvC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YACtB,GAAG,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;YACxC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YACxB,OAAO,KAAK,CAAC,CAAA;QACjB,CAAC,CAAC,CACL,CAAA;IACT,CAAC;8GAxGQ,iBAAiB;kHAAjB,iBAAiB,cADL,MAAM;;SAClB,iBAAiB;2FAAjB,iBAAiB;kBAD7B,UAAU;mBAAC,EAAC,UAAU,EAAE,MAAM,EAAC","sourcesContent":["import {Injectable, Injector} from '@angular/core';\nimport {combineLatest, map, mergeMap, Observable, of} from 'rxjs';\n\nimport {ITokenModel, ITokenService, YA_SERVICE_TOKEN} from '@yelon/auth';\nimport {_HttpClient} from '@yelon/theme';\nimport {\n    log,\n    useLocalStorageHeader,\n    useLocalStorageProjectInfo,\n    useLocalStorageTenant,\n    useLocalStorageUser,\n    WINDOW,\n    YunzaiBusinessConfig,\n    YunzaiConfigService\n} from '@yelon/util';\n\nimport {mergeBisConfig} from './bis.config';\n\n@Injectable({providedIn: 'root'})\nexport class YunzaiAuthService {\n    private config: YunzaiBusinessConfig;\n\n    constructor(private injector: Injector) {\n        this.config = mergeBisConfig(this.configService);\n    }\n\n    private get configService(): YunzaiConfigService {\n        return this.injector.get(YunzaiConfigService);\n    }\n\n    private get tokenService(): ITokenService {\n        return this.injector.get(YA_SERVICE_TOKEN);\n    }\n\n    private get httpClient(): _HttpClient {\n        return this.injector.get(_HttpClient);\n    }\n\n    askToken(): Observable<ITokenModel> {\n        log('yz.auth.service: ', 'askToken');\n        if (this.config.loginForm) {\n            return this.fetchTokenByUP();\n        } else {\n            return this.fetchTokenByCas();\n        }\n    }\n\n    fetchTokenByUP(): Observable<ITokenModel> {\n        log('yz.auth.service: ', 'fetchTokenByUP');\n        return this.httpClient.post(`/auth/oauth/token?_allow_anonymous=true`, this.config.loginForm).pipe(\n            map((response: any) => {\n                return response;\n            })\n        );\n    }\n\n    fetchTokenByCas(): Observable<ITokenModel> {\n        log('yz.auth.service: ', 'fetchTokenByCas');\n        const uri = encodeURIComponent(this.injector.get(WINDOW).location.href);\n        return this.httpClient\n            .get(`/cas-proxy/app/validate_full?callback=${uri}&_allow_anonymous=true&timestamp=${new Date().getTime()}`)\n            .pipe(\n                map((response: any) => {\n                    switch (response.errcode) {\n                        case 2000:\n                            return response.data;\n                        case 2001:\n                            this.injector.get(WINDOW).location.href = response.msg;\n                            throw Error(\"Cookie Error: Can't find Cas Cookie,So jump to login!\");\n                        default:\n                            if (response.data) {\n                                console.error(response.data);\n                                throw Error(response.data);\n                            } else if (response.msg) {\n                                console.error(response.msg);\n                                throw Error(response.msg);\n                            } else {\n                                console.error('cas unknown error');\n                                throw Error('Unknown Error: Cas auth exception!');\n                            }\n                    }\n                })\n            );\n    }\n\n    login(): Observable<void> {\n        log('yz.auth.service: ', 'login white login form->', this.config.loginForm);\n        return this.askToken().pipe(\n            mergeMap(token => {\n                log('yz.auth.service: get token->', token);\n                this.configService.set('auth', {\n                    token_send_key: 'Authorization',\n                    token_send_template: `${token.token_type} \\${access_token}`,\n                    token_send_place: 'header'\n                });\n                log('yz.auth.service: ', 'set token');\n                this.tokenService.set(token);\n                return of(null)\n            }),\n            mergeMap(() => this.cacheInit())\n        );\n    }\n\n    cacheInit(): Observable<void> {\n        log('yz.auth.service: ', 'cacheInit');\n        const [setTenant,] = useLocalStorageTenant()\n        const [setUser,] = useLocalStorageUser()\n        const [setHeader,] = useLocalStorageHeader()\n        const [setProject,] = useLocalStorageProjectInfo()\n        return combineLatest([this.httpClient.get(`/auth/user`), this.httpClient.get(`/auth/allheader/v2`), this.httpClient.get(`/app-manager/project/info`)])\n            .pipe(\n                map(([user, header, project]) => {\n                    log('yz.auth.service: ', 'set user');\n                    setUser(user.principal)\n                    log('yz.auth.service: ', 'set tenant');\n                    setTenant(user.tenantId)\n                    log('yz.auth.service: ', 'set header');\n                    setHeader(header.data)\n                    log('yz.auth.service: ', 'set project');\n                    setProject(project.data)\n                    return void 0\n                })\n            )\n    }\n}\n\n"]}