diff --git a/Dockerfile b/Dockerfile index 25c1917a1..8b3132244 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM jumpserver/lina-base:20251030_071727 AS stage-build +FROM jumpserver/lina-base:20251105_092554 AS stage-build ARG VERSION ENV VERSION=$VERSION diff --git a/package.json b/package.json index 038cf4903..07192b2d9 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "path-to-regexp": "3.3.0", "sortablejs": "^1.15.6", "v-sanitize": "^0.0.13", - "vue": "2.6.10", + "vue": "2.7.16", "vue-codemirror": "4.0.6", "vue-cookie": "^1.1.4", "vue-echarts": "^5.0.0-beta.0", @@ -119,11 +119,11 @@ "svg-sprite-loader": "4.1.3", "svgo": "1.2.2", "vue-i18n-extract": "^1.1.1", - "vue-template-compiler": "2.6.10", + "vue-template-compiler": "2.7.16", "webpack": "^4.28.4" }, "engines": { - "node": ">=8.9", + "node": ">=12", "npm": ">= 3.0.0" }, "browserslist": [ diff --git a/src/components/Apps/VariablesHelpTextDialog/index.vue b/src/components/Apps/VariablesHelpTextDialog/index.vue index c1e857d8e..291bcc51f 100644 --- a/src/components/Apps/VariablesHelpTextDialog/index.vue +++ b/src/components/Apps/VariablesHelpTextDialog/index.vue @@ -73,28 +73,28 @@ export default { } - - diff --git a/src/components/Tree/AutoDataZTree/index.vue b/src/components/Tree/AutoDataZTree/index.vue index e3d26c5a3..ee24cf541 100644 --- a/src/components/Tree/AutoDataZTree/index.vue +++ b/src/components/Tree/AutoDataZTree/index.vue @@ -421,12 +421,8 @@ export default { display: inline-block; } -.data-z-tree { - ::v-deep { - .icon { - width: 10px; - margin-right: 3px; - } - } +.data-z-tree ::v-deep .icon { + width: 10px; + margin-right: 3px; } diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 0654ddf84..4ea27c9b4 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -78,6 +78,3 @@ export default { } } - - diff --git a/src/layout/components/NavHeader/Search.vue b/src/layout/components/NavHeader/Search.vue index 040308e42..1420cd1cd 100644 --- a/src/layout/components/NavHeader/Search.vue +++ b/src/layout/components/NavHeader/Search.vue @@ -369,7 +369,7 @@ export default { } } - .el-input__prefix .el-input__icon{ + .el-input__prefix .el-input__icon { font-size: 15px; line-height: 32px; } @@ -402,11 +402,9 @@ export default { } } } - - - diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 0f289d316..47e6757df 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -276,10 +276,8 @@ export default { } } } - - - - - diff --git a/src/views/settings/Auth/Ldap/ImportDialog.vue b/src/views/settings/Auth/Ldap/ImportDialog.vue index 578e60b15..d25450413 100644 --- a/src/views/settings/Auth/Ldap/ImportDialog.vue +++ b/src/views/settings/Auth/Ldap/ImportDialog.vue @@ -222,13 +222,11 @@ export default { } - - diff --git a/src/views/settings/Security/WatermarkHelpDialog.vue b/src/views/settings/Security/WatermarkHelpDialog.vue index 1dae7a358..66b94ea0e 100644 --- a/src/views/settings/Security/WatermarkHelpDialog.vue +++ b/src/views/settings/Security/WatermarkHelpDialog.vue @@ -73,28 +73,28 @@ export default { } - - diff --git a/src/views/settings/Terminal/Monitor/component/MonitorCard.vue b/src/views/settings/Terminal/Monitor/component/MonitorCard.vue index 1a1a40a06..06e3a4964 100644 --- a/src/views/settings/Terminal/Monitor/component/MonitorCard.vue +++ b/src/views/settings/Terminal/Monitor/component/MonitorCard.vue @@ -219,11 +219,12 @@ export default { } - - -