From 9fcd3c78e185b8d0a1a0db5deaed26463b3ec763 Mon Sep 17 00:00:00 2001
From: ssongliu <songlius11@163.com>
Date: Fri, 2 Dec 2022 11:34:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=9D=9E=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E7=8A=B6=E6=80=81=E5=AE=B9=E5=99=A8=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/container.go                |  2 +-
 frontend/src/api/interface/container.ts         |  1 +
 .../src/components/confirm-dialog/index.vue     |  8 +++++---
 frontend/src/views/container/network/index.vue  | 17 ++++++++++++++++-
 .../src/views/login/components/login-form.vue   |  3 ---
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/backend/app/service/container.go b/backend/app/service/container.go
index df67ff999..840e4ae67 100644
--- a/backend/app/service/container.go
+++ b/backend/app/service/container.go
@@ -188,7 +188,7 @@ func (u *ContainerService) ContainerOperation(req dto.ContainerOperation) error
 	case constant.ContainerOpRename:
 		err = client.ContainerRename(ctx, req.ContainerID, req.NewName)
 	case constant.ContainerOpRemove:
-		err = client.ContainerRemove(ctx, req.ContainerID, types.ContainerRemoveOptions{RemoveVolumes: true, RemoveLinks: true, Force: true})
+		err = client.ContainerRemove(ctx, req.ContainerID, types.ContainerRemoveOptions{RemoveVolumes: true, Force: true})
 	}
 	return err
 }
diff --git a/frontend/src/api/interface/container.ts b/frontend/src/api/interface/container.ts
index 778ecb9c5..c4eaf791b 100644
--- a/frontend/src/api/interface/container.ts
+++ b/frontend/src/api/interface/container.ts
@@ -102,6 +102,7 @@ export namespace Container {
     export interface NetworkInfo {
         id: string;
         name: string;
+        isSystem: boolean;
         labels: Array<string>;
         driver: string;
         ipamDriver: string;
diff --git a/frontend/src/components/confirm-dialog/index.vue b/frontend/src/components/confirm-dialog/index.vue
index 7f6b2ece6..89fc712c5 100644
--- a/frontend/src/components/confirm-dialog/index.vue
+++ b/frontend/src/components/confirm-dialog/index.vue
@@ -7,9 +7,11 @@
         </template>
         <div>
             <span style="font-size: 12px">{{ operationInfo }}</span>
-            <el-input v-model="submitInput"></el-input>
-            <span style="font-size: 12px">{{ $t('commons.msg.operateConfirm') }}</span>
-            <span style="font-size: 12px; color: red; font-weight: 500">'{{ submitInputInfo }}'</span>
+            <div style="margin-top: 10px">
+                <span style="font-size: 12px">{{ $t('commons.msg.operateConfirm') }}</span>
+                <span style="font-size: 12px; color: red; font-weight: 500">'{{ submitInputInfo }}'</span>
+            </div>
+            <el-input style="margin-top: 10px" v-model="submitInput"></el-input>
         </div>
         <template #footer>
             <span class="dialog-footer">
diff --git a/frontend/src/views/container/network/index.vue b/frontend/src/views/container/network/index.vue
index f98acaa88..e3cb02b50 100644
--- a/frontend/src/views/container/network/index.vue
+++ b/frontend/src/views/container/network/index.vue
@@ -11,10 +11,11 @@
                         {{ $t('commons.button.delete') }}
                     </el-button>
                 </template>
-                <el-table-column type="selection" fix />
+                <el-table-column type="selection" :selectable="selectable" fix />
                 <el-table-column :label="$t('commons.table.name')" show-overflow-tooltip min-width="80" prop="name" fix>
                     <template #default="{ row }">
                         <el-link @click="onInspect(row.id)" type="primary">{{ row.name }}</el-link>
+                        <el-tag effect="dark" round v-if="row.isSystem" style="margin-left: 5px">system</el-tag>
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('container.driver')" show-overflow-tooltip min-width="40" prop="driver" />
@@ -81,6 +82,10 @@ const onCreate = async () => {
     dialogCreateRef.value!.acceptParams();
 };
 
+function selectable(row) {
+    return !row.isSystem;
+}
+
 const search = async () => {
     const params = {
         page: paginationConfig.page,
@@ -89,6 +94,9 @@ const search = async () => {
     await searchNetwork(params).then((res) => {
         if (res.data) {
             data.value = res.data.items;
+            for (const item of data.value) {
+                item.isSystem = isSystem(item.name);
+            }
         }
         paginationConfig.total = res.data.total;
     });
@@ -117,12 +125,19 @@ const onInspect = async (id: string) => {
     codemirror.value!.acceptParams(param);
 };
 
+function isSystem(val: string) {
+    return val === 'bridge' || val === '1panel' || val === 'none' || val === 'host';
+}
+
 const buttons = [
     {
         label: i18n.global.t('commons.button.delete'),
         click: (row: Container.NetworkInfo) => {
             batchDelete(row);
         },
+        disabled: (row: any) => {
+            return row.isSystem;
+        },
     },
 ];
 
diff --git a/frontend/src/views/login/components/login-form.vue b/frontend/src/views/login/components/login-form.vue
index 216411740..1fe6e4b8a 100644
--- a/frontend/src/views/login/components/login-form.vue
+++ b/frontend/src/views/login/components/login-form.vue
@@ -66,9 +66,6 @@
                         <div class="login-border"></div>
                         <div class="login-welcome">{{ $t('commons.login.codeInput') }}</div>
                         <div class="login-form">
-                            <el-form-item>
-                                <span style="font-size: 14px">Secret: {{ mfaLoginForm.secret }}</span>
-                            </el-form-item>
                             <el-form-item>
                                 <el-input
                                     size="default"