205 Commits

Author	SHA1	Message	Date
疯狂的狮子li	60dda6c7eb	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-ui/src/views/index.vue	2020-11-12 09:24:40 +08:00
RuoYi	0ef007240d	调整默认首页	2020-11-07 10:38:35 +08:00
疯狂的狮子li	efb938c370	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java ruoyi-ui/src/views/system/notice/index.vue ruoyi-ui/src/views/system/user/index.vue	2020-11-03 09:56:18 +08:00
FlyFive	212012dc62	未选择时，点击“确认”，出现必填验证提示。使用blur的话，选择之后验证消息不会自动消失，使用change会自动消失。	2020-11-02 11:49:25 +08:00
疯狂的狮子li	cf44d1f213	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java ruoyi-ui/src/views/system/dept/index.vue	2020-10-28 11:54:52 +08:00
FlyFive	2b9d46439f	update ruoyi-ui/src/views/system/dept/index.vue. ... 验证的提示信息错了	2020-10-26 16:31:51 +08:00
疯狂的狮子li	30d15afd33	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java ruoyi-generator/src/main/resources/vm/sql/sql.vm ruoyi-ui/src/views/login.vue sql/ry_20201021.sql	2020-10-23 17:41:02 +08:00
RuoYi	c9f25cb34e	调整sql默认时间	2020-10-21 11:30:37 +08:00
疯狂的狮子li	f4876422a9	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-ui/src/views/system/dict/index.vue ruoyi-ui/src/views/system/role/index.vue	2020-10-14 09:22:01 +08:00
RuoYi	08df2c93a9	删除不必要的代码	2020-10-13 14:41:26 +08:00
FlyFive	0cae7d0058	update ruoyi-ui/src/views/system/role/index.vue. ... getMenuAllCheckedKeys()方法中选中节点和半选节点获取的方法反了。	2020-10-12 13:50:25 +08:00
疯狂的狮子li	8ca53c7666	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-ui/src/views/monitor/job/index.vue ruoyi-ui/src/views/monitor/logininfor/index.vue ruoyi-ui/src/views/monitor/online/index.vue ruoyi-ui/src/views/monitor/operlog/index.vue ruoyi-ui/src/views/system/config/index.vue ruoyi-ui/src/views/system/dept/index.vue ruoyi-ui/src/views/system/dict/data.vue ruoyi-ui/src/views/system/dict/index.vue ruoyi-ui/src/views/system/menu/index.vue ruoyi-ui/src/views/system/notice/index.vue ruoyi-ui/src/views/system/post/index.vue ruoyi-ui/src/views/system/role/index.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 ruoyi-ui/src/views/tool/gen/index.vue	2020-10-12 09:54:59 +08:00
RuoYi	b0965653bf	删除不必要的代码	2020-10-10 17:54:30 +08:00
RuoYi	69256940df	若依 3.2	2020-10-10 09:38:21 +08:00
疯狂的狮子li	bd39b971cf	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-admin/src/main/resources/application.yml ruoyi-ui/package.json ruoyi-ui/src/utils/ruoyi.js ruoyi-ui/src/views/monitor/job/index.vue	2020-10-10 09:19:20 +08:00
若依	f67c97e095	!102 rouyi.js中添加日期范围方法dateRange获取bug修复 ... Merge pull request !102 from zora/master	2020-10-09 11:37:18 +08:00
RuoYi	dd721ff894	修正定时任务执行一次权限标识	2020-10-07 13:36:55 +08:00
疯狂的狮子li	cddaf4b088	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-ui/src/layout/components/TagsView/index.vue ruoyi-ui/src/views/system/user/index.vue	2020-10-07 12:25:38 +08:00
RuoYi	ae4290bdda	修复页签关闭所有固定标签路由不刷新问题	2020-10-03 20:05:24 +08:00
RuoYi	c19fec2cf8	格式化代码	2020-10-03 20:05:06 +08:00
RuoYi	669c42795a	表单构建布局型组件新增按钮	2020-10-03 17:47:24 +08:00
shizhenwei	5b0525d05c	[修改]此工具类应使用参数dateRange而非bind在model上的dateRange	2020-09-27 13:22:23 +08:00
疯狂的狮子li	ef4731e3ff	删除无用js	2020-09-25 12:05:01 +08:00
疯狂的狮子li	6101a3bf0d	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java ruoyi-ui/src/assets/styles/sidebar.scss	2020-09-25 11:15:57 +08:00
RuoYi	fb07677c32	左侧菜单文字过长显示省略号	2020-09-24 19:21:55 +08:00
疯狂的狮子li	aefa2095f0	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.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-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java ruoyi-generator/src/main/resources/vm/sql/sql.vm ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java 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/service/impl/SysDeptServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.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/SysRoleMapper.xml ruoyi-ui/src/assets/styles/ruoyi.scss ruoyi-ui/src/router/index.js ruoyi-ui/src/views/system/menu/index.vue ruoyi-ui/src/views/system/role/index.vue ruoyi-ui/src/views/system/user/index.vue sql/ry_20200920.sql	2020-09-22 13:22:30 +08:00
RuoYi	69829827fe	菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）	2020-09-21 14:10:01 +08:00
RuoYi	abeb8d7fd8	菜单新增是否缓存keep-alive	2020-09-20 10:34:03 +08:00
RuoYi	478fae0d28	菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）	2020-09-19 13:42:37 +08:00
疯狂的狮子li	298fabfdec	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml ruoyi-ui/src/api/tool/gen.js ruoyi-ui/src/assets/styles/ruoyi.scss ruoyi-ui/src/views/system/user/index.vue ruoyi-ui/src/views/tool/gen/index.vue	2020-09-18 17:38:23 +08:00
RuoYi	9e38c7de2e	代码生成支持同步数据库	2020-09-18 10:24:21 +08:00
RuoYi	9ca28d6dbf	表格操作列间距调整	2020-09-18 10:23:31 +08:00
疯狂的狮子li	b111cbeedd	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java ruoyi-ui/src/views/tool/gen/editTable.vue	2020-09-16 09:23:02 +08:00
RuoYi	a948affb2d	代码生成支持富文本控件	2020-09-15 15:53:27 +08:00
疯狂的狮子li	06c4d4d01b	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: pom.xml ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml ruoyi-ui/package.json ruoyi-ui/src/components/Editor/index.vue ruoyi-ui/src/router/index.js	2020-09-11 09:17:43 +08:00
RuoYi	70ab18052c	富文本工具栏样式对齐	2020-09-10 16:56:33 +08:00
RuoYi	aeb02c79d8	修正注释图标路径	2020-09-10 16:53:58 +08:00
疯狂的狮子li	ef95cec77f	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java ruoyi-ui/src/components/Editor/index.vue	2020-09-07 11:31:40 +08:00
HaoRan	a65c287075	修复Editor组件无法对响应式更新null值问题	2020-08-31 02:10:01 +08:00
疯狂的狮子li	184bb04bc2	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-ui/src/components/Editor/index.vue ruoyi-ui/src/views/system/notice/index.vue sql/ry_20200822.sql	2020-08-24 10:26:44 +08:00
RuoYi	fa5596bb20	Editor组件优化，支持自定义高度&图片冲突问题	2020-08-22 13:18:41 +08:00
疯狂的狮子li	5aeac1a8ae	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-ui/package.json ruoyi-ui/src/components/HeaderSearch/index.vue ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue ruoyi-ui/src/utils/ruoyi.js	2020-08-19 17:01:43 +08:00
RuoYi	5fcf342f5a	修改sass为node-sass，避免el-icon图标乱码	2020-08-18 17:36:20 +08:00
若依	c6912ca1d5	!64 修改sass为node-sass，避免el-icon图标乱码 ... Merge pull request !64 from 心悦李国楠/dev-心悦	2020-08-18 17:27:19 +08:00
若依	5c4f0c5503	!65 根节点为子部门时，树状结构显示问题 ... Merge pull request !65 from GSTong/master	2020-08-18 17:21:51 +08:00
疯狂的狮子li	def4377226	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-ui/src/utils/ruoyi.js	2020-08-17 12:57:06 +08:00
RuoYi	d596d5bb8e	还原 addDateRange js 函数	2020-08-13 12:08:24 +08:00
疯狂的狮子li	088bc98a43	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-admin/src/main/resources/application.yml ruoyi-ui/package.json	2020-08-13 11:24:04 +08:00
RuoYi	8f9f0c04cc	若依 3.1	2020-08-13 10:27:56 +08:00
RuoYi	1bad003fe3	修改公私钥	2020-08-12 11:55:26 +08:00