Merge branch 'main' into example

src/views/_builtin/login/index.vue

@@ -2,10 +2,10 @@
 import { computed } from 'vue';
 import type { Component } from 'vue';
 import { getPaletteColorByNumber, mixColor } from '@sa/color';
-import { $t } from '@/locales';
+import { loginModuleRecord } from '@/constants/app';
 import { useAppStore } from '@/store/modules/app';
 import { useThemeStore } from '@/store/modules/theme';
-import { loginModuleRecord } from '@/constants/app';
+import { $t } from '@/locales';
 import PwdLogin from './modules/pwd-login.vue';
 import CodeLogin from './modules/code-login.vue';
 import Register from './modules/register.vue';
@@ -66,6 +66,7 @@ const bgColor = computed(() => {
               @switch="themeStore.toggleThemeScheme"
             />
             <LangSwitch
+              v-if="themeStore.header.multilingual.visible"
               :lang="appStore.locale"
               :lang-options="appStore.localeOptions"
               :show-tooltip="false"

src/views/_builtin/login/modules/code-login.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { computed, reactive } from 'vue';
-import { $t } from '@/locales';
 import { useRouterPush } from '@/hooks/common/router';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
 import { useCaptcha } from '@/hooks/business/captcha';
+import { $t } from '@/locales';
 
 defineOptions({
   name: 'CodeLogin'

src/views/_builtin/login/modules/pwd-login.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { computed, reactive } from 'vue';
-import { $t } from '@/locales';
 import { loginModuleRecord } from '@/constants/app';
+import { useAuthStore } from '@/store/modules/auth';
 import { useRouterPush } from '@/hooks/common/router';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
-import { useAuthStore } from '@/store/modules/auth';
+import { $t } from '@/locales';
 
 defineOptions({
   name: 'PwdLogin'

src/views/_builtin/login/modules/register.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { computed, reactive } from 'vue';
-import { $t } from '@/locales';
 import { useRouterPush } from '@/hooks/common/router';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
 import { useCaptcha } from '@/hooks/business/captcha';
+import { $t } from '@/locales';
 
 defineOptions({
   name: 'Register'

src/views/_builtin/login/modules/reset-pwd.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { computed, reactive } from 'vue';
-import { $t } from '@/locales';
 import { useRouterPush } from '@/hooks/common/router';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
+import { $t } from '@/locales';
 
 defineOptions({
   name: 'ResetPwd'

src/views/home/modules/header-banner.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { computed } from 'vue';
-import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useAuthStore } from '@/store/modules/auth';
+import { $t } from '@/locales';
 
 defineOptions({
   name: 'HeaderBanner'

src/views/home/modules/line-chart.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { watch } from 'vue';
-import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useEcharts } from '@/hooks/common/echarts';
+import { $t } from '@/locales';
 
 defineOptions({
   name: 'LineChart'

src/views/home/modules/pie-chart.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { watch } from 'vue';
-import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useEcharts } from '@/hooks/common/echarts';
+import { $t } from '@/locales';
 
 defineOptions({
   name: 'PieChart'

src/views/plugin/gantt/vtable/index.vue

@@ -184,6 +184,7 @@ const basicGanttOption: VTableGantt.GanttConstructorOptions = {
   },
   markLine: [
     {
+      content: '',
       date: '2024-07-28',
       style: {
         lineWidth: 1,
@@ -192,6 +193,7 @@ const basicGanttOption: VTableGantt.GanttConstructorOptions = {
       }
     },
     {
+      content: '',
       date: '2024-08-17',
       style: {
         lineWidth: 2,
@@ -705,6 +707,7 @@ const customGanttOption: VTableGantt.GanttConstructorOptions = {
   maxDate: '2024-08-15',
   markLine: [
     {
+      content: '',
       date: '2024-07-29',
       style: {
         lineWidth: 1,
@@ -713,6 +716,7 @@ const customGanttOption: VTableGantt.GanttConstructorOptions = {
       }
     },
     {
+      content: '',
       date: '2024-08-17',
       style: {
         lineWidth: 2,

src/views/plugin/icon/index.vue

@@ -27,7 +27,7 @@ const localIcons = ['custom-icon', 'activity', 'at-sign', 'cast', 'chrome', 'cop
     </NCard>
     <NCard title="自定义图标示例" :bordered="false" class="mt-10px card-wrapper">
       <div class="pb-12px text-16px">
-        在src/assets/svg-icon文件夹下的svg文件，通过在template里面以 icon-local-{文件名} 直接渲染,
+        在src/assets/svg-icon文件夹下的svg文件，通过在template里面以 icon - local - {文件名} 直接渲染,
         其中icon-local为.env文件里的 VITE_ICON_LOCAL_PREFIX
       </div>
       <div class="grid grid-cols-10">