dcp-design-react 1.8.1 → 1.8.2

package/lib/modal/src/modal.d.ts

@@ -9,6 +9,7 @@ type IProps = AntModalProps & {
     height?: number | string;
     loading?: boolean;
     draggable?: boolean;
+    showHeader?: boolean;
     showFullScreen?: boolean;
     stopMouseDownEvent?: boolean;
     onClose?: (e: EventType) => void;
@@ -41,6 +42,7 @@ declare class QmModal extends Component<IProps, IState> {
     private $event;
     static defaultProps: {
         width: string;
+        showHeader: boolean;
         showFullScreen: boolean;
         destroyOnClose: boolean;
         draggable: boolean;

package/lib/modal/style/index.less

@@ -9,6 +9,20 @@
 @prefix-modal: ~'@{qm-prefix}-modal';
 
 .@{prefix-modal} {
+  &.no-header {
+    .ant-modal-close {
+      top: 4px;
+      right: 6px;
+    }
+    .ant-modal-header {
+      height: 0;
+      border: 0;
+      .full-screen {
+        top: 4px;
+        right: 42px;
+      }
+    }
+  }
   .ant-modal-header {
     display: flex;
     align-items: center;
@@ -21,26 +35,33 @@
       > div {
         display: flex;
         align-items: center;
-        justify-content: space-between;
-        padding-right: 20px;
         cursor: move;
-        .full-screen {
-          padding: @--padding-md 5px @--padding-md @--padding-md;
-          color: @--text-color-secondary;
-          line-height: 1;
-          font-size: @--font-size-lg;
-          transition: all 0.3s ease;
-          cursor: pointer;
-          &:hover {
-            color: @--text-color;
-          }
-        }
+      }
+    }
+    .full-screen {
+      display: inline-block;
+      text-align: center;
+      text-transform: none;
+      text-decoration: none;
+      background: transparent;
+      border: 0;
+      outline: 0;
+      position: absolute;
+      right: 34px;
+      padding: @--padding-md 5px @--padding-md @--padding-md;
+      color: @--text-color-secondary;
+      line-height: 1;
+      font-size: @--font-size-lg;
+      transition: all 0.3s ease;
+      cursor: pointer;
+      &:hover {
+        color: @--text-color;
       }
     }
   }
   .ant-modal-close {
-    top: 3px;
-    font-size: 17px;
+    top: 4px;
+    font-size: @--font-size-lg;
     padding: @--padding-md 15px @--padding-md 5px;
     .ant-modal-close-x {
       width: 1em;
@@ -75,7 +96,7 @@
       height: 48px;
     }
     .ant-modal-close {
-      top: 5px;
+      top: 6px;
     }
     .spinning {
       top: 48px;
@@ -86,7 +107,7 @@
       height: 40px;
     }
     .ant-modal-close {
-      top: 1px;
+      top: 2px;
     }
     .spinning {
       top: 40px;

package/lib/style/index.css

@@ -27658,6 +27658,18 @@ table {
  * @Last Modified by: 焦质晔
  * @Last Modified time: 2022-11-26 20:25:11
  */
+.qm-drawer.no-header .ant-drawer-header {
+  height: 0;
+  border: 0;
+}
+.qm-drawer.no-header .ant-drawer-header .ant-drawer-close {
+  top: 4px;
+  right: 0;
+}
+.qm-drawer.no-header .ant-drawer-header .full-screen {
+  top: 4px;
+  right: 42px;
+}
 .qm-drawer .ant-drawer-header {
   display: flex;
   align-items: center;
@@ -27669,12 +27681,23 @@ table {
 }
 .qm-drawer .ant-drawer-header .ant-drawer-title {
   display: flex;
-  flex: 1;
   align-items: center;
-  justify-content: space-between;
-  padding-right: 20px;
 }
-.qm-drawer .ant-drawer-header .ant-drawer-title .full-screen {
+.qm-drawer .ant-drawer-header .ant-drawer-close {
+  position: absolute;
+  right: -8px;
+  padding: 10px 10px 10px 5px;
+}
+.qm-drawer .ant-drawer-header .full-screen {
+  display: inline-block;
+  text-align: center;
+  text-transform: none;
+  text-decoration: none;
+  background: transparent;
+  border: 0;
+  outline: 0;
+  position: absolute;
+  right: 34px;
   padding: 10px 5px 10px 10px;
   color: rgba(0, 0, 0, 0.45);
   line-height: 1;
@@ -27682,15 +27705,9 @@ table {
   transition: all 0.3s ease;
   cursor: pointer;
 }
-.qm-drawer .ant-drawer-header .ant-drawer-title .full-screen:hover {
+.qm-drawer .ant-drawer-header .full-screen:hover {
   color: rgba(0, 0, 0, 0.85);
 }
-.qm-drawer .ant-drawer-header .ant-drawer-close {
-  position: absolute;
-  right: -8px;
-  font-size: 17px;
-  padding: 10px 10px 10px 5px;
-}
 .qm-drawer .ant-drawer-body {
   padding: 10px;
 }
@@ -27728,6 +27745,18 @@ table {
  * @Last Modified by: 焦质晔
  * @Last Modified time: 2022-11-26 20:25:21
  */
+.qm-modal.no-header .ant-modal-close {
+  top: 4px;
+  right: 6px;
+}
+.qm-modal.no-header .ant-modal-header {
+  height: 0;
+  border: 0;
+}
+.qm-modal.no-header .ant-modal-header .full-screen {
+  top: 4px;
+  right: 42px;
+}
 .qm-modal .ant-modal-header {
   display: flex;
   align-items: center;
@@ -27742,11 +27771,18 @@ table {
 .qm-modal .ant-modal-header .ant-modal-title > div {
   display: flex;
   align-items: center;
-  justify-content: space-between;
-  padding-right: 20px;
   cursor: move;
 }
-.qm-modal .ant-modal-header .ant-modal-title > div .full-screen {
+.qm-modal .ant-modal-header .full-screen {
+  display: inline-block;
+  text-align: center;
+  text-transform: none;
+  text-decoration: none;
+  background: transparent;
+  border: 0;
+  outline: 0;
+  position: absolute;
+  right: 34px;
   padding: 10px 5px 10px 10px;
   color: rgba(0, 0, 0, 0.45);
   line-height: 1;
@@ -27754,12 +27790,12 @@ table {
   transition: all 0.3s ease;
   cursor: pointer;
 }
-.qm-modal .ant-modal-header .ant-modal-title > div .full-screen:hover {
+.qm-modal .ant-modal-header .full-screen:hover {
   color: rgba(0, 0, 0, 0.85);
 }
 .qm-modal .ant-modal-close {
-  top: 3px;
-  font-size: 17px;
+  top: 4px;
+  font-size: 16px;
   padding: 10px 15px 10px 5px;
 }
 .qm-modal .ant-modal-close .ant-modal-close-x {
@@ -27791,7 +27827,7 @@ table {
   height: 48px;
 }
 .qm-modal--lg .ant-modal-close {
-  top: 5px;
+  top: 6px;
 }
 .qm-modal--lg .spinning {
   top: 48px;
@@ -27800,7 +27836,7 @@ table {
   height: 40px;
 }
 .qm-modal--sm .ant-modal-close {
-  top: 1px;
+  top: 2px;
 }
 .qm-modal--sm .spinning {
   top: 40px;