Merge branch '2.x' of https://github.com/zclzone/vue-naive-admin into 2.x

src/components/common/ThemeSetting.vue

@@ -1,9 +1,10 @@
 <template>
-  <n-tooltip trigger="hover">
+  <div class="f-c-c">
+    <n-tooltip trigger="hover" placement="bottom">
       <template #trigger>
         <n-color-picker
           id="theme-setting"
-        class="mr-16 h-32 w-32"
+          class="h-32 w-32"
           :value="appStore.primaryColor"
           :swatches="primaryColors"
           :on-update:value="(v) => appStore.setPrimaryColor(v)"
@@ -12,6 +13,7 @@
       </template>
       设置主题色
     </n-tooltip>
+  </div>
 </template>
 
 <script setup>