From b6c698c8833836971184a0a9c2645a15f8174d37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:31:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/searchcomponent/index.scss | 73 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 13 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/index.scss b/src/templates/sharecomponent/searchcomponent/index.scss
index 29bbb21..b6f619c 100644
--- a/src/templates/sharecomponent/searchcomponent/index.scss
+++ b/src/templates/sharecomponent/searchcomponent/index.scss
@@ -1,5 +1,5 @@
.model-table-search-list {
- padding: 1px 24px 20px;
+ padding: 16px 24px 20px;
min-height: 87px;
position: relative;
border-bottom: 1px solid #d9d9d9;
@@ -26,6 +26,9 @@
vertical-align: top;
}
.mk-search-item-wrap.action {
+ .ant-form-item {
+ white-space: nowrap;
+ }
.ant-form-item-label, .ant-form-item-control-wrapper {
display: inline-block;
}
@@ -47,6 +50,9 @@
.ant-form-item-label {
float: left;
}
+ label[title=" "]::after, label[title=" "]::after {
+ display: none;
+ }
.ant-form-item-control-wrapper {
float: left;
.ant-select {
@@ -62,18 +68,6 @@
.data-range .ant-calendar-picker-input {
padding: 4px 20px 4px 5px;
font-size: 13px;
- }
- .check-card-edit-box {
- .no-margin-bottom {
- margin-bottom: 0px;
- }
- .card-cell {
- padding: 4px 6px;
- }
- .card-color-cell {
- padding: 4px 6px;
- min-height: 32px;
- }
}
}
.ant-form-explain {
@@ -108,9 +102,29 @@
}
}
}
+ .page-card.range-wrap {
+ .ant-form-item-control-wrapper {
+ .ant-form-item-control {
+ .ant-form-item-children {
+ display: flex;
+ .ant-input:first-child {
+ margin-right: 5px;
+ }
+ .ant-input:last-child {
+ margin-left: 5px;
+ }
+ }
+ }
+ }
+ }
.page-card.advanced {
.ant-form-item-label label {
color: orange;
+ }
+ }
+ .page-card.no-query {
+ .ant-form-explain {
+ color: #13c2c2;
}
}
.ant-calendar-picker {
@@ -127,4 +141,37 @@
display: block;
}
}
+}
+.model-table-search-list.mk-order-small {
+ .page-card {
+ height: 45px;
+ }
+ .mk-search-item-wrap.action {
+ .ant-form-item {
+ height: 45px!important;
+ }
+ }
+}
+.model-table-search-list.mk-order-updown {
+ .mk-search-item-wrap {
+ .page-card {
+ height: auto;
+ }
+ .ant-form-item {
+ display: block;
+ .ant-form-item-label {
+ display: block;
+ width: 100% !important;
+ text-align: left;
+ float: none;
+ line-height: 2;
+ height: 24px;
+ }
+ .ant-form-item-control-wrapper {
+ display: block;
+ width: 100% !important;
+ float: none;
+ }
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0