From 7987cec9b92771d23da02bf9202dd72299648383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <haozi@loli.email>
Date: Sat, 31 May 2025 19:51:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/data/container_compose.go      |  3 +++
 web/src/views/container/ComposeView.vue | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/internal/data/container_compose.go b/internal/data/container_compose.go
index 1340e551..7d452a57 100644
--- a/internal/data/container_compose.go
+++ b/internal/data/container_compose.go
@@ -161,6 +161,9 @@ func (r *containerComposeRepo) Down(name string) error {
 
 // Remove 删除编排
 func (r *containerComposeRepo) Remove(name string) error {
+	if err := r.Down(name); err != nil {
+		return err
+	}
 	dir := filepath.Join(app.Root, "server", "compose", name)
 	return os.RemoveAll(dir)
 }
diff --git a/web/src/views/container/ComposeView.vue b/web/src/views/container/ComposeView.vue
index 6de53d85..618b4e9d 100644
--- a/web/src/views/container/ComposeView.vue
+++ b/web/src/views/container/ComposeView.vue
@@ -57,7 +57,7 @@ const columns: any = [
   {
     title: $gettext('Status'),
     key: 'status',
-    width: 150,
+    width: 300,
     resizable: true,
     ellipsis: { tooltip: true }
   },
@@ -165,10 +165,18 @@ const columns: any = [
           NPopconfirm,
           {
             onPositiveClick: () => {
-              useRequest(container.composeDown(row.name)).onSuccess(() => {
-                refresh()
-                window.$message.success($gettext('Stop successful'))
+              const messageReactive = window.$message.loading($gettext('Stopping...'), {
+                duration: 0
               })
+              useRequest(container.composeDown(row.name))
+                .onSuccess(() => {
+                  refresh()
+                  forcePush.value = false
+                  window.$message.success($gettext('Stop successful'))
+                })
+                .onComplete(() => {
+                  messageReactive?.destroy()
+                })
             }
           },
           {
@@ -290,7 +298,7 @@ onMounted(() => {
       striped
       remote
       :loading="loading"
-      :scroll-x="1000"
+      :scroll-x="1100"
       :data="data"
       :columns="columns"
       :row-key="(row: any) => row.name"