462 Commits

Author SHA1 Message Date
疯狂的狮子li
4c8dc500c7 fix 修复 table中更多按钮切换主题色未生效修复问题 2022-10-31 10:24:29 +08:00
疯狂的狮子li
85247991b6 fix 修复 上传png透明图片 生成头像透明部分变成黑色 2022-10-31 10:22:46 +08:00
疯狂的狮子li
a127eaa0e9 update 优化 重置时取消部门选中 2022-10-31 10:19:54 +08:00
疯狂的狮子li
efa2f23510 🐬发布 4.3.1 修复了一些问题建议升级 2022-10-24 14:22:38 +08:00
疯狂的狮子li
785c7495c1 Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
#	pom.xml
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
#	ruoyi-ui/src/App.vue
#	ruoyi-ui/src/assets/styles/ruoyi.scss
#	ruoyi-ui/src/views/system/user/index.vue
#	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
2022-10-24 09:43:35 +08:00
若依
b67f6a0fec
!604 修复小屏幕上修改头像界面布局错位的问题
Merge pull request !604 from 也曾为你、像超人/master
2022-10-21 03:50:16 +00:00
刘元博
b6153d1aef 修正选择按钮宽度 2022-10-21 11:21:59 +08:00
刘元博
9dcddc7876 修复小屏幕上修改头像界面布局错位的问题 2022-10-20 19:18:10 +08:00
kknd97
b970185536
update ruoyi-ui/src/views/system/user/index.vue.
handleUpdate(row)方法中:this.form = response.data;语句
会导致【this.form.postIds = response.postIds;】和【this.form.roleIds = response.roleIds;】失效。
导致用户编辑对话框中,角色和部门多选框无法正常修改。
建议使用以下语句修改:
this.$set(this.form, "postIds", response.postIds);
this.$set(this.form, "roleIds", response.roleIds);

Signed-off-by: kknd97 <liujingwei@ln.chinamobile.com>
2022-10-20 06:27:02 +00:00
疯狂的狮子Li
95010d4a4c 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/system/SysUserController.java
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-common/pom.xml
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.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/RateLimiterAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
#	ruoyi-generator/pom.xml
#	ruoyi-job/pom.xml
#	ruoyi-system/pom.xml
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
#	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
2022-10-12 10:55:42 +08:00
RuoYi
5b8edbf381 修复代码生成勾选属性无效问题 2022-09-28 19:31:52 +08:00
RuoYi
e95a1245c5 若依 3.8.4 2022-09-26 08:29:03 +08:00
抓蛙师
a680a84d91 !236 前端适配多字段排序功能案例OSS页面(重新排序需点击重置按钮,否则按照点击顺序依次排序,重复点击的字段排序位置不发生改变)
* 完善前端适配多字段排序功能案例OSS页面(完善排序图标显示效果和重置效果,支持正序,倒序,取消排序)
* 前端适配多字段排序功能案例OSS页面(重新排序需点击重置按钮,否则按照点击顺序依次排序,重复点击的字段排序位置不发生改变)
2022-09-20 08:41:40 +00:00
疯狂的狮子li
390edc5e3e update 优化 oss管理 支持时间排序 2022-09-20 10:51:08 +08:00
也曾为你、像超人
e781f88eca
优化日志操作中重置按钮时重复查询的问题
Signed-off-by: 也曾为你、像超人 <1553592282@qq.com>
2022-09-19 06:30:47 +00:00
疯狂的狮子li
adfae03953 🐣发布 4.3.0 正式版 2022-09-13 16:30:13 +08:00
疯狂的狮子li
be51b4bf25 fix 修复 没有权限的用户编辑部门缺少数据 2022-09-13 14:06:53 +08:00
RuoYi
2293822dc2 优化没有权限的用户编辑部门缺少数据(I5OF3O) 2022-09-12 17:22:23 +08:00
RuoYi
42d602b7a8 添加新群号:160110482 2022-08-28 20:09:25 +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
稚屿
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
疯狂的狮子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
RuoYi
cbedec7ca6 登录日志新增解锁账户功能 2022-08-08 09:23:52 +08:00
疯狂的狮子li
26b0dc336a update 同步 ruoyi 2022-07-27 18:34:45 +08:00
RuoYi
06177addf5 添加新群号:104748341 2022-07-25 18:45:51 +08:00
疯狂的狮子li
afc4f9552f update 更改首页过时的技术 2022-07-22 12:34:14 +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
89eb44afbc 优化字典数据回显样式下拉框显示值 2022-06-26 08:53:15 +08:00
RuoYi
9d7e32fb07 新增缓存列表菜单功能 2022-06-25 09:39:39 +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
RuoYi
8a2e3d13f2 表单构建按钮不显示正则校验 2022-05-27 09:18:26 +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