Commit 7ab881811ebaf181115b9f6e22314f113f75ddf4

Authored by zhangdaiscott
1 parent 913124da

解决2.3 [bug]online表单开发的权限控制使用报错 #1733

解决2.3 IE11兼容问题
ant-design-vue-jeecg/src/views/user/Login.vue
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 size="large" 11 size="large"
12 v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]" 12 v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]"
13 type="text" 13 type="text"
14 - placeholder="请输入帐户名 / jeecg"> 14 + placeholder="请输入帐户名 / admin">
15 <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/> 15 <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
16 </a-input> 16 </a-input>
17 </a-form-item> 17 </a-form-item>
ant-design-vue-jeecg/vue.config.js
@@ -58,20 +58,17 @@ module.exports = { @@ -58,20 +58,17 @@ module.exports = {
58 .loader('file-loader') 58 .loader('file-loader')
59 .end() 59 .end()
60 60
61 - // 编译某些npm包里的es6代码  
62 - // TODO 导致online js lib启动报错  
63 - // config.module  
64 - // // .rule('vxe')  
65 - // // .test(/\.js$/)  
66 - // // .use()  
67 - // // .loader('babel-loader')  
68 - // // .options({  
69 - // // include: [  
70 - // // resolve('node_modules/vxe-table'),  
71 - // // resolve('node_modules/vxe-table-plugin-antd'),  
72 - // // ]  
73 - // // })  
74 - // // .end() 61 + // 编译某些npm包里的es6代码
  62 + config.module
  63 + .rule('vxe')
  64 + .test(/\.js$/)
  65 + .include
  66 + .add(resolve('node_modules/vxe-table'))
  67 + .add(resolve('node_modules/vxe-table-plugin-antd'))
  68 + .end()
  69 + .use()
  70 + .loader('babel-loader')
  71 + .end()
75 72
76 }, 73 },
77 74
jeecg-boot/jeecg-boot-base-common/pom.xml
@@ -169,7 +169,7 @@ @@ -169,7 +169,7 @@
169 <dependency> 169 <dependency>
170 <groupId>org.hibernate</groupId> 170 <groupId>org.hibernate</groupId>
171 <artifactId>hibernate-re</artifactId> 171 <artifactId>hibernate-re</artifactId>
172 - <version>2.3.0</version> 172 + <version>2.3.01</version>
173 </dependency> 173 </dependency>
174 <dependency> 174 <dependency>
175 <groupId>org.hibernate</groupId> 175 <groupId>org.hibernate</groupId>