Merge remote-tracking branch 'refs/remotes/ruoyi/master'

# Conflicts:
#	README.md
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/vue.config.js
This commit is contained in:
zhuyong
2024-09-05 22:35:52 +08:00
50 changed files with 782 additions and 300 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "ruoyi",
"version": "3.8.7",
"version": "3.8.8",
"description": "若依管理系统",
"author": "若依",
"license": "MIT",
@@ -37,14 +37,14 @@
},
"dependencies": {
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.24.0",
"axios": "0.28.1",
"bpmn-js": "^11.1.0",
"bpmnlint": "^6.4.0",
"bpmn-js-bpmnlint": "^0.15.0",
"bpmnlint-loader": "^0.1.4",
"file-drops": "^0.4.0",
"clipboard": "2.0.8",
"core-js": "3.25.3",
"core-js": "3.37.1",
"diagram-js": "^11.4.1",
"echarts": "5.4.0",
"element-ui": "2.15.14",
@@ -65,8 +65,7 @@
"vue-meta": "2.4.0",
"vue-router": "3.4.9",
"vuedraggable": "2.24.3",
"vuex": "3.6.0",
"xcrud": "^0.4.19"
"vuex": "3.6.0"
},
"devDependencies": {
"@babel/parser": "^7.20.5",
@@ -76,7 +75,7 @@
"babel-eslint": "10.1.0",
"babel-plugin-dynamic-import-node": "2.3.3",
"chalk": "4.1.0",
"compression-webpack-plugin": "5.0.2",
"compression-webpack-plugin": "6.1.2",
"connect": "3.6.6",
"eslint": "7.15.0",
"eslint-plugin-vue": "7.2.0",