@delon/theme 16.4.2 → 17.0.0

package/layout-default/style/_aside.less

@@ -1,23 +1,23 @@
 @{alain-default-prefix}__aside {
   position: absolute;
+  z-index: @zindex + 5;
   top: 0;
   bottom: 0;
-  z-index: @zindex + 5;
+  overflow: hidden;
   width: @alain-default-aside-wd;
   margin-top: @alain-default-header-hg;
-  overflow: hidden;
-  background-color: @alain-default-aside-bg;
   backface-visibility: hidden;
+  background-color: @alain-default-aside-bg;
   transition: width 0.2s @alain-default-ease, translate 0.2s @alain-default-ease;
   -webkit-overflow-scrolling: touch;
 
   &::after {
+    content: '';
     position: absolute;
     top: 0;
     right: 0;
     bottom: 0;
     border-right: 1px solid @alain-default-content-heading-border;
-    content: '';
   }
 
   &-wrap {
@@ -27,13 +27,13 @@
   }
 
   &-inner {
+    // Firefox
+    scrollbar-width: none;
+    scroll-snap-type: proximity;
+    overflow: hidden scroll;
     flex: 1 1 0%;
-    overflow-x: hidden scroll;
     -webkit-overflow-scrolling: touch;
-    scroll-snap-type: proximity;
     scroll-snap-points-x: snaplist(100%, 200%, 300%, 400%, 500%);
-    // Firefox
-    scrollbar-width: none;
     // Chrome
     &::-webkit-scrollbar {
       width: @alain-default-aside-scrollbar-height;
@@ -53,10 +53,10 @@
     border-top: 1px solid @alain-default-content-heading-border;
 
     &-collapsed {
+      cursor: pointer;
       padding: 8px 0;
       font-size: 16px;
       text-align: center;
-      cursor: pointer;
     }
   }
 }

package/layout-default/style/_header.less

@@ -68,6 +68,7 @@
     }
 
     &-item {
+      cursor: pointer;
       display: block;
       min-width: 50px;
       padding: 8px 2px;
@@ -75,7 +76,6 @@
       text-align: center;
       border-radius: 2px;
       outline: none;
-      cursor: pointer;
       transition: background-color 300ms;
 
       &:hover {
@@ -85,9 +85,9 @@
 
       > i,
       &-icon {
-        font-size: @alain-default-header-icon-fs !important;
         // fix ant-dropdown-trigger
         transform: none !important;
+        font-size: @alain-default-header-icon-fs !important;
       }
     }
   }
@@ -105,8 +105,8 @@
     }
 
     &-disabled {
-      opacity: .5;
       pointer-events: none;
+      opacity: .5;
     }
   }
 }
@@ -166,8 +166,8 @@
       .@{ant-prefix}-input-group-addon,
       .@{ant-prefix}-input-affix-wrapper {
         i {
-          color: @grey-8;
           transform: rotate(90deg);
+          color: @grey-8;
         }
       }
     }
@@ -176,9 +176,9 @@
   @media (max-width: @mobile-max) {
     @{alain-default-prefix}__search {
       position: absolute;
+      z-index: @zindex+20;
       top: 0;
       left: 0;
-      z-index: @zindex+20;
       align-items: center;
       width: 100%;
       height: 100%;

package/layout-default/style/_layout.less

@@ -1,7 +1,7 @@
 html {
-  height: 100%; // http://updates.html5rocks.com/2013/12/300ms-tap-delay-gone-away
-  direction: ltr;
   touch-action: manipulation;
+  direction: ltr;
+  height: 100%; // http://updates.html5rocks.com/2013/12/300ms-tap-delay-gone-away
 }
 
 html,
@@ -18,11 +18,11 @@ body {
 
 @{alain-default-prefix} {
   position: relative;
+  overflow-x: hidden;
   display: block;
   width: 100%;
   height: auto;
   min-height: 100%;
-  overflow-x: hidden;
 
   &__unwrap {
     margin-right: -@alain-default-content-padding;
@@ -36,6 +36,7 @@ body {
 
   &__content {
     margin: 0 @alain-default-content-padding @alain-default-content-padding @alain-default-content-padding;
+    .router-ant();
 
     &-title {
       display: flex;
@@ -53,13 +54,13 @@ body {
 
       > h1 {
         margin-bottom: 0;
-        font-weight: normal;
         font-size: 18px;
+        font-weight: normal;
 
         > small {
           display: block;
-          color: @muted-color;
           font-size: 12px;
+          color: @muted-color;
         }
       }
     }
@@ -67,13 +68,12 @@ body {
     nz-input-group {
       width: auto;
     }
-    .router-ant();
   }
 
   &__hide-aside {
     @{alain-default-prefix}__content {
-      margin-left: @alain-default-content-padding !important;
       transform: none !important;
+      margin-left: @alain-default-content-padding !important;
     }
   }
 

package/layout-default/style/_progress-bar.less

@@ -1,18 +1,18 @@
 @{alain-default-prefix}__progress-bar {
   position: fixed;
   z-index: @zindex-base + 20;
+  overflow: hidden;
   width: 100vw;
   height: 4px;
-  overflow: hidden;
   background: fade(#ddd, 40%);
 
   &::after {
+    content: ' ';
+    transform-origin: top left;
     display: block;
     width: 33.3vw;
     height: 100%;
-    transform-origin: top left;
     animation: gradcolours 5s steps(1) infinite, loadthird 1s infinite linear;
-    content: ' ';
   }
 }
 

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

@@ -8,10 +8,10 @@
 @{alain-default-prefix}__fixed {
   @{reuse-tab-prefix} {
     position: fixed;
+    z-index: @zindex-fixed + 1;
     top: @alain-default-header-hg;
     right: @alain-default-content-padding;
     left: @alain-default-aside-width;
-    z-index: @zindex-fixed + 1;
   }
 }
 

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

@@ -15,16 +15,16 @@
     transition: border-left-color 0.4s ease;
 
     &-link {
+      user-select: none;
       position: relative;
+      overflow: hidden;
       display: block;
       padding: @alain-default-aside-nav-padding-top-bottom @alain-default-aside-nav-padding-left-right * 2
         @alain-default-aside-nav-padding-top-bottom @alain-default-aside-nav-padding-left-right;
-      overflow: hidden;
       color: @alain-default-aside-nav-text-color;
-      white-space: nowrap;
       text-decoration: none !important;
       text-overflow: ellipsis;
-      user-select: none;
+      white-space: nowrap;
 
       &:hover {
         color: @alain-default-aside-nav-text-hover-color;
@@ -97,8 +97,8 @@
   }
 
   &__sub {
-    display: none;
     overflow: hidden;
+    display: none;
 
     @{sidebar-nav-prefix}__item {
       border-left: 0 !important;
@@ -113,6 +113,7 @@
 
       &::before,
       &::after {
+        content: '';
         position: absolute;
         width: 6px;
         height: 1.5px;
@@ -120,7 +121,6 @@
         background-image: linear-gradient(to right, @menu-item-color, @menu-item-color);
         border-radius: 2px;
         transition: background-color 0.3s @ease-in-out, transform 0.3s @ease-in-out, top 0.3s @ease-in-out;
-        content: '';
       }
 
       &::before {

package/layout-default/style/widgets/_app-icons.less

@@ -2,10 +2,10 @@
   .app-icons {
     padding: @layout-gutter * 2;
     .@{ant-prefix}-col-6 {
+      cursor: pointer;
       padding: (@layout-gutter * 2) 0;
       text-align: center;
       border-radius: 4px;
-      cursor: pointer;
       transition: background-color 300ms;
 
       &:hover {
@@ -22,8 +22,8 @@
     small {
       display: block;
       padding-top: 4px;
-      color: #9c9c9c;
       font-size: 14px;
+      color: #9c9c9c;
     }
   }
 }

package/layout-default/style/widgets/_user.less

@@ -3,22 +3,23 @@
 
 .alain-default-aside-user-mixin(@enabled) when(@enabled=true) {
   @{alain-default-prefix}__aside-user {
+    cursor: pointer;
     display: flex;
     align-items: center;
     justify-content: center;
     margin: @alain-default-user-block-margin @alain-default-user-block-margin 0 @alain-default-user-block-margin;
-    cursor: pointer;
+
     .@{ant-prefix}-dropdown-trigger {
       display: flex;
       align-items: center;
     }
 
     &-info {
-      flex: 1;
       overflow: hidden;
+      flex: 1;
       color: @text-color;
-      white-space: nowrap;
       text-overflow: ellipsis;
+      white-space: nowrap;
     }
 
     &-avatar {
@@ -26,24 +27,6 @@
     }
   }
 
-  // Desktop
-  @media (min-width: @mobile-min) {
-    @{alain-default-prefix}__collapsed {
-      @{alain-default-prefix}__aside-user {
-        width: @alain-default-aside-collapsed-wd;
-        margin-left: 0;
-
-        &-info {
-          display: none;
-        }
-
-        &-avatar {
-          margin: 0 auto;
-        }
-      }
-    }
-  }
-
   [dir='rtl'] {
     @{alain-default-prefix}__aside-user {
       &-avatar {
@@ -64,5 +47,23 @@
       }
     }
   }
+
+  // Desktop
+  @media (min-width: @mobile-min) {
+    @{alain-default-prefix}__collapsed {
+      @{alain-default-prefix}__aside-user {
+        width: @alain-default-aside-collapsed-wd;
+        margin-left: 0;
+
+        &-info {
+          display: none;
+        }
+
+        &-avatar {
+          margin: 0 auto;
+        }
+      }
+    }
+  }
 }
 .alain-default-aside-user-mixin(@alain-default-aside-user-enabled);

package/package.json

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

package/public_api.d.ts

@@ -1,22 +1,8 @@
-export { preloaderFinished } from './src/services/preloader/preloader';
-export * from './src/services/menu/interface';
-export * from './src/services/menu/menu.service';
-export * from './src/services/settings/types';
-export * from './src/services/settings/settings.service';
-export * from './src/services/responsive/responsive';
-export * from './src/services/rtl/rtl.service';
-export * from './src/services/title/title.service';
-export * from './src/services/i18n/index';
+export * from './src/services/index';
 export * from './src/locale/index';
-export * from './src/services/modal/modal.helper';
-export * from './src/services/drawer/drawer.helper';
-export * from './src/services/http/index';
-export * from './src/pipes/date/date.pipe';
-export * from './src/pipes/keys/keys.pipe';
-export * from './src/pipes/yn/yn.pipe';
-export * from './src/pipes/safe/html.pipe';
-export * from './src/pipes/safe/url.pipe';
+export * from './src/pipes/index';
 export * from './src/config';
 export * from './src/theme.module';
+export * from './src/provide';
 export * from './src/router/optional-preloader';
 export { VERSION } from './src/version';

package/setting-drawer/style/index.less

@@ -28,33 +28,35 @@
 
     &__title {
       margin-bottom: 12px;
-      color: @heading-color;
       font-size: 14px;
       line-height: 22px;
+      color: @heading-color;
     }
 
     &__theme {
-      margin-top: 24px;
       overflow: hidden;
+      margin-top: 24px;
 
       &-tag {
+        cursor: pointer;
         float: left;
         width: 20px;
         height: 20px;
         margin-right: 8px;
-        color: #fff;
         font-weight: bold;
+        color: #fff;
         text-align: center;
         border-radius: 2px;
-        cursor: pointer;
       }
     }
 
     &__handle {
+      pointer-events: auto;
+      cursor: pointer;
       position: fixed;
+      z-index: @zindex-modal-mask - 1;
       top: 240px;
       right: 0;
-      z-index: @zindex-modal-mask - 1;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -64,18 +66,16 @@
       text-align: center;
       background: @primary-color;
       border-radius: 4px 0 0 4px;
-      cursor: pointer;
       transition: right @animation-duration-slow @ease-base-in;
-      pointer-events: auto;
 
       &-icon {
-        color: #fff;
         font-size: 20px;
+        color: #fff;
       }
 
       &-opened {
-        right: @setting-drawer-width;
         z-index: @zindex-modal-mask + 1;
+        right: @setting-drawer-width;
       }
     }
   }

package/src/config.d.ts

@@ -1,4 +1,5 @@
-import { ModuleWithProviders, Type } from '@angular/core';
+import type { HttpInterceptorFn } from '@angular/common/http';
+import type { EnvironmentProviders, ModuleWithProviders, Provider, Type } from '@angular/core';
 import type { NzSafeAny } from 'ng-zorro-antd/core/types';
 export interface Environment {
     [key: string]: NzSafeAny;
@@ -21,11 +22,23 @@ export interface Environment {
      */
     api: ApiConfig;
     /**
-     * Defined imported modules in `global-config.module.ts`
+     * Defined imported modules in `app-config.ts`
      *
-     * 定义在 `global-config.module.ts` 导入的模块列表
+     * 定义在 `app-config.ts` 导入的模块列表
      */
     modules?: Array<Type<NzSafeAny> | ModuleWithProviders<NzSafeAny> | NzSafeAny[]>;
+    /**
+     * Defined providers in `app-config.ts`
+     *
+     * 定义在 `app-config.ts` 导入的 providers 列表
+     */
+    providers?: Array<Provider | EnvironmentProviders>;
+    /**
+     * Defined interceptorFns in `app-config.ts`
+     *
+     * 定义在 `app-config.ts` 导入的 interceptorFns 列表
+     */
+    interceptorFns?: HttpInterceptorFn[];
 }
 export interface ApiConfig {
     [key: string]: NzSafeAny;

package/src/pipes/date/date.pipe.d.ts

@@ -1,10 +1,9 @@
 import { PipeTransform } from '@angular/core';
-import { NzI18nService } from 'ng-zorro-antd/i18n';
 import * as i0 from "@angular/core";
 export declare class DatePipe implements PipeTransform {
     private nzI18n;
-    constructor(nzI18n: NzI18nService);
-    transform(value: Date | string | number, formatString?: string): string;
+    private defFormat;
+    transform(value: Date | string | number, formatString?: string | null): string;
     static ɵfac: i0.ɵɵFactoryDeclaration<DatePipe, never>;
-    static ɵpipe: i0.ɵɵPipeDeclaration<DatePipe, "_date", false>;
+    static ɵpipe: i0.ɵɵPipeDeclaration<DatePipe, "_date", true>;
 }

package/src/pipes/index.d.ts

@@ -0,0 +1,5 @@
+export * from './date/date.pipe';
+export * from './keys/keys.pipe';
+export * from './yn/yn.pipe';
+export * from './safe/html.pipe';
+export * from './safe/url.pipe';

package/src/pipes/keys/keys.pipe.d.ts

@@ -7,5 +7,5 @@ import * as i0 from "@angular/core";
 export declare class KeysPipe implements PipeTransform {
     transform(value: NzSafeAny, keyIsNumber?: boolean): NzSafeAny[];
     static ɵfac: i0.ɵɵFactoryDeclaration<KeysPipe, never>;
-    static ɵpipe: i0.ɵɵPipeDeclaration<KeysPipe, "keys", false>;
+    static ɵpipe: i0.ɵɵPipeDeclaration<KeysPipe, "keys", true>;
 }

package/src/pipes/safe/html.pipe.d.ts

@@ -6,5 +6,5 @@ export declare class HTMLPipe implements PipeTransform {
     constructor(dom: DomSanitizer);
     transform(html: string): string | SafeHtml;
     static ɵfac: i0.ɵɵFactoryDeclaration<HTMLPipe, never>;
-    static ɵpipe: i0.ɵɵPipeDeclaration<HTMLPipe, "html", false>;
+    static ɵpipe: i0.ɵɵPipeDeclaration<HTMLPipe, "html", true>;
 }

package/src/pipes/safe/url.pipe.d.ts

@@ -6,5 +6,5 @@ export declare class URLPipe implements PipeTransform {
     constructor(dom: DomSanitizer);
     transform(url: string): string | SafeUrl;
     static ɵfac: i0.ɵɵFactoryDeclaration<URLPipe, never>;
-    static ɵpipe: i0.ɵɵPipeDeclaration<URLPipe, "url", false>;
+    static ɵpipe: i0.ɵɵPipeDeclaration<URLPipe, "url", true>;
 }

package/src/pipes/yn/yn.pipe.d.ts

@@ -13,5 +13,5 @@ export declare class YNPipe implements PipeTransform {
     constructor(dom: DomSanitizer);
     transform(value: boolean, yes?: string, no?: string, mode?: YNMode, isSafeHtml?: boolean): SafeHtml;
     static ɵfac: i0.ɵɵFactoryDeclaration<YNPipe, never>;
-    static ɵpipe: i0.ɵɵPipeDeclaration<YNPipe, "yn", false>;
+    static ɵpipe: i0.ɵɵPipeDeclaration<YNPipe, "yn", true>;
 }

package/src/provide.d.ts

@@ -0,0 +1,23 @@
+import { EnvironmentProviders, Type } from '@angular/core';
+import type { IconDefinition } from '@ant-design/icons-angular';
+import { AlainConfig } from '@delon/util/config';
+import type { NzSafeAny } from 'ng-zorro-antd/core/types';
+export interface AlainProvideOptions {
+    config?: AlainConfig;
+    /**
+     * Initialize default language
+     *
+     * 初始化默认语言
+     */
+    defaultLang?: AlainProvideLang;
+    i18nClass?: Type<NzSafeAny>;
+    icons?: IconDefinition[];
+}
+export interface AlainProvideLang {
+    abbr: string;
+    ng: NzSafeAny;
+    zorro: NzSafeAny;
+    date: NzSafeAny;
+    delon: NzSafeAny;
+}
+export declare function provideAlain(options: AlainProvideOptions): EnvironmentProviders;

package/src/services/i18n/i18n.pipe.d.ts

@@ -6,5 +6,5 @@ export declare class I18nPipe implements PipeTransform {
     constructor(i18n: AlainI18NService);
     transform(key: string, params?: Record<string, unknown>): string;
     static ɵfac: i0.ɵɵFactoryDeclaration<I18nPipe, never>;
-    static ɵpipe: i0.ɵɵPipeDeclaration<I18nPipe, "i18n", false>;
+    static ɵpipe: i0.ɵɵPipeDeclaration<I18nPipe, "i18n", true>;
 }

package/src/services/index.d.ts

@@ -0,0 +1,10 @@
+export * from './preloader/preloader';
+export * from './menu/index';
+export * from './settings/index';
+export * from './responsive/responsive';
+export * from './rtl/rtl.service';
+export * from './title/title.service';
+export * from './i18n/index';
+export * from './modal/modal.helper';
+export * from './drawer/drawer.helper';
+export * from './http/index';

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

@@ -0,0 +1,2 @@
+export * from './interface';
+export * from './menu.service';

package/src/services/preloader/preloader.d.ts

@@ -1 +1 @@
-export declare function preloaderFinished(): void;
+export declare function stepPreloader(): () => void;

package/src/services/settings/index.d.ts

@@ -0,0 +1,2 @@
+export * from './types';
+export * from './settings.service';

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

@@ -1,5 +1,5 @@
 import { Platform } from '@angular/cdk/platform';
-import { InjectionToken } from '@angular/core';
+import { InjectionToken, Provider } from '@angular/core';
 import { Observable } from 'rxjs';
 import type { NzSafeAny } from 'ng-zorro-antd/core/types';
 import { App, Layout, SettingsNotify, User } from './types';
@@ -13,6 +13,7 @@ export interface SettingsKeys {
     app: string;
 }
 export declare const ALAIN_SETTING_KEYS: InjectionToken<SettingsKeys>;
+export declare const ALAIN_SETTING_DEFAULT: Provider;
 export declare class SettingsService<L extends Layout = Layout, U extends User = User, A extends App = App> {
     private platform;
     private KEYS;

package/src/theme.module.d.ts

@@ -1,22 +1,22 @@
 import { ModuleWithProviders } from '@angular/core';
 import { NzIconService } from 'ng-zorro-antd/icon';
 import * as i0 from "@angular/core";
-import * as i1 from "./pipes/date/date.pipe";
-import * as i2 from "./pipes/keys/keys.pipe";
-import * as i3 from "./pipes/yn/yn.pipe";
-import * as i4 from "./services/i18n/i18n.pipe";
-import * as i5 from "./pipes/safe/html.pipe";
-import * as i6 from "./pipes/safe/url.pipe";
-import * as i7 from "@angular/common";
-import * as i8 from "@angular/router";
-import * as i9 from "@angular/cdk/overlay";
-import * as i10 from "ng-zorro-antd/i18n";
+import * as i1 from "@angular/common";
+import * as i2 from "@angular/router";
+import * as i3 from "@angular/cdk/overlay";
+import * as i4 from "ng-zorro-antd/i18n";
+import * as i5 from "./pipes/date/date.pipe";
+import * as i6 from "./pipes/keys/keys.pipe";
+import * as i7 from "./pipes/yn/yn.pipe";
+import * as i8 from "./services/i18n/i18n.pipe";
+import * as i9 from "./pipes/safe/html.pipe";
+import * as i10 from "./pipes/safe/url.pipe";
 import * as i11 from "./locale/locale.module";
 export declare class AlainThemeModule {
     constructor(iconSrv: NzIconService);
     static forRoot(): ModuleWithProviders<AlainThemeModule>;
     static forChild(): ModuleWithProviders<AlainThemeModule>;
     static ɵfac: i0.ɵɵFactoryDeclaration<AlainThemeModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AlainThemeModule, [typeof i1.DatePipe, typeof i2.KeysPipe, typeof i3.YNPipe, typeof i4.I18nPipe, typeof i5.HTMLPipe, typeof i6.URLPipe], [typeof i7.CommonModule, typeof i8.RouterModule, typeof i9.OverlayModule, typeof i10.NzI18nModule], [typeof i1.DatePipe, typeof i2.KeysPipe, typeof i3.YNPipe, typeof i4.I18nPipe, typeof i5.HTMLPipe, typeof i6.URLPipe, typeof i11.DelonLocaleModule]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AlainThemeModule, never, [typeof i1.CommonModule, typeof i2.RouterModule, typeof i3.OverlayModule, typeof i4.NzI18nModule, typeof i5.DatePipe, typeof i6.KeysPipe, typeof i7.YNPipe, typeof i8.I18nPipe, typeof i9.HTMLPipe, typeof i10.URLPipe], [typeof i5.DatePipe, typeof i6.KeysPipe, typeof i7.YNPipe, typeof i8.I18nPipe, typeof i9.HTMLPipe, typeof i10.URLPipe, typeof i11.DelonLocaleModule]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AlainThemeModule>;
 }