疯狂的狮子Li
|
5117fe2958
|
update 同步 ruoyi 相关提交
* fix 修复 文件名包含特殊字符（+、-、*...）的文件无法下载问题
* update 优化 弹窗内容过多展示不全问题
* update echarts 4.9.0 => 5.4.0
* fix 修复 Vue3树形下拉不能默认选中
* update 优化 删除fuse无效选项maxPatternLength
* fix 修复 代码生成图片/文件/单选时选择必填无法校验问题
* fix 修复 修改参数键名时 未移除过期缓存配置
|
2022-12-14 15:11:09 +08:00 |
|
疯狂的狮子li
|
56050aa650
|
update 同步 ruoyi 相关提交
* fix 修复Log注解GET请求记录不到参数问题
* fix 修复某些特性的环境生成代码变乱码TXT文件问题
* update 消除Vue3控制台出现的警告信息
* fix 开启TopNav没有子菜单隐藏侧边栏
* fix 修复回显数据字典数组异常问题(I60UYQ)
* update 忽略不必要的属性数据返回
|
2022-11-24 15:14:47 +08:00 |
|
疯狂的狮子Li
|
fde624998f
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# ruoyi-ui/src/components/FileUpload/index.vue
|
2022-10-13 15:59:43 +08:00 |
|
RuoYi
|
6505432bf4
|
修复文件上传组件格式验证问题(I5V32H)
|
2022-10-12 19:33:58 +08:00 |
|
疯狂的狮子li
|
aa638475e9
|
update 同步 ruoyi 新功能
|
2022-08-25 12:30:32 +08:00 |
|
疯狂的狮子li
|
4af334f2ad
|
update 同步 ruoyi 新功能
|
2022-08-25 12:08:50 +08:00 |
|
RuoYi
|
39efed1710
|
修复多文件上传报错出现的异常问题
|
2022-08-24 11:18:52 +08:00 |
|
疯狂的狮子li
|
3950f3c869
|
fix 修复 文件/图片上传组件 第一次上传报错导致后续上传无限loading问题
|
2022-08-23 18:34:42 +08:00 |
|
RuoYi
|
851dc54b49
|
修复图片预览组件src属性为null值控制台报错问题(I5KBAS)
|
2022-08-15 12:07:24 +08:00 |
|
abbfun
|
168d49fe0b
|
优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出）
无搜索条件时可通过search隐藏搜索按钮，工具条组右侧样式超出5px（相对于底部表格）,其父节点gutter代码生成默认10，此处也默认10，使工具组样式左右一致
(cherry picked from commit d4475d0e8d36a75980899246202ea420c3fad935)
|
2022-08-08 09:46:08 +08:00 |
|
疯狂的狮子li
|
26b0dc336a
|
update 同步 ruoyi
|
2022-07-27 18:34:45 +08:00 |
|
abbfun
|
d4475d0e8d
|
优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出）
无搜索条件时可通过search隐藏搜索按钮，工具条组右侧样式超出5px（相对于底部表格）,其父节点gutter代码生成默认10，此处也默认10，使工具组样式左右一致
|
2022-07-27 09:05:31 +00:00 |
|
RuoYi
|
bc8b5f1079
|
优化布局设置使用el-drawer抽屉显示
|
2022-07-21 08:50:48 +08:00 |
|
RuoYi
|
5ec5e1a65d
|
优化字典数据使用store存取
|
2022-07-20 19:38:16 +08:00 |
|
疯狂的狮子li
|
6a69be88c5
|
update 调整 图片预览组件 去除无用根目录拼接
|
2022-05-13 09:41:54 +08:00 |
|
疯狂的狮子li
|
af6a08398e
|
update 优化 文件与图片上传组件 使用id存储回显
|
2022-05-12 10:55:44 +08:00 |
|
疯狂的狮子Li
|
99dfd42372
|
update 优化 上传组件 部分用户存储url串 导致无法回显问题
|
2022-05-10 23:35:54 +08:00 |
|
疯狂的狮子Li
|
3dfb116fdd
|
update 优化文件上传、图片上传组件 文件列表展示文件原名便于后续处理, 完善组件删除功能
|
2022-04-18 19:55:23 +08:00 |
|
疯狂的狮子Li
|
d637f03067
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-generator/pom.xml
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-job/pom.xml
ruoyi-system/pom.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/README.md
ruoyi-ui/bin/package.bat
ruoyi-ui/package.json
ruoyi-ui/src/views/index.vue
|
2022-04-11 11:58:44 +08:00 |
|
RuoYi
|
d5f9b5b74a
|
topNav自定义隐藏侧边栏路由
|
2022-03-30 10:38:51 +08:00 |
|
疯狂的狮子li
|
cd312f1348
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/assets/styles/sidebar.scss
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/index.vue
ruoyi-ui/src/store/modules/app.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/log.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/importTable.vue
|
2022-03-15 10:20:53 +08:00 |
|
RuoYi
|
6130bebbb3
|
开启TopNav没有子菜单情况隐藏侧边栏
|
2022-03-06 09:03:44 +08:00 |
|
疯狂的狮子li
|
2190d87dc9
|
update 文件上传补全漏改
|
2022-02-28 13:03:55 +08:00 |
|
疯狂的狮子li
|
147eb7a9e5
|
update 图片上传 文件上传 支持并发上传
|
2022-02-28 12:10:55 +08:00 |
|
RuoYi
|
927b05713a
|
组件fileUpload支持多文件同时选择上传
|
2022-02-25 11:51:29 +08:00 |
|
RuoYi
|
e62e8e372c
|
组件ImageUpload支持多图同时选择上传
|
2022-02-25 09:08:56 +08:00 |
|
疯狂的狮子li
|
568e2a9337
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/src/components/Pagination/index.vue
ruoyi-ui/src/permission.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
2022-02-24 15:30:20 +08:00 |
|
RuoYi
|
aa9ed2e863
|
修复分页组件请求两次问题
|
2022-02-21 15:21:16 +08:00 |
|
疯狂的狮子li
|
f6edb48df9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-ui/src/components/Pagination/index.vue
|
2022-02-18 09:57:51 +08:00 |
|
RuoYi
|
d734bfc34f
|
修复分页组件请求两次问题(I4SQOR)
|
2022-02-17 11:56:11 +08:00 |
|
疯狂的狮子li
|
ee2f74dc5e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
.gitignore
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/src/components/FileUpload/index.vue
ruoyi-ui/src/views/tool/build/index.vue
|
2022-02-14 14:27:13 +08:00 |
|
sam
|
c491257359
|
修复自定义组件file-upload无法显示第一个文件，列表显示的文件比实际文件少一个的问题
|
2022-02-12 08:46:12 +08:00 |
|
疯狂的狮子li
|
a0bed51d96
|
update 格式化代码 统一间隔符
update 格式化代码 统一间隔符
|
2022-01-13 09:58:16 +08:00 |
|
疯狂的狮子li
|
1c7d840ff6
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2022-01-04 09:45:33 +08:00 |
|
RuoYi
|
7bc15245aa
|
预览组件支持多图显示
|
2022-01-01 09:46:18 +08:00 |
|
马小法
|
1294f68265
|
fix https://gitee.com/y_project/RuoYi-Vue/issues/I4O5WD
|
2021-12-27 15:33:22 +08:00 |
|
疯狂的狮子li
|
a3504dac6e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
ruoyi-ui/package.json
ruoyi-ui/src/main.js
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/vue.config.js
|
2021-12-20 09:47:56 +08:00 |
|
RuoYi
|
903b5aebca
|
新增图片预览组件
|
2021-12-18 12:23:59 +08:00 |
|
疯狂的狮子li
|
d2c6e27d07
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/views/system/user/index.vue
|
2021-12-16 14:21:04 +08:00 |
|
fuzui
|
43d76e5990
|
fix: cron组件中周回显bug
|
2021-12-16 02:18:48 +08:00 |
|
疯狂的狮子li
|
29c46a15f9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/directive/index.js
ruoyi-ui/src/plugins/download.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/system/user/authRole.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
|
2021-12-13 12:37:36 +08:00 |
|
fuzui
|
f28a91969a
|
fix: crontab组件中规范数据范围、冗余代码去除以及部分通配符说明
|
2021-11-30 02:08:08 +08:00 |
|
fuzui
|
ca285f5e53
|
fix: crontab组件周显示及计算bug
|
2021-11-30 00:22:23 +08:00 |
|
fuzui
|
34f2552cad
|
fix: crontab组件互斥bug
|
2021-11-30 00:17:12 +08:00 |
|
疯狂的狮子li
|
af25588b88
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
# ruoyi-generator/pom.xml
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
# ruoyi-generator/src/main/resources/vm/js/api.js.vm
# ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
# ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
# ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
# ruoyi-ui/package.json
# ruoyi-ui/src/api/monitor/server.js
# ruoyi-ui/src/components/RuoYi/Doc/index.vue
# ruoyi-ui/src/components/RuoYi/Git/index.vue
# ruoyi-ui/src/components/SizeSelect/index.vue
# ruoyi-ui/src/layout/components/Sidebar/Logo.vue
# ruoyi-ui/src/layout/components/TagsView/index.vue
# ruoyi-ui/src/layout/index.vue
# ruoyi-ui/src/main.js
# ruoyi-ui/src/plugins/download.js
# ruoyi-ui/src/router/index.js
# ruoyi-ui/src/store/modules/permission.js
# ruoyi-ui/src/store/modules/settings.js
# ruoyi-ui/src/store/modules/tagsView.js
# ruoyi-ui/src/store/modules/user.js
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/monitor/job/log.vue
# ruoyi-ui/src/views/system/dict/data.vue
# ruoyi-ui/src/views/system/role/index.vue
# ruoyi-ui/src/views/system/user/authRole.vue
# ruoyi-ui/src/views/system/user/index.vue
# ruoyi-ui/src/views/system/user/profile/resetPwd.vue
# ruoyi-ui/src/views/system/user/profile/userAvatar.vue
# ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
2021-11-25 19:39:53 +08:00 |
|
RuoYi
|
026a427103
|
优化前端代码
|
2021-11-24 14:47:24 +08:00 |
|
RuoYi
|
ef4bfde4a8
|
优化提示信息
|
2021-11-22 18:06:44 +08:00 |
|
疯狂的狮子li
|
64ec206ecb
|
update 更改上传数据回填
|
2021-10-14 17:28:13 +08:00 |
|
疯狂的狮子li
|
2f18d0d709
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/main.js
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-09-18 16:01:52 +08:00 |
|
RuoYi
|
12ab8b03d9
|
使用vue-data-dict，简化数据字典使用
|
2021-09-17 15:36:54 +08:00 |
|