疯狂的狮子li
|
99dcbe0207
|
update 封装通用下载方法简化下载使用
|
4 years ago |
|
疯狂的狮子li
|
125547f08f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
ruoyi-ui/src/views/monitor/server/index.vue
|
4 years ago |
|
疯狂的狮子Li
|
02ce9868a7
|
fix 自动生成代码漏掉 this.#[[$modal]]#.msgError
|
4 years ago |
|
疯狂的狮子li
|
03b31652a2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/log.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/monitor/server/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/post/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/authRole.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/importTable.vue
|
4 years ago |
RuoYi
|
fa124aeb8b
|
新增通用方法简化模态/缓存使用
|
4 years ago |
|
RuoYi
|
258335cc65
|
新增通用方法简化模态/缓存使用
|
4 years ago |
|
疯狂的狮子li
|
2f18d0d709
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/main.js
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
4 years ago |
|
RuoYi
|
12ab8b03d9
|
使用vue-data-dict，简化数据字典使用
|
4 years ago |
|
疯狂的狮子li
|
80784433b8
|
remove 移除分页合理化参数 使用 MP 全局配置分页溢出
|
4 years ago |
|
疯狂的狮子li
|
76710e453e
|
update 分页合理化
|
4 years ago |
|
疯狂的狮子li
|
adb31b71f8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
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/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dept/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
|
4 years ago |
马小法
|
c628aa5be8
|
修改代码生成字典回显样式
|
4 years ago |
|
疯狂的狮子li
|
bf86e5979b
|
update 重构 将下载excel工具提取到全局
|
4 years ago |
|
疯狂的狮子li
|
6473d4d8be
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
bin/clean.bat
bin/run.bat
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/bin/run-web.bat
ruoyi-ui/src/components/ImageUpload/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/index.vue
|
4 years ago |
|
RuoYi
|
f02743bde5
|
代码生成主子表多选行数据
|
4 years ago |
|
疯狂的狮子li
|
a5a71bf505
|
fix 修复代码生成 删除按钮报错 loading 不取消问题
|
4 years ago |
|
疯狂的狮子li
|
4e54190e3a
|
update 代码生成模板 适配新excel导出
|
4 years ago |
Nguyendream
|
1031ba44b7
|
fix 未完全解决的代码生成字典问题
|
5 years ago |
|
疯狂的狮子li
|
3b765f3ac9
|
fix 修复代码生成字典为null问题
|
5 years ago |
|
疯狂的狮子li
|
ea506de048
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/src/directive/index.js
ruoyi-ui/src/directive/permission/hasPermi.js
ruoyi-ui/src/directive/permission/hasRole.js
ruoyi-ui/src/main.js
ruoyi-ui/src/views/system/notice/index.vue
|
5 years ago |
|
RuoYi
|
8321f92d2c
|
全局注册通用组件
|
5 years ago |
|
Nguyendream
|
dfb4d9f049
|
修复 按钮loading卡死的问题
|
5 years ago |
|
疯狂的狮子li
|
a044519b21
|
update 移除 基础类 字段生成判断
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
19924cd184
|
修复关闭confirm提示框控制台报错问题
|
5 years ago |
kdyzm
|
6b789e2eb0
|
优化新增、修改页面的按钮动作loading从页面loading到按钮loading
|
5 years ago |
|
疯狂的狮子li
|
329c95196e
|
update 更新测试案例
|
5 years ago |
|
kdyzm
|
9590de2c19
|
优化树生成的代码生成：增加loading、修改删除按钮的回调函数为箭头函数
|
5 years ago |
|
kdyzm
|
430addf520
|
【优化】为代码生成器生成的前端代码添加loading；删除方法回调函数变更为箭头表达式
|
5 years ago |
|
疯狂的狮子li
|
6c195af2a3
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-generator/pom.xml
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-quartz/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/public/index.html
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/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
|
5 years ago |
|
RuoYi
|
7e79c4f249
|
生成vue模板导出按钮点击后添加遮罩
|
5 years ago |
|
疯狂的狮子li
|
bf5315d306
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
|
5 years ago |
Ricky
|
de73cf300b
|
优化树表代码生成模板
|
5 years ago |
|
Ricky
|
cbcee86d2c
|
优化树表代码生成模板
|
5 years ago |
|
疯狂的狮子li
|
8ba1266b6a
|
修改 页面生成模板 适配后端时间格式
|
5 years ago |
|
疯狂的狮子li
|
52325307f4
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
|
5 years ago |
|
RuoYi
|
bd19892aff
|
修复生成树表代码异常
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
14a859899c
|
代码生成模板支持主子表
|
5 years ago |
|
RuoYi
|
7a86c714fc
|
代码生成支持文件上传组件
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
edd090a098
|
代码生成支持文件上传组件
|
5 years ago |
|
RuoYi
|
a118738d0f
|
单图上传组件添加移除
|
5 years ago |
|
疯狂的狮子li
|
d73994f05d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/views/login.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
|
5 years ago |
|
RuoYi
|
57a2eb4217
|
操作按钮组调整为朴素按钮样式
|
5 years ago |
|
疯狂的狮子li
|
c24b912b50
|
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/store/modules/permission.js
|
5 years ago |
|
RuoYi
|
a9c6ba12e6
|
代码生成日期控件区分范围
|
5 years ago |
wangzhijun
|
fe39a7bc7b
|
模板controller导入；模板vue列表页当有查询条件时报错
|
5 years ago |
|
疯狂的狮子li
|
ff563c44e2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.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-ui/package.json
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
|
5 years ago |
|
RuoYi
|
823e95667e
|
代码生成支持上传控件
|
5 years ago |
