疯狂的狮子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
|
5 years ago |
RuoYi
|
ae4290bdda
|
修复页签关闭所有固定标签路由不刷新问题
|
5 years ago |
|
RuoYi
|
c19fec2cf8
|
格式化代码
|
5 years ago |
|
RuoYi
|
669c42795a
|
表单构建布局型组件新增按钮
|
5 years ago |
|
疯狂的狮子li
|
ef4731e3ff
|
删除无用js
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
fb07677c32
|
左侧菜单文字过长显示省略号
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
69829827fe
|
菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）
|
5 years ago |
|
RuoYi
|
abeb8d7fd8
|
菜单新增是否缓存keep-alive
|
5 years ago |
|
RuoYi
|
478fae0d28
|
菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
9e38c7de2e
|
代码生成支持同步数据库
|
5 years ago |
|
RuoYi
|
9ca28d6dbf
|
表格操作列间距调整
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
a948affb2d
|
代码生成支持富文本控件
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
70ab18052c
|
富文本工具栏样式对齐
|
5 years ago |
|
RuoYi
|
aeb02c79d8
|
修正注释图标路径
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
HaoRan
|
a65c287075
|
修复Editor组件无法对响应式更新null值问题
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
fa5596bb20
|
Editor组件优化，支持自定义高度&图片冲突问题
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
5fcf342f5a
|
修改sass为node-sass，避免el-icon图标乱码
|
6 years ago |
|
若依
|
c6912ca1d5
|
!64 修改sass为node-sass，避免el-icon图标乱码
Merge pull request !64 from 心悦李国楠/dev-心悦
|
6 years ago |
|
若依
|
5c4f0c5503
|
!65 根节点为子部门时，树状结构显示问题
Merge pull request !65 from GSTong/master
|
6 years ago |
|
疯狂的狮子li
|
def4377226
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/utils/ruoyi.js
|
6 years ago |
|
RuoYi
|
d596d5bb8e
|
还原 addDateRange js 函数
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
8f9f0c04cc
|
若依 3.1
|
6 years ago |
|
RuoYi
|
1bad003fe3
|
修改公私钥
|
6 years ago |
|
疯狂的狮子li
|
3aaff7b776
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/main.js
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
|
6 years ago |
gst
|
0070297fe1
|
根节点为子部门时，树状结构显示问题
|
6 years ago |
liguonan
|
650359c357
|
修改sass为node-sass，避免el-icon图标乱码
|
6 years ago |
|
RuoYi
|
74f52677be
|
表格右侧工具栏组件
|
6 years ago |
|
疯狂的狮子li
|
4044ed23ea
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-ui/src/components/Editor/index.vue
|
6 years ago |
平凡
|
5b04f388e9
|
重写表格工具栏右侧添加刷新&显隐查询栏
|
6 years ago |
|
RuoYi
|
d0b315f4a5
|
删除重复的placeholder
|
6 years ago |
|
RuoYi
|
7c39f92538
|
修复富文本空格和缩进保存后不生效问题
|
6 years ago |
|
疯狂的狮子li
|
a9f4a4e111
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
.gitignore
ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/utils/ruoyi.js
|
6 years ago |
|
RuoYi
|
3b61ed56b0
|
添加获取当前的环境配置方法
|
6 years ago |
fungleo
|
d78f642201
|
Merge remote-tracking branch 'upstream/master'
|
6 years ago |
|
fungleo
|
26dfee2ce8
|
彻底重写回显数据字典方法
|
6 years ago |
|
RuoYi
|
b56898858d
|
超时登录后页面跳转到首页
|
6 years ago |
|
疯狂的狮子li
|
c7785d1dbc
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-ui/src/utils/request.js
|
6 years ago |
|
fungleo
|
503dd64e3f
|
优化 addDateRange js 函数
|
6 years ago |
|
fungleo
|
876ecf21c7
|
优化构建树形数据JS方法
|
6 years ago |
|
fungleo
|
107672419e
|
Merge remote-tracking branch 'upstream/master'
|
6 years ago |
|
fungleo
|
d8d636fdbd
|
优化 回显数据字典（字符串数组）JS 函数
|
6 years ago |
