diff --git a/README.md b/README.md index 11f71f54..360b4d44 100644 --- a/README.md +++ b/README.md @@ -7,17 +7,16 @@ JEECG BOOT 低代码开发平台（前后端分离版本） =============== -当前最新版本： 3.0（发布日期：2021-11-01） +当前最新版本： 3.1.0（发布日期：2022-03-01） [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE) [![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://www.jeecg.com) [![](https://img.shields.io/badge/Blog-官方博客-blue.svg)](https://jeecg.blog.csdn.net) -[![](https://img.shields.io/badge/version-3.0-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot) +[![](https://img.shields.io/badge/version-3.1.0-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot) [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot) [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot) -

新年快乐！！！

项目介绍： @@ -48,8 +47,6 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中， - 在线演示 ： [http://boot.jeecg.com](http://boot.jeecg.com) -- 在线演示(VUE3beta版)：[http://boot3.jeecg.com](http://boot3.jeecg.com) - - 开发文档： [http://doc.jeecg.com](http://doc.jeecg.com) - 视频教程 ：[JeecgBoot入门视频](http://www.jeecg.com/doc/video) @@ -60,6 +57,8 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中， - 更新日志： [版本日志](http://www.jeecg.com/doc/log) +- VUE3版演示(未正式发布)：[http://boot3.jeecg.com](http://boot3.jeecg.com) + 交流互动 diff --git a/ant-design-vue-jeecg/.env b/ant-design-vue-jeecg/.env index 63279f6b..f1dd8896 100644 --- a/ant-design-vue-jeecg/.env +++ b/ant-design-vue-jeecg/.env @@ -1,3 +1,6 @@ NODE_ENV=production VUE_APP_PLATFORM_NAME=JeecgBoot 企业级低代码平台 -VUE_APP_SSO=false \ No newline at end of file +# 开启单点登录 +VUE_APP_SSO=false +# 开启微应用模式 +VUE_APP_QIANKUN=false diff --git a/ant-design-vue-jeecg/.env.development b/ant-design-vue-jeecg/.env.development index c514e743..c9c6c757 100644 --- a/ant-design-vue-jeecg/.env.development +++ b/ant-design-vue-jeecg/.env.development @@ -1,4 +1,7 @@ NODE_ENV=development VUE_APP_API_BASE_URL=http://localhost:8080/jeecg-boot VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas -VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file +VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview + +# 微应用列表必须VUE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 +VUE_APP_SUB_jeecg-app-1 = '//localhost:8092' diff --git a/ant-design-vue-jeecg/README.md b/ant-design-vue-jeecg/README.md index 53617b05..1a76874e 100644 --- a/ant-design-vue-jeecg/README.md +++ b/ant-design-vue-jeecg/README.md @@ -1,7 +1,7 @@ Ant Design Jeecg Vue ==== -当前最新版本： 3.0.0（发布日期：2021-11-01） +当前最新版本： 3.1.0（发布日期：20220301） Overview ---- diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index d1100fbb..50fd0f8c 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -1,6 +1,6 @@ { "name": "vue-antd-jeecg", - "version": "3.0.0", + "version": "3.1.0", "private": true, "scripts": { "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ", @@ -44,7 +44,8 @@ "xe-utils": "2.4.8", "vxe-table": "2.9.13", "vxe-table-plugin-antd": "1.8.10", - "cron-parser": "^2.10.0" + "cron-parser": "^2.10.0", + "qiankun": "^2.5.1" }, "devDependencies": { "@babel/polyfill": "^7.2.5", diff --git a/ant-design-vue-jeecg/public/index.html b/ant-design-vue-jeecg/public/index.html index 620b5e22..d3b55bb8 100644 --- a/ant-design-vue-jeecg/public/index.html +++ b/ant-design-vue-jeecg/public/index.html @@ -240,9 +240,7 @@ /* 滚动条优化 end */ - + diff --git a/ant-design-vue-jeecg/public/static/config.js b/ant-design-vue-jeecg/public/static/config.js new file mode 100644 index 00000000..2222138e --- /dev/null +++ b/ant-design-vue-jeecg/public/static/config.js @@ -0,0 +1,11 @@ +/** + * 存放配置常量(当值不为空时会覆盖env配置) + */ +window._CONFIG = { + //接口父路径 + VUE_APP_API_BASE_URL: '', + //单点登录地址 + VUE_APP_CAS_BASE_URL: '', + //文件预览路径 + VUE_APP_ONLINE_BASE_URL: '' +} \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/assets/less/AppIcon.less b/ant-design-vue-jeecg/src/assets/less/AppIcon.less new file mode 100644 index 00000000..54128e75 --- /dev/null +++ b/ant-design-vue-jeecg/src/assets/less/AppIcon.less @@ -0,0 +1,33 @@ +@active-color: #11da75; +ul { + max-height: 700px; + overflow-y: auto; + padding-left: .5rem; + img { + width:64px; + height:64px; + padding: .2rem; + margin: .3rem; + cursor: pointer; + &.active, &:hover { + border: 1px solid @active-color; + border-radius: 2px; + color: #fff; + transition: all .3s; + } + } + li { + list-style: none; + float: left; + text-align: center; + cursor: pointer; + color: #555; + transition: color .3s ease-in-out,background-color .3s ease-in-out; + position: relative; + margin: 3px 0; + border-radius: 4px; + background-color: #fff; + overflow: hidden; + padding: 10px 0 0; + } +} diff --git a/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue b/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue index 6705fa7a..28695f51 100644 --- a/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue +++ b/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue @@ -123,7 +123,17 @@ if(this.async){ if(!this.selectedAsyncValue || !this.selectedAsyncValue.key || this.selectedAsyncValue.key!=this.value){ console.log("这才请求后台") - getAction(`/sys/dict/loadDictItem/${this.dict}`,{key:this.value}).then(res=>{ + //update-begin-author:taoyan date:20220112 for: 方法initSelectValue 根据下拉框实际值查询下拉框的显示的文本 因后台接口只处理3个参数，所以将过滤条件去掉 + // TODO 隐患 查询效率问题 还是应该在后台作筛选 + let itemDictStr = this.dict + let arr = itemDictStr.split(',') + if(arr && arr.length==4){ + // 删除最后一个元素 + arr.pop(); + itemDictStr = arr.join(',') + } + //update-end-author:taoyan date:20220112 for: 方法initSelectValue 根据下拉框实际值查询下拉框的显示的文本 因后台接口只处理3个参数，所以将过滤条件去掉 + getAction(`/sys/dict/loadDictItem/${itemDictStr}`,{key:this.value}).then(res=>{ if(res.success){ let obj = { key:this.value, diff --git a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/mixin.less b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/mixin.less index 7278ab43..8f0d36e6 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/mixin.less +++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/mixin.less @@ -29,6 +29,13 @@ width: 4em; } +.week { + .list-check-item { + width: 5em; + text-align: left; + } +} + .tip-info { color: #999 } diff --git a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/week.vue b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/week.vue index 1f1b6041..0711c25c 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/week.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/week.vue @@ -1,5 +1,5 @@