diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3af520f..02eae45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支）
+## 1.1.2
+
+`2021.10.17`
+
+- 🌟 更新 依赖更新最新版本
+- 🐞 修复 开启全屏时，刷新界面被还原成未全屏的状态
+- 🎯 优化 tagsView 右键菜单关闭逻辑
+- 🎯 优化 wangeditor 富文本编辑器（增加双向绑定）
+- 🎉 新增 工作流（暂不开源）
+- 🎉 新增 基础版 ts（不带国际化），切换 `vue-next-admin-template` 分支
+
## 1.1.1
`2021.09.25`
diff --git a/README.md b/README.md
index 34127ae..c02cc11 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ cnpm run build
#### 💕 特别感谢
-特别感谢群里老哥的建议、指导与帮忙，谢谢！
+特别感谢老哥们的建议、指导与帮忙。谢谢！
- @省长
- @唐参
diff --git a/package.json b/package.json
index 060f93f..1803e08 100644
--- a/package.json
+++ b/package.json
@@ -1,19 +1,22 @@
{
"name": "vue-next-admin",
- "version": "1.1.1",
+ "version": "1.1.2",
+ "description": "vue3 vite next admin template",
+ "author": "lyt_20201208",
+ "license": "MIT",
"scripts": {
"dev": "vite",
"build": "vite build",
"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
},
"dependencies": {
- "axios": "^0.21.4",
+ "axios": "^0.23.0",
"countup.js": "^2.0.8",
"cropperjs": "^1.5.12",
"echarts": "^5.2.1",
"echarts-gl": "^2.0.8",
"echarts-wordcloud": "^2.0.0",
- "element-plus": "^1.1.0-beta.16",
+ "element-plus": "^1.1.0-beta.20",
"jsplumb": "^2.15.6",
"mitt": "^3.0.0",
"nprogress": "^0.2.0",
@@ -22,11 +25,11 @@
"screenfull": "^5.1.0",
"sortablejs": "^1.14.0",
"splitpanes": "^3.0.4",
- "vue": "^3.2.6",
+ "vue": "^3.2.20",
"vue-clipboard3": "^1.0.1",
"vue-grid-layout": "^3.0.0-beta1",
- "vue-i18n": "^9.1.7",
- "vue-router": "^4.0.11",
+ "vue-i18n": "^9.1.9",
+ "vue-router": "^4.0.12",
"vue-web-screen-shot": "^1.2.0",
"vuex": "^4.0.2",
"wangeditor": "^4.7.8"
@@ -34,26 +37,46 @@
"devDependencies": {
"@types/axios": "^0.14.0",
"@types/clipboard": "^2.0.1",
- "@types/node": "^16.9.6",
+ "@types/node": "^16.11.0",
"@types/nprogress": "^0.2.0",
"@types/sortablejs": "^1.10.7",
- "@typescript-eslint/eslint-plugin": "^4.31.2",
- "@typescript-eslint/parser": "^4.31.2",
- "@vitejs/plugin-vue": "^1.9.2",
- "@vue/compiler-sfc": "^3.2.18",
+ "@typescript-eslint/eslint-plugin": "^5.0.0",
+ "@typescript-eslint/parser": "^5.0.0",
+ "@vitejs/plugin-vue": "^1.9.3",
+ "@vue/compiler-sfc": "^3.2.20",
"dotenv": "^10.0.0",
- "eslint": "^7.32.0",
- "eslint-plugin-vue": "^7.18.0",
+ "eslint": "^8.0.1",
+ "eslint-plugin-vue": "^7.19.1",
"prettier": "^2.4.1",
- "sass": "^1.42.1",
- "sass-loader": "^12.1.0",
- "typescript": "^4.4.3",
- "vite": "^2.5.10",
+ "sass": "^1.43.2",
+ "sass-loader": "^12.2.0",
+ "typescript": "^4.4.4",
+ "vite": "^2.6.7",
"vue-eslint-parser": "^7.11.0"
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead"
- ]
+ ],
+ "bugs": {
+ "url": "https://gitee.com/lyt-top/vue-next-admin/issues"
+ },
+ "engines": {
+ "node": ">=12.0.0",
+ "npm": ">= 6.0.0"
+ },
+ "keywords": [
+ "vue",
+ "vue3",
+ "vuejs/vue-next",
+ "element-ui",
+ "element-plus",
+ "vue-next-admin",
+ "next-admin"
+ ],
+ "repository": {
+ "type": "git",
+ "url": "https://gitee.com/lyt-top/vue-next-admin.git"
+ }
}
diff --git a/src/App.vue b/src/App.vue
index a96c08d..0d51873 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,7 +12,7 @@ import { computed, ref, getCurrentInstance, onBeforeMount, onMounted, onUnmounte
import { useRoute } from 'vue-router';
import { useStore } from '/@/store/index';
import { useTitle } from '/@/utils/setWebTitle';
-import { Local } from '/@/utils/storage';
+import { Local, Session } from '/@/utils/storage';
import setIntroduction from '/@/utils/setIconfont';
import LockScreen from '/@/layout/lockScreen/index.vue';
import Setings from '/@/layout/navBars/breadcrumb/setings.vue';
@@ -60,6 +60,10 @@ export default defineComponent({
store.dispatch('themeConfig/setThemeConfig', Local.get('themeConfig'));
document.documentElement.style.cssText = Local.get('themeConfigStyle');
}
+ // 获取缓存中的全屏配置
+ if (Session.get('isTagsViewCurrenFull')) {
+ store.dispatch('tagsViewRoutes/setCurrenFullscreen', Session.get('isTagsViewCurrenFull'));
+ }
});
});
// 页面销毁时，关闭监听布局配置/i18n监听
diff --git a/src/components/editor/index.vue b/src/components/editor/index.vue
new file mode 100644
index 0000000..dc07e3c
--- /dev/null
+++ b/src/components/editor/index.vue
@@ -0,0 +1,59 @@
+
+
+
+
+
diff --git a/src/layout/component/main.vue b/src/layout/component/main.vue
index 983ad52..8d21e29 100644
--- a/src/layout/component/main.vue
+++ b/src/layout/component/main.vue
@@ -4,7 +4,7 @@
class="layout-scrollbar"
ref="layoutScrollbarRef"
:style="{
- minHeight: `calc(100vh - ${headerHeight}`,
+ minHeight: `calc(100vh - ${headerHeight})`,
padding: currentRouteMeta.isLink && currentRouteMeta.isIframe ? 0 : '',
transition: 'padding 0.3s ease-in-out',
}"
diff --git a/src/layout/navBars/tagsView/tagsView.vue b/src/layout/navBars/tagsView/tagsView.vue
index 952c541..f329def 100644
--- a/src/layout/navBars/tagsView/tagsView.vue
+++ b/src/layout/navBars/tagsView/tagsView.vue
@@ -194,10 +194,12 @@ export default {
// 最后一个且高亮时
if (arr[arr.length - 1].meta.isDynamic) {
// 动态路由（xxx/:id/:name"）
- router.push({ name: arr[arr.length - 1].name, params: arr[arr.length - 1].params });
+ if (k !== arr.length) router.push({ name: arr[k].name, params: arr[k].params });
+ else router.push({ name: arr[arr.length - 1].name, params: arr[arr.length - 1].params });
} else {
// 普通路由
- router.push({ path: arr[arr.length - 1].path, query: arr[arr.length - 1].query });
+ if (k !== arr.length) router.push({ path: arr[k].path, query: arr[k].query });
+ else router.push({ path: arr[arr.length - 1].path, query: arr[arr.length - 1].query });
}
} else {
// 非最后一个且高亮时，跳转到下一个
@@ -503,9 +505,10 @@ export default {