@delon/theme 19.1.0 → 20.0.0-beta.0

package/layout-blank/index.d.ts

@@ -1,5 +1,2 @@
-/**
- * Generated bundle index. Do not edit.
- */
-/// <amd-module name="@delon/theme/layout-blank" />
-export * from './public_api';
+
+export { };

package/layout-default/index.d.ts

@@ -1,5 +1,245 @@
-/**
- * Generated bundle index. Do not edit.
- */
-/// <amd-module name="@delon/theme/layout-default" />
-export * from './public_api';
+import * as i0 from '@angular/core';
+import { TemplateRef, QueryList, OnInit, OnDestroy, EventEmitter, AfterViewInit } from '@angular/core';
+import * as i8 from '@angular/router';
+import { Event } from '@angular/router';
+import { NzSafeAny } from 'ng-zorro-antd/core/types';
+import * as _angular_cdk_bidi_module_d_IN1Vp56w from '@angular/cdk/bidi-module.d-IN1Vp56w';
+import { SafeHtml } from '@angular/platform-browser';
+import { MenuInner, Menu, App } from '@delon/theme';
+import * as i7 from '@angular/common';
+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/badge';
+import { Observable } from 'rxjs';
+
+type LayoutDefaultHeaderItemHidden = 'pc' | 'mobile' | 'none';
+type LayoutDefaultHeaderItemDirection = 'left' | 'middle' | 'right';
+interface LayoutDefaultOptions {
+    /**
+     * Custom Logo Area
+     *
+     * 自定义 Logo 区域
+     */
+    logo?: TemplateRef<NzSafeAny> | null;
+    /**
+     * Logo url of expanded status, default: `./assets/logo-full.svg`
+     *
+     * 展开时 Logo 地址，默认：`./assets/logo-full.svg`
+     */
+    logoExpanded?: string;
+    /**
+     * Logo url of collapsed status, default: `./assets/logo.svg`
+     *
+     * 收缩时 Logo 地址，默认：`./assets/logo.svg`
+     */
+    logoCollapsed?: string;
+    /**
+     * Specify the logo routing address, default: `/`
+     *
+     * 指定 Logo 路由地址，默认：`/`
+     */
+    logoLink?: string;
+    /**
+     * Specify a fixed logo width
+     *
+     * 指定固定 Logo 宽度
+     */
+    logoFixWidth?: number;
+    /**
+     * Hide the sidebar without showing the collapsed icon button, default: `false`
+     *
+     * 隐藏侧边栏，同时不显收缩图标按钮，默认：`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;
+}
+
+declare class LayoutDefaultHeaderItemComponent {
+    host: TemplateRef<void>;
+    hidden: LayoutDefaultHeaderItemHidden;
+    direction: LayoutDefaultHeaderItemDirection;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultHeaderItemComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultHeaderItemComponent, "layout-default-header-item", never, { "hidden": { "alias": "hidden"; "required": false; }; "direction": { "alias": "direction"; "required": false; }; }, {}, never, ["*"], false, never>;
+}
+
+declare class LayoutDefaultComponent {
+    headerItems: QueryList<LayoutDefaultHeaderItemComponent>;
+    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;
+    fetchingStrictly: boolean;
+    fetching: boolean;
+    private isFetching;
+    get showFetching(): boolean;
+    get collapsed(): boolean;
+    get collapsedIcon(): string;
+    toggleCollapsed(): void;
+    private readonly router;
+    private readonly msgSrv;
+    private readonly settings;
+    private readonly el;
+    private readonly renderer;
+    private readonly doc;
+    private readonly srv;
+    constructor();
+    processEv(ev: Event): void;
+    private setClass;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultComponent, "layout-default", ["layoutDefault"], { "options": { "alias": "options"; "required": false; }; "asideUser": { "alias": "asideUser"; "required": false; }; "asideBottom": { "alias": "asideBottom"; "required": false; }; "nav": { "alias": "nav"; "required": false; }; "content": { "alias": "content"; "required": false; }; "customError": { "alias": "customError"; "required": false; }; "fetchingStrictly": { "alias": "fetchingStrictly"; "required": false; }; "fetching": { "alias": "fetching"; "required": false; }; }, {}, ["headerItems"], ["*"], false, never>;
+    static ngAcceptInputType_fetchingStrictly: unknown;
+    static ngAcceptInputType_fetching: unknown;
+}
+
+interface Nav extends MenuInner {
+    _needIcon?: boolean;
+    _text?: SafeHtml;
+}
+declare class LayoutDefaultNavComponent implements OnInit, OnDestroy {
+    private readonly doc;
+    private readonly win;
+    private readonly router;
+    private readonly render;
+    private readonly menuSrv;
+    private readonly settings;
+    private readonly cdr;
+    private readonly ngZone;
+    private readonly sanitizer;
+    private bodyEl;
+    private destroy$;
+    private floatingEl;
+    dir: i0.WritableSignal<_angular_cdk_bidi_module_d_IN1Vp56w.a>;
+    list: Nav[];
+    disabledAcl: boolean;
+    autoCloseUnderPad: boolean;
+    recursivePath: boolean;
+    hideEmptyChildren: boolean;
+    set openStrictly(value: boolean);
+    maxLevelIcon: number;
+    readonly select: EventEmitter<Menu>;
+    get collapsed(): boolean;
+    private getLinkNode;
+    private floatingClickHandle;
+    private clearFloating;
+    private genFloating;
+    private genSubNode;
+    private hideAll;
+    private calPos;
+    showSubMenu(e: MouseEvent, item: Nav): void;
+    to(item: Menu): void;
+    toggleOpen(item: Nav): void;
+    _click(): void;
+    closeSubMenu(): void;
+    private openByUrl;
+    ngOnInit(): void;
+    private fixHide;
+    ngOnDestroy(): void;
+    private get isPad();
+    private underPad;
+    private openAside;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultNavComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultNavComponent, "layout-default-nav", never, { "disabledAcl": { "alias": "disabledAcl"; "required": false; }; "autoCloseUnderPad": { "alias": "autoCloseUnderPad"; "required": false; }; "recursivePath": { "alias": "recursivePath"; "required": false; }; "hideEmptyChildren": { "alias": "hideEmptyChildren"; "required": false; }; "openStrictly": { "alias": "openStrictly"; "required": false; }; "maxLevelIcon": { "alias": "maxLevelIcon"; "required": false; }; }, { "select": "select"; }, never, never, false, never>;
+    static ngAcceptInputType_disabledAcl: unknown;
+    static ngAcceptInputType_autoCloseUnderPad: unknown;
+    static ngAcceptInputType_recursivePath: unknown;
+    static ngAcceptInputType_hideEmptyChildren: unknown;
+    static ngAcceptInputType_openStrictly: unknown;
+    static ngAcceptInputType_maxLevelIcon: unknown;
+}
+
+interface LayoutDefaultHeaderItem {
+    host: TemplateRef<NzSafeAny>;
+    hidden?: LayoutDefaultHeaderItemHidden;
+    direction?: LayoutDefaultHeaderItemDirection;
+}
+declare class LayoutDefaultHeaderComponent implements AfterViewInit {
+    private readonly settings;
+    private readonly srv;
+    private readonly cdr;
+    private readonly destroy$;
+    items: QueryList<LayoutDefaultHeaderItemComponent>;
+    left: LayoutDefaultHeaderItem[];
+    middle: LayoutDefaultHeaderItem[];
+    right: LayoutDefaultHeaderItem[];
+    get opt(): LayoutDefaultOptions;
+    get app(): App;
+    get collapsed(): boolean;
+    get collapsedIcon(): string;
+    private refresh;
+    ngAfterViewInit(): void;
+    toggleCollapsed(): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultHeaderComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultHeaderComponent, "layout-default-header", never, { "items": { "alias": "items"; "required": false; }; }, {}, never, never, false, never>;
+}
+
+declare class LayoutDefaultHeaderItemTriggerDirective {
+    static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultHeaderItemTriggerDirective, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<LayoutDefaultHeaderItemTriggerDirective, "[layout-default-header-item-trigger]", never, {}, {}, never, never, false, never>;
+}
+
+declare class LayoutDefaultTopMenuItemComponent {
+    selected: boolean;
+    disabled: boolean;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultTopMenuItemComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LayoutDefaultTopMenuItemComponent, "layout-default-top-menu-item", never, { "selected": { "alias": "selected"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, {}, never, ["*"], false, never>;
+    static ngAcceptInputType_selected: unknown;
+    static ngAcceptInputType_disabled: unknown;
+}
+
+declare class LayoutDefaultModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<LayoutDefaultModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<LayoutDefaultModule, [typeof LayoutDefaultComponent, typeof LayoutDefaultNavComponent, typeof LayoutDefaultHeaderComponent, typeof LayoutDefaultHeaderItemComponent, typeof LayoutDefaultHeaderItemTriggerDirective, typeof LayoutDefaultTopMenuItemComponent], [typeof i7.CommonModule, typeof i8.RouterModule, typeof i9.NzToolTipModule, typeof i10.NzIconModule, typeof i11.NzAvatarModule, typeof i12.NzDropDownModule, typeof i13.NzBadgeModule], [typeof LayoutDefaultComponent, typeof LayoutDefaultNavComponent, typeof LayoutDefaultHeaderComponent, typeof LayoutDefaultHeaderItemComponent, typeof LayoutDefaultHeaderItemTriggerDirective, typeof LayoutDefaultTopMenuItemComponent]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<LayoutDefaultModule>;
+}
+
+declare class LayoutDefaultService {
+    private readonly settings;
+    private readonly bm;
+    private _options$;
+    private _options;
+    get options(): LayoutDefaultOptions;
+    get options$(): Observable<LayoutDefaultOptions>;
+    get collapsedIcon(): string;
+    constructor();
+    private checkMedia;
+    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>;
+}
+
+export { LayoutDefaultComponent, LayoutDefaultHeaderComponent, LayoutDefaultHeaderItemComponent, LayoutDefaultHeaderItemTriggerDirective, LayoutDefaultModule, LayoutDefaultNavComponent, LayoutDefaultService, LayoutDefaultTopMenuItemComponent };
+export type { LayoutDefaultHeaderItemDirection, LayoutDefaultHeaderItemHidden, LayoutDefaultOptions, Nav };

package/layout-default/style/_header.less

@@ -72,9 +72,9 @@
       display: block;
       min-width: 50px;
       padding: 8px 2px;
+      border-radius: 2px;
       line-height: 100%;
       text-align: center;
-      border-radius: 2px;
       outline: none;
       transition: background-color 300ms;
 
@@ -129,9 +129,9 @@
     .@{ant-prefix}-input,
     .@{ant-prefix}-input-group-addon,
     .@{ant-prefix}-input-affix-wrapper {
-      color: #fff;
-      background-color: rgba(255, 255, 255, 0.2);
       border: none;
+      color: #fff;
+      background-color: rgb(255, 255, 255, 0.2);
 
       &::placeholder {
         color: #fff;

package/layout-default/style/_layout.less

@@ -48,9 +48,9 @@ body {
       padding: @alain-default-content-padding;
       padding-top: @alain-default-content-padding - 12;
       padding-bottom: @alain-default-content-padding - 12;
+      border-bottom: 1px solid @alain-default-content-heading-border;
       color: #929292;
       background-color: @alain-default-content-heading-bg;
-      border-bottom: 1px solid @alain-default-content-heading-border;
 
       >h1 {
         margin-bottom: 0;

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

@@ -35,7 +35,9 @@
       display: inline-block;
       min-width: @alain-default-aside-nav-icon-width;
       margin-right: @layout-gutter;
-      transition: font-size 0.15s @ease-out, margin 0.3s @ease-in-out;
+      transition:
+        font-size 0.15s @ease-out,
+        margin 0.3s @ease-in-out;
     }
 
     &-img,
@@ -46,7 +48,9 @@
 
     &-text {
       opacity: 1;
-      transition: opacity 0.3s @ease-in-out, width 0.3s @ease-in-out;
+      transition:
+        opacity 0.3s @ease-in-out,
+        width 0.3s @ease-in-out;
     }
 
     &-disabled {
@@ -59,10 +63,18 @@
     }
   }
 
+  &__divider {
+    overflow: hidden;
+    height: 1px;
+    margin: 4px 0;
+    line-height: 0;
+    background-color: @alain-default-aside-nav-divider-bg;
+  }
+
   // Selected
   &__selected {
-    background-color: @alain-default-aside-nav-selected-bg;
     border-left-color: @alain-default-aside-nav-selected-text-color;
+    background-color: @alain-default-aside-nav-selected-bg;
 
     > @{sidebar-nav-prefix}__item-link {
       color: @alain-default-aside-nav-selected-text-color;
@@ -117,10 +129,13 @@
         position: absolute;
         width: 6px;
         height: 1.5px;
+        border-radius: 2px;
         background: #fff;
         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;
+        transition:
+          background-color 0.3s @ease-in-out,
+          transform 0.3s @ease-in-out,
+          top 0.3s @ease-in-out;
       }
 
       &::before {
@@ -182,9 +197,9 @@
     z-index: @zindex + 7;
     display: none;
     min-width: 160px;
-    background-color: @alain-default-aside-bg;
     border: 1px solid @alain-default-content-heading-border;
     border-radius: 4px;
+    background-color: @alain-default-aside-bg;
 
     @{sidebar-nav-prefix}__item {
       &-link {

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

@@ -6,5 +6,6 @@
 @alain-default-aside-bg: @component-background;
 @alain-default-aside-nav-selected-bg: @component-background;
 @alain-default-content-heading-bg: @component-background;
+@alain-default-aside-nav-divider-bg: @border-color-split;
 @alain-default-content-heading-border: @border-color-split;
 @alain-default-content-bg: ~'var(--@{alain-default-name}-content-bg, @{body-background})';

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

@@ -35,6 +35,7 @@
 @alain-default-aside-nav-depth3-padding-left: @layout-gutter * 5;
 @alain-default-aside-nav-depth4-padding-left: @layout-gutter * 6;
 @alain-default-aside-nav-depth5-padding-left: @layout-gutter * 7;
+@alain-default-aside-nav-divider-bg: ~'var(--@{alain-default-name}-aside-nav-divider, #efe3e5)';
 
 @alain-default-aside-collapsed-wd: @layout-gutter * 8;
 @alain-default-aside-collapsed-nav-fs: 24px;

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

@@ -4,8 +4,8 @@
     .@{ant-prefix}-col-6 {
       cursor: pointer;
       padding: (@layout-gutter * 2) 0;
-      text-align: center;
       border-radius: 4px;
+      text-align: center;
       transition: background-color 300ms;
 
       &:hover {
@@ -15,8 +15,8 @@
 
     i {
       padding: 15px;
-      font-size: 22px;
       border-radius: 50%;
+      font-size: 22px;
     }
 
     small {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delon/theme",
-  "version": "19.1.0",
+  "version": "20.0.0-beta.0",
   "author": "cipchk<cipchk@qq.com>",
   "license": "MIT",
   "repository": {
@@ -21,11 +21,11 @@
     "component"
   ],
   "dependencies": {
-    "ng-zorro-antd": "^19.0.2",
-    "@delon/acl": "^19.1.0",
-    "@delon/abc": "^19.1.0",
-    "@delon/form": "^19.1.0",
-    "@delon/util": "^19.1.0",
+    "ng-zorro-antd": "^20.0.0",
+    "@delon/acl": "^20.0.0-beta.0",
+    "@delon/abc": "^20.0.0-beta.0",
+    "@delon/form": "^20.0.0-beta.0",
+    "@delon/util": "^20.0.0-beta.0",
     "tslib": "^2.3.0"
   },
   "module": "fesm2022/theme.mjs",

package/setting-drawer/index.d.ts

@@ -1,5 +1,65 @@
-/**
- * Generated bundle index. Do not edit.
- */
-/// <amd-module name="@delon/theme/setting-drawer" />
-export * from './public_api';
+import { NzSafeAny } from 'ng-zorro-antd/core/types';
+import * as i0 from '@angular/core';
+import { OnInit } from '@angular/core';
+import * as _angular_cdk_bidi_module_d_IN1Vp56w from '@angular/cdk/bidi-module.d-IN1Vp56w';
+import { Layout } from '@delon/theme';
+
+declare class SettingDrawerItemComponent {
+    i: NzSafeAny;
+    set data(val: NzSafeAny);
+    pxVal: number;
+    pxChange(val: number): void;
+    format: (value: number) => string;
+    static ɵfac: i0.ɵɵFactoryDeclaration<SettingDrawerItemComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SettingDrawerItemComponent, "setting-drawer-item", never, { "data": { "alias": "data"; "required": false; }; }, {}, never, never, true, never>;
+}
+
+declare class SettingDrawerComponent implements OnInit {
+    private readonly cdr;
+    private readonly msg;
+    private readonly settingSrv;
+    private readonly lazy;
+    private readonly ngZone;
+    private readonly doc;
+    autoApplyColor: boolean;
+    compilingText: string;
+    devTips: string;
+    lessJs: string;
+    private loadedLess;
+    dir: i0.WritableSignal<_angular_cdk_bidi_module_d_IN1Vp56w.a>;
+    isDev: boolean;
+    collapse: boolean;
+    get layout(): Layout;
+    data: NzSafeAny;
+    color: string;
+    colors: {
+        key: string;
+        color: string;
+    }[];
+    constructor();
+    private get cachedData();
+    private get DEFAULT_PRIMARY();
+    ngOnInit(): void;
+    private loadLess;
+    private genVars;
+    private runLess;
+    toggle(): void;
+    changeColor(color: string): void;
+    setLayout(name: string, value: NzSafeAny): void;
+    private resetData;
+    private get validKeys();
+    apply(): void;
+    reset(): void;
+    copyVar(): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<SettingDrawerComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SettingDrawerComponent, "setting-drawer", never, { "autoApplyColor": { "alias": "autoApplyColor"; "required": false; }; "compilingText": { "alias": "compilingText"; "required": false; }; "devTips": { "alias": "devTips"; "required": false; }; "lessJs": { "alias": "lessJs"; "required": false; }; }, {}, never, never, true, never>;
+    static ngAcceptInputType_autoApplyColor: unknown;
+}
+
+declare class SettingDrawerModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<SettingDrawerModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<SettingDrawerModule, never, [typeof SettingDrawerItemComponent, typeof SettingDrawerComponent], [typeof SettingDrawerItemComponent, typeof SettingDrawerComponent]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<SettingDrawerModule>;
+}
+
+export { SettingDrawerComponent, SettingDrawerItemComponent, SettingDrawerModule };

package/setting-drawer/style/index.less

@@ -43,10 +43,10 @@
         width: 20px;
         height: 20px;
         margin-right: 8px;
+        border-radius: 2px;
         font-weight: bold;
         color: #fff;
         text-align: center;
-        border-radius: 2px;
       }
     }
 
@@ -62,10 +62,10 @@
       justify-content: center;
       width: 48px;
       height: 48px;
+      border-radius: 4px 0 0 4px;
       font-size: 16px;
       text-align: center;
       background: @primary-color;
-      border-radius: 4px 0 0 4px;
       transition: right @animation-duration-slow @ease-base-in;
 
       &-icon {

package/system/antd/_drawer.less

@@ -128,9 +128,9 @@
     left: 0;
     width: 100%;
     padding: @drawer-footer-padding-vertical @drawer-body-padding;
-    text-align: right;
-    background: @popover-background;
     border-top: @border-width-base @border-style-base @border-color-split;
     border-radius: 0 0 @border-radius-base @border-radius-base;
+    text-align: right;
+    background: @popover-background;
   }
 }

package/system/antd/_modal.less

@@ -51,9 +51,9 @@
     justify-content: space-between;
     margin: -@margin-lg -@margin-lg @margin-lg -@margin-lg;
     padding: @modal-header-padding;
-    background: @component-background;
     border-bottom: @border-width-base @border-style-base @border-color-split;
     border-radius: @border-radius-base @border-radius-base 0 0;
+    background: @component-background;
   }
 
   &-title {
@@ -96,9 +96,9 @@
       */
     margin: @margin-lg -@margin-lg -@margin-lg -@margin-lg;
     padding: @modal-footer-padding-vertical @modal-footer-padding-horizontal;
-    text-align: right;
     border-top: @border-width-base @border-style-base @border-color-split;
     border-radius: 0 0 @border-radius-base @border-radius-base;
+    text-align: right;
   }
 
   &-include-tabs {
@@ -107,7 +107,7 @@
       *
       * 模态框内容是否包裹 `nz-tabs`，清除带来的多余边距
       */
-    nz-tabset {
+    nz-tabset, nz-tabs {
       margin-top: -16px;
     }
   }

package/system/antd/_table.less

@@ -11,8 +11,8 @@
     .img {
       max-width: @nz-table-img-max-width;
       max-height: @nz-table-img-max-height;
-      vertical-align: middle;
       border-radius: @nz-table-img-radius;
+      vertical-align: middle;
 
       &:not(:last-child) {
         margin-right: @nz-table-img-margin-right;
@@ -98,9 +98,9 @@
             align-items: center;
             width: 100%;
             padding: @nz-table-rep-padding-vertical @nz-table-rep-padding-horizontal;
+            border-bottom: none;
             text-align: left !important;
             white-space: inherit;
-            border-bottom: none;
 
             .@{ant-prefix}-table-rep__title + *:not(.@{ant-prefix}-avatar) {
               flex: 1;

package/system/antd/_tag.less

@@ -6,8 +6,8 @@
       * 标签：【+】的样式
       */
     .@{ant-prefix}-tag {
-      background: #fff;
       border-style: dashed;
+      background: #fff;
     }
   }
 }

package/system/ng/_preserve-white-spaces.less

@@ -8,12 +8,12 @@
   .@{ant-prefix}-btn:not(.ant-btn-link) + nz-popconfirm,
   nz-popconfirm + .@{ant-prefix}-btn,
   nz-popconfirm + nz-popconfirm,
-  .@{ant-prefix}-btn:not(.ant-btn-link) + nz-button-group,
-  nz-button-group + .@{ant-prefix}-btn,
+  .@{ant-prefix}-btn:not(.ant-btn-link) + nz-space-compact,
+  nz-space-compact + .@{ant-prefix}-btn,
   .@{ant-prefix}-btn:not(.ant-btn-link) + nz-dropdown,
   nz-dropdown + .@{ant-prefix}-btn,
-  nz-popconfirm + nz-button-group,
-  nz-button-group + nz-popconfirm {
+  nz-popconfirm + nz-space-compact,
+  nz-space-compact + nz-popconfirm {
     margin-left: @preserve-buttons-spaces;
   }
   .@{ant-prefix}-btn-group {
@@ -36,12 +36,12 @@
       .@{ant-prefix}-btn + nz-popconfirm,
       nz-popconfirm + .@{ant-prefix}-btn,
       nz-popconfirm + nz-popconfirm,
-      .@{ant-prefix}-btn + nz-button-group,
-      nz-button-group + .@{ant-prefix}-btn,
+      .@{ant-prefix}-btn + nz-space-compact,
+      nz-space-compact + .@{ant-prefix}-btn,
       .@{ant-prefix}-btn + nz-dropdown,
       nz-dropdown + .@{ant-prefix}-btn,
-      nz-popconfirm + nz-button-group,
-      nz-button-group + nz-popconfirm {
+      nz-popconfirm + nz-space-compact,
+      nz-space-compact + nz-popconfirm {
         margin-right: @preserve-buttons-spaces;
         margin-left: inherit;
       }

package/system/utils/_code.less

@@ -2,8 +2,8 @@
 code {
   margin: 0 4px;
   padding: 2px 4px;
-  font-size: 90%;
-  background-color: @code-bg;
   border: 1px solid @code-border-color;
   border-radius: @border-radius-base;
+  font-size: 90%;
+  background-color: @code-bg;
 }

package/system/utils/_scrollbar.less

@@ -58,8 +58,8 @@
  * 隐藏滚动条
  */
 .hide-scrollbar {
-  scrollbar-width: none;
   scrollbar-color: transparent transparent;
+  scrollbar-width: none;
 
   &::-webkit-scrollbar {
     width: 1px;

package/system/widgets/_header-dropdown.less

@@ -1,6 +1,6 @@
 .header-dropdown {
-  background-color: @popover-background;
   border-radius: 4px;
+  background-color: @popover-background;
   box-shadow: @shadow-1-down;
 }