diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a0f1b5..1180775 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,12 @@ 🎉🎉🔥 `vue-next-admin-template-js` 基于 （vue-next-admin-template v0.2.2 版本） vue3.x 、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支） +## 2.0.2 + +- 🎉 同步 vue-next-admin-template 基础版本（不带国际化） 分支 v2.0.2 版本内容，具体查看 master CHANGELOG.md + ## 0.1.0 `2021.12.27` -- 🎉 新增 vue-next-admin-template-js 基础版本（不带国际化），切换 `vue-next-admin-template-js` 分支 +- 🎉 新增 vue-next-admin-template 基础版本（不带国际化），切换 `vue-next-admin-template-js` 分支 diff --git a/README.md b/README.md index 10167de..a22a61e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@

 

-#### 🌈 介绍 基础版 js（不带国际化，基于vue-next-admin-template V0.2.2版） +#### 🌈 介绍 基础版 js（不带国际化，基于 vue-next-admin-template V2.0.2 版） 基于 vue3.x + CompositionAPI + vite + element plus + vue-router-next，适配手机、平板、pc 的后台开源免费模板，希望减少工作量，帮助大家实现快速开发。 @@ -73,19 +73,23 @@ cnpm run build #### 💯 学习交流加 QQ 群 -- 若加群了没同意（一般不会超过一天），那就是群满了，请换一个群试试 -- 查看开发文档：vue-next-admin-doc +- 若加群了没同意（一般秒过），那就是群满了（500 人群），请换一个群试试，3 群未满 +- 查看开发文档、vue-next-admin 开发文档正在编写中... - 群号码： 1 群：665452019 2 群：766356862 + 3 群：795345435 - vue-next-admin 讨论群 + vue-next-admin 讨论群1 vue-next-admin 讨论群 - + + vue-next-admin 讨论群3 + + #### 💒 集成后端 - @熊猫 PandaGoAdmin diff --git a/package.json b/package.json index 7369808..a2271dc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-next-admin-template-js", - "version": "0.1.0", + "version": "2.0.2", "description": "vue3 vite next admin template js setup", "author": "lyt_20201208", "license": "MIT", @@ -10,33 +10,33 @@ "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/" }, "dependencies": { - "@element-plus/icons-vue": "^0.2.4", - "axios": "^0.24.0", - "echarts": "^5.2.2", - "element-plus": "^1.2.0-beta.6", + "@element-plus/icons-vue": "^1.0.1", + "axios": "^0.26.0", + "echarts": "^5.3.0", + "element-plus": "^2.0.4", "mitt": "^3.0.0", "nprogress": "^0.2.0", "qrcodejs2-fixes": "^0.0.2", - "screenfull": "^6.0.0", + "screenfull": "^6.0.1", "sortablejs": "^1.14.0", - "vue": "^3.2.20", + "vue": "^3.2.31", "vue-clipboard3": "^1.0.1", - "vue-router": "^4.0.12", + "vue-router": "^4.0.13", "vuex": "^4.0.2" }, "devDependencies": { - "@vitejs/plugin-vue": "^2.0.1", - "@vue/compiler-sfc": "^3.2.26", - "dotenv": "^10.0.0", - "eslint": "^8.5.0", - "eslint-plugin-vue": "^8.2.0", + "@vitejs/plugin-vue": "^2.2.4", + "@vue/compiler-sfc": "^3.2.31", + "dotenv": "^16.0.0", + "eslint": "^8.10.0", + "eslint-plugin-vue": "^8.5.0", "prettier": "^2.5.1", - "sass": "^1.45.1", - "sass-loader": "^12.4.0", - "unplugin-auto-import": "^0.5.4", - "vite": "^2.7.4", - "vite-plugin-vue-setup-extend": "^0.1.0", - "vue-eslint-parser": "^8.0.1" + "sass": "^1.49.9", + "sass-loader": "^12.6.0", + "unplugin-auto-import": "^0.6.1", + "vite": "^2.8.6", + "vite-plugin-vue-setup-extend": "^0.4.0", + "vue-eslint-parser": "^8.3.0" }, "browserslist": [ "> 1%", diff --git a/src/App.vue b/src/App.vue index f6e3a28..d51ccde 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,11 +1,14 @@ diff --git a/src/layout/component/aside.vue b/src/layout/component/aside.vue index 8c84528..2d52fd1 100644 --- a/src/layout/component/aside.vue +++ b/src/layout/component/aside.vue @@ -26,7 +26,8 @@ const isTagsViewCurrenFull = computed(() => { // 设置菜单展开/收起时的宽度 const setCollapseStyle = computed(() => { const { layout, isCollapse, menuBar } = store.state.themeConfig.themeConfig; - const asideBrColor = menuBar === '#FFFFFF' || menuBar === '#FFF' || menuBar === '#fff' || menuBar === '#ffffff' ? 'layout-el-aside-br-color' : ''; + const asideBrTheme = ['#FFFFFF', '#FFF', '#fff', '#ffffff']; + const asideBrColor = asideBrTheme.includes(menuBar) ? 'layout-el-aside-br-color' : ''; // 判断是否是手机端 if (state.clientWidth <= 1000) { if (isCollapse) { diff --git a/src/layout/component/columnsAside.vue b/src/layout/component/columnsAside.vue index 9ce66b7..85724c2 100644 --- a/src/layout/component/columnsAside.vue +++ b/src/layout/component/columnsAside.vue @@ -184,11 +184,11 @@ onBeforeRouteUpdate((to) => { .layout-columns-aside { width: 70px; height: 100%; - background: var(--bg-columnsMenuBar); + background: var(--next-bg-columnsMenuBar); ul { position: relative; li { - color: var(--bg-columnsMenuBarColor); + color: var(--next-bg-columnsMenuBarColor); width: 100%; height: 50px; text-align: center; @@ -220,22 +220,22 @@ onBeforeRouteUpdate((to) => { } a { text-decoration: none; - color: var(--bg-columnsMenuBarColor); + color: var(--next-bg-columnsMenuBarColor); } } .layout-columns-active { - color: var(--color-whites) !important; + color: var(--el-color-white); transition: 0.3s ease-in-out; } .layout-columns-hover { - color: var(--color-primary); + color: var(--el-color-primary); a { - color: var(--color-primary); + color: var(--el-color-primary); } } .columns-round { - background: var(--color-primary); - color: var(--color-whites); + background: var(--el-color-primary); + color: var(--el-color-white); position: absolute; left: 50%; top: 2px; diff --git a/src/layout/component/main.vue b/src/layout/component/main.vue index 8647443..4ec7891 100644 --- a/src/layout/component/main.vue +++ b/src/layout/component/main.vue @@ -3,13 +3,9 @@ - +