Merge branch 'master' of https://github.com/youlaitech/vue3-element-admin

Former-commit-id: ff27d46edba89fcfa3054d87eb6ddf95a33bb563

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.6.0 (2023/8/24)💥💥💥
+
+### ✨ feat
+- 导航顶部模式、混合模式支持（author by [april-tong](https://april-tong.com/)）
+- 平台文档(内嵌)（author by [april-tong](https://april-tong.com/)）
+
 # 2.5.0 (2023/8/8)
 
 ### ✨ feat

package.json

@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "private": true,
-  "version": "2.5.0",
+  "version": "2.6.0",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "dev": "vite serve --mode development",

src/layout/components/Sidebar/SidebarItem.vue

@@ -121,3 +121,9 @@ function resolvePath(routePath: string) {
     </el-sub-menu>
   </div>
 </template>
+
+<style lang="scss" scoped>
+:deep(.el-menu-item .el-menu-tooltip__trigger) {
+  width: auto !important;
+}
+</style>

src/layout/index.vue

@@ -233,6 +233,7 @@ function toggleSideBar() {
   .mix-wrap {
     .el-menu {
       width: $sideBarWidth;
+      border: none;
     }
   }
 }

src/settings.ts

@@ -47,7 +47,7 @@ const defaultSettings: DefaultSettings = {
   tagsView: true,
   fixedHeader: false,
   sidebarLogo: true,
-  layout: "left",
+  layout: "mix",
   /**
    *  主题模式
    *

src/styles/sidebar.scss

@@ -47,7 +47,7 @@
     }
 
     .svg-icon {
-      margin-right: 16px;
+      margin-right: 12px;
     }
 
     .sub-el-icon {
@@ -83,6 +83,13 @@
     }
   }
 
+  .left-wrap {
+    .svg-icon {
+      margin-top: -2px;
+      margin-right: 12px;
+    }
+  }
+
   .hideSidebar {
     .sidebar-container {
       width: 54px !important;
@@ -174,7 +181,7 @@
 .el-menu--vertical {
   & > .el-menu {
     .svg-icon {
-      margin-right: 16px;
+      margin-right: 12px;
     }
 
     .sub-el-icon {

src/views/dashboard/index.vue

@@ -180,7 +180,7 @@ orderCount.value = 2000;
 
     <!-- Echarts 图表 -->
     <el-row :gutter="40">
-      <el-col :sm="24" :lg="8" class="mb-4">
+      <el-col :sm="24" :lg="8" class="mb-2">
         <BarChart
           id="barChart"
           height="400px"
@@ -189,7 +189,7 @@ orderCount.value = 2000;
         />
       </el-col>
 
-      <el-col :xs="24" :sm="12" :lg="8" class="mb-4">
+      <el-col :xs="24" :sm="12" :lg="8" class="mb-2">
         <PieChart
           id="pieChart"
           height="400px"
@@ -198,7 +198,7 @@ orderCount.value = 2000;
         />
       </el-col>
 
-      <el-col :xs="24" :sm="12" :lg="8" class="mb-4">
+      <el-col :xs="24" :sm="12" :lg="8" class="mb-2">
         <RadarChart
           id="radarChart"
           height="400px"

src/views/system/user/index.vue

@@ -294,13 +294,6 @@ function downloadTemplate() {
   });
 }
 
-/** 打开导入弹窗 */
-async function openImportDialog() {
-  await getDeptOptions();
-  importDeptId.value = undefined;
-  importDialog.visible = true;
-}
-
 /**
  * Excel文件change事件
  *
@@ -316,8 +309,22 @@ function handleExcelChange(file: UploadFile) {
   excelFile.value = file.raw;
 }
 
+/** 打开导入弹窗 */
+async function openImportDialog() {
+  await getDeptOptions();
+  importDeptId.value = undefined;
+  importDialog.visible = true;
+}
+
+/** 关闭导入弹窗 */
+function closeImportDialog() {
+  importDialog.visible = false;
+  excelFile.value = undefined;
+  excelFilelist.value = [];
+}
+
 /** 导入用户提交 */
-function handleUserImport() {
+function handleImport() {
   if (importDeptId.value) {
     if (!excelFile.value) {
       ElMessage.warning("上传Excel文件不能为空");
@@ -331,15 +338,8 @@ function handleUserImport() {
   }
 }
 
-/**  关闭导入弹窗 */
-function closeImportDialog() {
-  importDialog.visible = false;
-  excelFile.value = undefined;
-  excelFilelist.value = [];
-}
-
 /** 导出用户 */
-function handleUserExport() {
+function handleExport() {
   exportUser(queryParams).then((response: any) => {
     const blob = new Blob([response.data], {
       type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
@@ -457,7 +457,7 @@ onMounted(() => {
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>
-                <el-button class="ml-3" @click="handleUserExport"
+                <el-button class="ml-3" @click="handleExport"
                   ><template #icon><i-ep-download /></template>导出</el-button
                 >
               </div>
@@ -695,7 +695,7 @@ onMounted(() => {
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="handleUserImport">确 定</el-button>
+          <el-button type="primary" @click="handleImport">确 定</el-button>
           <el-button @click="closeImportDialog">取 消</el-button>
         </div>
       </template>