From f724c64b419f148985c0bd5a1153e3fc7d84b9e6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 七月 2023 17:03:27 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/calendar/board/index.scss | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/calendar/board/index.scss b/src/tabviews/custom/components/calendar/board/index.scss
index b79db1a..3957fc3 100644
--- a/src/tabviews/custom/components/calendar/board/index.scss
+++ b/src/tabviews/custom/components/calendar/board/index.scss
@@ -111,15 +111,28 @@
}
.content {
padding: 0 10px 10px;
- height: 70px;
+ height: 55px;
overflow-y: auto;
position: absolute;
left: 0;
right: 0;
.message {
width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ .ant-badge {
+ width: 100%;
+ }
.ant-badge-status-text {
- color: inherit;
+ font-size: 13px;
+ width: calc(100% - 15px);
+ overflow: hidden;
+ word-break: break-word;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ height: 21px;
+ display: inline-block;
+ vertical-align: top;
}
}
}
@@ -163,7 +176,6 @@
.year-wrap {
width: calc(100% - 2px);
box-shadow: 0px 0px 3px var(--mk-sys-color2);
- cursor: pointer;
transition: background 0.1s;
.header {
text-align: center;
@@ -182,7 +194,20 @@
width: 100%;
overflow: hidden;
margin-bottom: 5px;
- text-overflow: ellipsis;
+ .ant-badge {
+ width: 100%;
+ }
+ .ant-badge-status-text {
+ font-size: 13px;
+ width: calc(100% - 15px);
+ overflow: hidden;
+ word-break: break-word;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ height: 21px;
+ display: inline-block;
+ vertical-align: top;
+ }
}
}
.content::-webkit-scrollbar {
@@ -206,6 +231,28 @@
}
}
}
+.mk-calendar:not(.open-pop) {
+ .day-wrap {
+ cursor: default!important;
+ }
+ .month-wrap {
+ cursor: default!important;
+ }
+}
+.mk-calendar.open-menu {
+ .month-wrap, .year-wrap {
+ .content {
+ .message {
+ cursor: pointer;
+ }
+ }
+ }
+}
+.calendar-day-pop.open-menu {
+ .message {
+ cursor: pointer;
+ }
+}
.calendar-day-pop {
.message {
.ant-badge-status-text {
@@ -215,10 +262,17 @@
vertical-align: middle;
}
}
+ .ant-popover-inner {
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.25);
+ }
.ant-popover-inner-content {
- min-height: 100px;
+ padding: 0px;
+ min-height: 45px;
max-height: 200px;
overflow-y: auto;
+ >div {
+ padding: 12px 16px;
+ }
}
.ant-popover-inner-content::-webkit-scrollbar {
width: 5px;
--
Gitblit v1.8.0