From 1ef56b68318629e24f8e42406822059262d392b9 Mon Sep 17 00:00:00 2001
From: coder77 <2293444075@qq.com>
Date: Thu, 10 Apr 2025 11:03:25 +0800
Subject: [PATCH] Merge branch 'master_dev' of ssh://dev.zhiheiot.com:29418/mob-components into master_dev
---
forms/datePicker/cDateRangeAction.scss | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/forms/datePicker/cDateRangeAction.scss b/forms/datePicker/cDateRangeAction.scss
index 5d2abba..3c45ee1 100644
--- a/forms/datePicker/cDateRangeAction.scss
+++ b/forms/datePicker/cDateRangeAction.scss
@@ -3,26 +3,17 @@
* @author Tevin
*/
-@import "../../common/sassMixin";
+@import '../../common/sassMixin';
.c-data-range-float {
- @include position(fixed, 0 0, 90000);
- .at-drawer .at-drawer__content {
- width: 100%;
- min-height: 200px;
- bottom: auto;
- transform: translateY(-100%);
- }
- .at-drawer--show .at-drawer__content {
- transform: translateY(0%);
- }
+ @include position(fixed, 0 0, 9100);
.c-data-range-drawer {
.title {
height: 100px;
text-align: center;
line-height: 100px;
- border-top: 1PX solid #eee;
- border-bottom: 1PX solid #d6e4ef;
+ border-top: 1px solid #eee;
+ border-bottom: 1px solid #d6e4ef;
background-color: #f8f8f8;
}
.item {
@@ -31,7 +22,7 @@
height: 96px;
padding: 24px 0 24px 24px;
white-space: nowrap;
- border-bottom: 1PX solid #d6e4ef;
+ border-bottom: 1px solid #d6e4ef;
box-sizing: border-box;
background-color: #fff;
.label {
@@ -56,9 +47,32 @@
padding-bottom: 24px;
background-color: #f8f8f8;
}
+ .quick-select {
+ display: flex;
+ flex-wrap: wrap;
+ padding: 0 24px;
+ .quick-select-item {
+ height: 60px;
+ line-height: 60px;
+ padding: 0 18px;
+ margin-bottom: 24px;
+ text-align: center;
+ color: #1890ff;
+ background: #e6f7ff;
+ border: 1px solid #1890ff;
+ border-color: #91d5ff;
+ border-radius: 4px;
+ &:not(:last-child) {
+ margin-right: 24px;
+ }
+ &:active {
+ background-color: #e8e8e8;
+ }
+ }
+ }
.btn {
background-color: #36a0e7;
border: none;
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1