疯狂的狮子li
|
06944747fd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/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/tool/gen/index.vue
|
2021-07-27 12:42:41 +08:00 |
|
疯狂的狮子li
|
48817519a9
|
update 修改页面文档与源码地址
|
2021-07-26 13:08:54 +08:00 |
|
RuoYi
|
856d1ceba8
|
顶部菜单样式调整
|
2021-07-25 19:06:57 +08:00 |
|
RuoYi
|
bb87f35797
|
富文本新增上传文件大小限制
|
2021-07-25 08:57:01 +08:00 |
|
疯狂的狮子li
|
fbe9ad2392
|
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/router/index.js
|
2021-07-24 19:03:36 +08:00 |
|
RuoYi
|
c43f9bc3c2
|
顶部菜单排除隐藏的默认路由
|
2021-07-24 18:20:55 +08:00 |
|
疯狂的狮子li
|
ed197ce7ac
|
update 完成OSS模块页面功能
|
2021-07-20 17:26:20 +08:00 |
|
疯狂的狮子li
|
fd5414f82e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-ui/src/components/ImageUpload/index.vue
ruoyi-ui/src/views/login.vue
sql/ry_20210713.sql
|
2021-07-13 13:34:10 +08:00 |
|
RuoYi
|
c8b66f9b04
|
删除富文本video事件
|
2021-07-13 10:28:55 +08:00 |
|
严俊东
|
77a21d098f
|
图片上传 - 多图时无法删除相应图片修复
|
2021-07-12 03:01:50 +00:00 |
|
疯狂的狮子li
|
8231953e29
|
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/SysMenuController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-generator/pom.xml
ruoyi-quartz/pom.xml
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/layout/components/AppMain.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/index.vue
|
2021-07-12 09:37:23 +08:00 |
|
RuoYi
|
5879c2484a
|
菜单路由配置支持内链访问
|
2021-07-11 16:31:10 +08:00 |
|
RuoYi
|
1bfa14e3c6
|
富文本默认上传返回url类型
|
2021-07-10 12:17:32 +08:00 |
|
疯狂的狮子li
|
821f54f1ab
|
update 富文本接口返回值修正
|
2021-07-08 20:05:37 +08:00 |
|
疯狂的狮子li
|
e30079d656
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/components/FileUpload/index.vue
ruoyi-ui/src/components/ImageUpload/index.vue
|
2021-07-08 19:58:28 +08:00 |
|
RuoYi
|
f56da498ab
|
ImageUpload组件支持多图片上传
|
2021-07-08 19:17:09 +08:00 |
|
RuoYi
|
e259093e01
|
文件上传组件添加数量限制属性
|
2021-07-08 15:49:04 +08:00 |
|
RuoYi
|
e963a86b15
|
富文本编辑组件添加类型属性
|
2021-07-08 15:48:11 +08:00 |
|
RuoYi
|
e447fb806b
|
FileUpload组件支持多文件上传
|
2021-07-08 12:36:02 +08:00 |
|
疯狂的狮子li
|
c822e2f6cc
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/views/monitor/druid/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/tool/swagger/index.vue
|
2021-06-22 16:56:38 +08:00 |
|
Ricky
|
b1413f021e
|
增加字典标签样式回显
|
2021-06-22 14:04:14 +08:00 |
|
RuoYi
|
3f05ed6ffa
|
封装iframe组件
|
2021-06-17 20:17:42 +08:00 |
|
疯狂的狮子li
|
a8c1d02ee1
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/.env.development
ruoyi-ui/.env.production
ruoyi-ui/.env.staging
ruoyi-ui/package.json
ruoyi-ui/src/App.vue
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/Pagination/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/permission.js
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/vue.config.js
|
2021-06-17 18:15:34 +08:00 |
|
RuoYi
|
a209b39552
|
分页组件新增pagerCount属性
|
2021-06-10 22:29:13 +08:00 |
|
疯狂的狮子li
|
2103731f10
|
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/core/config/SwaggerConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/Navbar.vue
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/tool/gen/index.vue
ruoyi-ui/src/views/tool/swagger/index.vue
|
2021-06-10 09:44:56 +08:00 |
|
RuoYi
|
c16ee7fc2c
|
升级swagger到最新版本v3.0.0
|
2021-06-08 16:34:36 +08:00 |
|
RuoYi
|
b7446f8d0f
|
富文本工具栏配置视频
|
2021-06-03 13:26:09 +08:00 |
|
疯狂的狮子li
|
7076deb2b6
|
update 请求响应对象 与 分页对象 结构修改 适配接口文档配置
|
2021-05-20 13:23:12 +08:00 |
|
疯狂的狮子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 |
|
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
|
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 |
|
hechieh
|
ccf05b697d
|
富文本编辑器自定义上传地址
|
2021-04-10 17:08:49 +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 |
|
疯狂的狮子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 |
|
Josway
|
339b932a3d
|
富文本编辑组件支持只读
|
2021-02-22 17:49:17 +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
|
654aa6b30c
|
表格右侧工具栏组件支持显隐列
|
2021-01-06 17:30:39 +08:00 |
|
疯狂的狮子li
|
b368745380
|
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/util/GenUtils.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/main.js
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-01-06 09:35:00 +08:00 |
|
RuoYi
|
3cd886785b
|
图片组件添加预览功能
|
2021-01-05 20:33:41 +08:00 |
|
RuoYi
|
ae5a0f9774
|
新增文件上传组件
|
2021-01-05 20:11:09 +08:00 |
|