Merge remote-tracking branch 'upstream/develop' into refactor/eslint

Author: timi137137

CHANGELOG.md

@@ -5,23 +5,23 @@ toc: false
 docClass: timeline
 ---
 
-## 🌈 0.12.0 `2025-01-06` 
-### 🐞 Bug Fixes
-- `Vue`: 修复升级至 Vue 3.4 及 3.5 的生产模式下的问题 @uyarn ([#796](https://github.com/Tencent/tdesign-vue-next-starter/pull/796))
-### 📈 Performance
+## 🌈 0.12.0 `2025-01-06` 
+### 🐞 Bug Fixes
+- `Vue`: 修复升级至 Vue 3.4 及 3.5 的生产模式下的问题 @uyarn ([#796](https://github.com/Tencent/tdesign-vue-next-starter/pull/796))
+### 📈 Performance
 - defineProps改为Vue3.5解构语法 @liect ([#799](https://github.com/Tencent/tdesign-vue-next-starter/pull/799))
 
-## 🌈 0.11.0 `2024-11-06` 
-### 🚀 Features
-- `feat`: 调整默认lock文件配置 @timi137137 ([#717](https://github.com/Tencent/tdesign-vue-next-starter/pull/717))
-- `Router`: 路由跳转携带参数 @SuxueCode ([#720](https://github.com/Tencent/tdesign-vue-next-starter/pull/720))
-- `feat`: 新增菜单自动折叠 @RSS1102 ([#744](https://github.com/Tencent/tdesign-vue-next-starter/pull/744))
-### 🐞 Bug Fixes
-- `breadcrumb`: 修复多层级路由指向错误 @lz6060788 ([#749](https://github.com/Tencent/tdesign-vue-next-starter/pull/749))
-- `deps`: 修正因锁文件错误导致的编译失败 @timi137137 ([#777](https://github.com/Tencent/tdesign-vue-next-starter/pull/777))
-### 🚧 Others
-- `revert`: 回退Vue 3.3 @timi137137 ([#709](https://github.com/Tencent/tdesign-vue-next-starter/pull/709))
-- build(deps-dev): bump @types/lodash from 4.14.202 to 4.17.6 @dependabot[bot] ([#732](https://github.com/Tencent/tdesign-vue-next-starter/pull/732))
+## 🌈 0.11.0 `2024-11-06` 
+### 🚀 Features
+- `feat`: 调整默认lock文件配置 @timi137137 ([#717](https://github.com/Tencent/tdesign-vue-next-starter/pull/717))
+- `Router`: 路由跳转携带参数 @SuxueCode ([#720](https://github.com/Tencent/tdesign-vue-next-starter/pull/720))
+- `feat`: 新增菜单自动折叠 @RSS1102 ([#744](https://github.com/Tencent/tdesign-vue-next-starter/pull/744))
+### 🐞 Bug Fixes
+- `breadcrumb`: 修复多层级路由指向错误 @lz6060788 ([#749](https://github.com/Tencent/tdesign-vue-next-starter/pull/749))
+- `deps`: 修正因锁文件错误导致的编译失败 @timi137137 ([#777](https://github.com/Tencent/tdesign-vue-next-starter/pull/777))
+### 🚧 Others
+- `revert`: 回退Vue 3.3 @timi137137 ([#709](https://github.com/Tencent/tdesign-vue-next-starter/pull/709))
+- build(deps-dev): bump @types/lodash from 4.14.202 to 4.17.6 @dependabot[bot] ([#732](https://github.com/Tencent/tdesign-vue-next-starter/pull/732))
 - build(deps): bump tdesign-vue-next from 1.9.3 to 1.9.9 @dependabot[bot] ([#748](https://github.com/Tencent/tdesign-vue-next-starter/pull/748))
 
 ## 🌈 0.10.0 `2024-04-02`
@@ -141,7 +141,7 @@ docClass: timeline
 - 升级相关依赖 `vite`需升级至`3.0`以上，支持图标后端配置等场景需求  by @timi137137 @uyarn (https://github.com/Tencent/tdesign-vue-next-starter/pull/394)
 
 ### 🐞 Bug Fixes
-- 修复自定义颜色切换明亮暗黑模式时无法沿用的缺陷 by @uyarn (https://github.com/Tencent/tdesign-vue-next-starter/pull/392)
+- 修复自定义颜色切换明亮深色模式时无法沿用的缺陷 by @uyarn (https://github.com/Tencent/tdesign-vue-next-starter/pull/392)
 
 `Tips: 此次发布 较 0.6.x 版本 删除了此前大量内置项目的色彩生成逻辑，权限控制相关逻辑也发生巨大变动 若打开预览无法访问请清除 localStorage 等缓存再尝试 跟进升级请慎重`
 
@@ -276,7 +276,7 @@ docClass: timeline
 - 模板中使用颜色变量全部改造为CSS Token by @kerwin612 ([#157](https://github.com/Tencent/tdesign-vue-next-starter/pull/157))
 
 ### 🐞 Bug Fixes
--  升级组件库至0.15.4，修复菜单字重及顶部菜单箭头翻转方向、暗黑模式的颜色问题 by @uyarn @leejim ([#159](https://github.com/Tencent/tdesign-vue-next-starter/pull/159))  [tdesign-vue-next#916](https://github.com/Tencent/tdesign-vue-next/pull/916)
+-  升级组件库至0.15.4，修复菜单字重及顶部菜单箭头翻转方向、深色模式的颜色问题 by @uyarn @leejim ([#159](https://github.com/Tencent/tdesign-vue-next-starter/pull/159))  [tdesign-vue-next#916](https://github.com/Tencent/tdesign-vue-next/pull/916)
 
 ## 🌈 0.3.2 `2022-05-27`
 ### 🚀  Features

README-zh_CN.md

@@ -35,7 +35,7 @@ TDesign Vue Next Starter 是一个基于 TDesign，使用 `Vue3`、`Vite`、`Pin
 - 内置多种常用的中后台页面
 - 完善的目录结构
 - 完善的代码规范配置
-- 支持暗黑模式
+- 支持深色模式
 - 自定义主题颜色
 - 多种空间布局
 - 内置 Mock 数据方案

package-lock.json

@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@vueuse/core": "^12.3.0",
-    "axios": "^1.8.3",
+    "axios": "^1.8.4",
     "dayjs": "^1.11.13",
     "echarts": "5.4.3",
     "lodash": "^4.17.21",
@@ -32,7 +32,7 @@
     "qrcode.vue": "^3.4.1",
     "qs": "^6.13.1",
     "tdesign-icons-vue-next": "^0.3.4",
-    "tdesign-vue-next": "^1.11.4",
+    "tdesign-vue-next": "^1.11.5",
     "tvision-color": "^1.6.0",
     "vue": "^3.5.13",
     "vue-i18n": "^9.9.1",

package.json

@@ -13,10 +13,9 @@ import { useLocale } from '@/locales/useLocale';
 import type { RouteMeta } from '@/types/interface';
 
 const { locale } = useLocale();
+const route = useRoute();
 
 const crumbs = computed(() => {
-  const route = useRoute();
-
   const pathArray = route.path.split('/');
   pathArray.shift();
 

src/layouts/components/Breadcrumb.vue

@@ -28,7 +28,7 @@ export default {
       color: '主题色',
       options: {
         light: '明亮',
-        dark: '暗黑',
+        dark: '深色',
         auto: '跟随系统',
       },
     },

src/locales/lang/zh_CN/layout.ts

@@ -1,6 +1,6 @@
 /* eslint-disable simple-import-sort/imports */
-import TDesign from 'tdesign-vue-next';
 import { createApp } from 'vue';
+import TDesign from 'tdesign-vue-next';
 
 import App from './App.vue';
 import router from './router';

src/main.ts

@@ -62,11 +62,6 @@
     </t-row>
   </t-card>
 </template>
-<script lang="ts">
-export default {
-  name: 'DashboardBase',
-};
-</script>
 <script setup lang="ts">
 import { useWindowSize } from '@vueuse/core';
 import { LineChart } from 'echarts/charts';
@@ -84,6 +79,10 @@ import { LAST_7_DAYS } from '@/utils/date';
 
 import { constructInitDataset } from '../index';
 
+defineOptions({
+  name: 'DashboardBase',
+});
+
 echarts.use([TooltipComponent, LegendComponent, GridComponent, LineChart, CanvasRenderer]);
 
 const store = useSettingStore();

src/pages/dashboard/base/components/OutputOverview.vue

@@ -48,11 +48,6 @@
     </t-col>
   </t-row>
 </template>
-<script lang="ts">
-export default {
-  name: 'DashboardBase',
-};
-</script>
 <script setup lang="ts">
 import { useWindowSize } from '@vueuse/core';
 import { BarChart, LineChart } from 'echarts/charts';
@@ -69,6 +64,10 @@ import { changeChartsTheme } from '@/utils/color';
 
 import { constructInitDashboardDataset } from '../index';
 
+defineOptions({
+  name: 'DashboardBase',
+});
+
 echarts.use([LineChart, BarChart, CanvasRenderer]);
 
 const store = useSettingStore();

src/pages/dashboard/base/components/TopPanel.vue

@@ -10,16 +10,15 @@
     <output-overview class="row-container" />
   </div>
 </template>
-<script lang="ts">
-export default {
-  name: 'DashboardBase',
-};
-</script>
 <script setup lang="ts">
 import MiddleChart from './components/MiddleChart.vue';
 import OutputOverview from './components/OutputOverview.vue';
 import RankList from './components/RankList.vue';
 import TopPanel from './components/TopPanel.vue';
+
+defineOptions({
+  name: 'DashboardBase',
+});
 </script>
 <style scoped>
 .row-container:not(:last-child) {