疯狂的狮子li
|
4e723f4936
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
|
2021-04-25 09:27:07 +08:00 |
疯狂的狮子li
|
5fcef39a2e
|
add 集成 spring-boot-admin 全方位监控
|
2021-04-22 15:04:35 +08:00 |
RuoYi
|
62081aebb9
|
修复开启TopNav后,左侧打开外链问题
|
2021-04-21 16:34:44 +08:00 |
疯狂的狮子li
|
97873a7b2b
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/ThemePicker/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/store/modules/settings.js
|
2021-04-19 17:43:32 +08:00 |
RuoYi
|
2575c17f47
|
主题颜色保存配置
|
2021-04-19 16:59:56 +08:00 |
RuoYi
|
e60a69b670
|
兼容顶部栏一级菜单内部跳转
|
2021-04-18 18:33:13 +08:00 |
疯狂的狮子li
|
f093da99ec
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/resources/application-prod.yml
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/assets/styles/sidebar.scss
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/getters.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/views/monitor/druid/index.vue
|
2021-04-14 13:22:31 +08:00 |
RuoYi
|
cc50224d90
|
固定顶部导航栏&窗口大小改变实时更新栏数
|
2021-04-14 11:01:16 +08:00 |
RuoYi
|
ff09e1cf55
|
数据监控默认地址修改
|
2021-04-13 18:15:11 +08:00 |
RuoYi
|
fe2ccbdc1b
|
优化代码生成导出模板名称
|
2021-04-13 14:49:42 +08:00 |
RuoYi
|
c8df1f5e1f
|
布局设置支持保存&重置配置
|
2021-04-13 09:47:28 +08:00 |
RuoYi
|
e71c00e6fa
|
富文本编辑器支持自定义上传地址
|
2021-04-13 09:38:32 +08:00 |
若依
|
f13b6d92d2
|
!205 富文本编辑器自定义上传地址
Merge pull request !205 from hechieh/N/A
|
2021-04-13 09:36:42 +08:00 |
RuoYi
|
9aac65ff32
|
新增菜单导航显示风格TopNav(false为左侧导航菜单,true为顶部导航菜单)
|
2021-04-12 09:54:08 +08:00 |
RuoYi
|
5f2350569a
|
页签新增关闭右侧
|
2021-04-10 21:15:45 +08:00 |
hechieh
|
ccf05b697d
|
富文本编辑器自定义上传地址
|
2021-04-10 17:08:49 +08:00 |
RuoYi
|
6810243ab7
|
修复树表数据显示不全&加载慢问题
|
2021-04-09 08:31:13 +08:00 |
疯狂的狮子li
|
8b37eca241
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/utils/zipdownload.js
|
2021-04-08 17:12:13 +08:00 |
RuoYi
|
b56b8846d9
|
修改主题后mini类型按钮无效问题
|
2021-04-08 13:54:48 +08:00 |
RuoYi
|
8e1e4cd8fe
|
通用下载完成后删除节点
|
2021-04-08 13:46:22 +08:00 |
疯狂的狮子li
|
b16fe5e263
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/tool/build/index.vue
|
2021-03-31 16:49:45 +08:00 |
RuoYi
|
30f330f4a0
|
修复firefox下表单构建拖拽会新打卡一个选项卡
|
2021-03-30 17:45:35 +08:00 |
疯狂的狮子li
|
06e9feadee
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
|
2021-03-26 14:07:53 +08:00 |
RuoYi
|
090e258bf9
|
显隐列初始默认隐藏列
|
2021-03-24 15:46:37 +08:00 |
若依
|
505fa06dc3
|
!192 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue.
Merge pull request !192 from 谢凯/N/A
|
2021-03-24 15:32:24 +08:00 |
谢凯
|
881dc3fcf0
|
update ruoyi-ui/src/views/system/user/profile/userAvatar.vue.
|
2021-03-22 17:52:34 +08:00 |
allworldg
|
b65c8d4512
|
update ruoyi-ui/src/views/system/user/profile/userAvatar.vue.
|
2021-03-21 21:20:23 +08:00 |
疯狂的狮子li
|
63a582404b
|
update swagger 模板修改为 swagger-bootstrap-ui
|
2021-03-15 17:51:00 +08:00 |
疯狂的狮子li
|
5494ec36e5
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
ruoyi-ui/src/components/Editor/index.vue
ruoyi-ui/src/permission.js
ruoyi-ui/src/store/modules/user.js
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
|
2021-03-09 09:32:49 +08:00 |
RuoYi
|
61432480c8
|
删除多余的代码
|
2021-03-07 11:06:47 +08:00 |
若依
|
78deee063d
|
!180 富文本编辑组件支持只读
Merge pull request !180 from JOSWAY/master
|
2021-03-07 10:44:04 +08:00 |
若依
|
616f5a6aca
|
!185 update ruoyi-ui/src/views/monitor/logininfor/index.vue.
Merge pull request !185 from asher/N/A
|
2021-03-07 10:39:30 +08:00 |
asher
|
f938a24df0
|
update ruoyi-ui/src/views/monitor/logininfor/index.vue.
|
2021-03-04 17:00:07 +08:00 |
asher
|
45fa686a64
|
update ruoyi-ui/src/views/monitor/operlog/index.vue.
|
2021-03-04 16:58:18 +08:00 |
疯狂的狮子li
|
0638f3c1fe
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
ruoyi-ui/src/views/index.vue
|
2021-02-28 14:39:53 +08:00 |
RuoYi
|
64e807f27b
|
添加新群号:186866453
|
2021-02-24 13:45:24 +08:00 |
Josway
|
339b932a3d
|
富文本编辑组件支持只读
|
2021-02-22 17:49:17 +08:00 |
疯狂的狮子li
|
ac99fddfe6
|
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/views/index.vue
|
2021-02-22 10:04:43 +08:00 |
RuoYi
|
0b5c7f4c96
|
若依 3.4.0
|
2021-02-22 09:40:28 +08:00 |
疯狂的狮子li
|
2c40a892f8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/system/role/index.vue
|
2021-02-07 09:18:17 +08:00 |
RuoYi
|
3a51c53823
|
角色非自定义权限范围清空选择值
|
2021-02-06 10:34:12 +08:00 |
RuoYi
|
df504c5c14
|
修复四级菜单无法显示问题
|
2021-02-06 09:29:50 +08:00 |
疯狂的狮子li
|
6f0dfa850a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/system/role/index.vue
|
2021-02-03 13:38:43 +08:00 |
RuoYi
|
baeed2e8d3
|
修复角色管理-编辑角色-功能权限显示异常
|
2021-02-02 16:25:37 +08:00 |
疯狂的狮子li
|
2925f28255
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
|
2021-01-25 09:54:49 +08:00 |
RuoYi
|
2903de1561
|
升级element-ui到最新版本2.15.0
|
2021-01-24 12:06:19 +08:00 |
疯狂的狮子li
|
684eadbcc6
|
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/controller/GenController.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.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/java/com/ruoyi/generator/util/VelocityInitializer.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/java/domain.java.vm
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
ruoyi-ui/src/views/tool/gen/index.vue
sql/ry_20210108.sql
|
2021-01-11 09:58:41 +08:00 |
RuoYi
|
14a859899c
|
代码生成模板支持主子表
|
2021-01-08 10:47:36 +08:00 |
RuoYi
|
7d0eb3b8c7
|
用户显隐列添加不同key防止被复用
|
2021-01-07 13:28:16 +08:00 |
RuoYi
|
654aa6b30c
|
表格右侧工具栏组件支持显隐列
|
2021-01-06 17:30:39 +08:00 |