@delon/theme 14.2.0 → 15.0.0-beta.1

package/layout-default/layout-header-item-trigger.directive.d.ts

@@ -1,5 +1,5 @@
 import * as i0 from "@angular/core";
 export declare class LayoutDefaultHeaderItemTriggerDirective {
     static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultHeaderItemTriggerDirective, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<LayoutDefaultHeaderItemTriggerDirective, "[layout-default-header-item-trigger]", never, {}, {}, never, never, false>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<LayoutDefaultHeaderItemTriggerDirective, "[layout-default-header-item-trigger]", never, {}, {}, never, never, false, never>;
 }

package/layout-default/layout-header-item.component.d.ts

@@ -6,5 +6,5 @@ export declare class LayoutDefaultHeaderItemComponent {
     hidden: LayoutDefaultHeaderItemHidden;
     direction: LayoutDefaultHeaderItemDirection;
     static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultHeaderItemComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultHeaderItemComponent, "layout-default-header-item", never, { "hidden": "hidden"; "direction": "direction"; }, {}, never, ["*"], false>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultHeaderItemComponent, "layout-default-header-item", never, { "hidden": "hidden"; "direction": "direction"; }, {}, never, ["*"], false, never>;
 }

package/layout-default/layout-header.component.d.ts

@@ -2,6 +2,7 @@ import { AfterViewInit, ChangeDetectorRef, OnDestroy, QueryList, TemplateRef } f
 import { App, SettingsService } from '@delon/theme';
 import type { NzSafeAny } from 'ng-zorro-antd/core/types';
 import { LayoutDefaultHeaderItemComponent } from './layout-header-item.component';
+import { LayoutDefaultService } from './layout.service';
 import { LayoutDefaultHeaderItemDirection, LayoutDefaultHeaderItemHidden, LayoutDefaultOptions } from './types';
 import * as i0 from "@angular/core";
 interface LayoutDefaultHeaderItem {
@@ -10,23 +11,24 @@ interface LayoutDefaultHeaderItem {
     direction?: LayoutDefaultHeaderItemDirection;
 }
 export declare class LayoutDefaultHeaderComponent implements AfterViewInit, OnDestroy {
+    private srv;
     private settings;
     private cdr;
     private destroy$;
     items: QueryList<LayoutDefaultHeaderItemComponent>;
-    options: LayoutDefaultOptions;
     left: LayoutDefaultHeaderItem[];
     middle: LayoutDefaultHeaderItem[];
     right: LayoutDefaultHeaderItem[];
+    get opt(): LayoutDefaultOptions;
     get app(): App;
     get collapsed(): boolean;
     get collapsedIcon(): string;
-    constructor(settings: SettingsService, cdr: ChangeDetectorRef);
+    constructor(srv: LayoutDefaultService, settings: SettingsService, cdr: ChangeDetectorRef);
     private refresh;
     ngAfterViewInit(): void;
     toggleCollapsed(): void;
     ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultHeaderComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultHeaderComponent, "layout-default-header", never, { "items": "items"; "options": "options"; }, {}, never, never, false>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultHeaderComponent, "layout-default-header", never, { "items": "items"; }, {}, never, never, false, never>;
 }
 export {};

package/layout-default/layout-nav.component.d.ts

@@ -59,5 +59,5 @@ export declare class LayoutDefaultNavComponent implements OnInit, OnDestroy {
     private underPad;
     private openAside;
     static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultNavComponent, [null, null, null, null, null, null, null, null, null, { optional: true; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultNavComponent, "layout-default-nav", never, { "disabledAcl": "disabledAcl"; "autoCloseUnderPad": "autoCloseUnderPad"; "recursivePath": "recursivePath"; "openStrictly": "openStrictly"; "maxLevelIcon": "maxLevelIcon"; }, { "select": "select"; }, never, never, false>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultNavComponent, "layout-default-nav", never, { "disabledAcl": "disabledAcl"; "autoCloseUnderPad": "autoCloseUnderPad"; "recursivePath": "recursivePath"; "openStrictly": "openStrictly"; "maxLevelIcon": "maxLevelIcon"; }, { "select": "select"; }, never, never, false, never>;
 }

package/layout-default/layout-top-menu-item.d.ts

@@ -0,0 +1,10 @@
+import { BooleanInput } from '@delon/util/decorator';
+import * as i0 from "@angular/core";
+export declare class LayoutDefaultTopMenuItemComponent {
+    static ngAcceptInputType_selected: BooleanInput;
+    static ngAcceptInputType_disabled: BooleanInput;
+    selected: boolean;
+    disabled: boolean;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultTopMenuItemComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultTopMenuItemComponent, "layout-default-top-menu-item", never, { "selected": "selected"; "disabled": "disabled"; }, {}, never, ["*"], false, never>;
+}

package/layout-default/layout.component.d.ts

@@ -1,30 +1,36 @@
-import { ElementRef, OnDestroy, OnInit, QueryList, Renderer2, TemplateRef } from '@angular/core';
+import { ElementRef, OnDestroy, QueryList, Renderer2, TemplateRef } from '@angular/core';
 import { Router, Event } from '@angular/router';
 import { SettingsService } from '@delon/theme';
 import type { NzSafeAny } from 'ng-zorro-antd/core/types';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { LayoutDefaultHeaderItemComponent } from './layout-header-item.component';
+import { LayoutDefaultService } from './layout.service';
 import { LayoutDefaultOptions } from './types';
 import * as i0 from "@angular/core";
-export declare class LayoutDefaultComponent implements OnInit, OnDestroy {
+export declare class LayoutDefaultComponent implements OnDestroy {
     private msgSrv;
     private settings;
     private el;
     private renderer;
     private doc;
+    private srv;
     headerItems: QueryList<LayoutDefaultHeaderItemComponent>;
-    options: LayoutDefaultOptions;
+    get opt(): LayoutDefaultOptions;
+    set options(value: LayoutDefaultOptions | null | undefined);
     asideUser: TemplateRef<void> | null;
+    asideBottom: TemplateRef<NzSafeAny> | null;
     nav: TemplateRef<void> | null;
     content: TemplateRef<void> | null;
     customError?: string | null;
     private destroy$;
     isFetching: boolean;
-    constructor(router: Router, msgSrv: NzMessageService, settings: SettingsService, el: ElementRef, renderer: Renderer2, doc: NzSafeAny);
+    get collapsed(): boolean;
+    get collapsedIcon(): string;
+    toggleCollapsed(): void;
+    constructor(router: Router, msgSrv: NzMessageService, settings: SettingsService, el: ElementRef, renderer: Renderer2, doc: NzSafeAny, srv: LayoutDefaultService);
     processEv(ev: Event): void;
     private setClass;
-    ngOnInit(): void;
     ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultComponent, "layout-default", ["layoutDefault"], { "options": "options"; "asideUser": "asideUser"; "nav": "nav"; "content": "content"; "customError": "customError"; }, {}, ["headerItems"], ["*"], false>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultComponent, "layout-default", ["layoutDefault"], { "options": "options"; "asideUser": "asideUser"; "asideBottom": "asideBottom"; "nav": "nav"; "content": "content"; "customError": "customError"; }, {}, ["headerItems"], ["*"], false, never>;
 }

package/layout-default/layout.module.d.ts

@@ -4,16 +4,17 @@ import * as i2 from "./layout-nav.component";
 import * as i3 from "./layout-header.component";
 import * as i4 from "./layout-header-item.component";
 import * as i5 from "./layout-header-item-trigger.directive";
-import * as i6 from "@angular/common";
-import * as i7 from "@angular/router";
-import * as i8 from "ng-zorro-antd/tooltip";
-import * as i9 from "ng-zorro-antd/icon";
-import * as i10 from "ng-zorro-antd/avatar";
-import * as i11 from "ng-zorro-antd/dropdown";
-import * as i12 from "ng-zorro-antd/message";
-import * as i13 from "ng-zorro-antd/badge";
+import * as i6 from "./layout-top-menu-item";
+import * as i7 from "@angular/common";
+import * as i8 from "@angular/router";
+import * as i9 from "ng-zorro-antd/tooltip";
+import * as i10 from "ng-zorro-antd/icon";
+import * as i11 from "ng-zorro-antd/avatar";
+import * as i12 from "ng-zorro-antd/dropdown";
+import * as i13 from "ng-zorro-antd/message";
+import * as i14 from "ng-zorro-antd/badge";
 export declare class LayoutDefaultModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<LayoutDefaultModule, [typeof i1.LayoutDefaultComponent, typeof i2.LayoutDefaultNavComponent, typeof i3.LayoutDefaultHeaderComponent, typeof i4.LayoutDefaultHeaderItemComponent, typeof i5.LayoutDefaultHeaderItemTriggerDirective], [typeof i6.CommonModule, typeof i7.RouterModule, typeof i8.NzToolTipModule, typeof i9.NzIconModule, typeof i10.NzAvatarModule, typeof i11.NzDropDownModule, typeof i12.NzMessageModule, typeof i13.NzBadgeModule], [typeof i1.LayoutDefaultComponent, typeof i2.LayoutDefaultNavComponent, typeof i3.LayoutDefaultHeaderComponent, typeof i4.LayoutDefaultHeaderItemComponent, typeof i5.LayoutDefaultHeaderItemTriggerDirective]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<LayoutDefaultModule, [typeof i1.LayoutDefaultComponent, typeof i2.LayoutDefaultNavComponent, typeof i3.LayoutDefaultHeaderComponent, typeof i4.LayoutDefaultHeaderItemComponent, typeof i5.LayoutDefaultHeaderItemTriggerDirective, typeof i6.LayoutDefaultTopMenuItemComponent], [typeof i7.CommonModule, typeof i8.RouterModule, typeof i9.NzToolTipModule, typeof i10.NzIconModule, typeof i11.NzAvatarModule, typeof i12.NzDropDownModule, typeof i13.NzMessageModule, typeof i14.NzBadgeModule], [typeof i1.LayoutDefaultComponent, typeof i2.LayoutDefaultNavComponent, typeof i3.LayoutDefaultHeaderComponent, typeof i4.LayoutDefaultHeaderItemComponent, typeof i5.LayoutDefaultHeaderItemTriggerDirective, typeof i6.LayoutDefaultTopMenuItemComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<LayoutDefaultModule>;
 }

package/layout-default/layout.service.d.ts

@@ -0,0 +1,28 @@
+import { Observable } from 'rxjs';
+import { SettingsService } from '@delon/theme';
+import { LayoutDefaultOptions } from './types';
+import * as i0 from "@angular/core";
+export declare class LayoutDefaultService {
+    private settings;
+    private _options$;
+    private _options;
+    get options(): LayoutDefaultOptions;
+    get options$(): Observable<LayoutDefaultOptions>;
+    get collapsedIcon(): string;
+    constructor(settings: SettingsService);
+    private notify;
+    /**
+     * Set layout configuration
+     *
+     * 设置布局配置
+     */
+    setOptions(options?: LayoutDefaultOptions | null): void;
+    /**
+     * Toggle the collapsed state of the sidebar menu bar
+     *
+     * 切换侧边栏菜单栏折叠状态
+     */
+    toggleCollapsed(status?: boolean): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<LayoutDefaultService>;
+}

package/layout-default/public_api.d.ts

@@ -3,5 +3,7 @@ export * from './layout.module';
 export * from './layout-header.component';
 export * from './layout-header-item.component';
 export * from './layout-header-item-trigger.directive';
+export * from './layout-top-menu-item';
 export * from './layout-nav.component';
 export * from './types';
+export * from './layout.service';

package/layout-default/style/_aside.less

@@ -20,8 +20,14 @@
     content: '';
   }
 
-  &-inner {
+  &-wrap {
+    display: flex;
+    flex-direction: column;
     height: 100%;
+  }
+
+  &-inner {
+    flex: 1 1 0%;
     overflow-x: hidden;
     overflow-y: scroll;
     -webkit-overflow-scrolling: touch;
@@ -43,6 +49,17 @@
       background-color: @alain-default-aside-scrollbar-thumb-color;
     }
   }
+
+  &-link {
+    border-top: 1px solid @alain-default-content-heading-border;
+
+    &-collapsed {
+      padding: 8px 0;
+      font-size: 16px;
+      text-align: center;
+      cursor: pointer;
+    }
+  }
 }
 
 // Desktop

package/layout-default/style/_fixed.less

@@ -9,7 +9,11 @@
     &__aside {
       position: fixed;
     }
+  }
+}
 
+@{alain-default-prefix}__fixed:not(@{alain-default-prefix}__hide-header) {
+  @{alain-default-prefix} {
     &__content {
       margin-top: @alain-default-header-hg;
     }

package/layout-default/style/_header.less

@@ -43,6 +43,10 @@
     margin: 0;
     padding: 0;
 
+    &:first-child {
+      margin-right: 16px;
+    }
+
     &-middle {
       flex: 1;
     }
@@ -76,7 +80,7 @@
 
       &:hover {
         color: #fff;
-        background-color: rgba(255, 255, 255, 0.2) !important;
+        background-color: @alain-default-header-nav-bg-hover;
       }
 
       > i,
@@ -87,6 +91,24 @@
       }
     }
   }
+
+  &__top-menu-item {
+    display: flex;
+    align-items: center;
+    height: @alain-default-header-hg;
+    padding: @alain-default-header-top-menu-item-padding;
+    border-radius: 0;
+
+    &-selected {
+      color: #fff;
+      background-color: @alain-default-header-nav-bg-hover;
+    }
+
+    &-disabled {
+      opacity: .5;
+      pointer-events: none;
+    }
+  }
 }
 
 // Search

package/layout-default/style/_layout.less

@@ -75,6 +75,12 @@ body {
       transform: none !important;
     }
   }
+
+  &__hide-header {
+    @{alain-default-prefix}__aside {
+      margin-top: 0;
+    }
+  }
 }
 
 // Desktop

package/layout-default/style/fix/_reuse-tab.less

@@ -27,6 +27,12 @@
   }
 }
 
+@{alain-default-prefix}__hide-header {
+  @{reuse-tab-prefix} {
+    top: 0;
+  }
+}
+
 @media (min-width: @mobile-min) {
   @{alain-default-prefix}__fixed {
     @{reuse-tab-prefix} {

package/layout-default/style/fix/_sidebar-nav.less

@@ -234,7 +234,7 @@
         &-link {
           display: flex;
           justify-content: center;
-          padding: (@layout-gutter * 3) 0;
+          padding: @alain-default-aside-collapsed-padding;
 
           @{sidebar-nav-prefix}__item-icon {
             margin-right: 0;

package/layout-default/style/theme-compact.less

@@ -5,3 +5,5 @@
 
 @alain-default-aside-collapsed-nav-fs: 20px;
 @alain-default-aside-collapsed-nav-img-wh: 20px;
+
+@alain-default-header-top-menu-item-padding: 0 8px;

package/layout-default/style/theme-default.less

@@ -8,6 +8,9 @@
 @alain-default-header-icon-fs: 18px;
 @alain-default-header-logo-max-height: 36px;
 @alain-default-header-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.2);
+@alain-default-header-nav-bg-hover: rgba(255, 255, 255, 0.2);
+
+@alain-default-header-top-menu-item-padding: 0 16px;
 
 @alain-default-aside-wd: 200px;
 @alain-default-aside-bg: #fff;
@@ -26,7 +29,6 @@
 @alain-default-aside-nav-group-text-color: @text-color-secondary;
 @alain-default-aside-nav-selected-text-color: @primary-color;
 @alain-default-aside-nav-selected-bg: #fcfcfc;
-@alain-default-aside-nav-item-height: 38px;
 @alain-default-aside-nav-depth1-padding-left: @layout-gutter * 3;
 @alain-default-aside-nav-depth2-padding-left: @layout-gutter * 4;
 @alain-default-aside-nav-depth3-padding-left: @layout-gutter * 5;
@@ -36,6 +38,7 @@
 @alain-default-aside-collapsed-wd: @layout-gutter * 8;
 @alain-default-aside-collapsed-nav-fs: 24px;
 @alain-default-aside-collapsed-nav-img-wh: 24px;
+@alain-default-aside-collapsed-padding: (@layout-gutter * 2) 0;
 
 @alain-default-content-heading-bg: #fafbfc;
 @alain-default-content-heading-border: #efe3e5;

package/layout-default/types.d.ts

@@ -39,4 +39,22 @@ export interface LayoutDefaultOptions {
      * 隐藏侧边栏，同时不显收缩图标按钮，默认：`false`
      */
     hideAside?: boolean;
+    /**
+     * Hide top bar, default: `false`
+     *
+     * 隐藏顶栏，默认：`false`
+     */
+    hideHeader?: boolean;
+    /**
+     * Whether to display the menu collapse button on the top bar, default: `true`
+     *
+     * 是否在顶栏显示菜单折叠按钮，默认：`true`
+     */
+    showHeaderCollapse?: boolean;
+    /**
+     * Whether to show the menu collapse button at the bottom of the sidebar, default: `false`
+     *
+     * 是否在侧边栏底部显示菜单折叠按钮，默认：`false`
+     */
+    showSiderCollapse?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delon/theme",
-  "version": "14.2.0",
+  "version": "15.0.0-beta.1",
   "author": "cipchk<cipchk@qq.com>",
   "license": "MIT",
   "repository": {
@@ -21,9 +21,9 @@
     "component"
   ],
   "dependencies": {
-    "ng-zorro-antd": "^14.0.0",
-    "@delon/acl": "^14.2.0",
-    "@delon/util": "^14.2.0",
+    "ng-zorro-antd": "^15.0.0",
+    "@delon/acl": "^15.0.0-beta.1",
+    "@delon/util": "^15.0.0-beta.1",
     "tslib": "^2.3.0"
   },
   "module": "fesm2015/theme.mjs",

package/setting-drawer/setting-drawer-item.component.d.ts

@@ -7,5 +7,5 @@ export declare class SettingDrawerItemComponent {
     pxChange(val: number): void;
     format: (value: number) => string;
     static ɵfac: i0.ɵɵFactoryDeclaration<SettingDrawerItemComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<SettingDrawerItemComponent, "setting-drawer-item", never, { "data": "data"; }, {}, never, never, false>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SettingDrawerItemComponent, "setting-drawer-item", never, { "data": "data"; }, {}, never, never, false, never>;
 }

package/setting-drawer/setting-drawer.component.d.ts

@@ -46,5 +46,5 @@ export declare class SettingDrawerComponent implements OnInit, OnDestroy {
     copyVar(): void;
     ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<SettingDrawerComponent, [null, null, null, null, null, null, { optional: true; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<SettingDrawerComponent, "setting-drawer", never, { "autoApplyColor": "autoApplyColor"; "compilingText": "compilingText"; "devTips": "devTips"; "lessJs": "lessJs"; }, {}, never, never, false>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SettingDrawerComponent, "setting-drawer", never, { "autoApplyColor": "autoApplyColor"; "compilingText": "compilingText"; "devTips": "devTips"; "lessJs": "lessJs"; }, {}, never, never, false, never>;
 }

package/src/services/menu/menu.service.d.ts

@@ -86,18 +86,6 @@ export declare class MenuService implements OnDestroy {
         emit?: boolean;
     }): void;
     ngOnDestroy(): void;
-    /**
-     * @deprecated Will be removed in 15.0.0, Pls used `find` instead
-     */
-    getHit(data: Menu[], url: string, recursive?: boolean, cb?: ((i: Menu) => void) | null): Menu | null;
-    /**
-     * @deprecated Will be removed in 15.0.0, Pls used `find` and `setItem` instead
-     *
-     * 根据URL设置菜单 `_open` 属性
-     * - 若 `recursive: true` 则会自动向上递归查找
-     *  - 菜单数据源包含 `/ware`，则 `/ware/1` 也视为 `/ware` 项
-     */
-    openedByUrl(url: string | null, recursive?: boolean): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MenuService, [{ optional: true; }, { optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MenuService>;
 }

package/theme-btn/theme-btn.component.d.ts

@@ -31,5 +31,5 @@ export declare class ThemeBtnComponent implements OnInit, OnDestroy {
     onThemeChange(theme: string): void;
     ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ThemeBtnComponent, [null, null, null, null, { optional: true; }, null]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ThemeBtnComponent, "theme-btn", never, { "types": "types"; "devTips": "devTips"; "deployUrl": "deployUrl"; }, { "themeChange": "themeChange"; }, never, never, false>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ThemeBtnComponent, "theme-btn", never, { "types": "types"; "devTips": "devTips"; "deployUrl": "deployUrl"; }, { "themeChange": "themeChange"; }, never, never, false, never>;
 }