@yelon/bis 15.0.0-beta.6 → 15.1.0-077d885e

package/fesm2020/layout.mjs

@@ -1,10 +1,10 @@
 import * as i0 from '@angular/core';
 import { Component, ChangeDetectionStrategy, HostListener, Injectable, Inject, Input, Optional, NgModule, APP_INITIALIZER } from '@angular/core';
-import { forkJoin, map, Subject, takeUntil, of, mergeMap, mergeAll, BehaviorSubject, throwError, filter, take, switchMap, catchError } from 'rxjs';
-import * as i1$3 from '@yelon/util';
+import { Subject, takeUntil, of, catchError, forkJoin, map, mergeMap, mergeAll, BehaviorSubject, throwError, filter, take, switchMap } from 'rxjs';
+import * as i1$4 from '@yelon/util';
 import { WINDOW, log as log$1, deepCopy, YunzaiConfigService } from '@yelon/util';
 import * as i1$5 from '@yelon/theme/layout-default';
-import * as i1$4 from '@yelon/cache';
+import * as i1$3 from '@yelon/cache';
 import { CacheService } from '@yelon/cache';
 import * as i3$3 from '@yelon/socket';
 import * as i4$1 from '@angular/common';
@@ -20,16 +20,25 @@ import * as i9 from 'ng-zorro-antd/avatar';
 import * as i1 from 'ng-zorro-antd/modal';
 import * as i1$1 from 'ng-zorro-antd/message';
 import * as i1$2 from '@yelon/theme';
-import { zh_CN as zh_CN$1, zh_TW as zh_TW$1, en_US as en_US$1, YunzaiI18nBaseService, YUNZAI_I18N_TOKEN, _HttpClient } from '@yelon/theme';
+import { zh_CN as zh_CN$1, zh_TW as zh_TW$1, en_US as en_US$1, el_GR as el_GR$1, es_ES as es_ES$1, fr_FR as fr_FR$1, hr_HR as hr_HR$1, it_IT as it_IT$1, ko_KR as ko_KR$1, pl_PL as pl_PL$1, sl_SI as sl_SI$1, tr_TR as tr_TR$1, YunzaiI18nBaseService, YUNZAI_I18N_TOKEN, _HttpClient } from '@yelon/theme';
 import screenfull from 'screenfull';
 import { __decorate } from 'tslib';
 import { InputBoolean } from '@yelon/util/decorator';
 import ngEn from '@angular/common/locales/en';
+import { zhCN, zhTW, enUS, el, es, fr, hr, it, ko, pl, sl, tr } from 'date-fns/locale';
+import * as i2 from 'ng-zorro-antd/i18n';
+import { zh_CN, zh_TW, en_US, el_GR, es_ES, fr_FR, hr_HR, it_IT, ko_KR, pl_PL, sl_SI, tr_TR } from 'ng-zorro-antd/i18n';
+import ngElGr from '@angular/common/locales/el';
+import ngEsEs from '@angular/common/locales/es';
+import ngFr from '@angular/common/locales/fr';
+import ngHr from '@angular/common/locales/hr';
+import ngIt from '@angular/common/locales/it';
+import ngKo from '@angular/common/locales/ko';
+import ngPl from '@angular/common/locales/pl';
+import ngSl from '@angular/common/locales/sl';
+import ngTr from '@angular/common/locales/tr';
 import ngZh from '@angular/common/locales/zh';
 import ngZhTw from '@angular/common/locales/zh-Hant';
-import { zhCN, zhTW, enUS } from 'date-fns/locale';
-import * as i2 from 'ng-zorro-antd/i18n';
-import { zh_CN, zh_TW, en_US } from 'ng-zorro-antd/i18n';
 import * as i3$1 from '@angular/cdk/platform';
 import * as i4 from '@yelon/util/config';
 import { YunzaiConfigService as YunzaiConfigService$1 } from '@yelon/util/config';
@@ -76,7 +85,7 @@ class YunzaiClearStorageComponent {
 YunzaiClearStorageComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiClearStorageComponent, deps: [{ token: i1.NzModalService }, { token: i1$1.NzMessageService }], target: i0.ɵɵFactoryTarget.Component });
 YunzaiClearStorageComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.1.4", type: YunzaiClearStorageComponent, selector: "yunzai-clearstorage", host: { listeners: { "click": "_click()" }, properties: { "class.d-block": "true" } }, ngImport: i0, template: `
     <i nz-icon nzType="tool"></i>
-    {{ 'menu.clear.local.storage' | i18n }}
+    {{ 'storage.clear' | i18n }}
   `, isInline: true, dependencies: [{ kind: "directive", type: i3.ɵ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: i8.NzIconDirective, selector: "[nz-icon]", inputs: ["nzSpin", "nzRotate", "nzType", "nzTheme", "nzTwotoneColor", "nzIconfont"], exportAs: ["nzIcon"] }, { kind: "pipe", type: i1$2.I18nPipe, name: "i18n" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiClearStorageComponent, decorators: [{
             type: Component,
@@ -84,7 +93,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
                     selector: 'yunzai-clearstorage',
                     template: `
     <i nz-icon nzType="tool"></i>
-    {{ 'menu.clear.local.storage' | i18n }}
+    {{ 'storage.clear' | i18n }}
   `,
                     host: {
                         '[class.d-block]': 'true'
@@ -112,7 +121,7 @@ class YunzaiFullScreenComponent {
 YunzaiFullScreenComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiFullScreenComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
 YunzaiFullScreenComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.1.4", type: YunzaiFullScreenComponent, selector: "yunzai-fullscreen", host: { listeners: { "window:resize": "_resize()", "click": "_click()" }, properties: { "class.d-block": "true" } }, ngImport: i0, template: `
     <i nz-icon [nzType]="status ? 'fullscreen-exit' : 'fullscreen'"></i>
-    {{ (status ? 'menu.fullscreen.exit' : 'menu.fullscreen') | i18n }}
+    {{ (status ? 'exitFullscreen' : 'fullscreen') | i18n }}
   `, isInline: true, dependencies: [{ kind: "directive", type: i3.ɵ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: i8.NzIconDirective, selector: "[nz-icon]", inputs: ["nzSpin", "nzRotate", "nzType", "nzTheme", "nzTwotoneColor", "nzIconfont"], exportAs: ["nzIcon"] }, { kind: "pipe", type: i1$2.I18nPipe, name: "i18n" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiFullScreenComponent, decorators: [{
             type: Component,
@@ -120,7 +129,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
                     selector: 'yunzai-fullscreen',
                     template: `
     <i nz-icon [nzType]="status ? 'fullscreen-exit' : 'fullscreen'"></i>
-    {{ (status ? 'menu.fullscreen.exit' : 'menu.fullscreen') | i18n }}
+    {{ (status ? 'exitFullscreen' : 'fullscreen') | i18n }}
   `,
                     host: {
                         '[class.d-block]': 'true'
@@ -135,8 +144,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
                 args: ['click']
             }] } });
 
-const DEFAULT = 'zh-CN';
-const LANGS = {
+const BUSINESS_DEFAULT_CONFIG = {
+    baseUrl: '/backstage',
+    systemCode: 'portal',
+    loginForm: null,
+    refreshTokenEnabled: true,
+    refreshTokenType: 're-request'
+};
+function mergeBisConfig(srv) {
+    return srv.merge('bis', BUSINESS_DEFAULT_CONFIG);
+}
+
+const YUNZAI_LANGS = {
     'zh-CN': {
         text: '简体中文',
         ng: ngZh,
@@ -160,23 +179,100 @@ const LANGS = {
         date: enUS,
         yelon: en_US$1,
         abbr: '🇬🇧'
+    },
+    'el-GR': {
+        text: 'Ελληνικά',
+        ng: ngElGr,
+        zorro: el_GR,
+        date: el,
+        yelon: el_GR$1,
+        abbr: '🇬🇷'
+    },
+    'es-ES': {
+        text: 'Español',
+        ng: ngEsEs,
+        zorro: es_ES,
+        date: es,
+        yelon: es_ES$1,
+        abbr: '🇪🇸'
+    },
+    'fr-FR': {
+        text: 'Français',
+        ng: ngFr,
+        zorro: fr_FR,
+        date: fr,
+        yelon: fr_FR$1,
+        abbr: '🇫🇷'
+    },
+    'hr-HR': {
+        text: 'Hrvatski',
+        ng: ngHr,
+        zorro: hr_HR,
+        date: hr,
+        yelon: hr_HR$1,
+        abbr: '🇭🇷'
+    },
+    'it-IT': {
+        text: 'Italiano',
+        ng: ngIt,
+        zorro: it_IT,
+        date: it,
+        yelon: it_IT$1,
+        abbr: '🇮🇹'
+    },
+    'ko-KR': {
+        text: '한국어',
+        ng: ngKo,
+        zorro: ko_KR,
+        date: ko,
+        yelon: ko_KR$1,
+        abbr: '🇰🇷'
+    },
+    'pl-PL': {
+        text: 'Polski',
+        ng: ngPl,
+        zorro: pl_PL,
+        date: pl,
+        yelon: pl_PL$1,
+        abbr: '🇵🇱'
+    },
+    'sl-SI': {
+        text: 'Slovenščina',
+        ng: ngSl,
+        zorro: sl_SI,
+        date: sl,
+        yelon: sl_SI$1,
+        abbr: '🇸🇮'
+    },
+    'tr-TR': {
+        text: 'Türkçe',
+        ng: ngTr,
+        zorro: tr_TR,
+        date: tr,
+        yelon: tr_TR$1,
+        abbr: '🇹🇷'
     }
 };
+
+const DEFAULT = 'zh-CN';
 class YunzaiI18NService extends YunzaiI18nBaseService {
-    constructor(http, settings, nzI18nService, yelonLocaleService, platform, cogSrv) {
+    constructor(http, settings, nzI18nService, yelonLocaleService, platform, cogSrv, cacheService) {
         super(cogSrv);
         this.http = http;
         this.settings = settings;
         this.nzI18nService = nzI18nService;
         this.yelonLocaleService = yelonLocaleService;
         this.platform = platform;
+        this.cacheService = cacheService;
         this._defaultLang = DEFAULT;
-        this._langs = Object.keys(LANGS).map(code => {
-            const item = LANGS[code];
-            return { code, text: item.text, abbr: item.abbr };
-        });
+        this.destroy$ = new Subject();
         const defaultLang = this.getDefaultLang();
-        this._defaultLang = this._langs.findIndex(w => w.code === defaultLang) === -1 ? DEFAULT : defaultLang;
+        this.getLangs()
+            .pipe(takeUntil(this.destroy$))
+            .subscribe(langs => {
+            this._defaultLang = langs.findIndex(w => w.code === defaultLang) === -1 ? DEFAULT : defaultLang;
+        });
+        this.bis = mergeBisConfig(cogSrv);
     }
     getDefaultLang() {
         if (!this.platform.isBrowser) {
@@ -190,35 +286,70 @@ class YunzaiI18NService extends YunzaiI18nBaseService {
         return arr.length <= 1 ? res : `${arr[0]}-${arr[1].toUpperCase()}`;
     }
     loadLangData(lang) {
-        return this.http.get(`assets/tmp/i18n/${lang}.json`);
+        const key = `_yz_lang_${lang}`;
+        if (this.cacheService.getNone(key)) {
+            return of(this.cacheService.get(key));
+        }
+        else {
+            if (ngDevMode) {
+                return this.http.get(`assets/tmp/i18n/${lang}.json`);
+            }
+            else {
+                return this.http
+                    .get(`${this.bis.baseUrl}/i18n/api/v2/${lang}?_allow_anonymous`)
+                    .pipe(catchError(() => this.http.get(`assets/tmp/i18n/${lang}.json`)));
+            }
+        }
     }
     use(lang, data) {
         if (this._currentLang === lang)
             return;
+        const key = `_yz_lang_${lang}`;
+        this.cacheService.set(key, data);
+        this.cacheService.set(this.cacheDefaultKey, lang);
         this._data = this.flatData(data, []);
-        const item = LANGS[lang];
-        registerLocaleData(item.ng);
-        this.nzI18nService.setLocale(item.zorro);
-        this.nzI18nService.setDateLocale(item.date);
-        this.yelonLocaleService.setLocale(item.yelon);
-        this._currentLang = lang;
-        this._change$.next(lang);
+        const item = YUNZAI_LANGS[lang];
+        if (item) {
+            registerLocaleData(item.ng);
+            this.nzI18nService.setLocale(item.zorro);
+            this.nzI18nService.setDateLocale(item.date);
+            this.yelonLocaleService.setLocale(item.yelon);
+            this._currentLang = lang;
+            this._change$.next(lang);
+        }
+        else {
+            registerLocaleData(ngEn);
+            this.nzI18nService.setLocale(en_US);
+            this.nzI18nService.setDateLocale(enUS);
+            this.yelonLocaleService.setLocale(en_US$1);
+            this._currentLang = lang;
+            this._change$.next(lang);
+        }
     }
     getLangs() {
-        return this._langs;
+        const langs = Object.keys(YUNZAI_LANGS).map(code => {
+            const item = YUNZAI_LANGS[code];
+            return { code, text: item.text, abbr: item.abbr, icon: undefined };
+        });
+        if (ngDevMode) {
+            return of(langs);
+        }
+        else {
+            return this.http.get(`${this.bis.baseUrl}/i18n/api/v2/list?_allow_anonymous`).pipe(catchError(() => of(langs)));
+        }
+    }
+    ngOnDestroy() {
+        this.destroy$.complete();
     }
 }
-YunzaiI18NService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiI18NService, deps: [{ token: i1$2._HttpClient }, { token: i1$2.SettingsService }, { token: i2.NzI18nService }, { token: i1$2.YelonLocaleService }, { token: i3$1.Platform }, { token: i4.YunzaiConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
+YunzaiI18NService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiI18NService, deps: [{ token: i1$2._HttpClient }, { token: i1$2.SettingsService }, { token: i2.NzI18nService }, { token: i1$2.YelonLocaleService }, { token: i3$1.Platform }, { token: i4.YunzaiConfigService }, { token: i1$3.CacheService }], target: i0.ɵɵFactoryTarget.Injectable });
 YunzaiI18NService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiI18NService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiI18NService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
-        }], ctorParameters: function () { return [{ type: i1$2._HttpClient }, { type: i1$2.SettingsService }, { type: i2.NzI18nService }, { type: i1$2.YelonLocaleService }, { type: i3$1.Platform }, { type: i4.YunzaiConfigService }]; } });
+        }], ctorParameters: function () { return [{ type: i1$2._HttpClient }, { type: i1$2.SettingsService }, { type: i2.NzI18nService }, { type: i1$2.YelonLocaleService }, { type: i3$1.Platform }, { type: i4.YunzaiConfigService }, { type: i1$3.CacheService }]; } });
 
 class YunzaiI18NComponent {
-    get langs() {
-        return this.i18n.getLangs();
-    }
     get curLangCode() {
         return this.settings.layout.lang;
     }
@@ -226,8 +357,16 @@ class YunzaiI18NComponent {
         this.settings = settings;
         this.i18n = i18n;
         this.doc = doc;
+        this.destroy$ = new Subject();
         /** Whether to display language text */
         this.showLangText = true;
+        this.langs = [];
+        this.i18n
+            .getLangs()
+            .pipe(takeUntil(this.destroy$))
+            .subscribe(langs => {
+            this.langs = langs;
+        });
     }
     change(lang) {
         const spinEl = this.doc.createElement('div');
@@ -240,12 +379,15 @@ class YunzaiI18NComponent {
             setTimeout(() => this.doc.location.reload());
         });
     }
+    ngOnDestroy() {
+        this.destroy$.complete();
+    }
 }
 YunzaiI18NComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiI18NComponent, deps: [{ token: i1$2.SettingsService }, { token: YUNZAI_I18N_TOKEN }, { token: DOCUMENT }], target: i0.ɵɵFactoryTarget.Component });
 YunzaiI18NComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.1.4", type: YunzaiI18NComponent, selector: "yunzai-i18n", inputs: { showLangText: "showLangText" }, ngImport: i0, template: `
     <div *ngIf="showLangText" nz-dropdown [nzDropdownMenu]="langMenu" nzPlacement="bottomRight">
       <i nz-icon nzType="global"></i>
-      {{ 'menu.lang' | i18n }}
+      {{ 'lang.nav' | i18n }}
       <i nz-icon nzType="down"></i>
     </div>
     <i
@@ -264,7 +406,12 @@ YunzaiI18NComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", ve
           [nzSelected]="item.code === curLangCode"
           (click)="change(item.code)"
         >
-          <span role="img" [attr.aria-label]="item.text" class="pr-xs">{{ item.abbr }}</span>
+          <template *ngIf="!item.icon">
+            <span role="img" [attr.aria-label]="item.text" class="pr-xs">{{ item.abbr }}</span>
+          </template>
+          <template *ngIf="item.icon">
+            <img [src]="'data:image/png;base64,' + item.icon" [alt]="item.abbr" class="pr-xs" />
+          </template>
           {{ item.text }}
         </li>
       </ul>
@@ -280,7 +427,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
                     template: `
     <div *ngIf="showLangText" nz-dropdown [nzDropdownMenu]="langMenu" nzPlacement="bottomRight">
       <i nz-icon nzType="global"></i>
-      {{ 'menu.lang' | i18n }}
+      {{ 'lang.nav' | i18n }}
       <i nz-icon nzType="down"></i>
     </div>
     <i
@@ -299,7 +446,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
           [nzSelected]="item.code === curLangCode"
           (click)="change(item.code)"
         >
-          <span role="img" [attr.aria-label]="item.text" class="pr-xs">{{ item.abbr }}</span>
+          <template *ngIf="!item.icon">
+            <span role="img" [attr.aria-label]="item.text" class="pr-xs">{{ item.abbr }}</span>
+          </template>
+          <template *ngIf="item.icon">
+            <img [src]="'data:image/png;base64,' + item.icon" [alt]="item.abbr" class="pr-xs" />
+          </template>
           {{ item.text }}
         </li>
       </ul>
@@ -330,25 +482,25 @@ class YunzaiNotifyComponent {
                 key: 'msg',
                 title: this.y18n.fanyi('notify.message'),
                 list: [],
-                emptyText: this.y18n.fanyi('notify.message.emptyText'),
+                emptyText: this.y18n.fanyi('notify.message.empty'),
                 emptyImage: './assets/tmp/img/message.svg',
-                clearText: this.y18n.fanyi('notify.message.clearText')
+                clearText: this.y18n.fanyi('notify.message.clear')
             },
             {
                 key: 'todo',
                 title: this.y18n.fanyi('notify.todo'),
                 list: [],
-                emptyText: this.y18n.fanyi('notify.todo.emptyText'),
+                emptyText: this.y18n.fanyi('notify.todo.empty'),
                 emptyImage: './assets/tmp/img/todo.svg',
-                clearText: this.y18n.fanyi('notify.todo.clearText')
+                clearText: this.y18n.fanyi('notify.todo.clear')
             },
             {
                 key: 'notice',
                 title: this.y18n.fanyi('notify.notice'),
                 list: [],
-                emptyText: this.y18n.fanyi('notify.notice.emptyText'),
+                emptyText: this.y18n.fanyi('notify.notice.empty'),
                 emptyImage: './assets/tmp/img/notice.svg',
-                clearText: this.y18n.fanyi('notify.notice.clearText')
+                clearText: this.y18n.fanyi('notify.notice.clear')
             }
         ];
         this.loading = false;
@@ -668,17 +820,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
                 type: Input
             }] } });
 
-const BUSINESS_DEFAULT_CONFIG = {
-    baseUrl: '/backstage',
-    systemCode: 'portal',
-    loginForm: null,
-    refreshTokenEnabled: true,
-    refreshTokenType: 're-request'
-};
-function mergeBisConfig(srv) {
-    return srv.merge('bis', BUSINESS_DEFAULT_CONFIG);
-}
-
 class YunzaiUserComponent {
     constructor(injector, msg, tokenService, 
     // @ts-ignore
@@ -716,7 +857,7 @@ class YunzaiUserComponent {
         }
     }
 }
-YunzaiUserComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiUserComponent, deps: [{ token: i0.Injector }, { token: i1$1.NzMessageService }, { token: YA_SERVICE_TOKEN }, { token: i1$3.YunzaiConfigService }, { token: i1$4.CacheService }], target: i0.ɵɵFactoryTarget.Component });
+YunzaiUserComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiUserComponent, deps: [{ token: i0.Injector }, { token: i1$1.NzMessageService }, { token: YA_SERVICE_TOKEN }, { token: i1$4.YunzaiConfigService }, { token: i1$3.CacheService }], target: i0.ɵɵFactoryTarget.Component });
 YunzaiUserComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.1.4", type: YunzaiUserComponent, selector: "yunzai-user", ngImport: i0, template: `
     <div
       class="yunzai-default__nav-item d-flex align-items-center px-sm"
@@ -738,7 +879,7 @@ YunzaiUserComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", ve
         <li nz-menu-divider></li>
         <div nz-menu-item (click)="logout()">
           <i nz-icon nzType="logout" class="mr-sm"></i>
-          {{ 'menu.account.logout' | i18n }}
+          {{ 'logout' | i18n }}
         </div>
       </div>
     </nz-dropdown-menu>
@@ -768,7 +909,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
         <li nz-menu-divider></li>
         <div nz-menu-item (click)="logout()">
           <i nz-icon nzType="logout" class="mr-sm"></i>
-          {{ 'menu.account.logout' | i18n }}
+          {{ 'logout' | i18n }}
         </div>
       </div>
     </nz-dropdown-menu>
@@ -778,7 +919,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
         }], ctorParameters: function () { return [{ type: i0.Injector }, { type: i1$1.NzMessageService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [YA_SERVICE_TOKEN]
-                }] }, { type: i1$3.YunzaiConfigService }, { type: i1$4.CacheService }]; } });
+                }] }, { type: i1$4.YunzaiConfigService }, { type: i1$3.CacheService }]; } });
 
 var TopicType;
 (function (TopicType) {
@@ -895,7 +1036,7 @@ class LayoutNavApplicationComponent {
         this.state.destroy$.complete();
     }
 }
-LayoutNavApplicationComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: LayoutNavApplicationComponent, deps: [{ token: i1$4.CacheService }, { token: YunzaiI18NService }, { token: i1$2._HttpClient }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component });
+LayoutNavApplicationComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: LayoutNavApplicationComponent, deps: [{ token: i1$3.CacheService }, { token: YunzaiI18NService }, { token: i1$2._HttpClient }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component });
 LayoutNavApplicationComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.1.4", type: LayoutNavApplicationComponent, selector: "layout-nav-application", ngImport: i0, template: `
     <!--      template start-->
     <ng-template #search>
@@ -927,15 +1068,15 @@ LayoutNavApplicationComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "1
     <!--      template end-->
 
     <!--      button start-->
-    <div class="yunzai-default__nav-item" (click)="diffChange()"> {{ 'application.button' | i18n }}</div>
+    <div class="yunzai-default__nav-item" (click)="diffChange()"> {{ 'mode.nav' | i18n }}</div>
     <!--      button end-->
 
     <!--      header start-->
     <div class="yz-application" nz-row *ngIf="state.active">
       <div nz-col [nzSpan]="3" class="yz-application-topic">
-        <div class="yz-application-text" (click)="full()">{{ 'application.all' | i18n }}</div>
-        <div class="yz-application-text" (click)="own()">{{ 'application.mine' | i18n }}</div>
-        <div class="yz-application-text" *ngFor="let d of state.topics" (click)="every(d)">{{ d.name }}</div>
+        <div class="yz-application-text" (click)="full()">{{ 'mode.nav.all' | i18n }}</div>
+        <div class="yz-application-text" (click)="own()">{{ 'mode.nav.mine' | i18n }}</div>
+        <div class="yz-application-text" *ngFor="let d of state.topics" (click)="every(d)">{{ d.name | i18n }}</div>
       </div>
       <div nz-col [nzSpan]="21" [ngSwitch]="state.topic" class="yz-application-container">
         <div *ngSwitchCase="TopicType.FULL">
@@ -951,8 +1092,8 @@ LayoutNavApplicationComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "1
             <ul>
               <li *ngFor="let d of state.list" (click)="open(d)">
                 <a href="javascript:;">
-                  <h4>{{ d.name }}</h4>
-                  <p>{{ d.intro }}</p>
+                  <h4>{{ d.name | i18n }}</h4>
+                  <p>{{ d.intro | i18n }}</p>
                 </a>
               </li>
             </ul>
@@ -997,15 +1138,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
     <!--      template end-->
 
     <!--      button start-->
-    <div class="yunzai-default__nav-item" (click)="diffChange()"> {{ 'application.button' | i18n }}</div>
+    <div class="yunzai-default__nav-item" (click)="diffChange()"> {{ 'mode.nav' | i18n }}</div>
     <!--      button end-->
 
     <!--      header start-->
     <div class="yz-application" nz-row *ngIf="state.active">
       <div nz-col [nzSpan]="3" class="yz-application-topic">
-        <div class="yz-application-text" (click)="full()">{{ 'application.all' | i18n }}</div>
-        <div class="yz-application-text" (click)="own()">{{ 'application.mine' | i18n }}</div>
-        <div class="yz-application-text" *ngFor="let d of state.topics" (click)="every(d)">{{ d.name }}</div>
+        <div class="yz-application-text" (click)="full()">{{ 'mode.nav.all' | i18n }}</div>
+        <div class="yz-application-text" (click)="own()">{{ 'mode.nav.mine' | i18n }}</div>
+        <div class="yz-application-text" *ngFor="let d of state.topics" (click)="every(d)">{{ d.name | i18n }}</div>
       </div>
       <div nz-col [nzSpan]="21" [ngSwitch]="state.topic" class="yz-application-container">
         <div *ngSwitchCase="TopicType.FULL">
@@ -1021,8 +1162,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
             <ul>
               <li *ngFor="let d of state.list" (click)="open(d)">
                 <a href="javascript:;">
-                  <h4>{{ d.name }}</h4>
-                  <p>{{ d.intro }}</p>
+                  <h4>{{ d.name | i18n }}</h4>
+                  <p>{{ d.intro | i18n }}</p>
                 </a>
               </li>
             </ul>
@@ -1033,7 +1174,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
     <!--      header end-->
   `
                 }]
-        }], ctorParameters: function () { return [{ type: i1$4.CacheService }, { type: YunzaiI18NService }, { type: i1$2._HttpClient }, { type: i0.Injector }]; } });
+        }], ctorParameters: function () { return [{ type: i1$3.CacheService }, { type: YunzaiI18NService }, { type: i1$2._HttpClient }, { type: i0.Injector }]; } });
 
 class LayoutNavGroupComponent {
     constructor(inject, cacheService, http) {
@@ -1077,7 +1218,7 @@ class LayoutNavGroupComponent {
         this.state.destroy$.complete();
     }
 }
-LayoutNavGroupComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: LayoutNavGroupComponent, deps: [{ token: i0.Injector }, { token: i1$4.CacheService }, { token: i1$2._HttpClient }], target: i0.ɵɵFactoryTarget.Component });
+LayoutNavGroupComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: LayoutNavGroupComponent, deps: [{ token: i0.Injector }, { token: i1$3.CacheService }, { token: i1$2._HttpClient }], target: i0.ɵɵFactoryTarget.Component });
 LayoutNavGroupComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.1.4", type: LayoutNavGroupComponent, selector: "layout-nav-group", ngImport: i0, template: `
     <div class="yz-application-group">
       <nz-tabset>
@@ -1141,7 +1282,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
     </div>
   `
                 }]
-        }], ctorParameters: function () { return [{ type: i0.Injector }, { type: i1$4.CacheService }, { type: i1$2._HttpClient }]; } });
+        }], ctorParameters: function () { return [{ type: i0.Injector }, { type: i1$3.CacheService }, { type: i1$2._HttpClient }]; } });
 
 class LayoutNavTileComponent {
     constructor() { }
@@ -1174,7 +1315,7 @@ class YunzaiLayoutBasicComponent {
         if (!this.state.display.nav) {
             cascadingStyleSheet = {
                 ...cascadingStyleSheet,
-                top: 0
+                top: '0px'
             };
         }
         if (!this.state.display.aside) {
@@ -1257,12 +1398,18 @@ class YunzaiLayoutBasicComponent {
         this.layoutDisplayService.listen('reuseTab', (display) => {
             this.state.display.reusetab = display;
         });
+        this.layoutDisplayService.listen('nav', (display) => {
+            this.state.display.nav = display;
+        });
+        this.layoutDisplayService.listen('aside', (display) => {
+            this.state.display.aside = display;
+        });
     }
     ngOnDestroy() {
         this.state.destroy$.complete();
     }
 }
-YunzaiLayoutBasicComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiLayoutBasicComponent, deps: [{ token: i1$5.LayoutDisplayService }, { token: i1$4.CacheService }, { token: i3$3.StompService }, { token: WINDOW }], target: i0.ɵɵFactoryTarget.Component });
+YunzaiLayoutBasicComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiLayoutBasicComponent, deps: [{ token: i1$5.LayoutDisplayService }, { token: i1$3.CacheService }, { token: i3$3.StompService }, { token: WINDOW }], target: i0.ɵɵFactoryTarget.Component });
 YunzaiLayoutBasicComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.1.4", type: YunzaiLayoutBasicComponent, selector: "yz-layout-basic", ngImport: i0, template: `<layout-default
       [options]="options"
       [asideUser]="asideUserTpl"
@@ -1300,20 +1447,20 @@ YunzaiLayoutBasicComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0
         <nz-dropdown-menu #settingsMenu="nzDropdownMenu">
           <div nz-menu style="width: 200px;">
             <div nz-menu-item>
-              {{ 'menu.application.mode' | i18n }}
+              {{ 'mode.nav' | i18n }}
             </div>
 
             <div nz-menu-item (click)="onNavTypeChange(NavType.APPLICATION)">
               <i nz-icon nzType="appstore" class="mr-sm"></i>
-              {{ 'menu.application.application' | i18n }}
+              {{ 'mode.nav.application' | i18n }}
             </div>
             <div nz-menu-item (click)="onNavTypeChange(NavType.GROUP)">
               <i nz-icon nzType="group" class="mr-sm"></i>
-              {{ 'menu.application.group' | i18n }}
+              {{ 'mode.nav.group' | i18n }}
             </div>
             <div nz-menu-item (click)="onNavTypeChange(NavType.TILE)">
               <i nz-icon nzType="appstore" class="mr-sm"></i>
-              {{ 'menu.application.tile' | i18n }}
+              {{ 'mode.nav.tile' | i18n }}
             </div>
             <div nz-menu-item> <yunzai-fullscreen></yunzai-fullscreen> </div>
             <div nz-menu-item> <yunzai-clearstorage></yunzai-clearstorage> </div>
@@ -1336,7 +1483,7 @@ YunzaiLayoutBasicComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0
       </div>
       <nz-dropdown-menu #userMenu="nzDropdownMenu">
         <ul nz-menu>
-          <li nz-menu-item routerLink="/">{{ 'menu.backtohome' | i18n }}</li>
+          <li nz-menu-item routerLink="/">{{ 'back.home' | i18n }}</li>
         </ul>
       </nz-dropdown-menu>
     </ng-template>
@@ -1388,20 +1535,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
         <nz-dropdown-menu #settingsMenu="nzDropdownMenu">
           <div nz-menu style="width: 200px;">
             <div nz-menu-item>
-              {{ 'menu.application.mode' | i18n }}
+              {{ 'mode.nav' | i18n }}
             </div>
 
             <div nz-menu-item (click)="onNavTypeChange(NavType.APPLICATION)">
               <i nz-icon nzType="appstore" class="mr-sm"></i>
-              {{ 'menu.application.application' | i18n }}
+              {{ 'mode.nav.application' | i18n }}
             </div>
             <div nz-menu-item (click)="onNavTypeChange(NavType.GROUP)">
               <i nz-icon nzType="group" class="mr-sm"></i>
-              {{ 'menu.application.group' | i18n }}
+              {{ 'mode.nav.group' | i18n }}
             </div>
             <div nz-menu-item (click)="onNavTypeChange(NavType.TILE)">
               <i nz-icon nzType="appstore" class="mr-sm"></i>
-              {{ 'menu.application.tile' | i18n }}
+              {{ 'mode.nav.tile' | i18n }}
             </div>
             <div nz-menu-item> <yunzai-fullscreen></yunzai-fullscreen> </div>
             <div nz-menu-item> <yunzai-clearstorage></yunzai-clearstorage> </div>
@@ -1424,7 +1571,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
       </div>
       <nz-dropdown-menu #userMenu="nzDropdownMenu">
         <ul nz-menu>
-          <li nz-menu-item routerLink="/">{{ 'menu.backtohome' | i18n }}</li>
+          <li nz-menu-item routerLink="/">{{ 'back.home' | i18n }}</li>
         </ul>
       </nz-dropdown-menu>
     </ng-template>
@@ -1436,7 +1583,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
       <router-outlet></router-outlet>
     </ng-template> `
                 }]
-        }], ctorParameters: function () { return [{ type: i1$5.LayoutDisplayService }, { type: i1$4.CacheService }, { type: i3$3.StompService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1$5.LayoutDisplayService }, { type: i1$3.CacheService }, { type: i3$3.StompService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [WINDOW]
                 }] }]; } });
@@ -1532,14 +1679,14 @@ class ActGuard {
         });
     }
 }
-ActGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: ActGuard, deps: [{ token: i1$3.YunzaiConfigService }, { token: i1$4.CacheService }, { token: i1$3.PathToRegexpService }, { token: i5$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+ActGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: ActGuard, deps: [{ token: i1$4.YunzaiConfigService }, { token: i1$3.CacheService }, { token: i1$4.PathToRegexpService }, { token: i5$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
 ActGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: ActGuard, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: ActGuard, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1$3.YunzaiConfigService }, { type: i1$4.CacheService }, { type: i1$3.PathToRegexpService }, { type: i5$1.Router }]; } });
+        }], ctorParameters: function () { return [{ type: i1$4.YunzaiConfigService }, { type: i1$3.CacheService }, { type: i1$4.PathToRegexpService }, { type: i5$1.Router }]; } });
 
 class YunzaiAuthService {
     constructor(injector) {
@@ -1861,6 +2008,8 @@ class YunzaiDefaultInterceptor {
         if (url.includes('.json') && url.includes('assets')) {
             url = req.url;
         }
+        if (url.includes('i18n'))
+            return next.handle(req);
         // 加入语言头
         const newReq = req.clone({ url, setHeaders: this.getAdditionalHeaders(req.headers) });
         return next.handle(newReq).pipe(mergeMap(ev => {
@@ -2756,7 +2905,9 @@ class YunzaiStartupService {
     }
     load() {
         log$1('startup.service: ', 'load');
-        const defaultLang = this.i18n.defaultLang;
+        let defaultLang = this.cacheService.getNone(this.i18n.cacheDefaultKey);
+        if (!defaultLang)
+            defaultLang = this.i18n.defaultLang;
         return this.i18n.loadLangData(defaultLang).pipe(mergeMap(langData => {
             log$1('startup.service: ', 'set i18n, defaultLang->', defaultLang, ' langData->', langData);
             this.i18n.use(defaultLang, langData);
@@ -2826,7 +2977,7 @@ class YunzaiStartupService {
         }
     }
 }
-YunzaiStartupService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiStartupService, deps: [{ token: i8.NzIconService }, { token: i1$2.MenuService }, { token: YUNZAI_I18N_TOKEN }, { token: WINDOW }, { token: i1$2.SettingsService }, { token: i3$4.ACLService }, { token: i1$2.TitleService }, { token: YunzaiAuthService }, { token: i1$4.CacheService }, { token: i1$3.YunzaiConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
+YunzaiStartupService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiStartupService, deps: [{ token: i8.NzIconService }, { token: i1$2.MenuService }, { token: YUNZAI_I18N_TOKEN }, { token: WINDOW }, { token: i1$2.SettingsService }, { token: i3$4.ACLService }, { token: i1$2.TitleService }, { token: YunzaiAuthService }, { token: i1$3.CacheService }, { token: i1$4.YunzaiConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
 YunzaiStartupService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiStartupService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImport: i0, type: YunzaiStartupService, decorators: [{
             type: Injectable
@@ -2836,7 +2987,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.4", ngImpor
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [WINDOW]
-                }] }, { type: i1$2.SettingsService }, { type: i3$4.ACLService }, { type: i1$2.TitleService }, { type: YunzaiAuthService }, { type: i1$4.CacheService }, { type: i1$3.YunzaiConfigService }]; } });
+                }] }, { type: i1$2.SettingsService }, { type: i3$4.ACLService }, { type: i1$2.TitleService }, { type: YunzaiAuthService }, { type: i1$3.CacheService }, { type: i1$4.YunzaiConfigService }]; } });
 function mapYzSideToYelonMenu(menus) {
     menus.forEach(menu => {
         menu.badgeDot = menu.badge_dot || null;
@@ -2885,5 +3036,5 @@ const YUNZAI_APPINIT_PROVIDES = [
  * Generated bundle index. Do not edit.
  */
 
-export { ActGuard, BUSINESS_DEFAULT_CONFIG, LayoutNavApplicationComponent, LayoutNavGroupComponent, LayoutNavTileComponent, NavType, TopicType, YUNZAI_APPINIT_PROVIDES, YUNZAI_APPINIT_PROVIDES as YZ_APPINIT_PROVIDES, YunzaiAuthService, YunzaiClearStorageComponent, YunzaiDefaultInterceptor, YunzaiFullScreenComponent, YunzaiI18NComponent, YunzaiI18NService, YunzaiLayoutBasicComponent, YunzaiLayoutModule, YunzaiNotifyComponent, YunzaiStartupService, YunzaiStartupServiceFactory, YunzaiThemBtnComponent, YunzaiUserComponent, YunzaiAuthService as YzAuthService, YunzaiDefaultInterceptor as YzDefaultInterceptor, YunzaiI18NService as YzI18NService, YunzaiLayoutBasicComponent as YzLayoutBasicComponent, YunzaiStartupService as YzStartupService, YunzaiStartupServiceFactory as YzStartupServiceFactory, generateAbility, mapYzSideToYelonMenu, mergeBisConfig };
+export { ActGuard, BUSINESS_DEFAULT_CONFIG, LayoutNavApplicationComponent, LayoutNavGroupComponent, LayoutNavTileComponent, NavType, TopicType, YUNZAI_APPINIT_PROVIDES, YUNZAI_LANGS, YUNZAI_APPINIT_PROVIDES as YZ_APPINIT_PROVIDES, YunzaiAuthService, YunzaiClearStorageComponent, YunzaiDefaultInterceptor, YunzaiFullScreenComponent, YunzaiI18NComponent, YunzaiI18NService, YunzaiLayoutBasicComponent, YunzaiLayoutModule, YunzaiNotifyComponent, YunzaiStartupService, YunzaiStartupServiceFactory, YunzaiThemBtnComponent, YunzaiUserComponent, YunzaiAuthService as YzAuthService, YunzaiDefaultInterceptor as YzDefaultInterceptor, YunzaiI18NService as YzI18NService, YunzaiLayoutBasicComponent as YzLayoutBasicComponent, YunzaiStartupService as YzStartupService, YunzaiStartupServiceFactory as YzStartupServiceFactory, generateAbility, mapYzSideToYelonMenu, mergeBisConfig };
 //# sourceMappingURL=layout.mjs.map