@yelon/bis 16.2.2 → 16.2.4

package/fesm2022/layout.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { Component, ChangeDetectionStrategy, HostListener, inject, DestroyRef, Injectable, Inject, Input, Optional, NgModule, APP_INITIALIZER } from '@angular/core';
+import { Component, ChangeDetectionStrategy, HostListener, Injectable, Inject, Input, Optional, NgModule, APP_INITIALIZER } from '@angular/core';
 import * as i1$3 from '@yelon/util';
 import { useLocalStorageLang, useLocalStorageLangs, WINDOW, useLocalStorageProjectInfo, useLocalStorageUser, useLocalStorageHeader, NavType, hasFavicon, setFavicon, useLocalStorageCurrent, useLocalStorageHeaderType, useLocalStorageDefaultRoute, log as log$1, deepCopy, YunzaiConfigService, useLocalStorageTenant } from '@yelon/util';
 import * as i1$4 from '@yelon/theme/layout-default';
@@ -21,9 +21,8 @@ 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,
 import screenfull from 'screenfull';
 import { __decorate } from 'tslib';
 import { InputBoolean } from '@yelon/util/decorator';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Subject, takeUntil, of, catchError, forkJoin, map as map$1, mergeMap, combineLatest, BehaviorSubject, throwError, filter, take, switchMap } from 'rxjs';
 import ngEn from '@angular/common/locales/en';
-import { of, catchError, forkJoin, map as map$1, mergeMap, combineLatest, BehaviorSubject, throwError, filter, take, switchMap } from 'rxjs';
 import { zhCN, zhTW, enUS, el, es, fr, hr, it, ko, pl, sl, tr } from 'date-fns/locale';
 import { map } from 'rxjs/operators';
 import * as i2 from 'ng-zorro-antd/i18n';
@@ -262,10 +261,11 @@ class YunzaiI18NService extends YunzaiI18nBaseService {
         this.yelonLocaleService = yelonLocaleService;
         this.platform = platform;
         this._defaultLang = DEFAULT;
+        this.$destroy = new Subject();
         const defaultLang = this.getDefaultLang();
         this.bis = mergeBisConfig(cogSrv);
         this.getLangs()
-            .pipe(takeUntilDestroyed(inject(DestroyRef)))
+            .pipe(takeUntil(this.$destroy))
             .subscribe(langs => {
             this._defaultLang = langs.findIndex(w => w.code === defaultLang) === -1 ? DEFAULT : defaultLang;
         });
@@ -286,7 +286,7 @@ class YunzaiI18NService extends YunzaiI18nBaseService {
             return this.http.get(`assets/tmp/i18n/${lang}.json`);
         }
         else {
-            if (this.getLang(lang)) {
+            if (this.getLang(lang) !== null) {
                 return of(this.getLang(lang));
             }
             return this.http
@@ -343,7 +343,7 @@ class YunzaiI18NService extends YunzaiI18nBaseService {
     }
     getLang(lang) {
         const [, getL] = useLocalStorageLang();
-        return getL(lang) || {};
+        return getL(lang) || null;
     }
     cacheLangs(langs) {
         const [setLangs] = useLocalStorageLangs();
@@ -353,6 +353,9 @@ class YunzaiI18NService extends YunzaiI18nBaseService {
         const [, getLangs] = useLocalStorageLangs();
         return getLangs() || [];
     }
+    ngOnDestroy() {
+        this.$destroy.complete();
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.1", 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 }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: YunzaiI18NService, providedIn: 'root' }); }
 }
@@ -371,10 +374,11 @@ class YunzaiI18NComponent {
         this.doc = doc;
         /** Whether to display language text */
         this.showLangText = true;
+        this.$destroy = new Subject();
         this.langs = [];
         this.i18n
             .getLangs()
-            .pipe(takeUntilDestroyed(inject(DestroyRef)))
+            .pipe(takeUntil(this.$destroy))
             .subscribe(langs => {
             this.langs = langs;
         });
@@ -390,6 +394,9 @@ class YunzaiI18NComponent {
             setTimeout(() => this.doc.location.reload());
         });
     }
+    ngOnDestroy() {
+        this.$destroy.complete();
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: YunzaiI18NComponent, deps: [{ token: i1$2.SettingsService }, { token: YUNZAI_I18N_TOKEN }, { token: DOCUMENT }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.1", type: YunzaiI18NComponent, selector: "yunzai-i18n", inputs: { showLangText: "showLangText" }, ngImport: i0, template: `
     <div *ngIf="showLangText" nz-dropdown [nzDropdownMenu]="langMenu" nzPlacement="bottomRight">
@@ -686,10 +693,11 @@ class YunzaiThemBtnComponent {
         this.devTips = `When the dark.css file can't be found, you need to run it once: npm run theme`;
         this.deployUrl = '';
         this.dir = 'ltr';
+        this.$destroy = new Subject();
     }
     ngOnInit() {
         this.dir = this.directionality.value;
-        this.directionality.change?.pipe(takeUntilDestroyed(inject(DestroyRef))).subscribe((direction) => {
+        this.directionality.change?.pipe(takeUntil(this.$destroy)).subscribe((direction) => {
             this.dir = direction;
         });
         this.initTheme();
@@ -728,6 +736,7 @@ class YunzaiThemBtnComponent {
         this.updateChartTheme();
     }
     ngOnDestroy() {
+        this.$destroy.complete();
         const el = this.doc.getElementById(this.KEYS);
         if (el != null) {
             this.doc.body.removeChild(el);
@@ -979,6 +988,7 @@ class LayoutNavApplicationComponent {
         this.configService = configService;
         this.win = win;
         this.bis = BUSINESS_DEFAULT_CONFIG;
+        this.$destroy = new Subject();
         this.state = {
             active: false,
             type: 'all',
@@ -1059,7 +1069,7 @@ class LayoutNavApplicationComponent {
                 appId: topic.key,
                 createDate: new Date()
             })
-                .pipe(takeUntilDestroyed(inject(DestroyRef)))
+                .pipe(takeUntil(this.$destroy))
                 .subscribe();
         }
         switch (topic.target) {
@@ -1102,6 +1112,9 @@ class LayoutNavApplicationComponent {
             this.state.list = getTopics();
         }
     }
+    ngOnDestroy() {
+        this.$destroy.complete();
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: LayoutNavApplicationComponent, deps: [{ token: YunzaiI18NService }, { token: i1$2._HttpClient }, { token: i0.Injector }, { token: i1$3.YunzaiConfigService }, { token: WINDOW }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.1", type: LayoutNavApplicationComponent, selector: "layout-nav-application", ngImport: i0, template: `
     <!--      search start-->
@@ -1310,6 +1323,7 @@ class LayoutNavGroupComponent {
     constructor(inject, http) {
         this.inject = inject;
         this.http = http;
+        this.$destroy = new Subject();
         this.state = {
             topics: []
         };
@@ -1325,7 +1339,7 @@ class LayoutNavGroupComponent {
                 appId: topic.key,
                 createDate: new Date()
             })
-                .pipe(takeUntilDestroyed(inject(DestroyRef)))
+                .pipe(takeUntil(this.$destroy))
                 .subscribe();
         }
         switch (topic.target) {
@@ -1343,6 +1357,9 @@ class LayoutNavGroupComponent {
                 break;
         }
     }
+    ngOnDestroy() {
+        this.$destroy.complete();
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: LayoutNavGroupComponent, deps: [{ token: i0.Injector }, { token: i1$2._HttpClient }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.1", type: LayoutNavGroupComponent, selector: "layout-nav-group", ngImport: i0, template: `
     <div class="yz-application-group">