From 74fcdc4e2c8b5326d5fb419e45c3211804f4e2c5 Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Sun, 27 Apr 2025 14:52:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=87=E6=8D=A2=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/java/VelocityUtils.java                  |  4 +--
 .../modules/soy.operate-drawer.vue.vm         |  2 +-
 docs/template/soy.index.vue.vm                |  4 +--
 src/components/custom/status-switch.vue       |  4 +--
 src/components/custom/tenant-select.vue       | 35 ++++++++++++-------
 src/hooks/common/router.ts                    |  3 +-
 6 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/docs/java/VelocityUtils.java b/docs/java/VelocityUtils.java
index 73290c75..2f020a30 100644
--- a/docs/java/VelocityUtils.java
+++ b/docs/java/VelocityUtils.java
@@ -176,11 +176,11 @@ public class VelocityUtils {
             fileName = StringUtils.format("{}/domain/bo/{}Bo.java", javaPath, className);
         }
         if (template.contains("soy.index.vue.vm")) {
-            fileName = StringUtils.format("soybean/views/{}/{}/index.vue", moduleName, businessName);
+            fileName = StringUtils.format("soybean/views/{}/{}/index.vue", moduleName, StrUtil.toSymbolCase(businessName, '-'));
         } else if (template.contains("soy.api.d.ts.vm")) {
             fileName = StringUtils.format("soybean/typings/api/{}.api.d.ts", moduleName);
         } else if (template.contains("soy.api.ts.vm")) {
-            fileName = StringUtils.format("soybean/api/{}/{}.ts", moduleName, businessName);
+            fileName = StringUtils.format("soybean/api/{}/{}.ts", moduleName,  StrUtil.toSymbolCase(businessName, '-'));
         } else if (template.contains("soy.search.vue.vm")) {
             fileName = StringUtils.format("soybean/views/{}/{}/modules/{}-search.vue", moduleName, businessName, StrUtil.toSymbolCase(businessName, '-'));
         } else if (template.contains("soy.operate-drawer.vue.vm")) {
diff --git a/docs/template/modules/soy.operate-drawer.vue.vm b/docs/template/modules/soy.operate-drawer.vue.vm
index 2f720a53..8f6c869b 100644
--- a/docs/template/modules/soy.operate-drawer.vue.vm
+++ b/docs/template/modules/soy.operate-drawer.vue.vm
@@ -2,7 +2,7 @@
 import { computed, reactive, watch } from 'vue';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
 import { $t } from '@/locales';
-import { fetchCreate${BusinessName}, fetchUpdate${BusinessName} } from '@/service/api/${moduleName}/${businessName}';
+import { fetchCreate${BusinessName}, fetchUpdate${BusinessName} } from '@/service/api/${moduleName}/${business-name}';
 #if($dictList && $dictList.size() > 0)import { useDict } from '@/hooks/business/dict';#end
 
 defineOptions({
diff --git a/docs/template/soy.index.vue.vm b/docs/template/soy.index.vue.vm
index a2803054..0d7fd4f9 100644
--- a/docs/template/soy.index.vue.vm
+++ b/docs/template/soy.index.vue.vm
@@ -6,8 +6,8 @@ import { useAuth } from '@/hooks/business/auth';
 import { useAppStore } from '@/store/modules/app';
 import { useDownload } from '@/hooks/business/download';
 import { useTable, useTableOperate } from '@/hooks/common/table';
-import ${BusinessName}OperateDrawer from './modules/${business_name}-operate-drawer.vue';
-import ${BusinessName}Search from './modules/${business_name}-search.vue';
+import ${BusinessName}OperateDrawer from './modules/${business-name}-operate-drawer.vue';
+import ${BusinessName}Search from './modules/${business-name}-search.vue';
 
 defineOptions({
   name: '${BusinessName}List'
diff --git a/src/components/custom/status-switch.vue b/src/components/custom/status-switch.vue
index 0d9e7d45..d2856c49 100644
--- a/src/components/custom/status-switch.vue
+++ b/src/components/custom/status-switch.vue
@@ -51,8 +51,8 @@ const handleUpdateValue = (val: Api.Common.EnableStatus) => {
     v-model:value="value"
     :loading="loading"
     :rubber-band="false"
-    checked-value="1"
-    unchecked-value="0"
+    checked-value="0"
+    unchecked-value="1"
     :disabled="props.disabled"
     @update:value="handleUpdateValue"
   />
diff --git a/src/components/custom/tenant-select.vue b/src/components/custom/tenant-select.vue
index 4fd9cc3c..a23d31a5 100644
--- a/src/components/custom/tenant-select.vue
+++ b/src/components/custom/tenant-select.vue
@@ -1,16 +1,14 @@
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue';
-import { useRouter } from 'vue-router';
 import type { SelectOption } from 'naive-ui';
 import { useLoading } from '@sa/hooks';
 import { fetchTenantList } from '@/service/api';
 import { fetchChangeTenant, fetchClearTenant } from '@/service/api/system/tenant';
+import { useAppStore } from '@/store/modules/app';
 import { useTabStore } from '@/store/modules/tab';
 import { useAuth } from '@/hooks/business/auth';
+import { useRouterPush } from '@/hooks/common/router';
 
-const { hasRole } = useAuth();
-const { clearTabs } = useTabStore();
-const router = useRouter();
 defineOptions({ name: 'TenantSelect' });
 
 interface Props {
@@ -21,6 +19,11 @@ withDefaults(defineProps<Props>(), {
   clearable: false
 });
 
+const appStore = useAppStore();
+const { hasRole } = useAuth();
+const { clearTabs } = useTabStore();
+const { toHome } = useRouterPush();
+
 const tenantId = defineModel<CommonType.IdType>('tenantId', { required: false, default: undefined });
 const enabled = defineModel<boolean>('enabled', { required: false, default: true });
 
@@ -33,6 +36,20 @@ const showTenantSelect = computed<boolean>(() => {
   return hasRole('superadmin') && enabled.value;
 });
 
+/**
+ * 关闭当前页面并刷新
+ *
+ * @param msg 提示信息
+ * @param val 租户ID
+ */
+async function closeAndRefresh(msg: string, val: CommonType.IdType = '') {
+  lastSelected.value = val;
+  window.$message?.success(msg);
+  clearTabs();
+  toHome();
+  appStore.reloadPage(500);
+}
+
 async function handleChangeTenant(_tenantId: CommonType.IdType) {
   if (!_tenantId) {
     return;
@@ -41,18 +58,12 @@ async function handleChangeTenant(_tenantId: CommonType.IdType) {
     return;
   }
   await fetchChangeTenant(_tenantId);
-  lastSelected.value = _tenantId;
-  window.$message?.success('切换租户成功');
-  clearTabs();
-  router.push('/');
+  closeAndRefresh('切换租户成功', _tenantId);
 }
 
 async function handleClearTenant() {
   await fetchClearTenant();
-  lastSelected.value = '';
-  window.$message?.success('切换为默认租户');
-  clearTabs();
-  router.push('/');
+  closeAndRefresh('切换为默认租户');
 }
 
 async function handleFetchTenantList() {
diff --git a/src/hooks/common/router.ts b/src/hooks/common/router.ts
index ac51dfc4..3fadcbee 100644
--- a/src/hooks/common/router.ts
+++ b/src/hooks/common/router.ts
@@ -110,6 +110,7 @@ export function useRouterPush(inSetup = true) {
     routerPushByKeyWithMetaQuery,
     toLogin,
     toggleLoginModule,
-    redirectFromLogin
+    redirectFromLogin,
+    toHome
   };
 }