From 5f60ea3f8122934a9e21a56a38008f5a6e824881 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Fri, 8 Dec 2023 18:16:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=AF=BC=E8=87=B4=E7=9A=84=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E6=8A=96=E5=8A=A8=E9=97=AE=E9=A2=98=20(#3236)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/device.go                 |  4 +++-
 .../src/views/container/compose/index.vue     |  1 -
 .../src/views/container/container/index.vue   |  1 -
 .../container/container/upgrade/index.vue     |  2 +-
 frontend/src/views/container/image/index.vue  | 21 +++++++++----------
 .../src/views/container/network/index.vue     |  1 -
 frontend/src/views/container/repo/index.vue   |  1 -
 .../src/views/container/template/index.vue    |  1 -
 frontend/src/views/container/volume/index.vue |  1 -
 frontend/src/views/cronjob/index.vue          |  1 -
 frontend/src/views/database/mysql/index.vue   |  8 +++++--
 frontend/src/views/host/firewall/ip/index.vue |  1 -
 .../src/views/host/firewall/port/index.vue    |  1 -
 frontend/src/views/host/ssh/log/log.vue       |  1 -
 frontend/src/views/log/operation/index.vue    |  1 -
 frontend/src/views/setting/snapshot/index.vue |  1 -
 16 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/backend/app/service/device.go b/backend/app/service/device.go
index 9f1442478..28da10c78 100644
--- a/backend/app/service/device.go
+++ b/backend/app/service/device.go
@@ -326,7 +326,9 @@ func updateDNS(list []string) error {
 		}
 	}
 	for _, item := range list {
-		newFile += fmt.Sprintf("nameserver %s \n", item)
+		if len(item) != 0 {
+			newFile += fmt.Sprintf("nameserver %s \n", item)
+		}
 	}
 	file, err := os.OpenFile(defaultDNSPath, os.O_WRONLY|os.O_TRUNC, 0640)
 	if err != nil {
diff --git a/frontend/src/views/container/compose/index.vue b/frontend/src/views/container/compose/index.vue
index d499517d1..492d53159 100644
--- a/frontend/src/views/container/compose/index.vue
+++ b/frontend/src/views/container/compose/index.vue
@@ -36,7 +36,6 @@
                         <div class="search-button">
                             <el-input
                                 v-model="searchName"
-                                clearable
                                 @clear="search()"
                                 suffix-icon="Search"
                                 @keyup.enter="search()"
diff --git a/frontend/src/views/container/container/index.vue b/frontend/src/views/container/container/index.vue
index 52d328753..f1df04549 100644
--- a/frontend/src/views/container/container/index.vue
+++ b/frontend/src/views/container/container/index.vue
@@ -44,7 +44,6 @@
                         <div class="search-button">
                             <el-input
                                 v-model="searchName"
-                                clearable
                                 @clear="search()"
                                 suffix-icon="Search"
                                 @keyup.enter="search()"
diff --git a/frontend/src/views/container/container/upgrade/index.vue b/frontend/src/views/container/container/upgrade/index.vue
index 87d2da760..216882f5e 100644
--- a/frontend/src/views/container/container/upgrade/index.vue
+++ b/frontend/src/views/container/container/upgrade/index.vue
@@ -13,7 +13,7 @@
                     :closable="false"
                     type="error"
                 />
-                <el-form @submit.prevent ref="formRef" v-loading="loading" :model="form" label-position="top">
+                <el-form @submit.prevent ref="formRef" :model="form" label-position="top">
                     <el-form-item :label="$t('container.oldImage')" prop="oldImage">
                         <el-tooltip placement="top-start" :content="form.imageName" v-if="form.imageName.length > 50">
                             <el-tag>{{ form.imageName.substring(0, 50) }}...:{{ form.oldTag }}</el-tag>
diff --git a/frontend/src/views/container/image/index.vue b/frontend/src/views/container/image/index.vue
index 451dd1788..2f85bfcee 100644
--- a/frontend/src/views/container/image/index.vue
+++ b/frontend/src/views/container/image/index.vue
@@ -28,7 +28,6 @@
                         <div class="search-button">
                             <el-input
                                 v-model="searchName"
-                                clearable
                                 @clear="search()"
                                 suffix-icon="Search"
                                 @keyup.enter="search()"
@@ -196,7 +195,7 @@ const loadRepos = async () => {
 };
 
 const onDelete = (row: Container.ImageInfo) => {
-    let names = row.tags;
+    let names = row.tags || [row.id.replaceAll('sha256:', '').substring(0, 12)];
     opRef.value.acceptParams({
         title: i18n.global.t('commons.button.delete'),
         names: names,
@@ -243,7 +242,7 @@ const buttons = [
         label: i18n.global.t('container.tag'),
         click: (row: Container.ImageInfo) => {
             let params = {
-                itemName: row.tags.length !== 0 ? row.tags[0].split(':')[0] : '',
+                itemName: row.tags && row.tags?.length !== 0 ? row.tags[0].split(':')[0] : '',
                 repos: repos.value,
                 sourceID: row.id,
             };
@@ -273,16 +272,16 @@ const buttons = [
     {
         label: i18n.global.t('commons.button.delete'),
         click: async (row: Container.ImageInfo) => {
-            if (!row.tags?.length || row.tags.length <= 1) {
+            if (row.tags && row.tags.length > 1) {
+                let params = {
+                    id: row.id,
+                    isUsed: row.isUsed,
+                    tags: row.tags,
+                };
+                dialogDeleteRef.value!.acceptParams(params);
+            } else {
                 onDelete(row);
-                return;
             }
-            let params = {
-                id: row.id,
-                isUsed: row.isUsed,
-                tags: row.tags,
-            };
-            dialogDeleteRef.value!.acceptParams(params);
         },
     },
 ];
diff --git a/frontend/src/views/container/network/index.vue b/frontend/src/views/container/network/index.vue
index bea5eee34..49e1666f1 100644
--- a/frontend/src/views/container/network/index.vue
+++ b/frontend/src/views/container/network/index.vue
@@ -25,7 +25,6 @@
                         <div class="search-button">
                             <el-input
                                 v-model="searchName"
-                                clearable
                                 @clear="search()"
                                 suffix-icon="Search"
                                 @keyup.enter="search()"
diff --git a/frontend/src/views/container/repo/index.vue b/frontend/src/views/container/repo/index.vue
index b936cbe9e..65d54afe8 100644
--- a/frontend/src/views/container/repo/index.vue
+++ b/frontend/src/views/container/repo/index.vue
@@ -19,7 +19,6 @@
                         <div class="search-button">
                             <el-input
                                 v-model="searchName"
-                                clearable
                                 @clear="search()"
                                 suffix-icon="Search"
                                 @keyup.enter="search()"
diff --git a/frontend/src/views/container/template/index.vue b/frontend/src/views/container/template/index.vue
index 34526844f..8a360e26c 100644
--- a/frontend/src/views/container/template/index.vue
+++ b/frontend/src/views/container/template/index.vue
@@ -22,7 +22,6 @@
                         <div class="search-button">
                             <el-input
                                 v-model="searchName"
-                                clearable
                                 @clear="search()"
                                 suffix-icon="Search"
                                 @keyup.enter="search()"
diff --git a/frontend/src/views/container/volume/index.vue b/frontend/src/views/container/volume/index.vue
index 92b24af71..a4fc01747 100644
--- a/frontend/src/views/container/volume/index.vue
+++ b/frontend/src/views/container/volume/index.vue
@@ -25,7 +25,6 @@
                         <div class="search-button">
                             <el-input
                                 v-model="searchName"
-                                clearable
                                 @clear="search()"
                                 suffix-icon="Search"
                                 @keyup.enter="search()"
diff --git a/frontend/src/views/cronjob/index.vue b/frontend/src/views/cronjob/index.vue
index f2d7b622b..bbc19669e 100644
--- a/frontend/src/views/cronjob/index.vue
+++ b/frontend/src/views/cronjob/index.vue
@@ -32,7 +32,6 @@
                         <div class="search-button">
                             <el-input
                                 v-model="searchName"
-                                clearable
                                 @clear="search()"
                                 suffix-icon="Search"
                                 @keyup.enter="search()"
diff --git a/frontend/src/views/database/mysql/index.vue b/frontend/src/views/database/mysql/index.vue
index 63a1fde08..604826a56 100644
--- a/frontend/src/views/database/mysql/index.vue
+++ b/frontend/src/views/database/mysql/index.vue
@@ -96,8 +96,12 @@
                             </el-button>
                             <template #dropdown>
                                 <el-dropdown-menu>
-                                    <el-dropdown-item @click="goDashboard('phpMyAdmin')">phpMyAdmin</el-dropdown-item>
-                                    <el-dropdown-item @click="goDashboard('Adminer')" divided>Adminer</el-dropdown-item>
+                                    <el-dropdown-item icon="Position" @click="goDashboard('phpMyAdmin')">
+                                        phpMyAdmin
+                                    </el-dropdown-item>
+                                    <el-dropdown-item icon="Position" @click="goDashboard('Adminer')" divided>
+                                        Adminer
+                                    </el-dropdown-item>
                                 </el-dropdown-menu>
                             </template>
                         </el-dropdown>
diff --git a/frontend/src/views/host/firewall/ip/index.vue b/frontend/src/views/host/firewall/ip/index.vue
index 91c67e2c5..096dc9cfe 100644
--- a/frontend/src/views/host/firewall/ip/index.vue
+++ b/frontend/src/views/host/firewall/ip/index.vue
@@ -34,7 +34,6 @@
                                 <div class="search-button">
                                     <el-input
                                         v-model="searchName"
-                                        clearable
                                         suffix-icon="Search"
                                         @change="search()"
                                         :placeholder="$t('commons.button.search')"
diff --git a/frontend/src/views/host/firewall/port/index.vue b/frontend/src/views/host/firewall/port/index.vue
index 68156c095..2dd815e19 100644
--- a/frontend/src/views/host/firewall/port/index.vue
+++ b/frontend/src/views/host/firewall/port/index.vue
@@ -66,7 +66,6 @@
                                 <div class="search-button">
                                     <el-input
                                         v-model="searchName"
-                                        clearable
                                         suffix-icon="Search"
                                         @change="search()"
                                         :placeholder="$t('commons.button.search')"
diff --git a/frontend/src/views/host/ssh/log/log.vue b/frontend/src/views/host/ssh/log/log.vue
index ad2d4c86e..e64509042 100644
--- a/frontend/src/views/host/ssh/log/log.vue
+++ b/frontend/src/views/host/ssh/log/log.vue
@@ -22,7 +22,6 @@
                             <el-input
                                 v-model="searchInfo"
                                 @clear="search()"
-                                clearable
                                 suffix-icon="Search"
                                 @keyup.enter="search()"
                                 @change="search()"
diff --git a/frontend/src/views/log/operation/index.vue b/frontend/src/views/log/operation/index.vue
index b7b2ae55d..2e86266a1 100644
--- a/frontend/src/views/log/operation/index.vue
+++ b/frontend/src/views/log/operation/index.vue
@@ -19,7 +19,6 @@
                         <div class="search-button">
                             <el-input
                                 v-model="searchName"
-                                clearable
                                 @clear="search()"
                                 suffix-icon="Search"
                                 @keyup.enter="search()"
diff --git a/frontend/src/views/setting/snapshot/index.vue b/frontend/src/views/setting/snapshot/index.vue
index 66512e9d6..28c8b7937 100644
--- a/frontend/src/views/setting/snapshot/index.vue
+++ b/frontend/src/views/setting/snapshot/index.vue
@@ -19,7 +19,6 @@
                         <div class="search-button">
                             <el-input
                                 v-model="searchName"
-                                clearable
                                 @clear="search()"
                                 suffix-icon="Search"
                                 @keyup.enter="search()"