diff --git a/ant-design-vue-jeecg/src/views/user/Login.vue b/ant-design-vue-jeecg/src/views/user/Login.vue index 743313d67d1f8a6c2e7985a5b27d20be1ec4d420..f10cafbafe176586a69aa9cd15058af5a79533e7 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"> diff --git a/ant-design-vue-jeecg/vue.config.js b/ant-design-vue-jeecg/vue.config.js index b4e1dc0f72773c0e3a132434845b45304320dedc..bfd4a2beb511f1ba8fe58928ff433c83d54eb9ec 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 5a7cca0b859f3dc804e2335daabaef082bb10707..9c02826748bf3cdd67a311e82e0a5074d2576390 100644 --- a/jeecg-boot/jeecg-boot-base-common/pom.xml +++ b/jeecg-boot/jeecg-boot-base-common/pom.xml @@ -169,7 +169,7 @@ org.hibernate hibernate-re - 2.3.0 + 2.3.01 org.hibernate