ruoyi/RuoYi-Vue3
1
0
Fork 0
mirror of https://github.com/yangzongzhuan/RuoYi-Vue3.git synced 2025-09-27 14:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

升级组件依赖到最新版本

Browse Source
This commit is contained in:
RuoYi
2025-06-04 15:31:48 +08:00
parent 5723e17eef
commit f237f27861
6 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
package.json
View File

@@ -18,30 +18,30 @@
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "2.3.1", "@element-plus/icons-vue": "2.3.1",
"@vueup/vue-quill": "1.2.0", "@vueup/vue-quill": "1.2.0",
"@vueuse/core": "10.11.0", "@vueuse/core": "13.3.0",
"axios": "0.28.1", "axios": "1.9.0",
"clipboard": "2.0.11", "clipboard": "2.0.11",
"echarts": "5.5.1", "echarts": "5.6.0",
"element-plus": "2.7.6", "element-plus": "2.9.11",
"file-saver": "2.0.5", "file-saver": "2.0.5",
"fuse.js": "6.6.2", "fuse.js": "6.6.2",
"js-beautify": "1.14.11", "js-beautify": "1.14.11",
"js-cookie": "3.0.5", "js-cookie": "3.0.5",
"jsencrypt": "3.3.2", "jsencrypt": "3.3.2",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"pinia": "2.1.7", "pinia": "3.0.2",
"splitpanes": "3.1.5", "splitpanes": "4.0.4",
"vue": "3.4.31", "vue": "3.5.16",
"vue-cropper": "1.1.1", "vue-cropper": "1.1.1",
"vue-router": "4.4.0", "vue-router": "4.5.1",
"vuedraggable": "4.1.0" "vuedraggable": "4.1.0"
}, },
"devDependencies": { "devDependencies": {
"@vitejs/plugin-vue": "5.0.5", "@vitejs/plugin-vue": "5.2.4",
"sass": "1.77.5", "sass-embedded": "1.89.1",
"unplugin-auto-import": "0.17.6", "unplugin-auto-import": "0.18.6",
"unplugin-vue-setup-extend-plus": "1.0.1", "unplugin-vue-setup-extend-plus": "1.0.1",
"vite": "5.3.2", "vite": "6.3.5",
"vite-plugin-compression": "0.5.1", "vite-plugin-compression": "0.5.1",
"vite-plugin-svg-icons": "2.0.1" "vite-plugin-svg-icons": "2.0.1"
}, },

2
src/assets/styles/btn.scss
View File

@@ -1,4 +1,4 @@
@import './variables.module.scss'; @use './variables.module.scss' as *;
@mixin colorBtn($color) { @mixin colorBtn($color) {
background: $color; background: $color;

13
src/assets/styles/index.scss
View File

@@ -1,10 +1,9 @@
@import './variables.module.scss'; @use './mixin.scss';
@import './mixin.scss'; @use './transition.scss';
@import './transition.scss'; @use './element-ui.scss';
@import './element-ui.scss'; @use './sidebar.scss';
@import './sidebar.scss'; @use './btn.scss';
@import './btn.scss'; @use './ruoyi.scss';
@import './ruoyi.scss';
body { body {
height: 100%; height: 100%;

20
src/assets/styles/sidebar.scss
View File

@@ -1,9 +1,11 @@
@use './variables.module.scss' as vars;
#app { #app {
.main-container { .main-container {
min-height: 100%; min-height: 100%;
transition: margin-left .28s; transition: margin-left .28s;
margin-left: $base-sidebar-width; margin-left: vars.$base-sidebar-width;
position: relative; position: relative;
} }
@@ -13,7 +15,7 @@
.sidebar-container { .sidebar-container {
transition: width 0.28s; transition: width 0.28s;
width: $base-sidebar-width !important; width: vars.$base-sidebar-width !important;
height: 100%; height: 100%;
position: fixed; position: fixed;
font-size: 0px; font-size: 0px;
@@ -87,12 +89,12 @@
} }
& .theme-dark .is-active > .el-sub-menu__title { & .theme-dark .is-active > .el-sub-menu__title {
color: $base-menu-color-active !important; color: vars.$base-menu-color-active !important;
} }
& .nest-menu .el-sub-menu>.el-sub-menu__title, & .nest-menu .el-sub-menu>.el-sub-menu__title,
& .el-sub-menu .el-menu-item { & .el-sub-menu .el-menu-item {
min-width: $base-sidebar-width !important; min-width: vars.$base-sidebar-width !important;
&:hover { &:hover {
background-color: rgba(0, 0, 0, 0.06) !important; background-color: rgba(0, 0, 0, 0.06) !important;
@@ -101,10 +103,10 @@
& .theme-dark .nest-menu .el-sub-menu>.el-sub-menu__title, & .theme-dark .nest-menu .el-sub-menu>.el-sub-menu__title,
& .theme-dark .el-sub-menu .el-menu-item { & .theme-dark .el-sub-menu .el-menu-item {
background-color: $base-sub-menu-background; background-color: vars.$base-sub-menu-background;
&:hover { &:hover {
background-color: $base-sub-menu-hover !important; background-color: vars.$base-sub-menu-hover !important;
} }
} }
} }
@@ -167,7 +169,7 @@
} }
.el-menu--collapse .el-menu .el-sub-menu { .el-menu--collapse .el-menu .el-sub-menu {
min-width: $base-sidebar-width !important; min-width: vars.$base-sidebar-width !important;
} }
// mobile responsive // mobile responsive
@@ -178,14 +180,14 @@
.sidebar-container { .sidebar-container {
transition: transform .28s; transition: transform .28s;
width: $base-sidebar-width !important; width: vars.$base-sidebar-width !important;
} }
&.hideSidebar { &.hideSidebar {
.sidebar-container { .sidebar-container {
pointer-events: none; pointer-events: none;
transition-duration: 0.3s; transition-duration: 0.3s;
transform: translate3d(-$base-sidebar-width, 0, 0); transform: translate3d(-(vars.$base-sidebar-width), 0, 0);
} }
} }
} }

2
src/layout/components/Sidebar/Logo.vue
View File

@@ -47,8 +47,6 @@ const getLogoTextColor = computed(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '@/assets/styles/variables.module.scss';
.sidebarLogoFade-enter-active { .sidebarLogoFade-enter-active {
transition: opacity 1.5s; transition: opacity 1.5s;
} }

8
src/layout/index.vue
View File

@@ -64,11 +64,11 @@ function setLayout() {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/styles/mixin.scss"; @use "@/assets/styles/mixin.scss" as mix;
@import "@/assets/styles/variables.module.scss"; @use "@/assets/styles/variables.module.scss" as vars;
.app-wrapper { .app-wrapper {
@include clearfix; @include mix.clearfix;
position: relative; position: relative;
height: 100%; height: 100%;
width: 100%; width: 100%;
@@ -94,7 +94,7 @@ function setLayout() {
top: 0; top: 0;
right: 0; right: 0;
z-index: 9; z-index: 9;
width: calc(100% - #{$base-sidebar-width}); width: calc(100% - #{vars.$base-sidebar-width});
transition: width 0.28s; transition: width 0.28s;
} }