From 5cc6602cd5fbe761025149bc5dfaefae4f1adcea Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 19 Jan 2026 17:02:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/styles/common/cockpit.scss |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index 6a69422..4735e89 100644
--- a/applications/drone-command/src/styles/common/cockpit.scss
+++ b/applications/drone-command/src/styles/common/cockpit.scss
@@ -104,6 +104,10 @@
     }
 }
 
+.command-input.el-textarea {
+    height: auto;
+}
+
 .command-date-picker {
     height: 40px !important;
     box-shadow: none !important;
@@ -385,6 +389,7 @@
 }
 
 .command-select-popper.el-select__popper {
+    min-height: 186px;
     border: none;
     background: #2E2E48 !important;
 
@@ -473,6 +478,16 @@
 .command-tree-select-popper {
     background: #2E2E48 !important;
     border: none !important;
+
+    .el-scrollbar {
+
+        .el-scrollbar__wrap {
+
+            .el-select-dropdown__list {
+                min-height: 186px;
+            }
+        }
+    }
 
     .el-popper__arrow::before {
         background: #2E2E48 !important;
@@ -1128,6 +1143,12 @@
         }
 
         .dialog-form {
+            .el-row {
+                .el-col {
+                    margin-bottom: 0;
+                }
+            }
+
             .el-form-item {
                 display: flex;
                 align-items: center;
@@ -1187,6 +1208,7 @@
                     }
 
                     .el-button {
+                        height: 40px;
                         color: #fff;
                         background: #2E2E48 !important;
                         border: none;
@@ -1373,7 +1395,7 @@
                     text-transform: none;
                 }
 
-                .dialog-container {
+                .content {
                     height: 0;
                     flex: 1;
                     padding: 0 16px;
@@ -1395,7 +1417,7 @@
 
                     .el-row {
                         .el-col {
-                            margin-bottom: 20px;
+                            margin-bottom: 0;
                             display: flex;
                             align-items: center;
 
@@ -1447,6 +1469,12 @@
 
                     overflow-y: auto;
 
+                    .el-row {
+                        .el-col {
+                            margin-bottom: 0;
+                        }
+                    }
+
                     .el-form-item {
                         display: flex;
                         align-items: center;

--
Gitblit v1.9.3