From 7ab881811ebaf181115b9f6e22314f113f75ddf4 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 14 Sep 2020 23:51:35 +0800
Subject: [PATCH] 解决2.3 [bug]online表单开发的权限控制使用报错 #1733 解决2.3 IE11兼容问题
---
ant-design-vue-jeecg/src/views/user/Login.vue | 2 +-
ant-design-vue-jeecg/vue.config.js | 25 +++++++++++--------------
jeecg-boot/jeecg-boot-base-common/pom.xml | 2 +-
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/user/Login.vue b/ant-design-vue-jeecg/src/views/user/Login.vue
index 743313d..f10cafb 100644
--- a/ant-design-vue-jeecg/src/views/user/Login.vue
+++ b/ant-design-vue-jeecg/src/views/user/Login.vue
@@ -11,7 +11,7 @@
size="large"
v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]"
type="text"
- placeholder="请输入帐户名 / jeecg">
+ placeholder="请输入帐户名 / admin">
<a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
diff --git a/ant-design-vue-jeecg/vue.config.js b/ant-design-vue-jeecg/vue.config.js
index b4e1dc0..bfd4a2b 100644
--- a/ant-design-vue-jeecg/vue.config.js
+++ b/ant-design-vue-jeecg/vue.config.js
@@ -58,20 +58,17 @@ module.exports = {
.loader('file-loader')
.end()
- // 编译某些npm包里的es6代码
- // TODO 导致online js lib启动报错
- // config.module
- // // .rule('vxe')
- // // .test(/\.js$/)
- // // .use()
- // // .loader('babel-loader')
- // // .options({
- // // include: [
- // // resolve('node_modules/vxe-table'),
- // // resolve('node_modules/vxe-table-plugin-antd'),
- // // ]
- // // })
- // // .end()
+ // 编译某些npm包里的es6代码
+ config.module
+ .rule('vxe')
+ .test(/\.js$/)
+ .include
+ .add(resolve('node_modules/vxe-table'))
+ .add(resolve('node_modules/vxe-table-plugin-antd'))
+ .end()
+ .use()
+ .loader('babel-loader')
+ .end()
},
diff --git a/jeecg-boot/jeecg-boot-base-common/pom.xml b/jeecg-boot/jeecg-boot-base-common/pom.xml
index 5a7cca0..9c02826 100644
--- a/jeecg-boot/jeecg-boot-base-common/pom.xml
+++ b/jeecg-boot/jeecg-boot-base-common/pom.xml
@@ -169,7 +169,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-re</artifactId>
- <version>2.3.0</version>
+ <version>2.3.01</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
--
libgit2 0.22.2