chore: 将 layout 重命名为 layouts

This commit is contained in:
pany 2023-07-06 13:14:44 +08:00
parent 442ae06c47
commit 025a69883f
29 changed files with 18 additions and 18 deletions

View File

@ -1,5 +1,5 @@
<div align="center"> <div align="center">
<img alt="V3 Admin Vite Logo" width="120" height="120" src="./src/assets/layout/logo.png"> <img alt="V3 Admin Vite Logo" width="120" height="120" src="./src/assets/layouts/logo.png">
<h1>V3 Admin Vite</h1> <h1>V3 Admin Vite</h1>
<span>English | <a href="./README.zh-CN.md">中文</a></span> <span>English | <a href="./README.zh-CN.md">中文</a></span>
</div> </div>

View File

@ -1,5 +1,5 @@
<div align="center"> <div align="center">
<img alt="V3 Admin Vite Logo" width="120" height="120" src="./src/assets/layout/logo.png"> <img alt="V3 Admin Vite Logo" width="120" height="120" src="./src/assets/layouts/logo.png">
<h1>V3 Admin Vite</h1> <h1>V3 Admin Vite</h1>
<span><a href="./README.md">English</a> | 中文</span> <span><a href="./README.md">English</a> | 中文</span>
</div> </div>

View File

Before

Width:  |  Height:  |  Size: 373 KiB

After

Width:  |  Height:  |  Size: 373 KiB

View File

Before

Width:  |  Height:  |  Size: 407 KiB

After

Width:  |  Height:  |  Size: 407 KiB

View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -3,9 +3,9 @@ import { computed } from "vue"
import { storeToRefs } from "pinia" import { storeToRefs } from "pinia"
import { useSettingsStore } from "@/store/modules/settings" import { useSettingsStore } from "@/store/modules/settings"
import { getCssVariableValue } from "@/utils" import { getCssVariableValue } from "@/utils"
import logo from "@/assets/layout/logo.png?url" import logo from "@/assets/layouts/logo.png?url"
import logoText1 from "@/assets/layout/logo-text-1.png?url" import logoText1 from "@/assets/layouts/logo-text-1.png?url"
import logoText2 from "@/assets/layout/logo-text-2.png?url" import logoText2 from "@/assets/layouts/logo-text-2.png?url"
interface Props { interface Props {
collapse?: boolean collapse?: boolean

View File

@ -1,12 +1,12 @@
import { type RouteRecordRaw, createRouter, createWebHashHistory, createWebHistory } from "vue-router" import { type RouteRecordRaw, createRouter, createWebHashHistory, createWebHistory } from "vue-router"
const Layout = () => import("@/layout/index.vue") const Layouts = () => import("@/layouts/index.vue")
/** 常驻路由 */ /** 常驻路由 */
export const constantRoutes: RouteRecordRaw[] = [ export const constantRoutes: RouteRecordRaw[] = [
{ {
path: "/redirect", path: "/redirect",
component: Layout, component: Layouts,
meta: { meta: {
hidden: true hidden: true
}, },
@ -41,7 +41,7 @@ export const constantRoutes: RouteRecordRaw[] = [
}, },
{ {
path: "/", path: "/",
component: Layout, component: Layouts,
redirect: "/dashboard", redirect: "/dashboard",
children: [ children: [
{ {
@ -58,7 +58,7 @@ export const constantRoutes: RouteRecordRaw[] = [
}, },
{ {
path: "/unocss", path: "/unocss",
component: Layout, component: Layouts,
redirect: "/unocss/index", redirect: "/unocss/index",
children: [ children: [
{ {
@ -74,7 +74,7 @@ export const constantRoutes: RouteRecordRaw[] = [
}, },
{ {
path: "/link", path: "/link",
component: Layout, component: Layouts,
children: [ children: [
{ {
path: "https://juejin.cn/post/7089377403717287972", path: "https://juejin.cn/post/7089377403717287972",
@ -89,7 +89,7 @@ export const constantRoutes: RouteRecordRaw[] = [
}, },
{ {
path: "/table", path: "/table",
component: Layout, component: Layouts,
redirect: "/table/element-plus", redirect: "/table/element-plus",
name: "Table", name: "Table",
meta: { meta: {
@ -119,7 +119,7 @@ export const constantRoutes: RouteRecordRaw[] = [
}, },
{ {
path: "/menu", path: "/menu",
component: Layout, component: Layouts,
redirect: "/menu/menu1", redirect: "/menu/menu1",
name: "Menu", name: "Menu",
meta: { meta: {
@ -193,7 +193,7 @@ export const constantRoutes: RouteRecordRaw[] = [
}, },
{ {
path: "/hook-demo", path: "/hook-demo",
component: Layout, component: Layouts,
redirect: "/hook-demo/use-fetch-select", redirect: "/hook-demo/use-fetch-select",
name: "HookDemo", name: "HookDemo",
meta: { meta: {
@ -230,7 +230,7 @@ export const constantRoutes: RouteRecordRaw[] = [
export const asyncRoutes: RouteRecordRaw[] = [ export const asyncRoutes: RouteRecordRaw[] = [
{ {
path: "/permission", path: "/permission",
component: Layout, component: Layouts,
redirect: "/permission/page", redirect: "/permission/page",
name: "Permission", name: "Permission",
meta: { meta: {

View File

@ -1,6 +1,6 @@
import { type Ref, ref, watch } from "vue" import { type Ref, ref, watch } from "vue"
import { defineStore } from "pinia" import { defineStore } from "pinia"
import { type LayoutSettings, layoutSettings } from "@/config/layout" import { type LayoutSettings, layoutSettings } from "@/config/layouts"
import { setConfigLayout } from "@/utils/cache/local-storage" import { setConfigLayout } from "@/utils/cache/local-storage"
type SettingsStore = { type SettingsStore = {

View File

@ -1,5 +1,5 @@
.#{$theme-name} { .#{$theme-name} {
@import "./layout.scss"; @import "./layouts.scss";
@import "./login.scss"; @import "./login.scss";
@import "./error-page.scss"; @import "./error-page.scss";
@import "./element-plus.scss"; @import "./element-plus.scss";

View File

@ -4,7 +4,7 @@ import CacheKey from "@/constants/cache-key"
import { type SidebarOpened, type SidebarClosed } from "@/constants/app-key" import { type SidebarOpened, type SidebarClosed } from "@/constants/app-key"
import { type ThemeName } from "@/hooks/useTheme" import { type ThemeName } from "@/hooks/useTheme"
import { type TagView } from "@/store/modules/tags-view" import { type TagView } from "@/store/modules/tags-view"
import { type LayoutSettings } from "@/config/layout" import { type LayoutSettings } from "@/config/layouts"
//#region 系统布局配置 //#region 系统布局配置
export const getConfigLayout = () => { export const getConfigLayout = () => {

View File

@ -74,7 +74,7 @@ createCode()
<ThemeSwitch class="theme-switch" /> <ThemeSwitch class="theme-switch" />
<div class="login-card"> <div class="login-card">
<div class="title"> <div class="title">
<img src="@/assets/layout/logo-text-2.png" /> <img src="@/assets/layouts/logo-text-2.png" />
</div> </div>
<div class="content"> <div class="content">
<el-form ref="loginFormRef" :model="loginFormData" :rules="loginFormRules" @keyup.enter="handleLogin"> <el-form ref="loginFormRef" :model="loginFormData" :rules="loginFormRules" @keyup.enter="handleLogin">