From 5d15e566fce63cbe946d0ca0d21fe337d807b1cb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 11:31:12 +0800
Subject: [PATCH] 2023-08-10
---
src/tabviews/custom/components/card/double-data-card/index.scss | 1
src/tabviews/zshare/topSearch/mkDatePicker/index.jsx | 6 +
src/tabviews/zshare/topSearch/dategroup/index.scss | 3 +
src/tabviews/custom/components/card/data-card/index.scss | 1
src/assets/css/main.scss | 145 ++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 155 insertions(+), 1 deletions(-)
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 21ebdd8..4f694ca 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -459,6 +459,151 @@
padding: 2px 8px!important;
line-height: 1.5;
}
+.ant-calendar-picker-container {
+ .ant-calendar-range {
+ .ant-calendar-selected-start-date .ant-calendar-date,
+ .ant-calendar-selected-end-date .ant-calendar-date {
+ background: var(--mk-sys-color);
+ }
+
+ .ant-calendar-in-range-cell::before {
+ background: var(--mk-sys-color1);
+ }
+
+ .ant-calendar-selected-start-date .ant-calendar-date:hover,
+ .ant-calendar-selected-end-date .ant-calendar-date:hover {
+ background: var(--mk-sys-color);
+ }
+ }
+
+ .ant-calendar-date:hover {
+ background: var(--mk-sys-color1);
+ }
+
+ .ant-calendar-date:active {
+ background: var(--mk-sys-color5);
+ }
+
+ .ant-calendar-today .ant-calendar-date {
+ color: var(--mk-sys-color);
+ border-color: var(--mk-sys-color);
+ }
+
+ .ant-calendar-header a:hover {
+ color: var(--mk-sys-color5);
+ }
+ .ant-calendar-year-panel-header a:hover {
+ color: var(--mk-sys-color5);
+ }
+ .ant-calendar-month-panel-cell-disabled .ant-calendar-month-panel-month,
+ .ant-calendar-month-panel-cell-disabled .ant-calendar-month-panel-month:hover {
+ color: rgba(0, 0, 0, 0.25);
+ }
+ .ant-calendar-decade-panel-decade:hover {
+ background: var(--mk-sys-color1);
+ }
+
+ .ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade:hover,
+ .ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade {
+ color: #ffffff;
+ background: var(--mk-sys-color);
+ }
+
+ .ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year {
+ background: var(--mk-sys-color);
+ }
+ .ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year:hover {
+ color: #fff;
+ background: var(--mk-sys-color);
+ }
+ .ant-calendar-year-panel-year:hover {
+ background: var(--mk-sys-color1);
+ }
+
+ .ant-calendar-month-panel-selected-cell:not(.ant-calendar-month-panel-cell-disabled) .ant-calendar-month-panel-month {
+ background: var(--mk-sys-color);
+ }
+ .ant-calendar-month-panel-selected-cell:not(.ant-calendar-month-panel-cell-disabled) .ant-calendar-month-panel-month:hover {
+ color: #fff;
+ background: var(--mk-sys-color);
+ }
+ .ant-calendar-month-panel-month:hover {
+ background: var(--mk-sys-color1);
+ }
+
+ .ant-calendar-time-picker-select li:hover {
+ background: var(--mk-sys-color1);
+ }
+ .ant-calendar-time-picker-select li:focus {
+ color: var(--mk-sys-color);
+ }
+
+ .ant-calendar {
+ tr td {
+ .ant-calendar-year-panel-year.ant-year-selected {
+ color: #fff;
+ background: var(--mk-sys-color);
+ }
+ .ant-calendar-year-panel-year:hover {
+ color: var(--mk-sys-color5);
+ background: var(--mk-sys-color1);
+ }
+ }
+ }
+
+ .ant-calendar-time-picker-btn {
+ color: var(--mk-sys-color);
+ }
+ .ant-calendar {
+ .ant-calendar-ok-btn {
+ background-color: var(--mk-sys-color);
+ border-color: var(--mk-sys-color);
+ }
+
+ .ant-calendar-ok-btn:hover,
+ .ant-calendar-ok-btn:focus,
+ .ant-calendar-ok-btn:active,
+ .ant-calendar-ok-btn.active {
+ background-color: var(--mk-sys-color);
+ border-color: var(--mk-sys-color);
+ }
+ }
+ .ant-calendar-footer-extra {
+ .ant-tag-blue {
+ color: var(--mk-sys-color);
+ background: var(--mk-sys-color1);
+ border-color: var(--mk-sys-color3);
+ }
+ }
+
+ .ant-calendar-selected-day .ant-calendar-date {
+ background: var(--mk-sys-color2);
+ }
+ .ant-calendar-today-btn {
+ color: var(--mk-sys-color);
+ }
+
+ .ant-calendar-week-number {
+ .ant-calendar-body tr.ant-calendar-active-week {
+ background: var(--mk-sys-color2);
+ }
+ .ant-calendar-body tr:hover {
+ background: var(--mk-sys-color1);
+ }
+ }
+}
+.ant-calendar-quarter-picker .ant-calendar {
+ tr:not(.ant-quarter-selected):hover {
+ background: var(--mk-sys-color1);
+ }
+ tr.ant-quarter-selected {
+ background: var(--mk-sys-color2);
+ }
+}
+.ant-calendar-picker:focus .ant-calendar-picker-input:not(.ant-input-disabled) {
+ border-color: var(--mk-sys-color5)!important;
+ box-shadow: 0 0 0 2px var(--mk-sys-color2)!important;
+}
.mk-date-picker.minute {
.ant-calendar-time-picker-combobox {
.ant-calendar-time-picker-select {
diff --git a/src/tabviews/custom/components/card/data-card/index.scss b/src/tabviews/custom/components/card/data-card/index.scss
index 988dbf2..ea3ac4a 100644
--- a/src/tabviews/custom/components/card/data-card/index.scss
+++ b/src/tabviews/custom/components/card/data-card/index.scss
@@ -39,6 +39,7 @@
}
.card-row-list {
flex: 10;
+ max-width: 100%;
}
.card-row-list.flex-layout {
display: flex;
diff --git a/src/tabviews/custom/components/card/double-data-card/index.scss b/src/tabviews/custom/components/card/double-data-card/index.scss
index 40c3146..c6a13e8 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.scss
+++ b/src/tabviews/custom/components/card/double-data-card/index.scss
@@ -34,6 +34,7 @@
}
.card-row-list {
flex: 10;
+ max-width: 100%;
}
.card-row-list.flex-layout {
display: flex;
diff --git a/src/tabviews/zshare/topSearch/dategroup/index.scss b/src/tabviews/zshare/topSearch/dategroup/index.scss
index 57d4a16..e093074 100644
--- a/src/tabviews/zshare/topSearch/dategroup/index.scss
+++ b/src/tabviews/zshare/topSearch/dategroup/index.scss
@@ -4,6 +4,9 @@
position: relative;
z-index: 1;
+ .ant-tag-checkable:not(.ant-tag-checkable-checked):hover {
+ color: var(--mk-sys-color);
+ }
.ant-tag {
position: relative;
cursor: pointer;
diff --git a/src/tabviews/zshare/topSearch/mkDatePicker/index.jsx b/src/tabviews/zshare/topSearch/mkDatePicker/index.jsx
index 859be1a..c086876 100644
--- a/src/tabviews/zshare/topSearch/mkDatePicker/index.jsx
+++ b/src/tabviews/zshare/topSearch/mkDatePicker/index.jsx
@@ -94,7 +94,11 @@
} else if (mode === 'week') {
return <WeekPicker value={value} onChange={this.onChange}/>
} else if (mode === 'daterange') {
- return <RangePicker dropdownClassName={'mk-date-picker ' + precision} placeholder={['寮�濮嬫棩鏈�', '缁撴潫鏃ユ湡']} showTime={format !== 'YYYY-MM-DD'} format={format} value={value} onChange={this.onChange}/>
+ return <RangePicker ranges={format === 'YYYY-MM-DD' ? {
+ '浠婂ぉ': [moment(), moment()],
+ '褰撴湀': [moment().startOf('month'), moment().endOf('month')],
+ '涓婃湀': [moment().subtract(1, 'months').startOf('month'), moment().subtract(1, 'months').endOf('month')],
+ } : null} dropdownClassName={'mk-date-picker ' + precision} placeholder={['寮�濮嬫棩鏈�', '缁撴潫鏃ユ湡']} showTime={format !== 'YYYY-MM-DD'} format={format} value={value} onChange={this.onChange}/>
}
}
}
--
Gitblit v1.8.0