Skip to content

Commit 44df8c4

Browse files
YunaiVgitee-org
authored andcommitted
!314 fix: vue3 TODO 升级springboot 2.7.6
Merge pull request !314 from xingyu/feature/vue3
2 parents 66f7746 + 5ee1665 commit 44df8c4

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"screenfull": "5.0.2",
6161
"sortablejs": "1.10.2",
6262
"throttle-debounce": "2.1.0",
63-
"vue": "2.7.0",
63+
"vue": "2.7.14",
6464
"vue-count-to": "1.0.13",
6565
"vue-cropper": "0.5.8",
6666
"vue-meta": "^2.4.0",

src/store/modules/permission.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
6262
route.name = toCamelCase(route.path, true)
6363
// 处理三级及以上菜单路由缓存问题,将path名字赋值给name
6464
if (route.path.indexOf("/") !== -1) {
65-
var pathArr = route.path.split("/")
65+
const pathArr = route.path.split("/");
6666
route.name = toCamelCase(pathArr[pathArr.length - 1], true)
6767
}
6868
route.hidden = !route.visible
@@ -91,7 +91,7 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
9191
}
9292

9393
function filterChildren(childrenMap, lastRouter = false) {
94-
var children = []
94+
let children = [];
9595
childrenMap.forEach((el, index) => {
9696
if (el.children && el.children.length) {
9797
if (!el.component && !lastRouter) {

src/views/system/oauth2/token/index.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<el-form-item label="用户编号" prop="userId">
77
<el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter.native="handleQuery"/>
88
</el-form-item>
9+
<el-form-item label="客户端编号" prop="clientId">
10+
<el-input v-model="queryParams.clientId" placeholder="请输入客户端编号" clearable @keyup.enter.native="handleQuery"/>
11+
</el-form-item>
912
<el-form-item label="用户类型" prop="userType">
1013
<el-select v-model="queryParams.userType" placeholder="请选择用户类型" clearable>
1114
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.USER_TYPE)"
@@ -68,7 +71,8 @@ export default {
6871
pageNo: 1,
6972
pageSize: 10,
7073
userId: undefined,
71-
userType: undefined
74+
userType: undefined,
75+
clientId: undefined
7276
}
7377
};
7478
},

yarn.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,10 +1579,10 @@
15791579
"@vue/compiler-core" "3.2.44"
15801580
"@vue/shared" "3.2.44"
15811581

1582-
1583-
version "2.7.0"
1584-
resolved "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.0.tgz"
1585-
integrity sha512-hPOI15RsXO1G8aK6FNF93ld9C/D4e/uAJBE59K8NnL8giuKqeVksvamgu4jKhCJ9f9bbUpj5BuSV3sufIx2hmw==
1582+
1583+
version "2.7.14"
1584+
resolved "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz#3446fd2fbb670d709277fc3ffa88efc5e10284fd"
1585+
integrity sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==
15861586
dependencies:
15871587
"@babel/parser" "^7.18.4"
15881588
postcss "^8.4.14"
@@ -3976,7 +3976,7 @@ electron-to-chromium@^1.4.251:
39763976

39773977
39783978
version "2.15.10"
3979-
resolved "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.10.tgz"
3979+
resolved "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.10.tgz#fde0ff5cb4c30e8eb166d617f85916defe5948f1"
39803980
integrity sha512-jmD++mU2wKXbisvx4fxOl2mHaU+HWHTAq/3Wf8x9Bwyu4GdDZPLABb+CGi3DWN6fPqdgRcd74aX39DO+YHObLw==
39813981
dependencies:
39823982
async-validator "~1.8.1"
@@ -9985,12 +9985,12 @@ vue-template-es2015-compiler@^1.9.0:
99859985
resolved "https://registry.npmmirror.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"
99869986
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
99879987

9988-
9989-
version "2.7.0"
9990-
resolved "https://registry.npmmirror.com/vue/-/vue-2.7.0.tgz"
9991-
integrity sha512-su25f1hocH+QNkVEqk+Oj7B+mkDIWU70l0YY7nYSJFEs3Z64njXxo65RUXnWH46ooEhKmEWyLdW6HcYn8coNrg==
9988+
9989+
version "2.7.14"
9990+
resolved "https://registry.npmmirror.com/vue/-/vue-2.7.14.tgz#3743dcd248fd3a34d421ae456b864a0246bafb17"
9991+
integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==
99929992
dependencies:
9993-
"@vue/compiler-sfc" "2.7.0"
9993+
"@vue/compiler-sfc" "2.7.14"
99949994
csstype "^3.1.0"
99959995

99969996

0 commit comments

Comments
 (0)