'admin-22.07.10:发布v2.2.0版本,具体查看master分支根目录CHANGELOG.md'

This commit is contained in:
lyt 2022-07-10 19:37:39 +08:00
parent fdf9cd4abe
commit e57dde4bab
33 changed files with 523 additions and 511 deletions

View File

@ -2,6 +2,17 @@
🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等适配手机、平板、pc 的后台开源免费模板库vue2.x 请切换 vue-prev-admin 分支) 🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等适配手机、平板、pc 的后台开源免费模板库vue2.x 请切换 vue-prev-admin 分支)
## 2.2.0
`2022.07.10`
⚡⚡⚡ [/sec/stores/userInfo.ts](https://gitee.com/lyt-top/vue-next-admin/blob/master/src/stores/userInfo.ts) 下添加了 `getApiUserInfo` 接口模拟数据 `setTimeout` 为 3 秒
- 🌟 更新 依赖更新最新版本
- 🐞 修复 [主界面重新授权按钮点击卡死不跳转登录界面#I5C3JS](https://gitee.com/lyt-top/vue-next-admin/issues/I5C3JS),感谢[@Hero-Typ](https://gitee.com/tian_yu_peng)
- 🐞 修复 编译警告[#I5CVSB](https://gitee.com/lyt-top/vue-next-admin/issues/I5CVSB),全局替换成 `:deep(attr)`,感谢[@Linvas](https://gitee.com/linvas)。参考文档:[vue3 sfc-style](https://v3.cn.vuejs.org/api/sfc-style.html#style-scoped)。`node_modules\print-js\dist\print.js` 需 `print-js` 作者适配或去除 `package.json` 中的 `"print-js": "^1.6.0"`
- 🐞 修复 [vue-next-admin-template-js 版本前端控制路由userInfo.js 请求用户信息接口报错,加载不到路由 可以写个定时器模拟一下接口 一样的报错#I5F1HP](https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP),感谢[@白开水](https://gitee.com/libin951223)
## 2.1.1 ## 2.1.1
`2022.05.27` `2022.05.27`

View File

@ -76,6 +76,7 @@ cnpm run build
1 群:<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">665452019</a> 1 群:<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">665452019</a>
2 群:<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=zVfy3gNy7pNWVK3kMduDzwU369PZg2fw&jump_from=webapi">766356862</a> 2 群:<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=zVfy3gNy7pNWVK3kMduDzwU369PZg2fw&jump_from=webapi">766356862</a>
3 群:<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=02EWb5P2JkP-8iwzaDadgFdxA0HSHPpn&jump_from=webapi">795345435</a> 3 群:<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=02EWb5P2JkP-8iwzaDadgFdxA0HSHPpn&jump_from=webapi">795345435</a>
4 群:<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=0gTFO04WwkeZZ6R4lju6gucbeXHK-wNd&jump_from=webapi">736626228</a>
<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi"> <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">
<img src="https://img-blog.csdnimg.cn/35e00f12a3fe4820892ec630ca72f15f.png" width="220" height="220" alt="vue-next-admin 讨论群1" title="vue-next-admin 讨论群1"/> <img src="https://img-blog.csdnimg.cn/35e00f12a3fe4820892ec630ca72f15f.png" width="220" height="220" alt="vue-next-admin 讨论群1" title="vue-next-admin 讨论群1"/>
@ -86,6 +87,9 @@ cnpm run build
<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=02EWb5P2JkP-8iwzaDadgFdxA0HSHPpn&jump_from=webapi"> <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=02EWb5P2JkP-8iwzaDadgFdxA0HSHPpn&jump_from=webapi">
<img src="https://img-blog.csdnimg.cn/70c8a012dd304246bddeac2184c4ab3a.png" width="220" height="220" alt="vue-next-admin 讨论群3" title="vue-next-admin 讨论群3"/> <img src="https://img-blog.csdnimg.cn/70c8a012dd304246bddeac2184c4ab3a.png" width="220" height="220" alt="vue-next-admin 讨论群3" title="vue-next-admin 讨论群3"/>
</a> </a>
<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=0gTFO04WwkeZZ6R4lju6gucbeXHK-wNd&jump_from=webapi">
<img src="https://img-blog.csdnimg.cn/e5c9704eed1342bc9d9e74b37203402d.png" width="220" height="220" alt="vue-next-admin 讨论群4" title="vue-next-admin 讨论群4"/>
</a>
#### 💒 集成后端 #### 💒 集成后端
@ -97,6 +101,7 @@ cnpm run build
- <a target="_blank" href="https://gitee.com/zsvg/vboot-net">@zsvg vboot-net</a> - <a target="_blank" href="https://gitee.com/zsvg/vboot-net">@zsvg vboot-net</a>
- <a target="_blank" href="https://gitee.com/zsvg/vboot-java">@zsvg vboot-java</a> - <a target="_blank" href="https://gitee.com/zsvg/vboot-java">@zsvg vboot-java</a>
- <a target="_blank" href="https://gitee.com/wonderful-code/buildadmin">@青红造了个白 buildadmin</a> - <a target="_blank" href="https://gitee.com/wonderful-code/buildadmin">@青红造了个白 buildadmin</a>
- <a target="_blank" href="https://github.com/xiaodingding/iotfast">@Goodwell iotfast(一个开源的物联网平台)</a>
#### ❤️ 鸣谢列表 #### ❤️ 鸣谢列表
@ -130,7 +135,7 @@ cnpm run build
特别感谢老哥们的建议、指导与帮忙。谢谢! 特别感谢老哥们的建议、指导与帮忙。谢谢!
- <a href="https://gitee.com/click33/sa-plus" target="_blank">@省长</a> - <a href="https://gitee.com/click33/sa-plus" target="_blank">@省长</a>
- <a href="https://gitee.com/jskz/Jskz-SpringCloud" target="_blank">@唐参 - <a href="https://gitee.com/jskz/Jskz-SpringCloud" target="_blank">@唐参</a>
- <a href="https://gitee.com/chuange" target="_blank">@川歌</a> - <a href="https://gitee.com/chuange" target="_blank">@川歌</a>
- @华仔 - @华仔

784
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "vue-next-admin", "name": "vue-next-admin",
"version": "2.1.1", "version": "2.2.0",
"description": "vue3 vite next admin template", "description": "vue3 vite next admin template",
"author": "lyt_20201208", "author": "lyt_20201208",
"license": "MIT", "license": "MIT",
@ -10,15 +10,15 @@
"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/" "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "^2.0.3", "@element-plus/icons-vue": "^2.0.6",
"@wangeditor/editor": "^5.1.1", "@wangeditor/editor": "^5.1.1",
"axios": "^0.27.2", "axios": "^0.27.2",
"countup.js": "^2.2.0", "countup.js": "^2.3.2",
"cropperjs": "^1.5.12", "cropperjs": "^1.5.12",
"echarts": "^5.3.2", "echarts": "^5.3.3",
"echarts-gl": "^2.0.9", "echarts-gl": "^2.0.9",
"echarts-wordcloud": "^2.0.0", "echarts-wordcloud": "^2.0.0",
"element-plus": "^2.2.2", "element-plus": "^2.2.9",
"js-cookie": "^3.0.1", "js-cookie": "^3.0.1",
"jsplumb": "^2.15.6", "jsplumb": "^2.15.6",
"mitt": "^3.0.0", "mitt": "^3.0.0",
@ -26,32 +26,32 @@
"pinia": "^2.0.14", "pinia": "^2.0.14",
"print-js": "^1.6.0", "print-js": "^1.6.0",
"qrcodejs2-fixes": "^0.0.2", "qrcodejs2-fixes": "^0.0.2",
"screenfull": "^6.0.1", "screenfull": "^6.0.2",
"sortablejs": "^1.15.0", "sortablejs": "^1.15.0",
"splitpanes": "^3.1.1", "splitpanes": "^3.1.1",
"vue": "^3.2.36", "vue": "^3.2.37",
"vue-clipboard3": "^2.0.0", "vue-clipboard3": "^2.0.0",
"vue-grid-layout": "^3.0.0-beta1", "vue-grid-layout": "^3.0.0-beta1",
"vue-i18n": "^9.1.10", "vue-i18n": "^9.1.10",
"vue-router": "^4.0.15" "vue-router": "^4.1.1"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^17.0.39", "@types/node": "^18.0.3",
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.0",
"@types/sortablejs": "^1.13.0", "@types/sortablejs": "^1.13.0",
"@typescript-eslint/eslint-plugin": "^5.27.0", "@typescript-eslint/eslint-plugin": "^5.30.5",
"@typescript-eslint/parser": "^5.27.0", "@typescript-eslint/parser": "^5.30.5",
"@vitejs/plugin-vue": "^2.3.3", "@vitejs/plugin-vue": "^2.3.3",
"@vue/compiler-sfc": "^3.2.36", "@vue/compiler-sfc": "^3.2.37",
"dotenv": "^16.0.1", "dotenv": "^16.0.1",
"eslint": "^8.17.0", "eslint": "^8.19.0",
"eslint-plugin-vue": "^9.1.0", "eslint-plugin-vue": "^9.2.0",
"prettier": "^2.6.2", "prettier": "^2.7.1",
"sass": "^1.52.2", "sass": "^1.53.0",
"sass-loader": "^13.0.0", "sass-loader": "^13.0.2",
"typescript": "^4.7.3", "typescript": "^4.7.4",
"vite": "^2.9.9", "vite": "^2.9.14",
"vue-eslint-parser": "^9.0.2" "vue-eslint-parser": "^9.0.3"
}, },
"browserslist": [ "browserslist": [
"> 1%", "> 1%",

View File

@ -172,7 +172,7 @@ export default defineComponent({
.notice-bar-warp-slot { .notice-bar-warp-slot {
width: 100%; width: 100%;
white-space: nowrap; white-space: nowrap;
::v-deep(.el-carousel__item) { :deep(.el-carousel__item) {
display: flex; display: flex;
align-items: center; align-items: center;
} }

View File

@ -28,7 +28,7 @@
<div v-show="isShowLoockLogin" class="layout-lock-screen-login"> <div v-show="isShowLoockLogin" class="layout-lock-screen-login">
<div class="layout-lock-screen-login-box"> <div class="layout-lock-screen-login-box">
<div class="layout-lock-screen-login-box-img"> <div class="layout-lock-screen-login-box-img">
<img src="https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1813762643,1914315241&fm=26&gp=0.jpg" /> <img src="https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500" />
</div> </div>
<div class="layout-lock-screen-login-box-name">Administrator</div> <div class="layout-lock-screen-login-box-name">Administrator</div>
<div class="layout-lock-screen-login-box-value"> <div class="layout-lock-screen-login-box-value">
@ -359,11 +359,11 @@ export default defineComponent({
} }
} }
} }
::v-deep(.el-input-group__append) { :deep(.el-input-group__append) {
background: var(--el-color-white); background: var(--el-color-white);
padding: 0px 15px; padding: 0px 15px;
} }
::v-deep(.el-input__inner) { :deep(.el-input__inner) {
border-right-color: var(--el-border-color-extra-light); border-right-color: var(--el-border-color-extra-light);
&:hover { &:hover {
border-color: var(--el-border-color-extra-light); border-color: var(--el-border-color-extra-light);

View File

@ -148,11 +148,11 @@ export default defineComponent({
font-size: 14px; font-size: 14px;
margin-right: 5px; margin-right: 5px;
} }
::v-deep(.el-breadcrumb__separator) { :deep(.el-breadcrumb__separator) {
opacity: 0.7; opacity: 0.7;
color: var(--next-bg-topBarColor); color: var(--next-bg-topBarColor);
} }
::v-deep(.el-breadcrumb__inner a, .el-breadcrumb__inner.is-link) { :deep(.el-breadcrumb__inner a, .el-breadcrumb__inner.is-link) {
font-weight: unset !important; font-weight: unset !important;
color: var(--next-bg-topBarColor); color: var(--next-bg-topBarColor);
&:hover { &:hover {

View File

@ -42,7 +42,7 @@ export default defineComponent({
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
transition: all 0.3s ease; transition: all 0.3s ease;
position: relative; position: relative;
::v-deep(i) { :deep(i) {
position: absolute; position: absolute;
left: 10px; left: 10px;
top: 35px; top: 35px;
@ -52,7 +52,7 @@ export default defineComponent({
} }
&:hover { &:hover {
transition: all 0.3s ease; transition: all 0.3s ease;
::v-deep(i) { :deep(i) {
color: var(--el-color-primary); color: var(--el-color-primary);
transition: all 0.3s ease; transition: all 0.3s ease;
} }

View File

@ -122,12 +122,12 @@ export default defineComponent({
<style scoped lang="scss"> <style scoped lang="scss">
.layout-search-dialog { .layout-search-dialog {
::v-deep(.el-dialog) { :deep(.el-dialog) {
box-shadow: unset !important; box-shadow: unset !important;
border-radius: 0 !important; border-radius: 0 !important;
background: rgba(0, 0, 0, 0.5); background: rgba(0, 0, 0, 0.5);
} }
::v-deep(.el-autocomplete) { :deep(.el-autocomplete) {
width: 560px; width: 560px;
position: absolute; position: absolute;
top: 100px; top: 100px;

View File

@ -679,7 +679,7 @@ export default defineComponent({
.layout-breadcrumb-seting-bar { .layout-breadcrumb-seting-bar {
height: calc(100vh - 50px); height: calc(100vh - 50px);
padding: 0 15px; padding: 0 15px;
::v-deep(.el-scrollbar__view) { :deep(.el-scrollbar__view) {
overflow-x: hidden !important; overflow-x: hidden !important;
} }
.layout-breadcrumb-seting-bar-flex { .layout-breadcrumb-seting-bar-flex {

View File

@ -160,7 +160,8 @@ export default defineComponent({
}, },
}) })
.then(async () => { .then(async () => {
Session.clear(); // /token // /token
Session.clear();
// 使 reload resetRoute() // 使 reload resetRoute()
window.location.reload(); window.location.reload();
}) })
@ -282,16 +283,16 @@ export default defineComponent({
} }
} }
} }
::v-deep(.el-dropdown) { :deep(.el-dropdown) {
color: var(--next-bg-topBarColor); color: var(--next-bg-topBarColor);
} }
::v-deep(.el-badge) { :deep(.el-badge) {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
display: flex; display: flex;
align-items: center; align-items: center;
} }
::v-deep(.el-badge__content.is-fixed) { :deep(.el-badge__content.is-fixed) {
top: 12px; top: 12px;
} }
} }

View File

@ -108,7 +108,7 @@ export default defineComponent({
opacity: 1; opacity: 1;
} }
} }
::v-deep(.el-empty__description p) { :deep(.el-empty__description p) {
font-size: 13px; font-size: 13px;
} }
} }

View File

@ -607,7 +607,7 @@ export default defineComponent({
border-bottom: 1px solid var(--next-border-color-light); border-bottom: 1px solid var(--next-border-color-light);
position: relative; position: relative;
z-index: 4; z-index: 4;
::v-deep(.el-scrollbar__wrap) { :deep(.el-scrollbar__wrap) {
overflow-x: auto !important; overflow-x: auto !important;
} }
&-ul { &-ul {

View File

@ -141,10 +141,10 @@ export default defineComponent({
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
margin-right: 30px; margin-right: 30px;
::v-deep(.el-scrollbar__bar.is-vertical) { :deep(.el-scrollbar__bar.is-vertical) {
display: none; display: none;
} }
::v-deep(a) { :deep(a) {
width: 100%; width: 100%;
} }
.el-menu.el-menu--horizontal { .el-menu.el-menu--horizontal {

View File

@ -33,14 +33,14 @@ const dynamicViewsModules: Record<string, Function> = Object.assign({}, { ...lay
* @method setAddRoute * @method setAddRoute
* @method setFilterMenuAndCacheTagsViewRoutes vuex routesList * @method setFilterMenuAndCacheTagsViewRoutes vuex routesList
*/ */
export async function initBackEndControlRoutes() { export async function initBackEndControlRoutes() {
// 界面 loading 动画开始执行 // 界面 loading 动画开始执行
if (window.nextLoading === undefined) NextLoading.start(); if (window.nextLoading === undefined) NextLoading.start();
// 无 token 停止执行下一步 // 无 token 停止执行下一步
if (!Session.get('token')) return false; if (!Session.get('token')) return false;
// 触发初始化用户信息 pinia // 触发初始化用户信息 pinia
useUserInfo().setUserInfos(); // https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
await useUserInfo().setUserInfos();
// 获取路由菜单数据 // 获取路由菜单数据
const res = await getBackEndControlRoutes(); const res = await getBackEndControlRoutes();
// 存储接口原始路由未处理component根据需求选择使用 // 存储接口原始路由未处理component根据需求选择使用

View File

@ -24,7 +24,8 @@ export async function initFrontEndControlRoutes() {
// 无 token 停止执行下一步 // 无 token 停止执行下一步
if (!Session.get('token')) return false; if (!Session.get('token')) return false;
// 触发初始化用户信息 pinia // 触发初始化用户信息 pinia
useUserInfo(pinia).setUserInfos(); // https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
await useUserInfo(pinia).setUserInfos();
// 添加动态路由 // 添加动态路由
await setAddRoute(); await setAddRoute();
// 设置递归过滤有权限的路由到 vuex routesList 中(已处理成多级嵌套路由)及缓存多级嵌套数组处理后的一维数组 // 设置递归过滤有权限的路由到 vuex routesList 中(已处理成多级嵌套路由)及缓存多级嵌套数组处理后的一维数组

View File

@ -85,9 +85,6 @@ export function formatTwoStageRoutes(arr: any) {
return newArr; return newArr;
} }
// isRequestRoutes 为 true则开启后端控制路由路径`/src/stores/themeConfig.ts`
if (!isRequestRoutes) initFrontEndControlRoutes();
// 路由加载前 // 路由加载前
router.beforeEach(async (to, from, next) => { router.beforeEach(async (to, from, next) => {
NProgress.configure({ showSpinner: false }); NProgress.configure({ showSpinner: false });
@ -114,6 +111,10 @@ router.beforeEach(async (to, from, next) => {
// 动态添加路由:防止非首页刷新时跳转回首页的问题 // 动态添加路由:防止非首页刷新时跳转回首页的问题
// 确保 addRoute() 时动态添加的路由已经被完全加载上去 // 确保 addRoute() 时动态添加的路由已经被完全加载上去
next({ ...to, replace: true }); next({ ...to, replace: true });
} else {
// https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
await initFrontEndControlRoutes();
next({ ...to, replace: true });
} }
} else { } else {
next(); next();

View File

@ -1164,18 +1164,6 @@ export const notFoundAndNoPower = [
* @returns * @returns
*/ */
export const staticRoutes: Array<RouteRecordRaw> = [ export const staticRoutes: Array<RouteRecordRaw> = [
{
path: '/',
name: '/',
component: () => import('/@/layout/index.vue'),
meta: {
title: '布局界面',
},
children: [
// 请不要往这里 `children` 中添加内容,此内容为了防止 No match found for location with path "xxx" 问题
...notFoundAndNoPower,
],
},
{ {
path: '/login', path: '/login',
name: 'login', name: 'login',

View File

@ -19,6 +19,19 @@ export const useUserInfo = defineStore('userInfo', {
}), }),
actions: { actions: {
async setUserInfos() { async setUserInfos() {
// 存储用户信息到浏览器缓存
if (Session.get('userInfo')) {
this.userInfos = Session.get('userInfo');
} else {
const userInfos: any = await this.getApiUserInfo();
this.userInfos = userInfos;
}
},
// 模拟接口数据
// https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
async getApiUserInfo() {
return new Promise((resolve) => {
setTimeout(() => {
// 模拟数据,请求接口时,记得删除多余代码及对应依赖的引入 // 模拟数据,请求接口时,记得删除多余代码及对应依赖的引入
const userName = Cookies.get('userName'); const userName = Cookies.get('userName');
// 模拟数据 // 模拟数据
@ -45,20 +58,15 @@ export const useUserInfo = defineStore('userInfo', {
userName: userName, userName: userName,
photo: photo:
userName === 'admin' userName === 'admin'
? 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1813762643,1914315241&fm=26&gp=0.jpg' ? 'https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500'
: 'https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=317673774,2961727727&fm=26&gp=0.jpg', : 'https://img2.baidu.com/it/u=2370931438,70387529&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500',
time: new Date().getTime(), time: new Date().getTime(),
roles: defaultRoles, roles: defaultRoles,
authBtnList: defaultAuthBtnList, authBtnList: defaultAuthBtnList,
}; };
// 存储用户信息到浏览器缓存 resolve(userInfos);
Session.set('userInfo', userInfos); }, 3000);
});
if (Session.get('userInfo')) {
this.userInfos = Session.get('userInfo');
} else {
this.userInfos = userInfos;
}
}, },
}, },
}); });

View File

@ -412,15 +412,15 @@
flex: 1; flex: 1;
width: 100%; width: 100%;
margin-left: 10px; margin-left: 10px;
::v-deep(.el-progress__text) { :deep(.el-progress__text) {
color: var(--el-text-color-primary); color: var(--el-text-color-primary);
font-size: 12px !important; font-size: 12px !important;
text-align: right; text-align: right;
} }
::v-deep(.el-progress-bar__outer) { :deep(.el-progress-bar__outer) {
background-color: rgba(0, 0, 0, 0.1) !important; background-color: rgba(0, 0, 0, 0.1) !important;
} }
::v-deep(.el-progress-bar) { :deep(.el-progress-bar) {
margin-right: -22px !important; margin-right: -22px !important;
} }
} }

View File

@ -22,7 +22,6 @@
<script lang="ts"> <script lang="ts">
import { defineComponent, computed } from 'vue'; import { defineComponent, computed } from 'vue';
import { useRouter } from 'vue-router';
import { storeToRefs } from 'pinia'; import { storeToRefs } from 'pinia';
import { useThemeConfig } from '/@/stores/themeConfig'; import { useThemeConfig } from '/@/stores/themeConfig';
import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes'; import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
@ -35,10 +34,12 @@ export default defineComponent({
const storesTagsViewRoutes = useTagsViewRoutes(); const storesTagsViewRoutes = useTagsViewRoutes();
const { themeConfig } = storeToRefs(storesThemeConfig); const { themeConfig } = storeToRefs(storesThemeConfig);
const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes); const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
const router = useRouter();
const onSetAuth = () => { const onSetAuth = () => {
// https://gitee.com/lyt-top/vue-next-admin/issues/I5C3JS
// /token
Session.clear(); Session.clear();
router.push('/login'); // 使 reload resetRoute()
window.location.reload();
}; };
// //
const initTagViewHeight = computed(() => { const initTagViewHeight = computed(() => {

View File

@ -110,7 +110,7 @@ export default defineComponent({
<style scoped lang="scss"> <style scoped lang="scss">
.fun-tagsview { .fun-tagsview {
.fun-tagsview-from-item { .fun-tagsview-from-item {
::v-deep(.el-form-item__content) { :deep(.el-form-item__content) {
margin-left: 0 !important; margin-left: 0 !important;
} }
} }

View File

@ -48,7 +48,7 @@ export default defineComponent({
frontEndsResetRoute(); frontEndsResetRoute();
Cookies.set('userName', state.userAuth); Cookies.set('userName', state.userAuth);
// //
storesUserInfo.setUserInfos(); await storesUserInfo.setUserInfos();
await setAddRoute(); await setAddRoute();
setFilterMenuAndCacheTagsViewRoutes(); setFilterMenuAndCacheTagsViewRoutes();
}; };

View File

@ -47,7 +47,7 @@ export default defineComponent({
text-align: center; text-align: center;
@extend .login-scan-animation; @extend .login-scan-animation;
animation-delay: 0.1s; animation-delay: 0.1s;
::v-deep(img) { :deep(img) {
margin: auto; margin: auto;
} }
.login-msg { .login-msg {

View File

@ -328,7 +328,7 @@ export default defineComponent({
} }
} }
} }
::v-deep(.el-card__body) { :deep(.el-card__body) {
height: 100%; height: 100%;
.filtering-no-data { .filtering-no-data {
display: flex; display: flex;

View File

@ -13,10 +13,10 @@ export default defineComponent({
name: 'pagesPreview', name: 'pagesPreview',
setup() { setup() {
const state = reactive({ const state = reactive({
url: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1813762643,1914315241&fm=26&gp=0.jpg', url: 'https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500',
srcList: [ srcList: [
'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1813762643,1914315241&fm=26&gp=0.jpg', 'https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500',
'https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=317673774,2961727727&fm=26&gp=0.jpg', 'https://img2.baidu.com/it/u=2370931438,70387529&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500',
'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg', 'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg',
], ],
}); });

View File

@ -236,7 +236,7 @@ export default defineComponent({
padding-right: 8px; padding-right: 8px;
width: 100%; width: 100%;
} }
&::v-deep(.el-tree-node) { &:deep(.el-tree-node) {
border: 1px solid var(--next-border-color-light); border: 1px solid var(--next-border-color-light);
border-bottom: none; border-bottom: none;
color: #606266; color: #606266;

View File

@ -240,7 +240,7 @@ export default defineComponent({
<style scoped lang="scss"> <style scoped lang="scss">
.workflow-drawer-node { .workflow-drawer-node {
::v-deep { :deep {
.el-tabs { .el-tabs {
box-shadow: unset; box-shadow: unset;
border: unset; border: unset;

View File

@ -200,7 +200,7 @@ export default defineComponent({
}; };
// - // -
const initSortable = () => { const initSortable = () => {
state.leftNavRefs.forEach(v => { state.leftNavRefs.forEach((v) => {
Sortable.create(v as HTMLDivElement, { Sortable.create(v as HTMLDivElement, {
group: { group: {
name: 'vue-next-admin-1', name: 'vue-next-admin-1',
@ -555,7 +555,7 @@ export default defineComponent({
width: 220px; width: 220px;
height: 100%; height: 100%;
border-right: 1px solid var(--el-border-color-light, #ebeef5); border-right: 1px solid var(--el-border-color-light, #ebeef5);
::v-deep(.el-collapse-item__content) { :deep(.el-collapse-item__content) {
padding-bottom: 0; padding-bottom: 0;
} }
.workflow-left-title { .workflow-left-title {
@ -654,7 +654,7 @@ export default defineComponent({
color: var(--el-color-primary); color: var(--el-color-primary);
} }
} }
::v-deep(.jtk-overlay):not(.aLabel) { :deep(.jtk-overlay):not(.aLabel) {
padding: 4px 10px; padding: 4px 10px;
border: 1px solid var(--el-border-color-light, #ebeef5) !important; border: 1px solid var(--el-border-color-light, #ebeef5) !important;
color: var(--el-text-color-secondary) !important; color: var(--el-text-color-secondary) !important;
@ -662,7 +662,7 @@ export default defineComponent({
border-radius: 3px; border-radius: 3px;
font-size: 10px; font-size: 10px;
} }
::v-deep(.jtk-overlay.workflow-right-empty-label) { :deep(.jtk-overlay.workflow-right-empty-label) {
display: none; display: none;
} }
} }

View File

@ -7,7 +7,7 @@
<div class="personal-user"> <div class="personal-user">
<div class="personal-user-left"> <div class="personal-user-left">
<el-upload class="h100 personal-user-left-upload" action="https://jsonplaceholder.typicode.com/posts/" multiple :limit="1"> <el-upload class="h100 personal-user-left-upload" action="https://jsonplaceholder.typicode.com/posts/" multiple :limit="1">
<img src="https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1813762643,1914315241&fm=26&gp=0.jpg" /> <img src="https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500" />
</el-upload> </el-upload>
</div> </div>
<div class="personal-user-right"> <div class="personal-user-right">
@ -233,7 +233,7 @@ export default defineComponent({
width: 100px; width: 100px;
height: 130px; height: 130px;
border-radius: 3px; border-radius: 3px;
::v-deep(.el-upload) { :deep(.el-upload) {
height: 100%; height: 100%;
} }
.personal-user-left-upload { .personal-user-left-upload {

View File

@ -481,7 +481,7 @@ export default defineComponent({
<style scoped lang="scss"> <style scoped lang="scss">
.tools-warp-form { .tools-warp-form {
::v-deep(.el-form-item--small.el-form-item) { :deep(.el-form-item--small.el-form-item) {
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
.tools-warp-form-msg { .tools-warp-form-msg {

View File

@ -970,10 +970,10 @@ $titleWidth: 240px;
height: 100%; height: 100%;
width: 100%; width: 100%;
position: relative; position: relative;
::v-deep(.BMap_cpyCtrl) { :deep(.BMap_cpyCtrl) {
display: none; display: none;
} }
::v-deep(.anchorBL) { :deep(.anchorBL) {
display: none; display: none;
} }
.visualizing-container { .visualizing-container {

View File

@ -853,7 +853,7 @@ export default defineComponent({
.ml15:hover { .ml15:hover {
cursor: pointer; cursor: pointer;
} }
::v-deep(.el-dropdown) { :deep(.el-dropdown) {
font-size: 13px !important; font-size: 13px !important;
color: #43bdf0; color: #43bdf0;
cursor: pointer; cursor: pointer;