@delon/theme 16.0.1 → 16.1.1

package/layout-blank/style/index.less

@@ -1,4 +1,3 @@
 @import './theme-default.less';
-
 @import './_layout.less';
 @import './fix/index.less';

package/layout-default/style/_aside.less

@@ -98,6 +98,7 @@
         left: 0;
       }
     }
+
     @media (max-width: @mobile-max) {
       @{alain-default-prefix}__content {
         transform: translate3d(-@alain-default-aside-wd, 0, 0);

package/layout-default/style/_layout.less

@@ -27,6 +27,7 @@ body {
   &__unwrap {
     margin-right: -@alain-default-content-padding;
     margin-left: -@alain-default-content-padding;
+
     @media (max-width: @mobile-max) {
       margin-right: 0;
       margin-left: 0;

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

@@ -285,6 +285,7 @@
         left: @layout-gutter * 2;
       }
     }
+
     @media (min-width: @mobile-min) {
       @{alain-default-prefix}__collapsed {
         @{sidebar-nav-prefix}:not(@{sidebar-nav-prefix}__sub) {

package/layout-default/style/index.less

@@ -1,11 +1,11 @@
 @import './theme-default.less';
-
+// Layout
 @import './_layout.less';
 @import './_header.less';
 @import './_aside.less';
-
+// Widgets
 @import './_progress-bar.less';
 @import './fix/index.less';
 @import './widgets/index.less';
-
+// Fix
 @import './_fixed.less';

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

@@ -51,6 +51,7 @@
         margin-left: @layout-gutter;
       }
     }
+
     @media (min-width: @mobile-min) {
       @{alain-default-prefix}__collapsed {
         @{alain-default-prefix}__aside-user {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delon/theme",
-  "version": "16.0.1",
+  "version": "16.1.1",
   "author": "cipchk<cipchk@qq.com>",
   "license": "MIT",
   "repository": {
@@ -22,8 +22,8 @@
   ],
   "dependencies": {
     "ng-zorro-antd": "^16.0.0",
-    "@delon/acl": "^16.0.1",
-    "@delon/util": "^16.0.1",
+    "@delon/acl": "^16.1.1",
+    "@delon/util": "^16.1.1",
     "tslib": "^2.3.0"
   },
   "module": "fesm2022/theme.mjs",

package/src/services/modal/modal.helper.d.ts

@@ -1,3 +1,4 @@
+import { DragDrop } from '@angular/cdk/drag-drop';
 import { TemplateRef, Type } from '@angular/core';
 import { Observable } from 'rxjs';
 import type { NzSafeAny } from 'ng-zorro-antd/core/types';
@@ -12,13 +13,27 @@ export interface ModalHelperOptions {
     exact?: boolean;
     /** 是否包裹标签页，修复模态包含标签间距问题 */
     includeTabs?: boolean;
+    /**
+     * 是否支持拖动，默认是通过标题来触发
+     */
+    drag?: ModalHelperDragOptions | boolean;
+}
+export interface ModalHelperDragOptions {
+    /**
+     * 指定拖地区域的类名，若指定为 `null` 时表示整个对话框，默认：`.modal-header, .ant-modal-title`
+     */
+    handleCls?: string | null;
 }
 /**
  * 对话框辅助类
  */
 export declare class ModalHelper {
     private srv;
-    constructor(srv: NzModalService);
+    private drag;
+    private document;
+    private dragClsPrefix;
+    constructor(srv: NzModalService, drag: DragDrop, doc: NzSafeAny);
+    private createDragRef;
     /**
      * 构建一个对话框
      *

package/system/antd/_drawer.less

@@ -7,6 +7,7 @@
         max-width: @drawer-sm;
       }
     }
+
     @media (max-width: (@drawer-sm - 1)) {
       .drawer-sm {
         width: 100% !important;
@@ -19,6 +20,7 @@
         max-width: @drawer-md;
       }
     }
+
     @media (max-width: (@drawer-md - 1)) {
       .drawer-md {
         width: 100% !important;
@@ -31,6 +33,7 @@
         max-width: @drawer-lg;
       }
     }
+
     @media (max-width: (@drawer-lg - 1)) {
       .drawer-lg {
         width: 100% !important;
@@ -43,6 +46,7 @@
         max-width: @drawer-xl;
       }
     }
+
     @media (max-width: (@drawer-xl - 1)) {
       .drawer-xl {
         width: 100% !important;
@@ -58,6 +62,7 @@
         max-height: @drawer-sm-height;
       }
     }
+
     @media (max-height: (@drawer-sm-height - 1)) {
       .drawer-sm {
         height: 100% !important;
@@ -70,6 +75,7 @@
         max-height: @drawer-md-height;
       }
     }
+
     @media (max-height: (@drawer-md-height - 1)) {
       .drawer-md {
         height: 100% !important;
@@ -82,6 +88,7 @@
         max-height: @drawer-lg-height;
       }
     }
+
     @media (max-height: (@drawer-lg-height - 1)) {
       .drawer-lg {
         height: 100% !important;
@@ -94,6 +101,7 @@
         max-height: @drawer-xl-height;
       }
     }
+
     @media (max-height: (@drawer-xl-height - 1)) {
       .drawer-xl {
         height: 100% !important;

package/system/antd/_modal.less

@@ -123,3 +123,7 @@
     }
   }
 }
+
+.MODAL-DRAG-HANDLE {
+  cursor: move;
+}

package/system/antd/index.less

@@ -1,5 +1,4 @@
 @import './_link.less';
-
 @import './_input-number.less';
 @import './_card.less';
 @import './_drawer.less';

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

@@ -4,13 +4,13 @@
   }
 
   // button + button
-  .@{ant-prefix}-btn + .@{ant-prefix}-btn,
-  .@{ant-prefix}-btn + nz-popconfirm,
+  .@{ant-prefix}-btn:not(.ant-btn-link) + .@{ant-prefix}-btn,
+  .@{ant-prefix}-btn:not(.ant-btn-link) + nz-popconfirm,
   nz-popconfirm + .@{ant-prefix}-btn,
   nz-popconfirm + nz-popconfirm,
-  .@{ant-prefix}-btn + nz-button-group,
+  .@{ant-prefix}-btn:not(.ant-btn-link) + nz-button-group,
   nz-button-group + .@{ant-prefix}-btn,
-  .@{ant-prefix}-btn + nz-dropdown,
+  .@{ant-prefix}-btn:not(.ant-btn-link) + nz-dropdown,
   nz-dropdown + .@{ant-prefix}-btn,
   nz-popconfirm + nz-button-group,
   nz-button-group + nz-popconfirm {