Skip to content

Commit 2d3046e

Browse files
YunaiVYunaiV
committed
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/notify
# Conflicts: # sql/mysql/ruoyi-vue-pro.sql # yudao-ui-admin/src/utils/dict.js
2 parents f92a77d + 473de10 commit 2d3046e

File tree

317 files changed

+17120
-4760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

317 files changed

+17120
-4760
lines changed

‎.env.demo1024

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ VUE_APP_APP_NAME ='/admin-ui/'
1717
# 多租户的开关
1818
VUE_APP_TENANT_ENABLE = true
1919

20+
# 验证码的开关
21+
VUE_APP_CAPTCHA_ENABLE = true
22+
2023
# 文档的开关
2124
VUE_APP_DOC_ENABLE = true
2225

‎.env.dev

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
1313
# 多租户的开关
1414
VUE_APP_TENANT_ENABLE = true
1515

16+
# 验证码的开关
17+
VUE_APP_CAPTCHA_ENABLE = true
18+
1619
# 文档的开关
1720
VUE_APP_DOC_ENABLE = true
1821

‎.env.local

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
1414
# 多租户的开关
1515
VUE_APP_TENANT_ENABLE = true
1616

17+
# 验证码的开关
18+
VUE_APP_CAPTCHA_ENABLE = true
19+
1720
# 文档的开关
1821
VUE_APP_DOC_ENABLE = true
1922

‎.env.prod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ VUE_APP_APP_NAME ='yudao-admin'
1515
# 多租户的开关
1616
VUE_APP_TENANT_ENABLE = true
1717

18+
# 验证码的开关
19+
VUE_APP_CAPTCHA_ENABLE = true
20+
1821
# 文档的开关
1922
VUE_APP_DOC_ENABLE = false
2023

‎.env.stage

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
1515
# 多租户的开关
1616
VUE_APP_TENANT_ENABLE = true
1717

18+
# 验证码的开关
19+
VUE_APP_CAPTCHA_ENABLE = true
20+
1821
# 文档的开关
1922
VUE_APP_DOC_ENABLE = false
2023

‎.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ public
77
# 忽略当前目录下为js的文件的语法检查
88
*.js
99
# 忽略当前目录下为vue的文件的语法检查
10-
*.vue
10+
*.vue

‎.eslintrc.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ module.exports = {
1515
// add your custom rules here
1616
//it is base on https://github.com/vuejs/eslint-config-vue
1717
rules: {
18-
"vue/max-attributes-per-line": [2, {
19-
"singleline": 10,
20-
"multiline": {
21-
"max": 1,
22-
"allowFirstLine": false
23-
}
24-
}],
2518
"vue/singleline-html-element-content-newline": "off",
2619
"vue/multiline-html-element-content-newline":"off",
2720
"vue/name-property-casing": ["error", "PascalCase"],

‎build/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
1212
const port = 9526
1313
const publicPath = config.publicPath
1414

15-
var connect = require('connect')
16-
var serveStatic = require('serve-static')
15+
const connect = require('connect')
16+
const serveStatic = require('serve-static')
1717
const app = connect()
1818

1919
app.use(

‎package.json

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "yudao-ui-admin",
3-
"version": "1.6.3-snapshot",
3+
"version": "1.6.6-snapshot",
44
"description": "芋道管理系统",
55
"author": "芋道",
66
"license": "MIT",
@@ -40,66 +40,68 @@
4040
"url": "https://github.com/YunaiV/ruoyi-vue-pro"
4141
},
4242
"dependencies": {
43+
"@babel/parser": "7.18.4",
4344
"@riophae/vue-treeselect": "0.4.0",
44-
"axios": "0.24.0",
45+
"axios": "0.27.2",
46+
"benz-amr-recorder": "^1.1.5",
47+
"bpmn-js-token-simulation": "0.10.0",
4548
"clipboard": "2.0.8",
46-
"core-js": "^3.21.1",
47-
"echarts": "4.9.0",
48-
"element-ui": "2.15.8",
49+
"core-js": "^3.26.0",
50+
"crypto-js": "^4.0.0",
51+
"echarts": "5.4.0",
52+
"element-ui": "2.15.12",
4953
"file-saver": "2.0.5",
50-
"fuse.js": "6.4.3",
54+
"fuse.js": "6.6.2",
5155
"highlight.js": "9.18.5",
5256
"js-beautify": "1.13.0",
53-
"jsencrypt": "3.0.0-rc.1",
57+
"jsencrypt": "3.3.1",
58+
"min-dash": "3.5.2",
5459
"nprogress": "0.2.0",
5560
"quill": "1.3.7",
5661
"screenfull": "5.0.2",
5762
"sortablejs": "1.10.2",
58-
"vue": "2.6.12",
63+
"throttle-debounce": "2.1.0",
64+
"vue": "2.7.14",
5965
"vue-count-to": "1.0.13",
60-
"vue-cropper": "0.5.5",
66+
"vue-cropper": "0.5.8",
6167
"vue-meta": "^2.4.0",
68+
"vue-quill-editor": "^3.0.6",
6269
"vue-router": "3.4.9",
70+
"vue-video-player": "^5.0.2",
6371
"vuedraggable": "2.24.3",
64-
"vuex": "3.6.0",
65-
"bpmn-js-token-simulation": "0.10.0",
66-
"min-dash": "3.5.2",
67-
"xml-js": "1.6.11",
68-
"@babel/parser": "7.7.4",
69-
"throttle-debounce": "2.1.0"
72+
"vuex": "3.6.2",
73+
"xml-js": "1.6.11"
7074
},
7175
"devDependencies": {
72-
"@vue/cli-plugin-babel": "4.4.6",
73-
"@vue/cli-plugin-eslint": "4.4.6",
74-
"@vue/cli-service": "4.4.6",
76+
"@vue/cli-plugin-babel": "4.5.18",
77+
"@vue/cli-plugin-eslint": "4.5.18",
78+
"@vue/cli-service": "4.5.18",
79+
"@vue/compiler-sfc": "^3.0.1",
80+
"@vue/eslint-config-prettier": "^5.0.0",
7581
"babel-eslint": "10.1.0",
82+
"bpmn-js": "8.9.0",
83+
"bpmn-js-properties-panel": "0.46.0",
7684
"chalk": "4.1.0",
7785
"compression-webpack-plugin": "5.0.2",
7886
"connect": "3.6.6",
7987
"eslint": "7.15.0",
80-
"eslint-plugin-vue": "7.2.0",
81-
"lint-staged": "10.5.3",
82-
"sass": "1.32.13",
88+
"eslint-config-airbnb-base": "^14.0.0",
89+
"eslint-plugin-import": "^2.26.0",
90+
"eslint-plugin-prettier": "^3.1.0",
91+
"eslint-plugin-vue": "9.0.0",
92+
"fs-extra": "^8.1.0",
93+
"lint-staged": "12.5.0",
8394
"runjs": "4.4.2",
84-
"sass-loader": "10.1.1",
95+
"sass": "1.32.13",
96+
"sass-loader": "10.2.0",
8597
"script-ext-html-webpack-plugin": "2.1.5",
8698
"svg-sprite-loader": "5.1.1",
87-
"vue-template-compiler": "2.6.12",
88-
"vue2-ace-editor": "^0.0.15",
89-
"@vue/compiler-sfc": "^3.0.1",
90-
"@vue/eslint-config-prettier": "^5.0.0",
91-
"bpmn-js": "8.9.0",
92-
"bpmn-js-properties-panel": "0.46.0",
93-
"eslint-plugin-prettier": "^3.1.0",
94-
"fs-extra": "^8.1.0",
9599
"terser-webpack-plugin": "^4.2.3",
96-
"webpack-bundle-analyzer": "^3.9.0",
97-
"eslint-config-airbnb-base": "^14.0.0",
98-
"eslint-plugin-import": "^2.20.0"
100+
"webpack-bundle-analyzer": "^3.9.0"
99101
},
100102
"engines": {
101-
"node": ">=8.9",
102-
"npm": ">= 3.0.0"
103+
"node": ">= 10.13.0",
104+
"npm": ">= 5.0.0"
103105
},
104106
"browserslist": [
105107
"> 1%",

‎public/libs/monaco-editor/vs/language/html/htmlMode.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)