Commit b32d0724b7a912973f2afb14b5b783e9a0f1183f

Authored by RuoYi
1 parent 8deacb70

升级vue-cli版本到4.4.4

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
... ... @@ -77,8 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
77 77  
78 78 <select id="checkDeptNameUnique" resultMap="SysDeptResult">
79 79 <include refid="selectDeptVo"/>
80   - where dept_name=#{deptName} and parent_id = #{parentId}
81   - limit 1
  80 + where dept_name=#{deptName} and parent_id = #{parentId} limit 1
82 81 </select>
83 82  
84 83 <insert id="insertDept" parameterType="SysDept">
... ...
ruoyi-ui/babel.config.js
1 1 module.exports = {
2 2 presets: [
3   - '@vue/app'
4   - ]
  3 + // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
  4 + '@vue/cli-plugin-babel/preset'
  5 + ],
  6 + 'env': {
  7 + 'development': {
  8 + // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
  9 + // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
  10 + 'plugins': ['dynamic-import-node']
  11 + }
  12 + }
5 13 }
... ...
ruoyi-ui/package.json
... ... @@ -5,7 +5,7 @@
5 5 "author": "若依",
6 6 "license": "MIT",
7 7 "scripts": {
8   - "dev": "vue-cli-service serve --open",
  8 + "dev": "vue-cli-service serve",
9 9 "build:prod": "vue-cli-service build",
10 10 "build:stage": "vue-cli-service build --mode staging",
11 11 "preview": "node build/index.js --preview",
... ... @@ -43,10 +43,11 @@
43 43 "@riophae/vue-treeselect": "0.4.0",
44 44 "axios": "0.18.1",
45 45 "clipboard": "2.0.4",
  46 + "core-js": "3.6.5",
46 47 "echarts": "4.2.1",
47 48 "element-ui": "2.13.2",
48 49 "file-saver": "2.0.1",
49   - "js-beautify": "^1.10.2",
  50 + "js-beautify": "1.10.2",
50 51 "fuse.js": "3.4.4",
51 52 "js-cookie": "2.2.0",
52 53 "jsencrypt": "3.0.0-rc.1",
... ... @@ -65,32 +66,31 @@
65 66 "vuex": "3.1.0"
66 67 },
67 68 "devDependencies": {
68   - "@vue/cli-plugin-babel": "3.5.3",
69   - "@vue/cli-plugin-eslint": "^3.9.1",
70   - "@vue/cli-plugin-unit-jest": "3.5.3",
71   - "@vue/cli-service": "3.5.3",
  69 + "@vue/cli-plugin-babel": "4.4.4",
  70 + "@vue/cli-plugin-eslint": "4.4.4",
  71 + "@vue/cli-plugin-unit-jest": "4.4.4",
  72 + "@vue/cli-service": "4.4.4",
72 73 "@vue/test-utils": "1.0.0-beta.29",
73   - "autoprefixer": "^9.5.1",
74   - "babel-core": "7.0.0-bridge.0",
75   - "babel-eslint": "10.0.1",
  74 + "autoprefixer": "9.5.1",
  75 + "babel-eslint": "10.1.0",
76 76 "babel-jest": "23.6.0",
  77 + "babel-plugin-dynamic-import-node": "2.3.3",
77 78 "chalk": "2.4.2",
78 79 "chokidar": "2.1.5",
79 80 "connect": "3.6.6",
80   - "eslint": "5.15.3",
81   - "eslint-plugin-vue": "5.2.2",
  81 + "eslint": "6.7.2",
  82 + "eslint-plugin-vue": "6.2.2",
82 83 "html-webpack-plugin": "3.2.0",
83   - "http-proxy-middleware": "^0.19.1",
84 84 "husky": "1.3.1",
85 85 "lint-staged": "8.1.5",
86 86 "mockjs": "1.0.1-beta3",
87 87 "plop": "2.3.0",
88   - "runjs": "^4.3.2",
89   - "sass": "^1.26.10",
90   - "sass-loader": "^7.1.0",
  88 + "runjs": "4.3.2",
  89 + "sass": "1.26.10",
  90 + "sass-loader": "8.0.2",
91 91 "script-ext-html-webpack-plugin": "2.1.3",
92 92 "script-loader": "0.7.2",
93   - "serve-static": "^1.13.2",
  93 + "serve-static": "1.13.2",
94 94 "svg-sprite-loader": "4.1.3",
95 95 "svgo": "1.2.0",
96 96 "vue-template-compiler": "2.6.10"
... ...
ruoyi-ui/vue.config.js
... ... @@ -30,6 +30,7 @@ module.exports = {
30 30 devServer: {
31 31 host: '0.0.0.0',
32 32 port: port,
  33 + open: true,
33 34 proxy: {
34 35 // detail: https://cli.vuejs.org/config/#devserver-proxy
35 36 [process.env.VUE_APP_BASE_API]: {
... ... @@ -71,17 +72,6 @@ module.exports = {
71 72 })
72 73 .end()
73 74  
74   - // set preserveWhitespace
75   - config.module
76   - .rule('vue')
77   - .use('vue-loader')
78   - .loader('vue-loader')
79   - .tap(options => {
80   - options.compilerOptions.preserveWhitespace = true
81   - return options
82   - })
83   - .end()
84   -
85 75 config
86 76 .when(process.env.NODE_ENV !== 'development',
87 77 config => {
... ...