diff --git a/README.md b/README.md index e4d9cf0..d7d6c63 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ - Secondary encapsulation of commonly used components to meet basic work requirements. - Dark theme adaptation, maintaining the Naive style for interface aesthetics. - Only performs eslint validation during submission without excessive restrictions for simpler development. -- Flexible and configurable interface style layout. +- Flexible and configurable interface layout based on [pro-naive-ui](https://github.com/Zheng-Changfu/pro-naive-ui) - Multilanguage (i18n) support. ## Project preview diff --git a/README.zh-CN.md b/README.zh-CN.md index 8232f36..1083724 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -31,7 +31,7 @@ - 对日常使用频率较高的组件二次封装,满足基础工作需求 - 黑暗主题适配, 界面样式保持Naive风格 - 仅在提交时进行eslint校验,没有过多限制,开发更简便 -- 界面样式布局灵活可配置 +- 基于[pro-naive-ui](https://github.com/Zheng-Changfu/pro-naive-ui)的界面布局,灵活可配置 - 多语言(i18n)支持 ## 项目预览 diff --git a/locales/en_US.json b/locales/en_US.json index ca16936..e7369d3 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -59,9 +59,12 @@ "backHome": "Back to the homepage", "getRouteError": "Failed to obtain route, please try again later.", "layoutSetting": "Layout settings", - "leftMenu": "Left menu", - "topMenu": "Top menu", - "mixMenu": "Mix menu" + "verticalLayout": "Vertical layout", + "horizontalLayout": "Horizontal layout", + "twoColumnLayout": "Two column layout", + "mixedTwoColumnLayout": "Mixed two column layout", + "sidebarLayout": "Sidebar layout", + "mixedSidebarLayout": "Mixed sidebar layout" }, "login": { "signInTitle": "Login", diff --git a/locales/zh_CN.json b/locales/zh_CN.json index e519c66..9441091 100644 --- a/locales/zh_CN.json +++ b/locales/zh_CN.json @@ -59,9 +59,12 @@ "backHome": "回到首页", "getRouteError": "获取路由失败,请稍后再试", "layoutSetting": "布局设置", - "leftMenu": "左侧菜单", - "topMenu": "顶部菜单", - "mixMenu": "混合菜单" + "verticalLayout": "竖向布局", + "horizontalLayout": "横向布局", + "twoColumnLayout": "双栏布局", + "mixedTwoColumnLayout": "混合双栏布局", + "sidebarLayout": "侧边栏布局", + "mixedSidebarLayout": "双栏布局" }, "http": { "400": "请求出现语法错误", diff --git a/package.json b/package.json index f9625f0..9059b09 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "md-editor-v3": "^5.6.1", "pinia": "^3.0.3", "pinia-plugin-persistedstate": "^4.3.0", + "pro-naive-ui": "^2.4.3", "quill": "^2.0.3", "radash": "^12.1.0", "vue": "^3.5.16", diff --git a/src/layouts/Content.vue b/src/layouts/Content.vue new file mode 100644 index 0000000..418556d --- /dev/null +++ b/src/layouts/Content.vue @@ -0,0 +1,22 @@ + + + diff --git a/src/layouts/components/common/LayoutSelector.vue b/src/layouts/components/common/LayoutSelector.vue index 09967dd..bc06683 100644 --- a/src/layouts/components/common/LayoutSelector.vue +++ b/src/layouts/components/common/LayoutSelector.vue @@ -1,63 +1,120 @@