748 Commits

Author SHA1 Message Date
疯狂的狮子li
be51b4bf25 fix 修复 没有权限的用户编辑部门缺少数据 2022-09-13 14:06:53 +08:00
梁剑锋
3fb15d8ec3
fix 修复 注解文字错误
Signed-off-by: 梁剑锋 <1822213252@qq.com>
2022-08-31 08:56:50 +00: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
RuoYi
9a895763d5 优化页面内嵌iframe切换tab不刷新数据 2022-08-23 20:59:26 +08:00
疯狂的狮子li
3950f3c869 fix 修复 文件/图片上传组件 第一次上传报错导致后续上传无限loading问题 2022-08-23 18:34:42 +08:00
RuoYi
7347cbaedf 优化页面内嵌iframe切换tab不刷新数据 2022-08-23 17:29:09 +08:00
稚屿
e02f692359
修复菜单管理已知问题
问题描述:在菜单管理下,类型为菜单或者按钮的条目下点击修改按钮。
情况1,如果是类型为菜单,第一次点击修改按钮正常,则第二次点击另一个条目后面的修改按钮时报错!
情况2,如果是类型为按钮,第一次点击修改时正常,当点击取消按钮关闭弹窗时,浏览器报错!

报错代码:this.resetForm("form")

修复方案:添加遗漏的表单 prop 属性

Signed-off-by: 稚屿 <1491182878@qq.com>
2022-08-22 06:19:08 +00:00
RuoYi
9b3767a954 优化多角色数据权限匹配规则 2022-08-21 22:53:57 +08:00
疯狂的狮子li
d1681dc18c 👀 发布 4.3.0-beta2 公测版 2022-08-17 18:19:48 +08:00
RuoYi
851dc54b49 修复图片预览组件src属性为null值控制台报错问题(I5KBAS) 2022-08-15 12:07:24 +08:00
疯狂的狮子Li
d351c59b38 update 优化 缓存列表管理 适配 spring-cache 缓存的数据 2022-08-14 01:50:32 +08:00
RuoYi
5b05d4a123 个人中心修改密码去除多余的user传递 2022-08-12 12:17:28 +08:00
疯狂的狮子li
e57682aa53 👀 发布 4.3.0-beta1 公测版 2022-08-08 15:59:22 +08:00
疯狂的狮子li
be7766b5f0 update 同步ruoyi 2022-08-08 10:03:56 +08:00
abbfun
168d49fe0b 优化表格上右侧工具条(搜索按钮显隐&右侧样式凸出)
无搜索条件时可通过search隐藏搜索按钮,工具条组右侧样式超出5px(相对于底部表格),其父节点gutter代码生成默认10,此处也默认10,使工具组样式左右一致

(cherry picked from commit d4475d0e8d36a75980899246202ea420c3fad935)
2022-08-08 09:46:08 +08:00
RuoYi
cbedec7ca6 登录日志新增解锁账户功能 2022-08-08 09:23:52 +08:00
疯狂的狮子li
4a796d0e81 update 优化 前后端多环境部署保持一致 删除无用环境文件 2022-08-01 13:34:19 +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
06177addf5 添加新群号:104748341 2022-07-25 18:45:51 +08:00
疯狂的狮子li
afc4f9552f update 更改首页过时的技术 2022-07-22 12:34:14 +08:00
RuoYi
bc8b5f1079 优化布局设置使用el-drawer抽屉显示 2022-07-21 08:50:48 +08:00
RuoYi
5ec5e1a65d 优化字典数据使用store存取 2022-07-20 19:38:16 +08:00
RuoYi
1852017ecc 修改验证码开关变量名 2022-07-14 19:49:00 +08:00
RuoYi
eb9f3d3772 修改验证码开关变量名 2022-07-12 18:04:49 +08:00
疯狂的狮子li
c57ab693e4 update 更新 README.md 与 项目首页 关于接口文档介绍 2022-07-11 16:34:31 +08:00
疯狂的狮子li
af54608f62 update 优化 移除自带 swagger-ui 界面包 建议使用外置工具 2022-07-11 16:29:16 +08:00
疯狂的狮子li
a46a7458e1 Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
#	README.md
#	pom.xml
#	ruoyi-admin/pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-common/pom.xml
#	ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
#	ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java
#	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.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-framework/pom.xml
#	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
#	ruoyi-generator/pom.xml
#	ruoyi-job/pom.xml
#	ruoyi-system/pom.xml
#	ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/src/views/monitor/cache/list.vue
#	ruoyi-ui/src/views/system/dict/data.vue
#	ruoyi-ui/vue.config.js
#	sql/ry_20220625.sql
2022-07-06 15:46:19 +08:00
疯狂的狮子li
c33aa5c969 add 同步ruoyi 新增缓存列表菜单功能 2022-07-06 15:42:45 +08:00
疯狂的狮子li
7545323eba 😘 发布 4.2.0 2022-06-28 09:39:34 +08:00
RuoYi
6f48fc3c58 若依 3.8.3 2022-06-27 08:23:47 +08:00
zbk
2ae41df23b
修复缓存列表页面变量名错误导致错误 2022-06-26 12:51:55 +00:00
RuoYi
8c956d681b 默认不启用压缩文件缓存防止node_modules过大 2022-06-26 08:53:56 +08:00
RuoYi
89eb44afbc 优化字典数据回显样式下拉框显示值 2022-06-26 08:53:15 +08:00
RuoYi
9d7e32fb07 新增缓存列表菜单功能 2022-06-25 09:39:39 +08:00
疯狂的狮子li
63eb145772 update 同步 ruoyi 2022-06-15 18:18:51 +08:00
RuoYi
e8fbf5fdbd reset babel 2022-06-14 21:26:14 +08:00
RuoYi
eab1b450d5 优化代码 2022-06-13 21:43:11 +08:00
疯狂的狮子li
426aeb0a7f 发布 4.2.0-beta1 公测版 2022-06-07 11:04:43 +08:00
疯狂的狮子Li
5ced7e05f5 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	README.md
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/views/index.vue
2022-05-28 22:30:06 +08:00
mingliangyang
52e1717014 增加对空字符串参数的过滤 2022-05-27 12:06:27 +08:00
RuoYi
8a2e3d13f2 表单构建按钮不显示正则校验 2022-05-27 09:18:26 +08:00
RuoYi
63d471ec94 修复字典导出序列化报错问题 2022-05-27 08:37:14 +08:00
RuoYi
77fffda10e 添加新群号:139821253 2022-05-23 09:38:52 +08:00
疯狂的狮子li
970561b956 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/domain/entity/SysDept.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/assets/styles/element-variables.scss
	ruoyi-ui/src/views/monitor/server/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/user/index.vue
2022-05-16 09:38:03 +08:00
RuoYi
9c3b53b701 用户管理左侧树型组件增加选中高亮保持 2022-05-13 15:02: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