diff --git a/.env.development b/.env.development index 83d0de6..45af119 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,2 @@ # 开发环境 -VUE_APP_BASE_API = 'http://localhost:9999/' \ No newline at end of file +VUE_APP_BASE_API = http://localhost:9999/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 281a5cd..86ec8dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ 🎉🎉🔥 `vue-prev-admin` 基于 vue2.x + webpack + element ui，适配手机、平板、pc 的后台开源免费模板库（vue3.x 请切换 master 分支） +## 1.2.2 + +`2023.02.23` + +🚩🚩🚩 感谢 [驰骋工作流引擎-表单引擎-低代码开发平台](http://www.ccflow.org/) 赞助商的赞助。驰骋公司为社会提供流程引擎+表单引擎+低代码开发平台一体的开源软件解决方案，欢迎广大开发者前去体验！ + +- 🎉 新增 赞助商组件（`/src/layout/sponsors`），[项目目录结构查看](https://lyt-top.gitee.io/vue-next-admin-doc-preview/config/) +- 🎯 优化 `/src/utils/storage` 下 `key` 编写成 `${__NEXT_NAME__}:${key}`，防止部署多套系统到同一域名不同目录时，变量共用的问题（`__NEXT_NAME__`为 `package.json` 中的 `name`） + ## 1.2.1 `2022.12.12` diff --git a/README.md b/README.md index f51a6ce..1a4f5d4 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,28 @@

- - vue - - - element ui - + + vue + + + element ui + - webpack + webpack - license + license

 

+#### 💝 长期赞助商 + + + + + #### 🌈 介绍 基于 vue2.x + webpack + element ui，适配手机、平板、pc 的后台开源免费模板，希望减少工作量，帮助大家实现快速开发。 diff --git a/package.json b/package.json index a181fea..de1ea7a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-prev-admin", - "version": "1.2.1", + "version": "1.2.2", "private": true, "description": "vue2 webpack admin template", "author": "lyt_20201208", diff --git a/src/App.vue b/src/App.vue index 193f556..46c0ab7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,6 +3,7 @@ + @@ -12,9 +13,10 @@ import setIntroduction from '@/utils/setIconfont.js'; import { Local } from '@/utils/storage.js'; import Setings from '@/layout/navBars/breadcrumb/setings.vue'; import Upgrade from '@/layout/upgrade/index.vue'; +import Sponsors from '@/layout/sponsors/index.vue'; export default { name: 'App', - components: { Setings, Upgrade }, + components: { Setings, Upgrade, Sponsors }, mounted() { this.initSetIconfont(); this.openSetingsDrawer(); diff --git a/src/assets/ccflowRightNextAdmin.png b/src/assets/ccflowRightNextAdmin.png new file mode 100644 index 0000000..9b44a6e Binary files /dev/null and b/src/assets/ccflowRightNextAdmin.png differ diff --git a/src/layout/component/columnsAside.vue b/src/layout/component/columnsAside.vue index d36605b..65fd576 100644 --- a/src/layout/component/columnsAside.vue +++ b/src/layout/component/columnsAside.vue @@ -66,6 +66,7 @@ export default { methods: { // 设置菜单高亮位置移动 setColumnsAsideMove(k) { + if (k === undefined) return false; const els = this.$refs.columnsAsideOffsetTopRefs; this.liIndex = k; this.$refs.columnsAsideActiveRef.style.top = `${els[k].offsetTop + this.difference}px`; @@ -194,7 +195,8 @@ export default { color: var(--prev-bg-columnsMenuBarColor); } } - .layout-columns-active { + .layout-columns-active, + .layout-columns-active a { color: var(--prev-color-text-white); transition: 0.3s ease-in-out; } diff --git a/src/layout/sponsors/index.vue b/src/layout/sponsors/index.vue new file mode 100644 index 0000000..d99cdd8 --- /dev/null +++ b/src/layout/sponsors/index.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/src/utils/storage.js b/src/utils/storage.js index 098e3be..fec4136 100644 --- a/src/utils/storage.js +++ b/src/utils/storage.js @@ -1,17 +1,24 @@ +import config from '/package.json'; + // 1、window.localStorage 浏览器永久缓存 export const Local = { + // 查看 v2.4.3版本更新日志 + setKey(key) { + // @ts-ignore + return `${config.name}:${key}`; + }, // 设置永久缓存 set(key, val) { - window.localStorage.setItem(key, JSON.stringify(val)); + window.localStorage.setItem(Local.setKey(key), JSON.stringify(val)); }, // 获取永久缓存 get(key) { - let json = window.localStorage.getItem(key); + let json = window.localStorage.getItem(Local.setKey(key)); return JSON.parse(json); }, // 移除永久缓存 remove(key) { - window.localStorage.removeItem(key); + window.localStorage.removeItem(Local.setKey(key)); }, // 移除全部永久缓存 clear() { @@ -23,16 +30,16 @@ export const Local = { export const Session = { // 设置临时缓存 set(key, val) { - window.sessionStorage.setItem(key, JSON.stringify(val)); + window.sessionStorage.setItem(Local.setKey(key), JSON.stringify(val)); }, // 获取临时缓存 get(key) { - let json = window.sessionStorage.getItem(key); + let json = window.sessionStorage.getItem(Local.setKey(key)); return JSON.parse(json); }, // 移除临时缓存 remove(key) { - window.sessionStorage.removeItem(key); + window.sessionStorage.removeItem(Local.setKey(key)); }, // 移除全部临时缓存 clear() { diff --git a/vue.config.js b/vue.config.js index bbd3bdd..dbb2438 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,7 +3,7 @@ module.exports = { publicPath: process.env.NODE_ENV === 'production' ? './' : '/', lintOnSave: false, devServer: { - open: process.env.VUE_APP_OPEN === 'false' ? false : true, // 自动打开浏览器 + open: JSON.parse(process.env.VUE_APP_OPEN), // 自动打开浏览器 host: '0.0.0.0', // 真机模拟，使用 port: process.env.VUE_APP_PORT, // 前台代理端口号 https: false, // https： {type: Booleam}