From 870856f3d7cb03d68191d80b41e465788001e338 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Thu, 11 Apr 2024 15:36:41 +0800
Subject: [PATCH] =?UTF-8?q?diglog=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rts-sim-testing-message                       |  2 +-
 src/components/common/DraggableDialog.vue     | 15 +++++++---
 .../draw-app/dialogs/SetTrainParam.vue        | 30 +++++++++++++------
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/rts-sim-testing-message b/rts-sim-testing-message
index e4728f0..7d576a6 160000
--- a/rts-sim-testing-message
+++ b/rts-sim-testing-message
@@ -1 +1 @@
-Subproject commit e4728f0f732904f543a86aabb2c3da2653dd139f
+Subproject commit 7d576a6c69ccbcdcdf14219f992602ccf0b1b30f
diff --git a/src/components/common/DraggableDialog.vue b/src/components/common/DraggableDialog.vue
index 31cc8f6..2f729bb 100644
--- a/src/components/common/DraggableDialog.vue
+++ b/src/components/common/DraggableDialog.vue
@@ -35,14 +35,21 @@
         <div style="margin-right: 10px"><slot name="titleButton"></slot></div>
         <q-btn dense flat icon="sym_o_close" v-close-popup></q-btn>
       </q-bar>
-      <q-scroll-area
+      <!-- <q-scroll-area
         :style="`width: ${props.width}px; height: ${props.height}px;`"
-      >
-        <slot></slot>
-      </q-scroll-area>
+      > -->
+      <slot></slot>
+      <!-- </q-scroll-area> -->
+
       <div :style="`width: ${props.width}px`">
         <slot name="footer"></slot>
       </div>
+      <div
+        :style="`width: ${props.width}px`"
+        style="position: sticky; bottom: 0px"
+      >
+        <slot name="sticky-footer"></slot>
+      </div>
     </q-card>
   </q-dialog>
 </template>
diff --git a/src/components/draw-app/dialogs/SetTrainParam.vue b/src/components/draw-app/dialogs/SetTrainParam.vue
index c144491..72c6b08 100644
--- a/src/components/draw-app/dialogs/SetTrainParam.vue
+++ b/src/components/draw-app/dialogs/SetTrainParam.vue
@@ -427,17 +427,29 @@
             </div>
           </div>
         </div>
-        <q-card-actions align="right" class="text-primary">
-          <q-btn
-            flat
-            label="取消"
-            @click="showTrainParamOperation = false"
-            v-close-popup
-          />
-          <q-btn flat label="确认" type="submit" />
-        </q-card-actions>
+        <!-- <q-card-actions align="right" class="text-primary">
+
+        </q-card-actions> -->
       </q-form>
     </q-card>
+    <template v-slot:sticky-footer>
+      <div
+        style="
+          height: 45px;
+          line-height: 45px;
+          text-align: right;
+          background: #fff;
+        "
+      >
+        <q-btn
+          flat
+          label="取消"
+          @click="showTrainParamOperation = false"
+          v-close-popup
+        />
+        <q-btn flat label="确认" type="submit" />
+      </div>
+    </template>
   </draggable-dialog>
 </template>