xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'abp' into abp-dev

Browse Source
This commit is contained in:
陈淳
2024-04-15 08:50:06 +08:00
parent 646531393f 9ef959ee46
commit 6bfcccfbb6
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Yi.RuoYi.Vue3/package.json
View File

@@ -15,33 +15,35 @@
"url": "https://gitee.com/y_project/RuoYi-Vue.git" "url": "https://gitee.com/y_project/RuoYi-Vue.git"
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "1.1.4", "@element-plus/icons-vue": "2.3.1",
"@microsoft/signalr": "^6.0.9", "@microsoft/signalr": "^8.0.0",
"@vueuse/core": "8.5.0", "@vueuse/core": "10.9.0",
"axios": "0.26.1", "axios": "1.6.8",
"echarts": "5.3.2", "echarts": "5.5.0",
"element-plus": "2.1.8", "element-plus": "2.6.3",
"file-saver": "2.0.5", "file-saver": "2.0.5",
"fuse.js": "6.5.3", "fuse.js": "7.0.0",
"js-cookie": "3.0.1", "js-cookie": "3.0.5",
"jsencrypt": "3.2.1", "jsencrypt": "3.3.2",
"json-bigint": "^1.0.0", "json-bigint": "^1.0.0",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"pinia": "2.0.14", "pinia": "2.1.7",
"qs": "^6.11.2", "qs": "^6.12.0",
"typeface-roboto": "^1.1.13", "typeface-roboto": "^1.1.13",
"vue": "3.2.37", "vue": "3.4.21",
"vue-cropper": "1.0.3", "vue-cropper": "1.0.3",
"vue-router": "^4.0.14" "vue-router": "4.3.0"
}, },
"devDependencies": { "devDependencies": {
"@vitejs/plugin-vue": "2.3.3", "@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "3.2.36", "@vue/compiler-sfc": "^3.4.21",
"sass": "1.52.1", "consola": "^3.2.3",
"unplugin-auto-import": "0.8.5", "sass": "^1.74.1",
"vite": "2.9.14", "unplugin-auto-import": "^0.17.5",
"vite-plugin-compression": "0.5.1", "vite": "^5.2.8",
"vite-plugin-svg-icons": "2.0.1", "vite-plugin-compression": "^0.5.1",
"vite-plugin-vue-setup-extend": "0.4.0" "vite-plugin-style-import": "^2.0.0",
"vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-vue-setup-extend": "^0.4.0"
} }
} }

4
Yi.RuoYi.Vue3/src/layout/components/Settings/index.vue
View File

@@ -80,7 +80,9 @@
<script setup> <script setup>
import variables from '@/assets/styles/variables.module.scss' import variables from '@/assets/styles/variables.module.scss'
import originElementPlus from 'element-plus/theme-chalk/index.css' import 'element-plus/theme-chalk/index.css'
import 'element-plus/theme-chalk/dark/css-vars.css'
//import originElementPlus from 'element-plus/theme-chalk/index.css'
import axios from 'axios' import axios from 'axios'
import { ElLoading, ElMessage } from 'element-plus' import { ElLoading, ElMessage } from 'element-plus'
import { useDynamicTitle } from '@/utils/dynamicTitle' import { useDynamicTitle } from '@/utils/dynamicTitle'

2
Yi.RuoYi.Vue3/src/layout/components/TagsView/ScrollPane.vue
View File

@@ -15,7 +15,7 @@ import useTagsViewStore from '@/store/modules/tagsView'
const tagAndTagSpacing = ref(4); const tagAndTagSpacing = ref(4);
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const scrollWrapper = computed(() => proxy.$refs.scrollContainer.$refs.wrap$); const scrollWrapper = computed(() => proxy.$refs.scrollContainer.$refs.wrapRef);
onMounted(() => { onMounted(() => {
scrollWrapper.value.addEventListener('scroll', emitScroll, true) scrollWrapper.value.addEventListener('scroll', emitScroll, true)