From 9a22eac5c7af5ad309fa40789d9458a47f4141cf Mon Sep 17 00:00:00 2001
From: WangChenChen <932560435@qq.com>
Date: Wed, 15 Nov 2023 23:50:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dweb=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=B8=AD=E2=80=9C=E6=9B=B4=E5=A4=9A=E2=80=9D?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platform-web-ui/src/styles/element-plus.scss  |  9 +++++++++
 platform-web-ui/src/utils/index.ts            |  2 --
 .../src/views/sys/tenant/index.vue            | 20 ++++++++++---------
 tenant-web-ui/src/styles/element-plus.scss    |  9 +++++++++
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/platform-web-ui/src/styles/element-plus.scss b/platform-web-ui/src/styles/element-plus.scss
index d7d24c3..fb54a16 100644
--- a/platform-web-ui/src/styles/element-plus.scss
+++ b/platform-web-ui/src/styles/element-plus.scss
@@ -36,3 +36,12 @@
 .el-date-editor.el-input__wrapper {
   width: 100%;
 }
+
+.el-dropdown {
+  line-height: 1.6;
+
+  .el-dropdown-link {
+    cursor: pointer;
+    outline: none;
+  }
+}
diff --git a/platform-web-ui/src/utils/index.ts b/platform-web-ui/src/utils/index.ts
index 54e1cb9..99f31e4 100644
--- a/platform-web-ui/src/utils/index.ts
+++ b/platform-web-ui/src/utils/index.ts
@@ -2,8 +2,6 @@ import dayjs from "dayjs"
 import { removeConfigLayout } from "@/utils/cache/local-storage"
 import chinaAreaJson from "@/assets/ChinaArea.json"
 import { ISimpleProject, ISimpleTenant } from "@/types/base"
-import { getFileBlob, httpGet } from "./service"
-import { AxiosResponse } from "axios"
 
 //#region 格式化日期时间
 export const DEFAULT_DATE_TIME_PATTERN = "YYYY-MM-DD HH:mm:ss"
diff --git a/platform-web-ui/src/views/sys/tenant/index.vue b/platform-web-ui/src/views/sys/tenant/index.vue
index c2be24d..bbd1e26 100644
--- a/platform-web-ui/src/views/sys/tenant/index.vue
+++ b/platform-web-ui/src/views/sys/tenant/index.vue
@@ -82,7 +82,10 @@
               <el-link :icon="Edit" type="warning" @click="handleEdit(scope.row)">编辑</el-link>
               &nbsp;
               <!-- v-admin 只有管理员才可以 删除租户、重置数据 -->
-              <el-dropdown v-admin @command="(cmd: string) => handleCommand(cmd, scope.row)">
+              <el-dropdown
+                @command="(cmd: string) => handleCommand(cmd, scope.row)"
+                v-if="!isDefaultTenantId(scope.row.tenantId)"
+              >
                 <span class="el-dropdown-link">
                   更多
                   <el-icon class="el-icon--right">
@@ -95,12 +98,12 @@
                     <el-dropdown-item command="QRcode">
                       <template #default><SvgIcon name="qrcode" />&nbsp;生成二维码</template>
                     </el-dropdown-item>
-                    <el-dropdown-item v-if="!isDefaultTenantId(scope.row.tenantId)" :icon="Refresh" command="ResetData">
-                      重置数据
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="!isDefaultTenantId(scope.row.tenantId)" :icon="Delete" command="Delete">
-                      删除
-                    </el-dropdown-item>
+                    <div v-admin>
+                      <el-dropdown-item :icon="Refresh" command="ResetData">重置数据</el-dropdown-item>
+                    </div>
+                    <div v-admin>
+                      <el-dropdown-item :icon="Delete" command="Delete">删除</el-dropdown-item>
+                    </div>
                   </el-dropdown-menu>
                 </template>
               </el-dropdown>
@@ -288,8 +291,7 @@ import { isEmail, isTelphone } from "@/utils/validate"
 import { futureShortcuts } from "@/utils"
 import { useNoticeStoreHook } from "@/store/modules/notice"
 import QRCodeVue3 from "qrcode-vue3"
-import logoPng from "@/assets/layouts/logo.png?url"
-import { downloadFile, getFileBlob } from "@/utils/service"
+import { getFileBlob } from "@/utils/service"
 
 const dictStore = useDictStoreHook()
 
diff --git a/tenant-web-ui/src/styles/element-plus.scss b/tenant-web-ui/src/styles/element-plus.scss
index d7d24c3..fb54a16 100644
--- a/tenant-web-ui/src/styles/element-plus.scss
+++ b/tenant-web-ui/src/styles/element-plus.scss
@@ -36,3 +36,12 @@
 .el-date-editor.el-input__wrapper {
   width: 100%;
 }
+
+.el-dropdown {
+  line-height: 1.6;
+
+  .el-dropdown-link {
+    cursor: pointer;
+    outline: none;
+  }
+}