From 335dc0cc1194f86657dbb47d9249053dcee74a60 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Tue, 8 Oct 2024 14:16:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=B3=E9=97=AD=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8D=E5=BA=94=E6=98=BE=E7=A4=BA`=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=AD=97=E5=85=B8`=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                     | 16 ++++++++++++++--
 .../src/views/system/dict/type/index.vue         | 15 +++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84ba20d5..756eb995 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,18 @@
-1.0.0-beta (2024-10-8)
+# 1.0.0
 
-# FEATURES
+**FEATURES**
+
+- 基础功能已经开发完毕
+- 工作流相关模块等待后端重构后开发
+
+**BUG FIXES**
+
+- 登录页面 关闭租户后下拉框没有正常隐藏
+- 字典管理 关闭租户不应显示`同步租户字典`按钮
+
+# 1.0.0-beta (2024-10-8)
+
+**FEATURES**
 
 - 基础功能已经开发完毕
 - 工作流相关模块等待后端重构后开发
diff --git a/apps/web-antd/src/views/system/dict/type/index.vue b/apps/web-antd/src/views/system/dict/type/index.vue
index dc44cacc..ed6921dc 100644
--- a/apps/web-antd/src/views/system/dict/type/index.vue
+++ b/apps/web-antd/src/views/system/dict/type/index.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import type { Recordable } from '@vben/types';
 
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 
+import { useAccess } from '@vben/access';
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getPopupContainer } from '@vben/utils';
 
@@ -25,6 +26,7 @@ import {
   refreshDictTypeCache,
 } from '#/api/system/dict/dict-type';
 import { dictSyncTenant } from '#/api/system/tenant';
+import { useTenantStore } from '#/store/tenant';
 import { downloadExcel } from '#/utils/file/download';
 
 import { emitter } from '../mitt';
@@ -172,6 +174,15 @@ function handleSyncTenantDict() {
     },
   });
 }
+
+const { hasAccessByRoles } = useAccess();
+const tenantStore = useTenantStore();
+/**
+ * 开启租户 & 超级管理员才可以同步租户字典
+ */
+const couldSyncTenantDict = computed(() => {
+  return tenantStore.tenantEnable && hasAccessByRoles(['superadmin']);
+});
 </script>
 
 <template>
@@ -188,7 +199,7 @@ function handleSyncTenantDict() {
                 <span v-access:code="['system:dict:edit']">
                   <MenuItem key="1">刷新字典缓存</MenuItem>
                 </span>
-                <span v-access:role="['superadmin']">
+                <span v-if="couldSyncTenantDict">
                   <MenuItem key="2"> 同步租户字典 </MenuItem>
                 </span>
               </Menu>