Commit 7ab881811ebaf181115b9f6e22314f113f75ddf4
1 parent
913124da
解决2.3 [bug]online表单开发的权限控制使用报错 #1733
解决2.3 IE11兼容问题
Showing
3 changed files
with
13 additions
and
16 deletions
ant-design-vue-jeecg/src/views/user/Login.vue
| ... | ... | @@ -11,7 +11,7 @@ |
| 11 | 11 | size="large" |
| 12 | 12 | v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]" |
| 13 | 13 | type="text" |
| 14 | - placeholder="请输入帐户名 / jeecg"> | |
| 14 | + placeholder="请输入帐户名 / admin"> | |
| 15 | 15 | <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/> |
| 16 | 16 | </a-input> |
| 17 | 17 | </a-form-item> |
| ... | ... |
ant-design-vue-jeecg/vue.config.js
| ... | ... | @@ -58,20 +58,17 @@ module.exports = { |
| 58 | 58 | .loader('file-loader') |
| 59 | 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