From f9816a4078fdba44115c69025d9982997f23b484 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 29 四月 2024 16:00:49 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/group/normal-group/index.scss |  103 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 103 insertions(+), 0 deletions(-)

diff --git a/src/tabviews/custom/components/group/normal-group/index.scss b/src/tabviews/custom/components/group/normal-group/index.scss
index 3869386..a67276f 100644
--- a/src/tabviews/custom/components/group/normal-group/index.scss
+++ b/src/tabviews/custom/components/group/normal-group/index.scss
@@ -13,11 +13,28 @@
       text-decoration: inherit;
       font-weight: inherit;
       font-style: inherit;
+      font-family: inherit;
       float: left;
       line-height: inherit;
       margin-left: 10px;
       position: relative;
       z-index: 1;
+    }
+  }
+
+  .mk-control {
+    display: none;
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    z-index: 2;
+    background: #ffffff;
+    box-shadow: 0px 0px 2px #d8d8d8;
+    transition: all 0.2s;
+
+    .anticon {
+      padding: 5px;
+      cursor: pointer;
     }
   }
 }
@@ -37,4 +54,90 @@
       width: 5%;
     }
   }
+}
+
+.mk-merge-able {
+  transition: all 0.2s;
+
+  .normal-group-wrap {
+    position: relative;
+    transition: all 0.2s;
+  }
+  .mk-control {
+    display: inline-block;
+
+    .anticon-double-left {
+      display: inline-block;
+    }
+    .anticon-double-right {
+      display: none;
+    }
+  }
+}
+
+.mk-merge-able.close {
+  width: 25px;
+  .normal-group-wrap {
+    width: 0px;
+    margin: 0px!important;
+    border-width: 0px!important;
+    box-shadow: none!important;
+  }
+  .mk-control {
+    display: inline-block;
+    right: -24px;
+
+    .anticon-double-left {
+      display: none;
+    }
+    .anticon-double-right {
+      display: inline-block;
+    }
+  }
+}
+
+.mk-merge-able + .ant-col,
+.mk-merge-able + .ant-col + .ant-col,
+.mk-merge-able + .ant-col + .ant-col + .ant-col,
+.mk-merge-able + .ant-col + .ant-col + .ant-col + .ant-col,
+.mk-merge-able + .ant-col + .ant-col + .ant-col + .ant-col + .ant-col {
+  transition: all 0.2s;
+}
+
+.mk-merge-able.close + .ant-col {
+  width: calc(100% - 25px);
+}
+
+.mk-merge-able.close.mk-ctrl-2 + .ant-col + .ant-col {
+  width: calc(100% - 25px);
+}
+
+.mk-merge-able.close.mk-ctrl-3 + .ant-col + .ant-col {
+  width: calc(100% - 25px);
+}
+.mk-merge-able.close.mk-ctrl-3 + .ant-col + .ant-col + .ant-col {
+  width: calc(100% - 25px);
+}
+
+.mk-merge-able.close.mk-ctrl-4 + .ant-col + .ant-col {
+  width: calc(100% - 25px);
+}
+.mk-merge-able.close.mk-ctrl-4 + .ant-col + .ant-col + .ant-col {
+  width: calc(100% - 25px);
+}
+.mk-merge-able.close.mk-ctrl-4 + .ant-col + .ant-col + .ant-col + .ant-col {
+  width: calc(100% - 25px);
+}
+
+.mk-merge-able.close.mk-ctrl-5 + .ant-col + .ant-col {
+  width: calc(100% - 25px);
+}
+.mk-merge-able.close.mk-ctrl-5 + .ant-col + .ant-col + .ant-col {
+  width: calc(100% - 25px);
+}
+.mk-merge-able.close.mk-ctrl-5 + .ant-col + .ant-col + .ant-col + .ant-col {
+  width: calc(100% - 25px);
+}
+.mk-merge-able.close.mk-ctrl-5 + .ant-col + .ant-col + .ant-col + .ant-col + .ant-col {
+  width: calc(100% - 25px);
 }
\ No newline at end of file

--
Gitblit v1.8.0