From 99d11116da7cac752cbe36f63a4bd5a80e67df5c Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 12 Jun 2024 10:24:59 +0800
Subject: [PATCH] =?UTF-8?q?style(sj=5F1.1.0=5Fbeta1):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E5=88=87=E6=8D=A2=E7=BB=84=E4=BB=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/namespace-select/index.vue        | 35 +++++++++++++++----
 src/store/modules/auth/index.ts               |  4 +++
 src/views/namespace/index.vue                 |  3 --
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/layouts/modules/namespace-select/index.vue b/src/layouts/modules/namespace-select/index.vue
index ebb481d..298c961 100644
--- a/src/layouts/modules/namespace-select/index.vue
+++ b/src/layouts/modules/namespace-select/index.vue
@@ -1,5 +1,5 @@
 <script lang="tsx" setup>
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import { $t } from '@/locales';
 import { localStg } from '@/utils/storage';
@@ -18,10 +18,28 @@ const authStore = useAuthStore();
 const namespaceId = ref<string>(localStg.get('namespaceId')!);
 const userInfo = localStg.get('userInfo');
 
+watch(
+  () => authStore.namespaceUniqueId,
+  val => {
+    namespaceId.value = val;
+    authStore.setNamespaceId(val);
+  }
+);
+
 const dropOptions = computed(() =>
   userInfo?.namespaceIds.map(item => {
     return {
-      label: () => <span class="block w-120px">{item.name}</span>,
+      label: () => {
+        if (item.uniqueId === namespaceId.value) {
+          return (
+            <div class="flex-center">
+              <span class="block w-113px">{item.name}</span>
+              <SvgIcon icon="ant-design:check-outlined" />
+            </div>
+          );
+        }
+        return <span class="block w-120px">{item.name}</span>;
+      },
       key: item.uniqueId
     };
   })
@@ -34,7 +52,7 @@ const onChange = (value: string) => {
 };
 
 const namespaceName = computed(() => {
-  return userInfo?.namespaceIds.filter(item => (item.id = namespaceId.value))[0].name || 'Default';
+  return userInfo?.namespaceIds.filter(item => item.uniqueId === namespaceId.value)[0].name || 'Default';
 });
 </script>
 
@@ -60,16 +78,19 @@ const namespaceName = computed(() => {
 
 <style lang="scss" scoped>
 .namespace-select {
-  width: 150px;
+  width: 158px;
   border: 1px solid rgb(224, 224, 230);
-  border-radius: 6px;
+  border-radius: 35px;
 
-  :deep(.n-button):hover {
+  :deep(.n-button):hover,
+  :deep(.n-button):focus {
     background-color: var(--n-color);
   }
 
   :deep(.n-ellipsis) {
-    max-width: 96px;
+    width: 100%;
+    text-align: left;
+    max-width: 88px;
   }
 
   :deep(.n-button) {
diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts
index f7469fc..97569e6 100644
--- a/src/store/modules/auth/index.ts
+++ b/src/store/modules/auth/index.ts
@@ -19,6 +19,8 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
 
   const token = ref(getToken());
 
+  const namespaceUniqueId = ref('');
+
   const userInfo: Api.Auth.UserInfo = reactive({
     id: '',
     userId: '',
@@ -160,6 +162,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
   }
 
   function setNamespaceId(namespaceId: string) {
+    namespaceUniqueId.value = namespaceId;
     const userNamespace = localStg.get('userNamespace') || {};
     userNamespace[userInfo.userId] = namespaceId;
     localStg.set('userNamespace', userNamespace);
@@ -169,6 +172,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
   return {
     token,
     userInfo,
+    namespaceUniqueId,
     isStaticSuper,
     isLogin,
     loginLoading,
diff --git a/src/views/namespace/index.vue b/src/views/namespace/index.vue
index ea19020..46e3455 100644
--- a/src/views/namespace/index.vue
+++ b/src/views/namespace/index.vue
@@ -1,7 +1,6 @@
 <script setup lang="tsx">
 import { NButton } from 'naive-ui';
 import { ref } from 'vue';
-import { useRouter } from 'vue-router';
 import { fetchGetNamespaceList } from '@/service/api';
 import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
@@ -12,7 +11,6 @@ import SvgIcon from '@/components/custom/svg-icon.vue';
 import NamespaceOperateDrawer from './modules/namespace-operate-drawer.vue';
 import NamespaceSearch from './modules/namespace-search.vue';
 
-const router = useRouter();
 const appStore = useAppStore();
 const authStore = useAuthStore();
 const namespaceId = ref<string>(localStg.get('namespaceId')!);
@@ -20,7 +18,6 @@ const namespaceId = ref<string>(localStg.get('namespaceId')!);
 const handleChange = (uniqueId: string) => {
   namespaceId.value = uniqueId;
   authStore.setNamespaceId(uniqueId);
-  router.go(0);
 };
 
 const { columns, columnChecks, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({