From 4dd9fa911ab2422084dc2650a010c50da6c7d002 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Fri, 6 Mar 2020 21:44:24 +0800
Subject: [PATCH] fix: #73 (halo-dev/console#87)

---
 src/views/interface/ThemeList.vue | 61 ++++++++++++++++---------------
 src/views/system/OptionForm.vue   |  6 +--
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/views/interface/ThemeList.vue b/src/views/interface/ThemeList.vue
index 6359eae2b..2c4008c44 100644
--- a/src/views/interface/ThemeList.vue
+++ b/src/views/interface/ThemeList.vue
@@ -71,41 +71,22 @@
                     <a-menu-item
                       :key="1"
                       :disabled="item.activated"
+                      @click="handleConfirmDelete(item)"
                     >
-                      <a-popconfirm
-                        v-if="!item.activated"
-                        :title="'确定删除【' + item.name + '】主题？'"
-                        @confirm="handleDeleteTheme(item.id)"
-                        okText="确定"
-                        cancelText="取消"
-                      >
-                        <a-icon
-                          type="delete"
-                          style="margin-right:3px"
-                        />删除
-                      </a-popconfirm>
-                      <span v-else>
-                        <a-icon
-                          type="delete"
-                          style="margin-right:3px"
-                        />删除
-                      </span>
+                      <a-icon
+                        type="delete"
+                        style="margin-right:3px"
+                      />删除
                     </a-menu-item>
                     <a-menu-item
                       :key="2"
                       v-if="item.repo"
+                      @click="handleConfirmUpdate(item)"
                     >
-                      <a-popconfirm
-                        :title="'确定更新【' + item.name + '】主题？'"
-                        @confirm="handleUpdateTheme(item.id)"
-                        okText="确定"
-                        cancelText="取消"
-                      >
-                        <a-icon
-                          type="cloud"
-                          style="margin-right:3px"
-                        />在线更新
-                      </a-popconfirm>
+                      <a-icon
+                        type="cloud"
+                        style="margin-right:3px"
+                      />在线更新
                     </a-menu-item>
                     <a-menu-item
                       :key="3"
@@ -365,6 +346,28 @@ export default {
       this.selectedTheme = theme
       this.themeSettingVisible = true
     },
+    handleConfirmDelete(item) {
+      this.$confirm({
+        title: '提示',
+        maskClosable: true,
+        content: '确定删除【' + item.name + '】主题？',
+        onOk() {
+          this.handleDeleteTheme(item.id)
+        },
+        onCancel() {}
+      })
+    },
+    handleConfirmUpdate(item) {
+      this.$confirm({
+        title: '提示',
+        maskClosable: true,
+        content: '确定更新【' + item.name + '】主题？',
+        onOk() {
+          this.handleUpdateTheme(item.id)
+        },
+        onCancel() {}
+      })
+    },
     onThemeUploadClose() {
       if (this.uploadThemeVisible) {
         this.$refs.upload.handleClearFileList()
diff --git a/src/views/system/OptionForm.vue b/src/views/system/OptionForm.vue
index 41dea59b7..6182ea088 100644
--- a/src/views/system/OptionForm.vue
+++ b/src/views/system/OptionForm.vue
@@ -982,7 +982,7 @@ export default {
           if (!this.options.smms_api_secret_token) {
             this.$notification['error']({
               message: '提示',
-              description: 'Secret Token不能为空！'
+              description: 'Secret Token 不能为空！'
             })
             return
           }
@@ -991,7 +991,7 @@ export default {
           if (!this.options.oss_upyun_domain) {
             this.$notification['error']({
               message: '提示',
-              description: '域名不能为空！'
+              description: '绑定域名不能为空！'
             })
             return
           }
@@ -1028,7 +1028,7 @@ export default {
           if (!this.options.oss_qiniu_domain) {
             this.$notification['error']({
               message: '提示',
-              description: '域名不能为空！'
+              description: '绑定域名不能为空！'
             })
             return
           }