From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/group/normal-group/index.scss | 84 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 18 deletions(-)
diff --git a/src/tabviews/custom/components/group/normal-group/index.scss b/src/tabviews/custom/components/group/normal-group/index.scss
index 0d6c035..a67276f 100644
--- a/src/tabviews/custom/components/group/normal-group/index.scss
+++ b/src/tabviews/custom/components/group/normal-group/index.scss
@@ -13,6 +13,7 @@
text-decoration: inherit;
font-weight: inherit;
font-style: inherit;
+ font-family: inherit;
float: left;
line-height: inherit;
margin-left: 10px;
@@ -25,10 +26,11 @@
display: none;
position: absolute;
top: 0px;
- right: -24px;
+ right: 0px;
z-index: 2;
background: #ffffff;
box-shadow: 0px 0px 2px #d8d8d8;
+ transition: all 0.2s;
.anticon {
padding: 5px;
@@ -59,6 +61,7 @@
.normal-group-wrap {
position: relative;
+ transition: all 0.2s;
}
.mk-control {
display: inline-block;
@@ -71,25 +74,70 @@
}
}
}
-.mk-merge-able + .ant-col {
+
+.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 {
- width: 0px;
- .normal-group-wrap {
- margin: 0!important;
- }
- .mk-control {
- display: inline-block;
- .anticon-double-left {
- display: none;
- }
- .anticon-double-right {
- display: inline-block;
- }
- }
-}
.mk-merge-able.close + .ant-col {
- width: 100%;
+ 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