admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,073 Commits 3 Branches 0 Tags
Commit Graph

87 Commits

Author SHA1 Message Date
疯狂的狮子li
9bad713db5 fix 修复 index-tree.vue.vm 漏删 #end 2022-01-11 11:30:53 +08:00
疯狂的狮子li
d9a0de20f8 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
#	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
 2022-01-07 15:41:18 +08:00
RuoYi
db4c2d3dd5 代码生成列表图片支持预览 2022-01-04 20:27:08 +08:00
疯狂的狮子li
d600cdd8a0 add 代码生成增加 vue3 页面模板 2021-12-16 15:09:35 +08:00
疯狂的狮子li
d2c6e27d07 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/views/system/user/index.vue
 2021-12-16 14:21:04 +08:00
RuoYi
fef7ead0d5 新增Vue3前端代码生成模板 2021-12-16 09:51:11 +08:00
疯狂的狮子li
af25588b88 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
#	ruoyi-generator/pom.xml
#	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/vm/js/api.js.vm
#	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
#	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
#	ruoyi-ui/package.json
#	ruoyi-ui/src/api/monitor/server.js
#	ruoyi-ui/src/components/RuoYi/Doc/index.vue
#	ruoyi-ui/src/components/RuoYi/Git/index.vue
#	ruoyi-ui/src/components/SizeSelect/index.vue
#	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
#	ruoyi-ui/src/layout/components/TagsView/index.vue
#	ruoyi-ui/src/layout/index.vue
#	ruoyi-ui/src/main.js
#	ruoyi-ui/src/plugins/download.js
#	ruoyi-ui/src/router/index.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/store/modules/user.js
#	ruoyi-ui/src/views/login.vue
#	ruoyi-ui/src/views/monitor/job/log.vue
#	ruoyi-ui/src/views/system/dict/data.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
 2021-11-25 19:39:53 +08:00
Ricky
664192da0b 升级velocity到最新版本2.3（语法升级） 2021-11-25 15:18:02 +08:00
Ricky
64f6a69d9a 修复代码生成复选框字典遗漏问题 2021-11-25 13:54:49 +08:00
fuzui
b4f032fab4 删除代码生成中冗余的导出方法 2021-11-24 02:48:35 +08:00
疯狂的狮子li
64add90edd 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-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
	ruoyi-ui/package.json
	ruoyi-ui/src/api/monitor/logininfor.js
	ruoyi-ui/src/api/monitor/operlog.js
	ruoyi-ui/src/api/system/config.js
	ruoyi-ui/src/api/system/dict/data.js
	ruoyi-ui/src/api/system/dict/type.js
	ruoyi-ui/src/api/system/post.js
	ruoyi-ui/src/api/system/role.js
	ruoyi-ui/src/api/system/user.js
	ruoyi-ui/src/main.js
	ruoyi-ui/src/utils/request.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/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/post/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-11-17 19:14:03 +08:00
RuoYi
cedd2d1daf 优化导出数据操作 2021-11-17 11:57:17 +08:00
疯狂的狮子li
3353ead5d3 update 搜索框 更新文本域生成 用于模糊查询 2021-10-28 09:45:29 +08:00
疯狂的狮子li
99dcbe0207 update 封装通用下载方法简化下载使用 2021-09-27 17:24:37 +08:00
RuoYi
ded99502ae 新增通用方法简化下载使用 2021-09-27 10:38:29 +08:00
疯狂的狮子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
 2021-09-26 10:05:29 +08:00
疯狂的狮子Li
02ce9868a7 fix 自动生成代码漏掉 this.#[[$modal]]#.msgError 2021-09-24 05:41:55 +00:00
疯狂的狮子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
 2021-09-23 18:53:17 +08:00
RuoYi
fa124aeb8b 新增通用方法简化模态/缓存使用 2021-09-23 09:57:29 +08:00
RuoYi
258335cc65 新增通用方法简化模态/缓存使用 2021-09-23 09:38:16 +08:00
疯狂的狮子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
 2021-09-18 16:01:52 +08:00
RuoYi
12ab8b03d9 使用vue-data-dict，简化数据字典使用 2021-09-17 15:36:54 +08:00
疯狂的狮子li
80784433b8 remove 移除分页合理化参数 使用 MP 全局配置分页溢出 2021-09-02 15:59:42 +08:00
疯狂的狮子li
76710e453e update 分页合理化 2021-09-02 13:46:11 +08:00
疯狂的狮子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
 2021-09-01 09:40:36 +08:00
马小法
c628aa5be8 修改代码生成字典回显样式 2021-08-30 16:49:30 +08:00
疯狂的狮子li
bf86e5979b update 重构 将下载excel工具提取到全局 2021-08-24 14:28:20 +08:00
疯狂的狮子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
 2021-08-13 17:36:26 +08:00
RuoYi
f02743bde5 代码生成主子表多选行数据 2021-08-13 14:50:35 +08:00
疯狂的狮子li
a5a71bf505 fix 修复代码生成 删除按钮报错 loading 不取消问题 2021-08-13 14:07:32 +08:00
疯狂的狮子li
4e54190e3a update 代码生成模板 适配新excel导出 2021-08-05 10:22:29 +08:00
Nguyendream
1031ba44b7 fix 未完全解决的代码生成字典问题 2021-07-14 06:38:56 +00:00
疯狂的狮子li
3b765f3ac9 fix 修复代码生成字典为null问题 2021-07-13 11:24:12 +08:00
疯狂的狮子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
 2021-07-09 18:07:32 +08:00
RuoYi
8321f92d2c 全局注册通用组件 2021-07-09 17:09:57 +08:00
Nguyendream
dfb4d9f049 修复 按钮loading卡死的问题 2021-07-05 00:39:29 +00:00
疯狂的狮子li
a044519b21 update 移除 基础类 字段生成判断 2021-06-12 23:40:34 +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
19924cd184 修复关闭confirm提示框控制台报错问题 2021-06-03 13:24:29 +08:00
kdyzm
6b789e2eb0 优化新增、修改页面的按钮动作loading从页面loading到按钮loading 2021-06-02 18:13:34 +08:00
疯狂的狮子li
329c95196e update 更新测试案例 2021-06-02 17:15:20 +08:00
kdyzm
9590de2c19 优化树生成的代码生成：增加loading、修改删除按钮的回调函数为箭头函数 2021-06-02 17:08:00 +08:00
kdyzm
430addf520 【优化】为代码生成器生成的前端代码添加loading；删除方法回调函数变更为箭头表达式 2021-06-02 16:40:58 +08:00
疯狂的狮子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
 2021-05-25 10:00:36 +08:00
RuoYi
7e79c4f249 生成vue模板导出按钮点击后添加遮罩 2021-05-24 11:34:03 +08:00
疯狂的狮子li
bf5315d306 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 2021-04-16 11:34:39 +08:00
Ricky
de73cf300b 优化树表代码生成模板 2021-04-15 10:39:09 +08:00
Ricky
cbcee86d2c 优化树表代码生成模板 2021-04-15 10:37:22 +08:00
疯狂的狮子li
8ba1266b6a 修改 页面生成模板 适配后端时间格式 2021-01-28 09:22:25 +08:00
疯狂的狮子li
52325307f4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	README.md
 2021-01-15 15:08:50 +08:00