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 |  128 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 117 insertions(+), 11 deletions(-)

diff --git a/src/templates/sharecomponent/searchcomponent/index.scss b/src/templates/sharecomponent/searchcomponent/index.scss
index cf4253b..b6f619c 100644
--- a/src/templates/sharecomponent/searchcomponent/index.scss
+++ b/src/templates/sharecomponent/searchcomponent/index.scss
@@ -1,23 +1,44 @@
 .model-table-search-list {
-  padding: 1px 24px 20px;
+  padding: 16px 24px 20px;
   min-height: 87px;
+  position: relative;
   border-bottom: 1px solid #d9d9d9;
 
-  .anticon-question-circle {
-    color: #c49f47;
-    position: relative;
-    left: -15px;
-    top: 5px;
+  .quickly-add {
+    display: none;
+  }
+  .switch-field-show {
+    position: absolute;
+    z-index: 1;
+    right: 20px;
+    bottom: 5px;
   }
   > .ant-row {
     min-height: 65px;
+    >.ant-col {
+      padding: 0 12px!important;
+    }
   }
-  .ant-row .ant-col-6 {
-    padding: 0 12px!important;
+
+  .mk-search-item-wrap {
+    display: inline-block;
+    float: none;
+    vertical-align: top;
   }
-  .ant-row.ant-form-item .ant-col {
-    padding: 0;
+  .mk-search-item-wrap.action {
+    .ant-form-item {
+      white-space: nowrap;
+    }
+    .ant-form-item-label, .ant-form-item-control-wrapper {
+      display: inline-block;
+    }
   }
+  .mk-search-item-wrap.action.hide-button {
+    span {
+      text-decoration: line-through #ff4d4f;
+    }
+  }
+
   .page-card {
     position: relative;
     background: #ffffff;
@@ -26,7 +47,14 @@
     height: 55px;
     .ant-form-item {
       margin-bottom: 0px;
+      .ant-form-item-label {
+        float: left;
+      }
+      label[title=" "]::after, label[title="  "]::after {
+        display: none;
+      }
       .ant-form-item-control-wrapper {
+        float: left;
         .ant-select {
           width: 100%;
           margin-top: 4px;
@@ -42,6 +70,9 @@
           font-size: 13px;
         }
       }
+      .ant-form-explain {
+        display: none;
+      }
     }
     >div::after {
       display: block;
@@ -56,7 +87,7 @@
       z-index: 2;
     }
   }
-  .page-card.false {
+  .page-card.label-hide {
     .ant-form-item-label {
       display: none;
     }
@@ -64,8 +95,83 @@
       width: 100%;
     }
   }
+  .page-card.checkcard {
+    .ant-form-item-control-wrapper {
+      .ant-form-item-control {
+        line-height: 1;
+      }
+    }
+  }
+  .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 {
     min-width: 100px!important;
     width: 100%;
   }
+  .check-card-edit-box {
+    margin-top: 5px!important;
+  }
+}
+.model-table-search-list.show-field {
+  .page-card {
+    .ant-form-explain {
+      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