From 4570a21a63c50b15bc2315fdb7d5ac4567c9e503 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 14 Sep 2020 23:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B32.3=20[bug]online=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=BC=80=E5=8F=91=E7=9A=84=E6=9D=83=E9=99=90=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E4=BD=BF=E7=94=A8=E6=8A=A5=E9=94=99#1733=20\=20IE11?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 743313d6..f10cafba 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 b4e1dc0f..bfd4a2be 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 5a7cca0b..9c028267 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>
-- 
GitLab