From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/components/normalform/modalform/index.scss |   78 ++++++++-------------------------------
 1 files changed, 16 insertions(+), 62 deletions(-)

diff --git a/src/components/normalform/modalform/index.scss b/src/components/normalform/modalform/index.scss
index b9b9b6c..3def0e9 100644
--- a/src/components/normalform/modalform/index.scss
+++ b/src/components/normalform/modalform/index.scss
@@ -8,10 +8,6 @@
     padding-left: 1.2%!important;
     padding-right: 1.2%!important;
   }
-  .ant-form-item-label .anticon-question-circle {
-    color: #c49f47;
-    margin-right: 3px;
-  }
   .ant-checkbox-group {
     line-height: unset;
     .ant-checkbox-wrapper {
@@ -24,20 +20,7 @@
   .ant-form-item {
     display: flex;
   }
-  .ant-form-item.checkcard {
-    margin-bottom: 10px;
-    .ant-form-item-control {
-      line-height: 1.5;
-    }
-  }
-  .ant-form-item.hint {
-    margin-bottom: 0px;
-    .message {
-      margin-top: 9px;
-      line-height: 1.5;
-      color: rgba(0, 0, 0, 0.85);
-    }
-  }
+
   .ant-form-item-control-wrapper {
     flex: 1;
   }
@@ -48,30 +31,7 @@
     white-space: nowrap;
     width: 33.3%;
   }
-  >.ant-row.cols2 .ant-col-24 {
-    .ant-form-item {
-      .ant-form-item-label {
-        width: 16%;
-      }
-    }
-  }
-  >.ant-row.cols3 .ant-col-24 {
-    .ant-form-item {
-      .ant-form-item-label {
-        width: 10.5%;
-      }
-    }
-  }
-  >.ant-row.cols4 .ant-col-24 {
-    .ant-form-item {
-      .ant-form-item-label {
-        width: 7.5%;
-      }
-    }
-  }
-  .ant-input-number {
-    width: 100%;
-  }
+
   .ant-form-explain {
     overflow:hidden;
     text-overflow:ellipsis;
@@ -81,32 +41,26 @@
     margin-top: 7px;
     overflow: hidden;
     .color-sketch-block-box {
-      min-width: 100px;
+      min-width: 50px;
+      max-width: 100px;
+      .color-sketch-block-inner {
+        box-shadow: 0 0 0 1px rgba(0, 0, 0, .1) inset;
+      }
     }
   }
-  .normal-braft-editor {
-    border: 1px solid #d9d9d9;
-    border-radius: 4px;
-    overflow-x: hidden;
-  }
-  p {
-    color: #1890ff;
-    font-size: 15px;
-    padding-left: 10px;
-    border-bottom: 1px solid #e9e9e9;
-  }
-  .ant-input-disabled {
-    color: rgba(0, 0, 0, 0.65)!important;
-    cursor: default!important;
-  }
+
   .ant-input-number-input {
     color: rgba(0, 0, 0, 0.65)!important;
     cursor: default!important;
   }
-  .ant-select-disabled {
-    color: rgba(0, 0, 0, 0.65)!important;
-    .ant-select-selection--multiple .ant-select-selection__choice {
-      color: rgba(0, 0, 0, 0.65)!important;
+  .ant-col-12 + .ant-col-24 {
+    .ant-form-item-label {
+      width: 16%;
+    }
+  }
+  .ant-col-12 + .ant-col-24 + .ant-col-24 {
+    .ant-form-item-label {
+      width: 16%;
     }
   }
 }
\ No newline at end of file

--
Gitblit v1.8.0