基本模型初始化完成

master
DongZeLiang 2024-04-12 21:01:01 +08:00
parent 67fc6a31d5
commit 6c189e557c
30 changed files with 912 additions and 4558 deletions

View File

@ -1,10 +1,10 @@
# 页面标题
VUE_APP_TITLE = 若依管理系统
VUE_APP_TITLE = 智能车联管理系统
# 开发环境配置
ENV = 'development'
# 若依管理系统/开发环境
# 智能车联管理系统/开发环境
VUE_APP_BASE_API = '/dev-api'
# 路由懒加载

View File

@ -1,8 +1,8 @@
# 页面标题
VUE_APP_TITLE = 若依管理系统
VUE_APP_TITLE = 智能车联管理系统
# 生产环境配置
ENV = 'production'
# 若依管理系统/生产环境
# 智能车联管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'

View File

@ -1,10 +1,10 @@
# 页面标题
VUE_APP_TITLE = 若依管理系统
VUE_APP_TITLE = 智能车联管理系统
NODE_ENV = production
# 测试环境配置
ENV = 'staging'
# 若依管理系统/测试环境
# 智能车联管理系统/测试环境
VUE_APP_BASE_API = '/stage-api'

View File

@ -1,8 +1,8 @@
{
"name": "muyu",
"version": "3.6.3",
"description": "若依管理系统",
"author": "若依",
"description": "智能车联管理系统",
"author": "智能车联",
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",

View File

@ -258,6 +258,322 @@ let dictDataMap =
"status": "0",
"remark": "关闭状态"
}
],
// 系统状态
"sys_common_status": [
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 28,
"dictSort": 1,
"dictLabel": "成功",
"dictValue": "0",
"dictType": "sys_common_status",
"cssClass": "",
"listClass": "primary",
"isDefault": "N",
"status": "0",
"remark": "正常状态"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 29,
"dictSort": 2,
"dictLabel": "失败",
"dictValue": "1",
"dictType": "sys_common_status",
"cssClass": "",
"listClass": "danger",
"isDefault": "N",
"status": "0",
"remark": "停用状态"
}
],
// 定时任务组
"sys_job_group": [
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 10,
"dictSort": 1,
"dictLabel": "默认",
"dictValue": "DEFAULT",
"dictType": "sys_job_group",
"cssClass": "",
"listClass": "",
"isDefault": "Y",
"status": "0",
"remark": "默认分组"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 11,
"dictSort": 2,
"dictLabel": "系统",
"dictValue": "SYSTEM",
"dictType": "sys_job_group",
"cssClass": "",
"listClass": "",
"isDefault": "N",
"status": "0",
"remark": "系统分组"
}
],
// 定时任务状态
"sys_job_status": [
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 8,
"dictSort": 1,
"dictLabel": "正常",
"dictValue": "0",
"dictType": "sys_job_status",
"cssClass": "",
"listClass": "primary",
"isDefault": "Y",
"status": "0",
"remark": "正常状态"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 9,
"dictSort": 2,
"dictLabel": "暂停",
"dictValue": "1",
"dictType": "sys_job_status",
"cssClass": "",
"listClass": "danger",
"isDefault": "N",
"status": "0",
"remark": "停用状态"
}
],
// 操作类型
"sys_oper_type": [
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 19,
"dictSort": 1,
"dictLabel": "新增",
"dictValue": "1",
"dictType": "sys_oper_type",
"cssClass": "",
"listClass": "info",
"isDefault": "N",
"status": "0",
"remark": "新增操作"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 20,
"dictSort": 2,
"dictLabel": "修改",
"dictValue": "2",
"dictType": "sys_oper_type",
"cssClass": "",
"listClass": "info",
"isDefault": "N",
"status": "0",
"remark": "修改操作"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 21,
"dictSort": 3,
"dictLabel": "删除",
"dictValue": "3",
"dictType": "sys_oper_type",
"cssClass": "",
"listClass": "danger",
"isDefault": "N",
"status": "0",
"remark": "删除操作"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 22,
"dictSort": 4,
"dictLabel": "授权",
"dictValue": "4",
"dictType": "sys_oper_type",
"cssClass": "",
"listClass": "primary",
"isDefault": "N",
"status": "0",
"remark": "授权操作"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 23,
"dictSort": 5,
"dictLabel": "导出",
"dictValue": "5",
"dictType": "sys_oper_type",
"cssClass": "",
"listClass": "warning",
"isDefault": "N",
"status": "0",
"remark": "导出操作"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 24,
"dictSort": 6,
"dictLabel": "导入",
"dictValue": "6",
"dictType": "sys_oper_type",
"cssClass": "",
"listClass": "warning",
"isDefault": "N",
"status": "0",
"remark": "导入操作"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 25,
"dictSort": 7,
"dictLabel": "强退",
"dictValue": "7",
"dictType": "sys_oper_type",
"cssClass": "",
"listClass": "danger",
"isDefault": "N",
"status": "0",
"remark": "强退操作"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 26,
"dictSort": 8,
"dictLabel": "生成代码",
"dictValue": "8",
"dictType": "sys_oper_type",
"cssClass": "",
"listClass": "warning",
"isDefault": "N",
"status": "0",
"remark": "生成操作"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 27,
"dictSort": 9,
"dictLabel": "清空数据",
"dictValue": "9",
"dictType": "sys_oper_type",
"cssClass": "",
"listClass": "danger",
"isDefault": "N",
"status": "0",
"remark": "清空操作"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"params": {
"@type": "java.util.HashMap"
},
"dictCode": 18,
"dictSort": 99,
"dictLabel": "其他",
"dictValue": "0",
"dictType": "sys_oper_type",
"cssClass": "",
"listClass": "info",
"isDefault": "N",
"status": "0",
"remark": "其他操作"
}
]
}
/**

View File

@ -146,20 +146,6 @@ export const dynamicRoutes = [
meta: {title: '调度日志', activeMenu: '/monitor/job'}
}
]
},
{
path: '/tool/gen-edit',
component: Layout,
hidden: true,
permissions: ['tool:gen:edit'],
children: [
{
path: 'index/:tableId(\\d+)',
component: () => import('@/views/tool/gen/editTable'),
name: 'GenEdit',
meta: {title: '修改生成配置', activeMenu: '/tool/gen'}
}
]
}
]

View File

@ -136,7 +136,7 @@ let routeResponse = {
"name": "Operlog",
"path": "operlog",
"hidden": false,
"component": "monitor/operlog/index",
"component": "system/operlog/index",
"meta": {
"title": "操作日志",
"icon": "form",
@ -148,7 +148,7 @@ let routeResponse = {
"name": "Logininfor",
"path": "logininfor",
"hidden": false,
"component": "monitor/logininfor/index",
"component": "system/logininfor/index",
"meta": {
"title": "登录日志",
"icon": "logininfor",
@ -197,120 +197,8 @@ let routeResponse = {
"noCache": false,
"link": null
}
},
{
"name": "Druid",
"path": "druid",
"hidden": false,
"component": "monitor/druid/index",
"meta": {
"title": "数据监控",
"icon": "druid",
"noCache": false,
"link": null
}
},
{
"name": "Server",
"path": "server",
"hidden": false,
"component": "monitor/server/index",
"meta": {
"title": "服务监控",
"icon": "server",
"noCache": false,
"link": null
}
},
{
"name": "Cache",
"path": "cache",
"hidden": false,
"component": "monitor/cache/index",
"meta": {
"title": "缓存监控",
"icon": "redis",
"noCache": false,
"link": null
}
},
{
"name": "CacheList",
"path": "cacheList",
"hidden": false,
"component": "monitor/cache/list",
"meta": {
"title": "缓存列表",
"icon": "redis-list",
"noCache": false,
"link": null
}
}
]
},
{
"name": "Tool",
"path": "/tool",
"hidden": false,
"redirect": "noRedirect",
"component": "Layout",
"alwaysShow": true,
"meta": {
"title": "系统工具",
"icon": "tool",
"noCache": false,
"link": null
},
"children": [
{
"name": "Build",
"path": "build",
"hidden": false,
"component": "tool/build/index",
"meta": {
"title": "表单构建",
"icon": "build",
"noCache": false,
"link": null
}
},
{
"name": "Gen",
"path": "gen",
"hidden": false,
"component": "tool/gen/index",
"meta": {
"title": "代码生成",
"icon": "code",
"noCache": false,
"link": null
}
},
{
"name": "Swagger",
"path": "swagger",
"hidden": false,
"component": "tool/swagger/index",
"meta": {
"title": "系统接口",
"icon": "swagger",
"noCache": false,
"link": null
}
}
]
},
{
"name": "Http://ruoyi.vip",
"path": "http://ruoyi.vip",
"hidden": true,
"component": "Layout",
"meta": {
"title": "若依官网",
"icon": "guide",
"noCache": false,
"link": "http://ruoyi.vip"
}
}
]
}

View File

@ -75,7 +75,7 @@ const user = {
"userId": 1,
"deptId": 103,
"userName": "admin",
"nickName": "若依",
"nickName": "智能车联",
"email": "ry@163.com",
"phonenumber": "15888888888",
"sex": "1",
@ -95,7 +95,7 @@ const user = {
"ancestors": "0,100,101",
"deptName": "研发部门",
"orderNum": 1,
"leader": "若依",
"leader": "智能车联",
"phone": null,
"email": null,
"status": "0",

View File

@ -1,885 +1,6 @@
<template>
<div class="app-container home">
<el-row :gutter="20">
<el-col :lg="24" :sm="24">
<blockquote class="text-warning" style="font-size: 14px">
领取阿里云通用云产品1888优惠券
<br/>
<el-link
href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
target="_blank"
type="primary"
>https://www.aliyun.com/minisite/goods?userCode=brki8iof
</el-link
>
<br/>
领取腾讯云通用云产品2860优惠券
<br/>
<el-link
href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
target="_blank"
type="primary"
>https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console
</el-link
>
<br/>
阿里云服务器折扣区
<el-link href="http://aly.muyu.vip" target="_blank" type="primary"
>>点我进入
</el-link
>
&nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区
<el-link href="http://txy.muyu.vip" target="_blank" type="primary"
>>点我进入
</el-link
>
<br/>
<h4 class="text-danger">
云产品通用红包可叠加官网常规优惠使用(仅限新用户)
</h4>
</blockquote>
<hr/>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :lg="12" :sm="24" style="padding-left: 20px">
<h2>若依后台管理框架</h2>
<p>
一直想做一款后台管理系统看了很多优秀的开源项目但是发现没有合适自己的于是利用空闲休息时间开始自己写一套后台系统如此有了若依管理系统她可以用于所有的Web应用程序如网站管理后台网站会员中心CMSCRMOA等等当然您也可以对她进行深度定制以做出更强系统所有前端后台代码封装过后十分精简易上手出错概率低同时支持移动客户端访问系统会陆续更新一些实用功能
</p>
<p>
<b>当前版本:</b> <span>v{{ version }}</span>
</p>
<p>
<el-tag type="danger">&yen;免费开源</el-tag>
</p>
<p>
<el-button
icon="el-icon-cloudy"
plain
size="mini"
type="primary"
@click="goTarget('https://gitee.com/y_project/MuYu-Cloud')"
>访问码云
</el-button
>
<el-button
icon="el-icon-s-home"
plain
size="mini"
@click="goTarget('http://muyu.vip')"
>访问主页
</el-button
>
</p>
</el-col>
<el-col :lg="12" :sm="24" style="padding-left: 50px">
<el-row>
<el-col :span="12">
<h2>技术选型</h2>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<h4>后端技术</h4>
<ul>
<li>SpringBoot</li>
<li>SpringCloud</li>
<li>Nacos</li>
<li>Sentinel</li>
<li>Seata</li>
<li>Minio</li>
<li>...</li>
</ul>
</el-col>
<el-col :span="6">
<h4>前端技术</h4>
<ul>
<li>Vue</li>
<li>Vuex</li>
<li>Element-ui</li>
<li>Axios</li>
<li>Echarts</li>
<li>Quill</li>
<li>...</li>
</ul>
</el-col>
</el-row>
</el-col>
</el-row>
<el-divider/>
<el-row :gutter="20">
<el-col :lg="8" :md="12" :sm="24" :xs="24">
<el-card class="update-log">
<div slot="header" class="clearfix">
<span>联系信息</span>
</div>
<div class="body">
<p>
<i class="el-icon-s-promotion"></i> 官网
<el-link
href="http://www.muyu.vip"
target="_blank"
>http://www.muyu.vip
</el-link
>
</p>
<p>
<i class="el-icon-user-solid"></i> QQ群 <s> 满42799195 </s> <s> 满170157040 </s>
<s> 满130643120 </s> <s> 满225920371 </s> <s> 满201705537 </s> <s> 满236543183 </s>
<s> 满213618602 </s> <s> 满148794840 </s> <s> 满118752664 </s> <s> 满101038945</s>
<a
href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=pHuELvQ01AXiVC_CH9HNq-hL6qd6EbIb&authKey=k5nCvwTnimKrFBbJpFEfaQabjBHzZhMAbvsZAjAXiOIekreMrmJzjjTVuoMsZgB%2F&noverify=0&group_code=128355254"
target="_blank"
>128355254</a
>
</p>
<p>
<i class="el-icon-chat-dot-round"></i> 微信<a
href="javascript:"
>/ *</a
>
</p>
<p>
<i class="el-icon-money"></i> 支付宝<a
class="支付宝信息"
href="javascript:"
>/ *</a
>
</p>
</div>
</el-card>
</el-col>
<el-col :lg="8" :md="12" :sm="24" :xs="24">
<el-card class="update-log">
<div slot="header" class="clearfix">
<span>更新日志</span>
</div>
<el-collapse accordion>
<el-collapse-item title="v3.6.3 - 2023-07-07">
<ol>
<li>支持登录IP黑名单限制</li>
<li>操作日志新增消耗时间属性</li>
<li>屏蔽定时任务bean违规的字符</li>
<li>日志管理使用索引提升查询性能</li>
<li>日志注解支持排除指定的请求参数</li>
<li>支持自定义隐藏属性列过滤子对象</li>
<li>升级spring-boot到最新版本2.7.13</li>
<li>升级spring-cloud到最新版2021.0.8</li>
<li>升级spring-cloud-alibaba到最新版2021.0.5.0</li>
<li>升级druid到最新版本1.2.16</li>
<li>升级fastjson到最新版2.0.34</li>
<li>升级pagehelper到最新版1.4.7</li>
<li>升级transmittable-thread-local到最新版本2.14.3</li>
<li>升级element-ui到最新版本2.15.13</li>
<li>移除apache/commons-fileupload依赖</li>
<li>修复页面切换时布局错乱的问题</li>
<li>修复用户多角色数据权限可能出现权限抬升的情况</li>
<li>修复导入用户时无法更新存在用户数据的问题</li>
<li>修复开启TopNav后一级菜单路由参数设置无效问题</li>
<li>优化文件下载出现的异常</li>
<li>优化选择图标组件高亮回显</li>
<li>优化修改密码日志存储明文问题</li>
<li>优化排序属性orderBy参数限制长度</li>
<li>优化页签栏关闭其他出现的异常问题</li>
<li>优化页签关闭左侧选项排除首页选项</li>
<li>优化关闭当前tab页跳转最右侧tab页</li>
<li>优化文件上传服务关闭InputStream</li>
<li>优化页签在Firefox浏览器被遮挡的问题</li>
<li>优化侧边栏的平台标题与VUE_APP_TITLE保持同步</li>
<li>优化DictTag组件value没有匹配的值时则展示value</li>
<li>优化去除@EnableCustomSwagger注解后会启动失败问题</li>
<li>优化upload接口在文件过大和文件名过长的情况返回提示信息</li>
<li>优化异步保存日志发生报错不进RemoteLogFallbackFactory问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.6.2 - 2023-01-16">
<ol>
<li>重置时取消部门选中</li>
<li>新增返回警告消息提示</li>
<li>忽略不必要的属性数据返回</li>
<li>修改参数键名时移除前缓存配置</li>
<li>开启TopNav没有子菜单隐藏侧边栏</li>
<li>删除fuse无效选项maxPatternLength</li>
<li>兼容Excel下拉框内容过多无法显示的问题</li>
<li>修复文件上传组件格式验证问题</li>
<li>修复回显数据字典数组异常问题</li>
<li>修复sheet超出最大行数异常问题</li>
<li>修复Log注解GET请求记录不到参数问题</li>
<li>修复gateway流控规则生效但不显示问题</li>
<li>修复主题颜色在Drawer组件不会加载问题</li>
<li>修复调度日志点击多次数据不变化的问题</li>
<li>修复用户编辑时角色和部门存在无法修改情况</li>
<li>修复使用透明底png图片时自动填充黑色背景</li>
<li>修复table中更多按钮切换主题色未生效修复问题</li>
<li>修复某些特性的环境生成代码变乱码TXT文件问题</li>
<li>修复代码生成图片/文件/单选时选择必填无法校验问题</li>
<li>升级spring-cloud到最新版2021.0.5</li>
<li>升级spring-boot到最新版本2.7.7</li>
<li>升级spring-boot-admin到最新版2.7.10</li>
<li>升级kaptcha到最新版2.3.3</li>
<li>升级druid到最新版本1.2.15</li>
<li>升级fastjson到最新版2.0.22</li>
<li>升级pagehelper到最新版1.4.6</li>
<li>升级transmittable-thread-local到最新版本2.14.2</li>
<li>升级echarts到最新版本5.4.0</li>
<li>升级core-js到最新版本3.25.3</li>
<li>升级element-ui到最新版本2.15.12</li>
<li>移除commons-collections多余的依赖</li>
<li>优化弹窗内容过多展示不全问题</li>
<li>优化导出对象的子列表为空会出现[]问题</li>
<li>优化字符未使用下划线不进行驼峰式处理</li>
<li>优化nacos修改xss开关时同步过滤器验证</li>
<li>优化修改头像在小屏幕上页面布局错位的问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.6.1 - 2022-10-01">
<ol>
<li>数据逻辑删除不进行唯一验证</li>
<li>支持多权限字符匹配角色数据权限</li>
<li>页面内嵌iframe切换tab不刷新数据</li>
<li>新增密码最大错误次数/锁定时间</li>
<li>登录日志新增解锁账户功能</li>
<li>通用下载方法新增config配置选项</li>
<li>操作日志记录支持排除敏感属性字段</li>
<li>Excel注解支持导出对象的子列表方法</li>
<li>Excel注解支持自定义隐藏属性列</li>
<li>Excel注解支持backgroundColor属性设置背景色</li>
<li>升级spring-cloud-alibaba到最新版2021.0.4.0</li>
<li>升级spring-cloud到最新版2021.0.4</li>
<li>升级spring-boot到最新版本2.7.3</li>
<li>升级spring-boot-admin到最新版2.7.5</li>
<li>升级seata到最新版1.5.2</li>
<li>升级druid到最新版本1.2.12</li>
<li>升级fastjson到最新版2.0.14</li>
<li>升级pagehelper到最新版1.4.5</li>
<li>升级core-js到最新版本3.25.2</li>
<li>升级dynamic-ds到最新版本3.5.2</li>
<li>升级element-ui到最新版本2.15.10</li>
<li>修复多文件上传报错出现的异常问题</li>
<li>修复图片预览组件src属性为null值控制台报错问题</li>
<li>修复使用FastDFS上传头像失败提示文件名没有后缀问题</li>
<li>优化seata单独依赖模块</li>
<li>优化任务过期不执行调度</li>
<li>优化字典数据使用store存取</li>
<li>优化代码生成同步后值NULL问题</li>
<li>优化定时任务支持执行父类方法</li>
<li>优化修改资料头像被覆盖的问题</li>
<li>优化修改用户登录账号重复验证</li>
<li>优化用户个人信息接口防止修改部门</li>
<li>优化布局设置使用el-drawer抽屉显示</li>
<li>优化日志注解记录限制请求地址的长度</li>
<li>优化导入更新用户数据前校验数据权限</li>
<li>优化excel/scale属性导出单元格数值类型</li>
<li>优化日志操作中重置按钮时重复查询的问题</li>
<li>优化多个相同角色数据导致权限SQL重复问题</li>
<li>优化表格上右侧工具条搜索按钮显隐&右侧样式凸出</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.6.0 - 2022-07-16">
<ol>
<li>Excel注解支持color字体颜色</li>
<li>用户头像上传限制只能为图片格式</li>
<li>检查定时任务bean所在包名是否为白名单配置</li>
<li>字典类型必须以字母开头且只能为小写字母数字下滑线</li>
<li>升级spring-cloud-alibaba到最新版2021.0.1.0</li>
<li>升级spring-cloud到最新版2021.0.3</li>
<li>升级spring-boot到最新版本2.7.1</li>
<li>升级spring-boot-admin到最新版2.7.2</li>
<li>升级seata到最新版1.5.1</li>
<li>升级pagehelper到最新版1.4.3</li>
<li>升级dynamic-ds到最新版本3.5.1</li>
<li>升级fastjson到最新版2.0.9</li>
<li>升级druid到最新版本1.2.11</li>
<li>升级transmittable-thread-local到最新版本2.13.2</li>
<li>升级element-ui到最新版本2.15.9</li>
<li>修复字典数据显示不全问题</li>
<li>修复操作日志查询类型条件为0时会查到所有数据</li>
<li>优化验证码开关变量名</li>
<li>优化设置分页参数默认值</li>
<li>优化对空字符串参数处理的过滤</li>
<li>优化Maven使用阿里云镜像站加速</li>
<li>优化用户列表查询不显示密码字段</li>
<li>优化表单构建按钮不显示正则校验</li>
<li>优化字典类型删除多余的mapper注解</li>
<li>优化字典数据回显样式下拉框显示值</li>
<li>优化用户管理左侧树型组件增加选中高亮保持</li>
<li>优化新增用户与角色信息&用户与岗位信息逻辑</li>
<li>优化数据监控Spring Security权限认证过时代码</li>
<li>优化岗位长主键溢出问题将查询返回类型改为Long</li>
<li>优化删除无用admin-client依赖声明避免造成误解</li>
<li>优化默认不启用压缩文件缓存防止node_modules过大</li>
<li>优化获取body请求数据缓存过滤器CacheRequestFilter</li>
<li>优化网关通过注解解决循环引用及Bean重复问题删除allow配置</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.5.0 - 2022-04-11">
<ol>
<li>开启TopNav没有子菜单情况隐藏侧边栏</li>
<li>侧边栏菜单名称过长悬停显示标题</li>
<li>用户访问控制时校验数据权限防止越权</li>
<li>导出Excel时屏蔽公式防止CSV注入风险</li>
<li>组件ImageUpload支持多图同时选择上传</li>
<li>组件FileUpload支持多文件同时选择上传</li>
<li>代码生成树表新增(展开/折叠)</li>
<li>代码生成子表支持日期/字典配置</li>
<li>代码生成编辑修改打开新页签</li>
<li>添加页签openPage支持传递参数</li>
<li>添加清理分页的线程变量方法</li>
<li>修改npm即将过期的注册源地址</li>
<li>用户缓存信息添加部门ancestors祖级列表</li>
<li>升级spring-cloud到最新版2021.0.1</li>
<li>升级spring-boot到最新版本2.6.6</li>
<li>升级spring-boot-admin到最新版2.6.6</li>
<li>升级spring-boot-mybatis到最新版2.2.2</li>
<li>降级jsencrypt版本兼容IE浏览器</li>
<li>修复分页组件请求两次问题</li>
<li>修复表单清除元素位置未垂直居中问题</li>
<li>修复Excel注解prompt/combo同时使用不生效问题</li>
<li>修复导入Excel时字典字段类型为Long转义为空问题</li>
<li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
<li>修复Xss注解字段值为空时的异常问题</li>
<li>优化IP地址获取到多个的问题</li>
<li>优化文件上传兼容Weblogic环境</li>
<li>代码生成同步保留必填/类型选项</li>
<li>优化Excel格式化不同类型的日期对象</li>
<li>优化菜单表关键字导致的插件报错问题</li>
<li>优化Oracle用户头像列为空时不显示问题</li>
<li>优化页面若未匹配到字典标签则返回原字典值</li>
<li>优化修复登录失效后多次请求提示多次弹窗问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.4.0 - 2022-01-24">
<ol>
<li>新增Vue3前端代码生成模板</li>
<li>新增图片预览组件</li>
<li>新增压缩插件实现打包Gzip</li>
<li>新增docker一键复制的脚本</li>
<li>自定义xss校验注解实现</li>
<li>路由支持单独配置菜单或角色权限</li>
<li>前端支持设置是否需要防止数据重复提交</li>
<li>预览组件支持多图显示</li>
<li>代码生成列表图片支持预览</li>
<li>代码生成新增Java类型Boolean</li>
<li>定时任务目标字符串过滤特殊字符</li>
<li>定时任务目标字符串验证包名白名单</li>
<li>升级nacos到最新版2.0.4</li>
<li>升级spring-cloud到最新版2021.0.0</li>
<li>升级spring-boot到最新版本2.6.3</li>
<li>升级spring-boot-admin到最新版2.6.1</li>
<li>升级pagehelper到最新版1.4.1</li>
<li>升级fastjson到最新版1.2.79</li>
<li>SQL工具类新增检查关键字方法</li>
<li>修复打包后字体图标偶现的乱码问题</li>
<li>修复版本差异导致的懒加载报错问题</li>
<li>修复选项卡点击右键刷新丢失参数问题</li>
<li>修复登录失效后多次请求提示多次弹窗问题</li>
<li>优化加载字典缓存数据</li>
<li>优化代码生成同步更新字段</li>
<li>优化代码生成字典组重复问题</li>
<li>优化空值不进行回显数据字典</li>
<li>优化用户导入提示溢出则显示滚动条</li>
<li>优化定时任务cron表达式小时设置24</li>
<li>优化部门修改缩放后出现的错位问题</li>
<li>优化分页方法设置成通用方便灵活调用</li>
<li>优化用户管理部门查询选择节点后分页参数初始</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.3.0 - 2021-12-13">
<ol>
<li>新增配套并同步的Vue3前端版本</li>
<li>新增认证对象简化权限验证</li>
<li>新增tab对象简化页签操作</li>
<li>修改获取缓存信息方式</li>
<li>修改权限认证注解实现</li>
<li>自定义文字复制剪贴指令</li>
<li>升级axios到最新版本0.24.0</li>
<li>升级core-js到最新版本3.19.1</li>
<li>升级jsencrypt到最新版本3.2.1</li>
<li>升级js-cookie到最新版本3.0.1</li>
<li>升级clipboard到最新版本2.0.8</li>
<li>升级velocity到最新版本2.3</li>
<li>升级spring-boot到最新版本2.5.6</li>
<li>升级spring-boot-admin到最新版2.5.4</li>
<li>升级dynamic-ds到最新版本3.5.0</li>
<li>代码生成预览支持复制内容</li>
<li>修复五级以上菜单出现的404问题</li>
<li>生产环境使用路由懒加载提升页面响应速度</li>
<li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
<li>优化用户个人信息接口防止修改用户名</li>
<li>优化登录/验证码请求headers不设置token</li>
<li>优化注册成功提示消息类型success</li>
<li>优化下载解析blob响应是否登录失效</li>
<li>修复字符串无法被反转义问题</li>
<li>修复响应体过大出现的乱码问题</li>
<li>修复回显数据字典组的键值错误</li>
<li>修复代码生成复选框字典遗漏问题</li>
<li>修复代码生成模板主子表删除缺少事务</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.2.0 - 2021-10-12">
<ol>
<li>菜单管理支持配置路由参数</li>
<li>定时任务支持在线生成cron表达式</li>
<li>自定义弹层溢出滚动样式</li>
<li>自定义可拖动弹窗宽度指令</li>
<li>自定义可拖动弹窗高度指令</li>
<li>修改时检查用户数据权限范围</li>
<li>修复保存配置主题颜色失效问题</li>
<li>新增暗色菜单风格主题</li>
<li>菜单&部门新增展开/折叠功能</li>
<li>页签新增关闭左侧&添加图标</li>
<li>代码生成主子表多选行数据</li>
<li>日期范围支持添加多组</li>
<li>Excel导入支持@Excels注解</li>
<li>Excel注解支持导入导出标题信息</li>
<li>Excel注解支持自定义数据处理器</li>
<li>日志注解新增是否保存响应参数</li>
<li>定时任务对检查异常进行事务回滚</li>
<li>补充定时任务表字段注释</li>
<li>定时任务屏蔽ldap远程调用</li>
<li>新增通用方法简化下载使用</li>
<li>新增通用方法简化模态/缓存使用</li>
<li>新增data-dict组件简化数据字典使用</li>
<li>禁用dict-tag组件的渐变动画</li>
<li>默认首页使用keep-alive缓存</li>
<li>升级springcloud到最新版2020.0.4</li>
<li>升级spring-boot到最新版本2.5.5</li>
<li>升级spring-boot-admin到最新版2.5.2</li>
<li>升级pagehelper到最新版1.4.0</li>
<li>升级fastjson到最新版1.2.78</li>
<li>升级druid到最新版1.2.8</li>
<li>升级element-ui到最新版本2.15.6</li>
<li>升级sass-loader到最新版本10.1.1</li>
<li>升级dart-sass到版本1.32.13</li>
<li>升级file-saver到最新版本2.0.5</li>
<li>优化异常处理信息</li>
<li>验证码默认20s超时</li>
<li>优化代码生成导入表按创建时间排序</li>
<li>优化代码生成点击预览重置激活tab</li>
<li>修复主子表代码模板方法名错误问题</li>
<li>修复xss过滤后格式出现的异常</li>
<li>修复多图组件验证失败被删除问题</li>
<li>请求参数新增reasonable分页合理化属性</li>
<li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
<li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.1.0 - 2021-08-02">
<ol>
<li>支持配置XSS跨站脚本过滤</li>
<li>支持配置验证码开关&类型</li>
<li>新增是否开启用户注册功能</li>
<li>用户管理新增分配角色功能</li>
<li>角色管理新增分配用户功能</li>
<li>系统布局配置支持动态标题开关</li>
<li>增加字典标签样式回显dict组件</li>
<li>FileUpload组件支持多文件上传</li>
<li>ImageUpload组件支持多图片上传</li>
<li>封装通用iframe组件</li>
<li>菜单路由配置支持内链访问</li>
<li>全局注册通用组件</li>
<li>富文本默认上传返回url类型</li>
<li>富文本新增上传文件大小限制</li>
<li>增加自定义弹窗拖拽指令</li>
<li>顶部菜单排除隐藏的默认路由</li>
<li>跳转路由高亮相对应的菜单栏</li>
<li>日志列表支持排序操作</li>
<li>分页组件新增pagerCount属性</li>
<li>定时任务屏蔽http(s)远程调用</li>
<li>文件服务本地资源允许跨域访问</li>
<li>升级spring-boot到最新版本2.5.3</li>
<li>升级spring-boot-admin到最新版2.4.3</li>
<li>升级spring-boot-mybatis到最新版2.2.0</li>
<li>升级nacos到最新版2.0.3</li>
<li>升级pagehelper到最新版1.3.1</li>
<li>升级minio到最新版本8.2.2</li>
<li>升级tobato到最新版本1.27.2</li>
<li>升级dynamic-ds到最新版本3.4.1</li>
<li>升级commons.io到最新版本v2.11.0</li>
<li>升级common-pool到最新版本2.10.0</li>
<li>升级commons.fileupload到最新版本v1.4</li>
<li>升级element-ui到最新版本2.15.3</li>
<li>优化统一网关错误码响应</li>
<li>修复导出含params属性对象参数问题</li>
<li>修复任意账户越权问题</li>
<li>修复定时任务日志执行状态显示</li>
<li>修改登录失效返回值code401</li>
<li>用户信息长度校验限制</li>
<li>角色&菜单新增字段属性提示信息</li>
<li>修复用户搜索分页变量错误</li>
<li>优化部门父级启用状态</li>
<li>启用部门状态排除顶级节点</li>
<li>定时任务新增更多操作</li>
<li>优化代码生成模板</li>
<li>优化顶部菜单显示样式</li>
<li>优化导入用户显示样式</li>
<li>优化用户不能删除自己</li>
<li>密码框新增显示切换密码图标</li>
<li>BLOB下载时清除URL对象引用</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.0.0 - 2021-06-10">
<ol>
<li>新增菜单导航显示风格TopNavfalse为左侧导航菜单true为顶部导航菜单</li>
<li>布局设置支持保存&重置配置</li>
<li>富文本编辑器支持自定义上传地址</li>
<li>富文本编辑组件新增readOnly属性</li>
<li>优化参数&字典缓存操作</li>
<li>新增IE浏览器版本过低提示页面</li>
<li>页签TagsView新增关闭右侧功能</li>
<li>显隐列组件加载初始默认隐藏列</li>
<li>关闭头像上传窗口还原默认图片</li>
<li>个人信息添加手机&邮箱重复验证</li>
<li>代码生成模板树表操作列添加新增按钮</li>
<li>代码生成模板修复主子表字段重名问题</li>
<li>支持docker部署项目</li>
<li>升级springcloud到最新版2020.0.3</li>
<li>升级spring-boot-alibaba到最新版2021.1</li>
<li>升级nacos到最新版2.0.1 性能提升</li>
<li>升级spring-boot到最新版本2.5.0</li>
<li>升级spring-boot-admin到最新版2.4.1</li>
<li>升级swagger到最新版本3.0.0</li>
<li>升级mybatis到最新版3.5.6</li>
<li>升级dynamic-ds到最新版本3.3.2</li>
<li>升级minio到最新版本8.2.1</li>
<li>升级fastjson到最新版1.2.76</li>
<li>升级druid到最新版本v1.2.6</li>
<li>修复四级菜单无法显示问题</li>
<li>修复树表数据显示不全&加载慢问题</li>
<li>修复关闭confirm提示框控制台报错问题</li>
<li>上传媒体类型添加视频格式</li>
<li>增加feign客户端IP头部信息</li>
<li>修复两处存在SQL注入漏洞问题</li>
<li>优化图片工具类读取文件防止异常</li>
<li>修复导出角色数据范围翻译缺少仅本人</li>
<li>修复表单构建选择下拉选择控制台报错问题</li>
<li>修复请求形参未传值记录日志异常问题</li>
<li>调整sql默认为当前时间</li>
<li>修改ip字段长度防止ipv6地址长度不够</li>
<li>删除操作日志记录信息</li>
<li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
<li>用户&角色单条删除时使其逻辑删除</li>
<li>优化树表代码生成模板</li>
<li>修正通知公告日志记录类型</li>
<li>修正后端导入表权限标识</li>
<li>过滤BindingResult对象防止异常</li>
<li>Redis设置HashKey序列化</li>
<li>优化Excel导入增加空行判断</li>
<li>树级结构更新子节点使用replaceFirst</li>
<li>富文本工具栏配置视频</li>
<li>修正模板字符编码</li>
<li>优化通用下载完成后删除节点</li>
<li>角色非自定义权限范围清空选择值</li>
<li>修改主题后mini类型按钮无效问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.5.0 - 2021-02-02">
<ol>
<li>增加分布式事务seata支持</li>
<li>代码生成模板支持主子表</li>
<li>表格右侧工具栏组件支持显隐列</li>
<li>图片组件添加预览&移除功能</li>
<li>Excel注解支持Image图片导出</li>
<li>操作按钮组调整为朴素按钮样式</li>
<li>代码生成支持文件上传组件</li>
<li>代码生成日期控件区分范围</li>
<li>代码生成数据库文本类型生成表单文本域</li>
<li>用户手机邮箱&菜单组件修改允许空字符串</li>
<li>修复header获取username中文情况下乱码</li>
<li>修复角色管理-编辑角色-功能权限显示异常</li>
<li>修正操作日志删除接口路径</li>
<li>修复IE11浏览器报错问题</li>
<li>修复sentinel流量告警前端不响应</li>
<li>修正侧边栏静态路由丢失问题</li>
<li>修复导入数据为负浮点数时丢失精度问题</li>
<li>修复Get请求参数特殊值无法正确的传参</li>
<li>更换过期的共享配置属性</li>
<li>添加启动执行脚本</li>
<li>升级element-ui到最新版本2.15.0</li>
<li>升级spring-boot到最新版本2.3.7</li>
<li>升级spring-cloud到Hoxton.SR9</li>
<li>升级spring-boot-alibaba到最新版2.2.5</li>
<li>升级spring-boot-admin到最新版2.3.1</li>
<li>升级druid到最新版本v1.2.4</li>
<li>升级fastjson到最新版1.2.75</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.4.0 - 2020-12-22">
<ol>
<li>增加分布式文件Minio支持</li>
<li>支持多数据源切换</li>
<li>修复多级菜单之间切换无法缓存的问题</li>
<li>三级菜单自动配置组件</li>
<li>支持主题风格配置</li>
<li>服务之间feign调用传递用户信息</li>
<li>删除用户和角色解绑关联</li>
<li>去除用户手机邮箱部门必填验证</li>
<li>代码生成预览支持高亮显示</li>
<li>获取请求token方法移至权限工具类</li>
<li>代码生成预览提供滚动机制</li>
<li>权限工具类增加管理员判断</li>
<li>日志记录增加过滤多文件场景</li>
<li>修改用户头像预览宽高</li>
<li>Excel支持注解align对齐方式</li>
<li>项目添加robots.txt 防止系统被搜索引擎收录</li>
<li>移除path-to-regexp正则匹配插件</li>
<li>修改Set可能导致嵌套的问题</li>
<li>调整代码生成页列宽</li>
<li>回显数据字典防止空值报错</li>
<li>支持get请求映射params参数</li>
<li>登录后push添加catch防止出现检查错误</li>
<li>防止安全扫描YUI出现的风险提示</li>
<li>代码生成删除多余的数字float类型</li>
<li>Excel支持导入Boolean型数据</li>
<li>修正转换字符串的目标字符集属性</li>
<li>删除多余的依赖</li>
<li>修改node-sass为dart-sass</li>
<li>升级poi到最新版本4.1.2</li>
<li>升级axios到最新版本0.21.0</li>
<li>升级element-ui到最新版本2.14.1</li>
<li>升级vue到最新版本2.6.12</li>
<li>升级vuex到最新版本3.6.0</li>
<li>升级vue-cli到版本4.5.9</li>
<li>升级vue-router到最新版本3.4.9</li>
<li>升级vue-cli到最新版本4.4.6</li>
<li>升级vue-cropper到最新版本0.5.5</li>
<li>升级clipboard到最新版本2.0.6</li>
<li>升级core-js到最新版本3.8.1</li>
<li>升级echarts到最新版本4.9.0</li>
<li>升级file-saver到最新版本2.0.4</li>
<li>升级fuse.js到最新版本6.4.3</li>
<li>升级js-beautify到最新版本1.13.0</li>
<li>升级js-cookie到最新版本2.2.1</li>
<li>升级path-to-regexp到最新版本6.2.0</li>
<li>升级quill到最新版本1.3.7</li>
<li>升级screenfull到最新版本5.0.2</li>
<li>升级sortablejs到最新版本1.10.2</li>
<li>升级vuedraggable到最新版本2.24.3</li>
<li>升级chalk到最新版本4.1.0</li>
<li>升级eslint到最新版本7.15.0</li>
<li>升级eslint-plugin-vue到最新版本7.2.0</li>
<li>升级lint-staged到最新版本10.5.3</li>
<li>升级runjs到最新版本4.4.2</li>
<li>升级sass-loader到最新版本10.1.0</li>
<li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
<li>升级svg-sprite-loader到最新版本5.1.1</li>
<li>升级vue-template-compiler到最新版本2.6.12</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.3.0 - 2020-11-20">
<ol>
<li>新增文件服务应用支持本地FastDFS</li>
<li>优化头像样式鼠标移入悬停遮罩</li>
<li>AjaxResult重写put方法以方便链式调用</li>
<li>代码生成支持上传控件</li>
<li>新增图片上传组件</li>
<li>支持用户头像更新</li>
<li>调整默认首页</li>
<li>角色权限验证hasRole匹配改为equals</li>
<li>修正数组权限为空判断</li>
<li>修正注释选中节点和半选节点获取</li>
<li>升级pagehelper到最新版1.3.0</li>
<li>升级fastjson到最新版1.2.74</li>
<li>修正定时任务执行一次权限标识</li>
<li>修复页签关闭所有固定标签路由不刷新问题</li>
<li>表单构建布局型组件新增按钮</li>
<li>调整日志路径到模块目录</li>
<li>修正菜单提示信息错误</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.2.0 - 2020-10-10">
<ol>
<li>移除 OAuth2 改为 Redis</li>
<li>升级SpringCloud到最新版本Hoxton.SR8</li>
<li>升级SpringCloud Alibaba到最新版本2.2.3</li>
<li>升级SpringBoot Admin到最新版本2.3.0</li>
<li>升级Fastjson到最新版1.2.73</li>
<li>新增在线用户会话管理</li>
<li>修改用户个人资料/密码同步缓存信息</li>
<li>修复前端通用导出方法参数传值请求方式问题</li>
<li>菜单新增是否缓存keep-alive</li>
<li>菜单&数据权限新增展开/折叠 全选/全不选 父子联动</li>
<li>Job与Gen模块增加Redis默认配置</li>
<li>新增表格右侧工具栏组件right-toolbar</li>
<li>代码生成支持同步数据库</li>
<li>代码生成支持富文本控件</li>
<li>代码生成树模板去掉多余双引号</li>
<li>代码生成添加select必填选项</li>
<li>代码生成页面时不忽略remark属性</li>
<li>修复代码生成下载路径错误</li>
<li>左侧菜单文字过长显示省略号</li>
<li>表格操作列间距调整</li>
<li>Excel注解支持自动统计数据总和</li>
<li>Excel注解支持设置BigDecimal精度&舍入规则</li>
<li>导入Excel整形值校验优化</li>
<li>导出Excel类型NUMERIC支持精度浮点类型</li>
<li>导出Excel调整targetAttr获取值方法防止get方法不规范</li>
<li>Token续期调整为后端刷新</li>
<li>Token设置默认有效期时长12小时</li>
<li>网关白名单放入nacos配置&支持模糊匹配</li>
<li>修复富文本工具栏样式不对齐问题</li>
<li>Editor组件优化支持自定义高度&图片冲突问题</li>
<li>
修复富文本空格和缩进保存后不生效问题&删除重复的placeholder
</li>
<li>限制系统内置参数不允许删除</li>
<li>修正调用目标字符串最大长度</li>
<li>修改自定义权限实现</li>
<li>优化递归菜单&部门子节点</li>
<li>修改sass为node-sass避免el-icon图标乱码</li>
<li>修复根节点为子部门时树状结构显示问题</li>
<li>全局异常状态汉化拦截处理</li>
<li>唯一限制条件只返回单条数据</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.1.0 - 2020-08-02">
<ol>
<li>表格工具栏右侧添加刷新&显隐查询栏</li>
<li>OAuth自动刷新续签Token</li>
<li>网关支持黑名单配置</li>
<li>权限配置自动注册</li>
<li>Feign配置自动注册</li>
<li>代码生成支持选择上级菜单</li>
<li>代码生成支持复选框</li>
<li>代码生成支持自定义路径</li>
<li>验证码类型支持数组计算字符验证</li>
<li>Excel支持sort导出排序</li>
<li>Excel支持分割字符串组内容</li>
<li>excel 导入数字不需要格式化 导入允许列和属性个数不一致</li>
<li>新增菜单默认主类目</li>
<li>升级vue-cli版本到4.4.4</li>
<li>修改 node-sass dart-sass</li>
<li>升级element-ui版本到2.13.2</li>
<li>删除babel提高编译速度</li>
<li>修复验证码异常时network面板的中文会出现乱码问题</li>
<li>修复 utils/index.js 中不包含 parseTime 函数的 bug</li>
<li>优化selectDictLabel方法数组迭代器换为some</li>
<li>修复客户端模式认证会出现错误</li>
<li>检查字符支持小数点&降级改成异常提醒</li>
<li>定时任务添加cron表达式验证</li>
<li>代码生成查询条件修正</li>
<li>修正角色管理导出权限权限字符</li>
<li>修正防止切换权限用户后登录出现404</li>
<li>终端设置安全码加密&更新缓存</li>
<li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
<li>修复布局为small者mini用户表单显示错位问题</li>
<li>修复代码生成点击多次表修改数据不变化的问题</li>
<li>修复代码生成导入表结构出现异常页面不提醒问题</li>
<li>修复角色权限修改时已有权限未自动勾选异常</li>
<li>创建用户不允许选择系统管理员角色</li>
<li>添加全局异常处理网关异常&业务异常</li>
<li>修复终端查询Enter键搜索时是刷新页面而不是查询列表</li>
<li>删除job重复表单参数</li>
<li>代码生成浮点型改用BigDecimal</li>
<li>表单类型为Integer/Long设置整形默认值</li>
<li>修改用户管理复选框宽度防止部分浏览器出现省略号</li>
<li>
RedisCache中所有方法参数添加final并优化list取出效率添加其它常用redis方法
</li>
<li>修正定时任务日志权限字符</li>
<li>添加Jackson时区配置</li>
<li>代码生成相关问题修复</li>
<li>自定义oauth2返回异常信息</li>
<li>升级nacos到最新版1.3.0 全新内核构建</li>
<li>修正代码生成功能无法下载的问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.0.0 - 2019-12-02">
<ol>
<li>新增代码生成</li>
<li>新增@RepeatSubmit注解防止重复提交</li>
<li>新增菜单主目录添加/删除操作</li>
<li>日志记录过滤特殊对象防止转换异常</li>
<li>修改代码生成路由脚本错误</li>
<li>用户上传头像实时同步缓存无需重新登录</li>
<li>调整切换页签后不重新加载数据</li>
<li>添加jsencrypt实现参数的前端加密</li>
<li>系统退出删除用户缓存记录</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.0.0 - 2020-06-10">
<ol>
<li>使用Sentinel代替Hystrix</li>
<li>菜单新增终端管理配置</li>
<li>菜单新增Nacos&Sentinel控制台</li>
<li>代码生成适配Cloud</li>
<li>记录登录退出日志信息</li>
<li>网关验证码过滤器添加放行校验</li>
<li>个性化的定制自动加载类</li>
<li>定时任务调整label-width防止部署出现错位</li>
<li>调整表头固定列默认样式</li>
<li>代码生成模板调整字段为String并且必填则加空串条件</li>
<li>代码生成字典Integer/Long使用parseInt</li>
<li>修复退出登录重定向到登录页登录后参数丢失</li>
<li>修正岗位导出权限注解</li>
<li>修复首页搜索菜单外链无法点击跳转问题</li>
<li>修复菜单管理选择图标backspace删除时不过滤数据</li>
<li>用户管理部门分支节点不可检查&显示计数</li>
<li>数据范围过滤属性调整</li>
<li>字典管理添加缓存读取</li>
<li>参数管理支持缓存操作</li>
<li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
<li>dev启动默认打开浏览器</li>
<li>使用vue-cli默认source-map</li>
<li>slidebar eslint报错优化</li>
<li>当tags-view滚动关闭右键菜单</li>
<li>支持一级菜单和主页同级在main区域显示</li>
<li>限制外链地址必须以http(s)😕/开头</li>
<li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
<li>
修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
</li>
<li>权限部分代码调整</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v1.0.0 - 2020-05-20">
<ol>
<li>若依微服务系统正式发布</li>
</ol>
</el-collapse-item>
</el-collapse>
</el-card>
</el-col>
<el-col :lg="8" :md="12" :sm="24" :xs="24">
<el-card class="update-log">
<div slot="header" class="clearfix">
<span>捐赠支持</span>
</div>
<div class="body">
<img
alt="donate"
src="@/assets/images/pay.png"
width="100%"
/>
<span style="display: inline-block; height: 30px; line-height: 30px"
>你可以请作者喝杯咖啡表示鼓励</span
>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
@ -893,76 +14,10 @@ export default {
};
},
methods: {
goTarget(href) {
window.open(href, "_blank");
},
},
};
</script>
<style lang="scss" scoped>
.home {
blockquote {
padding: 10px 20px;
margin: 0 0 20px;
font-size: 17.5px;
border-left: 5px solid #eee;
}
hr {
margin-top: 20px;
margin-bottom: 20px;
border: 0;
border-top: 1px solid #eee;
}
.col-item {
margin-bottom: 20px;
}
ul {
padding: 0;
margin: 0;
}
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
color: #676a6c;
overflow-x: hidden;
ul {
list-style-type: none;
}
h4 {
margin-top: 0px;
}
h2 {
margin-top: 10px;
font-size: 26px;
font-weight: 100;
}
p {
margin-top: 10px;
b {
font-weight: 700;
}
}
.update-log {
ol {
display: block;
list-style-type: decimal;
margin-block-start: 1em;
margin-block-end: 1em;
margin-inline-start: 0;
margin-inline-end: 0;
padding-inline-start: 40px;
}
}
}
</style>

View File

@ -1,7 +1,7 @@
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">智能车联后台管理系统</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"

View File

@ -367,11 +367,66 @@ export default {
/** 查询定时任务列表 */
getList() {
this.loading = true;
listJob(this.queryParams).then(response => {
let response = {
"code": 200,
"msg": "查询成功",
"data": {
"total": 3,
"rows": [
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"jobId": 1,
"jobName": "系统默认(无参)",
"jobGroup": "DEFAULT",
"invokeTarget": "rtTask.rtNoParams",
"cronExpression": "0/10 * * * * ?",
"misfirePolicy": "3",
"concurrent": "1",
"status": "1",
"remark": "",
"nextValidTime": "2024-04-12 20:43:50"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"jobId": 2,
"jobName": "系统默认(有参)",
"jobGroup": "DEFAULT",
"invokeTarget": "rtTask.rtParams('ruiteng')",
"cronExpression": "0/15 * * * * ?",
"misfirePolicy": "3",
"concurrent": "1",
"status": "1",
"remark": "",
"nextValidTime": "2024-04-12 20:44:00"
},
{
"createBy": 1,
"createTime": "2023-09-29 11:47:28",
"updateBy": null,
"updateTime": null,
"jobId": 3,
"jobName": "系统默认(多参)",
"jobGroup": "DEFAULT",
"invokeTarget": "rtTask.rtMultipleParams('ruiteng', true, 2000L, 316.50D, 100)",
"cronExpression": "0/20 * * * * ?",
"misfirePolicy": "3",
"concurrent": "1",
"status": "1",
"remark": "",
"nextValidTime": "2024-04-12 20:44:00"
}
]
}
}
this.jobList = response.data.rows;
this.total = response.data.total;
this.loading = false;
});
},
//
jobGroupFormat(row, column) {
@ -431,29 +486,18 @@ export default {
//
handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用";
this.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗?').then(function () {
return changeJobStatus(row.jobId, row.status);
}).then(() => {
this.$modal.msgSuccess(text + "成功");
}).catch(function () {
row.status = row.status === "0" ? "1" : "0";
});
},
/* 立即执行一次 */
handleRun(row) {
this.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗?').then(function () {
return runJob(row.jobId, row.jobGroup);
}).then(() => {
this.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗?').then(() => {
this.$modal.msgSuccess("执行成功");
}).catch(() => {
});
},
/** 任务详细信息 */
handleView(row) {
getJob(row.jobId).then(response => {
this.form = response.data;
this.form = row;
this.openView = true;
});
},
/** cron表达式按钮操作 */
handleShowCron() {
@ -479,28 +523,20 @@ export default {
handleUpdate(row) {
this.reset();
const jobId = row.jobId || this.ids;
getJob(jobId).then(response => {
this.form = response.data;
this.form = row;
this.open = true;
this.title = "修改任务";
});
},
/** 提交按钮 */
submitForm: function () {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.jobId != undefined) {
updateJob(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addJob(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
@ -508,19 +544,13 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const jobIds = row.jobId || this.ids;
this.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项?').then(function () {
return delJob(jobIds);
}).then(() => {
this.getList();
this.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项?').then(() => {
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('schedule/job/export', {
...this.queryParams
}, `job_${new Date().getTime()}.xlsx`)
this.$modal.msgSuccess("导出成功");
}
}
};

View File

@ -237,12 +237,63 @@ export default {
/** 查询调度日志列表 */
getList() {
this.loading = true;
listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let response = {
"code": 200,
"msg": "查询成功",
"data": {
"total": 3,
"rows": [
{
"createBy": null,
"createTime": "2024-04-12 12:50:15",
"updateBy": null,
"updateTime": null,
"jobLogId": 1,
"jobName": "系统默认(无参)",
"jobGroup": "DEFAULT",
"invokeTarget": "rtTask.rtNoParams",
"jobMessage": "系统默认(无参) 总共耗时1毫秒",
"status": "1",
"exceptionInfo": "java.lang.NoSuchMethodException: com.ruiteng.quartz.task.RtTask.rtNoParams()\n\tat java.base/java.lang.Class.getMethod(Class.java:2227)\n\tat com.ruiteng.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:52)\n\tat com.ruiteng.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:31)\n\tat com.ruiteng.quartz.util.QuartzDisallowConcurrentExecution.doExecute(QuartzDisallowConcurrentExecution.java:16)\n\tat com.ruiteng.quartz.util.AbstractQuartzJob.execute(AbstractQuartzJob.java:40)\n\tat org.quartz.core.JobRunShell.run(JobRunShell.java:202)\n\tat org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:573)\n",
"startTime": null,
"stopTime": null
},
{
"createBy": null,
"createTime": "2024-04-12 12:50:17",
"updateBy": null,
"updateTime": null,
"jobLogId": 2,
"jobName": "系统默认(有参)",
"jobGroup": "DEFAULT",
"invokeTarget": "rtTask.rtParams('ruiteng')",
"jobMessage": "系统默认(有参) 总共耗时0毫秒",
"status": "1",
"exceptionInfo": "java.lang.NoSuchMethodException: com.ruiteng.quartz.task.RtTask.rtParams(java.lang.String)\n\tat java.base/java.lang.Class.getMethod(Class.java:2227)\n\tat com.ruiteng.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:49)\n\tat com.ruiteng.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:31)\n\tat com.ruiteng.quartz.util.QuartzDisallowConcurrentExecution.doExecute(QuartzDisallowConcurrentExecution.java:16)\n\tat com.ruiteng.quartz.util.AbstractQuartzJob.execute(AbstractQuartzJob.java:40)\n\tat org.quartz.core.JobRunShell.run(JobRunShell.java:202)\n\tat org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:573)\n",
"startTime": null,
"stopTime": null
},
{
"createBy": null,
"createTime": "2024-04-12 12:50:19",
"updateBy": null,
"updateTime": null,
"jobLogId": 3,
"jobName": "系统默认(多参)",
"jobGroup": "DEFAULT",
"invokeTarget": "rtTask.rtMultipleParams('ruiteng', true, 2000L, 316.50D, 100)",
"jobMessage": "系统默认(多参) 总共耗时0毫秒",
"status": "1",
"exceptionInfo": "java.lang.NoSuchMethodException: com.ruiteng.quartz.task.RtTask.rtMultipleParams(java.lang.String,java.lang.Boolean,java.lang.Long,java.lang.Double,java.lang.Integer)\n\tat java.base/java.lang.Class.getMethod(Class.java:2227)\n\tat com.ruiteng.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:49)\n\tat com.ruiteng.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:31)\n\tat com.ruiteng.quartz.util.QuartzDisallowConcurrentExecution.doExecute(QuartzDisallowConcurrentExecution.java:16)\n\tat com.ruiteng.quartz.util.AbstractQuartzJob.execute(AbstractQuartzJob.java:40)\n\tat org.quartz.core.JobRunShell.run(JobRunShell.java:202)\n\tat org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:573)\n",
"startTime": null,
"stopTime": null
}
]
}
}
this.jobLogList = response.data.rows;
this.total = response.data.total;
this.loading = false;
}
);
},
//
handleClose() {
@ -273,29 +324,19 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const jobLogIds = this.ids;
this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项?').then(function () {
return delJobLog(jobLogIds);
}).then(() => {
this.getList();
this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项?').then(() => {
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 清空按钮操作 */
handleClean() {
this.$modal.confirm('是否确认清空所有调度日志数据项?').then(function () {
return cleanJobLog();
}).then(() => {
this.getList();
this.$modal.confirm('是否确认清空所有调度日志数据项?').then(() => {
this.$modal.msgSuccess("清空成功");
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('schedule/job/log/export', {
...this.queryParams
}, `log_${new Date().getTime()}.xlsx`)
this.$modal.msgSuccess("导出成功");
}
}
};

View File

@ -88,11 +88,28 @@ export default {
/** 查询登录日志列表 */
getList() {
this.loading = true;
list(this.queryParams).then(response => {
let response = {
"code": 200,
"msg": "查询成功",
"data": {
"total": 1,
"rows": [
{
"tokenId": "c1d9e4ea-b4bf-47ba-82e0-fe7a15e04d63",
"deptName": "研发部门",
"userName": "admin",
"ipaddr": "101.85.117.49",
"loginLocation": "XX XX",
"browser": "Chrome 12",
"os": "Windows 10",
"loginTime": 1712925493172
}
]
}
}
this.list = response.data.rows;
this.total = response.data.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
@ -106,12 +123,8 @@ export default {
},
/** 强退按钮操作 */
handleForceLogout(row) {
this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户?').then(function () {
return forceLogout(row.tokenId);
}).then(() => {
this.getList();
this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户?').then(() => {
this.$modal.msgSuccess("强退成功");
}).catch(() => {
});
}
}

View File

@ -1,7 +1,7 @@
<template>
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">智能车联后台管理系统</h3>
<el-form-item prop="username">
<el-input v-model="registerForm.username" auto-complete="off" placeholder="账号" type="text">
<svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="user"/>

View File

@ -178,12 +178,168 @@ export default {
/** 查询登录日志列表 */
getList() {
this.loading = true;
list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let response = {
"code": 200,
"msg": "查询成功",
"data": {
"total": 24,
"rows": [
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"infoId": 24,
"userName": "admin",
"status": "0",
"ipaddr": "101.85.117.49",
"loginLocation": "XX XX",
"browser": "Chrome 12",
"os": "Windows 10",
"msg": "登录成功",
"loginTime": "2024-04-12 12:26:11"
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"infoId": 23,
"userName": "admin",
"status": "0",
"ipaddr": "223.166.248.233",
"loginLocation": "XX XX",
"browser": "Chrome 12",
"os": "Windows 10",
"msg": "登录成功",
"loginTime": "2024-04-12 10:43:36"
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"infoId": 22,
"userName": "admin",
"status": "1",
"ipaddr": "223.166.248.233",
"loginLocation": "XX XX",
"browser": "Chrome 12",
"os": "Windows 10",
"msg": "验证码错误",
"loginTime": "2024-04-12 10:43:34"
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"infoId": 21,
"userName": "admin",
"status": "0",
"ipaddr": "223.166.248.233",
"loginLocation": "XX XX",
"browser": "Chrome 12",
"os": "Windows 10",
"msg": "登录成功",
"loginTime": "2024-04-12 06:12:37"
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"infoId": 20,
"userName": "admin",
"status": "1",
"ipaddr": "223.166.248.233",
"loginLocation": "XX XX",
"browser": "Chrome 12",
"os": "Windows 10",
"msg": "验证码已失效",
"loginTime": "2024-04-12 06:12:34"
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"infoId": 19,
"userName": "admin",
"status": "0",
"ipaddr": "114.95.174.13",
"loginLocation": "XX XX",
"browser": "Chrome 12",
"os": "Windows 10",
"msg": "登录成功",
"loginTime": "2024-04-11 10:34:59"
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"infoId": 18,
"userName": "admin",
"status": "0",
"ipaddr": "39.144.87.206",
"loginLocation": "XX XX",
"browser": "Chrome 12",
"os": "Windows 10",
"msg": "登录成功",
"loginTime": "2024-03-31 15:21:45"
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"infoId": 17,
"userName": "admin",
"status": "1",
"ipaddr": "116.176.18.145",
"loginLocation": "XX XX",
"browser": "Chrome 11",
"os": "Windows 10",
"msg": "用户不存在/密码错误",
"loginTime": "2024-03-26 03:29:42"
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"infoId": 16,
"userName": "admin",
"status": "1",
"ipaddr": "116.176.18.145",
"loginLocation": "XX XX",
"browser": "Chrome 11",
"os": "Windows 10",
"msg": "密码输入错误1次",
"loginTime": "2024-03-26 03:29:42"
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"infoId": 15,
"userName": "admin",
"status": "0",
"ipaddr": "222.189.50.22",
"loginLocation": "XX XX",
"browser": "Chrome 12",
"os": "Windows 10",
"msg": "登录成功",
"loginTime": "2024-03-25 08:21:40"
}
]
}
}
this.list = response.data.rows;
this.total = response.data.total;
this.loading = false;
}
);
},
/** 搜索按钮操作 */
handleQuery() {
@ -213,39 +369,26 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const infoIds = row.infoId || this.ids;
this.$modal.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?').then(function () {
return delLogininfor(infoIds);
}).then(() => {
this.getList();
this.$modal.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?').then(() => {
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 清空按钮操作 */
handleClean() {
this.$modal.confirm('是否确认清空所有登录日志数据项?').then(function () {
return cleanLogininfor();
}).then(() => {
this.getList();
this.$modal.confirm('是否确认清空所有登录日志数据项?').then(() => {
this.$modal.msgSuccess("清空成功");
}).catch(() => {
});
},
/** 解锁按钮操作 */
handleUnlock() {
const username = this.selectName;
this.$modal.confirm('是否确认解锁用户"' + username + '"数据项?').then(function () {
return unlockLogininfor(username);
}).then(() => {
this.$modal.confirm('是否确认解锁用户"' + username + '"数据项?').then(() => {
this.$modal.msgSuccess("用户" + username + "解锁成功");
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/logininfor/export', {
...this.queryParams
}, `logininfor_${new Date().getTime()}.xlsx`)
this.$modal.msgSuccess("导出成功");
}
}
};

View File

@ -1736,7 +1736,7 @@ export default {
"parentId": 108,
"orderNum": 1,
"path": "operlog",
"component": "monitor/operlog/index",
"component": "system/operlog/index",
"query": "",
"isFrame": "1",
"isCache": "0",
@ -3690,7 +3690,7 @@ export default {
"parentId": 108,
"orderNum": 1,
"path": "operlog",
"component": "monitor/operlog/index",
"component": "system/operlog/index",
"query": "",
"isFrame": "1",
"isCache": "0",

View File

@ -262,12 +262,258 @@ export default {
/** 查询登录日志 */
getList() {
this.loading = true;
list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let response = {
"code": 200,
"msg": "查询成功",
"data": {
"total": 14,
"rows": [
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"operId": 14,
"title": "角色管理",
"businessType": 4,
"businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysRoleController.selectAuthUserAll()",
"requestMethod": "PUT",
"operatorType": 1,
"operName": "admin",
"deptName": null,
"operUrl": "/system/role/authUser/selectAll",
"operIp": "223.166.248.233",
"operLocation": "XX XX",
"operParam": "{\"roleId\":\"2\",\"userIds\":\"1\"}",
"jsonResult": null,
"status": 1,
"errorMsg": "\n### Error updating database. Cause: java.sql.SQLIntegrityConstraintViolationException: Duplicate entry '1-2' for key 'PRIMARY'\n### The error may exist in URL [jar:file:/home/app.jar!/BOOT-INF/lib/ruiteng-system-1.0.0.jar!/mapper/system/SysUserRoleMapper.xml]\n### The error may involve defaultParameterMap\n### The error occurred while setting parameters\n### SQL: insert into sys_user_role(user_id, role_id) values (?,?)\n### Cause: java.sql.SQLIntegrityConstraintViolationException: Duplicate entry '1-2' for key 'PRIMARY'\n; Duplicate entry '1-2' for key 'PRIMARY'; nested exception is java.sql.SQLIntegrityConstraintViolationException: Duplicate entry '1-2' for key 'PRIMARY'",
"operTime": "2024-04-12 07:15:07",
"costTime": 96
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"operId": 13,
"title": "角色管理",
"businessType": 4,
"businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysRoleController.selectAuthUserAll()",
"requestMethod": "PUT",
"operatorType": 1,
"operName": "admin",
"deptName": null,
"operUrl": "/system/role/authUser/selectAll",
"operIp": "223.166.248.233",
"operLocation": "XX XX",
"operParam": "{\"roleId\":\"2\",\"userIds\":\"1\"}",
"jsonResult": "{\"code\":200,\"msg\":\"操作成功\"}",
"status": 0,
"errorMsg": null,
"operTime": "2024-04-12 07:15:05",
"costTime": 7
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"operId": 12,
"title": "参数管理",
"businessType": 5,
"businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysConfigController.export()",
"requestMethod": "POST",
"operatorType": 1,
"operName": "admin",
"deptName": null,
"operUrl": "/system/config/export",
"operIp": "39.144.87.206",
"operLocation": "XX XX",
"operParam": "{\"pageSize\":\"10\",\"pageNum\":\"1\"}",
"jsonResult": null,
"status": 0,
"errorMsg": null,
"operTime": "2024-03-31 15:22:04",
"costTime": 753
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"operId": 11,
"title": "菜单管理",
"businessType": 3,
"businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.remove()",
"requestMethod": "DELETE",
"operatorType": 1,
"operName": "admin",
"deptName": null,
"operUrl": "/system/menu/1067",
"operIp": "180.127.207.21",
"operLocation": "XX XX",
"operParam": "{}",
"jsonResult": "{\"code\":200,\"msg\":\"操作成功\"}",
"status": 0,
"errorMsg": null,
"operTime": "2024-03-25 08:05:24",
"costTime": 13
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"operId": 10,
"title": "菜单管理",
"businessType": 3,
"businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.remove()",
"requestMethod": "DELETE",
"operatorType": 1,
"operName": "admin",
"deptName": null,
"operUrl": "/system/menu/1068",
"operIp": "180.127.207.21",
"operLocation": "XX XX",
"operParam": "{}",
"jsonResult": "{\"code\":200,\"msg\":\"操作成功\"}",
"status": 0,
"errorMsg": null,
"operTime": "2024-03-25 08:05:21",
"costTime": 8
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"operId": 9,
"title": "菜单管理",
"businessType": 3,
"businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.remove()",
"requestMethod": "DELETE",
"operatorType": 1,
"operName": "admin",
"deptName": null,
"operUrl": "/system/menu/1069",
"operIp": "180.127.207.21",
"operLocation": "XX XX",
"operParam": "{}",
"jsonResult": "{\"code\":200,\"msg\":\"操作成功\"}",
"status": 0,
"errorMsg": null,
"operTime": "2024-03-25 08:05:19",
"costTime": 12
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"operId": 8,
"title": "菜单管理",
"businessType": 3,
"businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.remove()",
"requestMethod": "DELETE",
"operatorType": 1,
"operName": "admin",
"deptName": null,
"operUrl": "/system/menu/1070",
"operIp": "180.127.207.21",
"operLocation": "XX XX",
"operParam": "{}",
"jsonResult": "{\"code\":200,\"msg\":\"操作成功\"}",
"status": 0,
"errorMsg": null,
"operTime": "2024-03-25 08:04:12",
"costTime": 9
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"operId": 7,
"title": "菜单管理",
"businessType": 1,
"businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.add()",
"requestMethod": "POST",
"operatorType": 1,
"operName": "admin",
"deptName": null,
"operUrl": "/system/menu",
"operIp": "180.127.207.21",
"operLocation": "XX XX",
"operParam": "{\"children\":[],\"createBy\":1,\"isCache\":\"0\",\"isFrame\":\"1\",\"menuName\":\"111\",\"menuType\":\"F\",\"orderNum\":3,\"params\":{},\"parentId\":0,\"status\":\"0\",\"visible\":\"0\"}",
"jsonResult": "{\"code\":200,\"msg\":\"操作成功\"}",
"status": 0,
"errorMsg": null,
"operTime": "2024-03-25 08:04:07",
"costTime": 10
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"operId": 6,
"title": "菜单管理",
"businessType": 1,
"businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.add()",
"requestMethod": "POST",
"operatorType": 1,
"operName": "admin",
"deptName": null,
"operUrl": "/system/menu",
"operIp": "180.127.207.21",
"operLocation": "XX XX",
"operParam": "{\"children\":[],\"createBy\":1,\"icon\":\"button\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuName\":\"1111\",\"menuType\":\"C\",\"orderNum\":2,\"params\":{},\"parentId\":1067,\"path\":\"111\",\"status\":\"0\",\"visible\":\"0\"}",
"jsonResult": "{\"code\":200,\"msg\":\"操作成功\"}",
"status": 0,
"errorMsg": null,
"operTime": "2024-03-25 08:03:56",
"costTime": 8
},
{
"createBy": null,
"createTime": null,
"updateBy": null,
"updateTime": null,
"operId": 5,
"title": "菜单管理",
"businessType": 2,
"businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.edit()",
"requestMethod": "PUT",
"operatorType": 1,
"operName": "admin",
"deptName": null,
"operUrl": "/system/menu",
"operIp": "180.127.207.21",
"operLocation": "XX XX",
"operParam": "{\"children\":[],\"createTime\":\"2024-03-25 07:56:46\",\"icon\":\"404\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":1068,\"menuName\":\"党组织分布\",\"menuType\":\"M\",\"orderNum\":1,\"params\":{},\"parentId\":1067,\"path\":\"dzzfb\",\"perms\":\"\",\"status\":\"0\",\"updateBy\":1,\"visible\":\"0\"}",
"jsonResult": "{\"code\":200,\"msg\":\"操作成功\"}",
"status": 0,
"errorMsg": null,
"operTime": "2024-03-25 07:59:44",
"costTime": 11
}
]
}
}
this.list = response.data.rows;
this.total = response.data.total;
this.loading = false;
}
);
},
//
typeFormat(row, column) {
@ -304,29 +550,19 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const operIds = row.operId || this.ids;
this.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项?').then(function () {
return delOperlog(operIds);
}).then(() => {
this.getList();
this.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项?').then(() => {
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 清空按钮操作 */
handleClean() {
this.$modal.confirm('是否确认清空所有操作日志数据项?').then(function () {
return cleanOperlog();
}).then(() => {
this.getList();
this.$modal.confirm('是否确认清空所有操作日志数据项?').then(() => {
this.$modal.msgSuccess("清空成功");
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/operlog/export', {
...this.queryParams
}, `operlog_${new Date().getTime()}.xlsx`)
this.$modal.msgSuccess("导出成功");
}
}
};

View File

@ -511,7 +511,7 @@ export default {
"userId": 1,
"deptId": 103,
"userName": "admin",
"nickName": "若依",
"nickName": "智能车联",
"email": "ry@163.com",
"phonenumber": "15888888888",
"sex": "1",
@ -532,7 +532,7 @@ export default {
"ancestors": null,
"deptName": "研发部门",
"orderNum": null,
"leader": "若依",
"leader": "智能车联",
"phone": null,
"email": null,
"status": null,
@ -555,7 +555,7 @@ export default {
"userId": 2,
"deptId": 105,
"userName": "ry",
"nickName": "若依",
"nickName": "智能车联",
"email": "ry@qq.com",
"phonenumber": "15666666666",
"sex": "1",
@ -576,7 +576,7 @@ export default {
"ancestors": null,
"deptName": "测试部门",
"orderNum": null,
"leader": "若依",
"leader": "智能车联",
"phone": null,
"email": null,
"status": null,
@ -605,7 +605,7 @@ export default {
"data": [
{
"id": 100,
"label": "若依科技",
"label": "智能车联科技",
"children": [
{
"id": 101,

View File

@ -1,106 +0,0 @@
<template>
<div>
<el-dialog
:close-on-click-modal="false"
:modal-append-to-body="false"
v-bind="$attrs"
width="500px"
@close="onClose"
@open="onOpen"
v-on="$listeners"
>
<el-row :gutter="15">
<el-form
ref="elForm"
:model="formData"
:rules="rules"
label-width="100px"
size="medium"
>
<el-col :span="24">
<el-form-item label="生成类型" prop="type">
<el-radio-group v-model="formData.type">
<el-radio-button
v-for="(item, index) in typeOptions"
:key="index"
:disabled="item.disabled"
:label="item.value"
>
{{ item.label }}
</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item v-if="showFileName" label="文件名" prop="fileName">
<el-input v-model="formData.fileName" clearable placeholder="请输入文件名"/>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div slot="footer">
<el-button @click="close">
取消
</el-button>
<el-button type="primary" @click="handleConfirm">
确定
</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
inheritAttrs: false,
props: ['showFileName'],
data() {
return {
formData: {
fileName: undefined,
type: 'file'
},
rules: {
fileName: [{
required: true,
message: '请输入文件名',
trigger: 'blur'
}],
type: [{
required: true,
message: '生成类型不能为空',
trigger: 'change'
}]
},
typeOptions: [{
label: '页面',
value: 'file'
}, {
label: '弹窗',
value: 'dialog'
}]
}
},
computed: {},
watch: {},
mounted() {
},
methods: {
onOpen() {
if (this.showFileName) {
this.formData.fileName = `${+new Date()}.vue`
}
},
onClose() {
},
close(e) {
this.$emit('update:visible', false)
},
handleConfirm() {
this.$refs.elForm.validate(valid => {
if (!valid) return
this.$emit('confirm', {...this.formData})
this.close()
})
}
}
}
</script>

View File

@ -1,108 +0,0 @@
<script>
import draggable from 'vuedraggable'
import render from '@/utils/generator/render'
const components = {
itemBtns(h, element, index, parent) {
const {copyItem, deleteItem} = this.$listeners
return [
<span class="drawing-item-copy" title="复制" onClick={event => {
copyItem(element, parent);
event.stopPropagation()
}}>
<i class="el-icon-copy-document"/>
</span>,
<span class="drawing-item-delete" title="删除" onClick={event => {
deleteItem(index, parent);
event.stopPropagation()
}}>
<i class="el-icon-delete"/>
</span>
]
}
}
const layouts = {
colFormItem(h, element, index, parent) {
const {activeItem} = this.$listeners
let className = this.activeId === element.formId ? 'drawing-item active-from-item' : 'drawing-item'
if (this.formConf.unFocusedComponentBorder) className += ' unfocus-bordered'
return (
<el-col span={element.span} class={className}
nativeOnClick={event => {
activeItem(element);
event.stopPropagation()
}}>
<el-form-item label-width={element.labelWidth ? `${element.labelWidth}px` : null}
label={element.label} required={element.required}>
<render key={element.renderKey} conf={element} onInput={event => {
this.$set(element, 'defaultValue', event)
}}/>
</el-form-item>
{components.itemBtns.apply(this, arguments)}
</el-col>
)
},
rowFormItem(h, element, index, parent) {
const {activeItem} = this.$listeners
const className = this.activeId === element.formId ? 'drawing-row-item active-from-item' : 'drawing-row-item'
let child = renderChildren.apply(this, arguments)
if (element.type === 'flex') {
child = <el-row type={element.type} justify={element.justify} align={element.align}>
{child}
</el-row>
}
return (
<el-col span={element.span}>
<el-row gutter={element.gutter} class={className}
nativeOnClick={event => {
activeItem(element);
event.stopPropagation()
}}>
<span class="component-name">{element.componentName}</span>
<draggable list={element.children} animation={340} group="componentsGroup" class="drag-wrapper">
{child}
</draggable>
{components.itemBtns.apply(this, arguments)}
</el-row>
</el-col>
)
}
}
function renderChildren(h, element, index, parent) {
if (!Array.isArray(element.children)) return null
return element.children.map((el, i) => {
const layout = layouts[el.layout]
if (layout) {
return layout.call(this, h, el, i, element.children)
}
return layoutIsNotFound()
})
}
function layoutIsNotFound() {
throw new Error(`没有与${this.element.layout}匹配的layout`)
}
export default {
components: {
render,
draggable
},
props: [
'element',
'index',
'drawingList',
'activeId',
'formConf'
],
render(h) {
const layout = layouts[this.element.layout]
if (layout) {
return layout.call(this, h, this.element, this.index, this.drawingList)
}
return layoutIsNotFound()
}
}
</script>

View File

@ -1,131 +0,0 @@
<template>
<div class="icon-dialog">
<el-dialog
:modal-append-to-body="false"
v-bind="$attrs"
width="980px"
@close="onClose"
@open="onOpen"
v-on="$listeners"
>
<div slot="title">
选择图标
<el-input
v-model="key"
:style="{width: '260px'}"
clearable
placeholder="请输入图标名称"
prefix-icon="el-icon-search"
size="mini"
/>
</div>
<ul class="icon-ul">
<li
v-for="icon in iconList"
:key="icon"
:class="active===icon?'active-item':''"
@click="onSelect(icon)"
>
<i :class="icon"/>
<div>{{ icon }}</div>
</li>
</ul>
</el-dialog>
</div>
</template>
<script>
import iconList from '@/utils/generator/icon.json'
const originList = iconList.map(name => `el-icon-${name}`)
export default {
inheritAttrs: false,
props: ['current'],
data() {
return {
iconList: originList,
active: null,
key: ''
}
},
watch: {
key(val) {
if (val) {
this.iconList = originList.filter(name => name.indexOf(val) > -1)
} else {
this.iconList = originList
}
}
},
methods: {
onOpen() {
this.active = this.current
this.key = ''
},
onClose() {
},
onSelect(icon) {
this.active = icon
this.$emit('select', icon)
this.$emit('update:visible', false)
}
}
}
</script>
<style lang="scss" scoped>
.icon-ul {
margin: 0;
padding: 0;
font-size: 0;
li {
list-style-type: none;
text-align: center;
font-size: 14px;
display: inline-block;
width: 16.66%;
box-sizing: border-box;
height: 108px;
padding: 15px 6px 6px 6px;
cursor: pointer;
overflow: hidden;
&:hover {
background: #f2f2f2;
}
&.active-item {
background: #e1f3fb;
color: #7a6df0
}
> i {
font-size: 30px;
line-height: 50px;
}
}
}
.icon-dialog {
::v-deep .el-dialog {
border-radius: 8px;
margin-bottom: 0;
margin-top: 4vh !important;
display: flex;
flex-direction: column;
max-height: 92vh;
overflow: hidden;
box-sizing: border-box;
.el-dialog__header {
padding-top: 14px;
}
.el-dialog__body {
margin: 0 20px 20px 20px;
padding: 0;
overflow: auto;
}
}
}
</style>

View File

@ -1,956 +0,0 @@
<template>
<div class="right-board">
<el-tabs v-model="currentTab" class="center-tabs">
<el-tab-pane label="组件属性" name="field"/>
<el-tab-pane label="表单属性" name="form"/>
</el-tabs>
<div class="field-box">
<a :href="documentLink" class="document-link" target="_blank" title="查看组件文档">
<i class="el-icon-link"/>
</a>
<el-scrollbar class="right-scrollbar">
<!-- 组件属性 -->
<el-form v-show="currentTab==='field' && showField" label-width="90px" size="small">
<el-form-item v-if="activeData.changeTag" label="组件类型">
<el-select
v-model="activeData.tagIcon"
:style="{width: '100%'}"
placeholder="请选择组件类型"
@change="tagChange"
>
<el-option-group v-for="group in tagList" :key="group.label" :label="group.label">
<el-option
v-for="item in group.options"
:key="item.label"
:label="item.label"
:value="item.tagIcon"
>
<svg-icon :icon-class="item.tagIcon" class="node-icon"/>
<span> {{ item.label }}</span>
</el-option>
</el-option-group>
</el-select>
</el-form-item>
<el-form-item v-if="activeData.vModel!==undefined" label="字段名">
<el-input v-model="activeData.vModel" placeholder="请输入字段名v-model"/>
</el-form-item>
<el-form-item v-if="activeData.componentName!==undefined" label="组件名">
{{ activeData.componentName }}
</el-form-item>
<el-form-item v-if="activeData.label!==undefined" label="标题">
<el-input v-model="activeData.label" placeholder="请输入标题"/>
</el-form-item>
<el-form-item v-if="activeData.placeholder!==undefined" label="占位提示">
<el-input v-model="activeData.placeholder" placeholder="请输入占位提示"/>
</el-form-item>
<el-form-item v-if="activeData['start-placeholder']!==undefined" label="开始占位">
<el-input v-model="activeData['start-placeholder']" placeholder="请输入占位提示"/>
</el-form-item>
<el-form-item v-if="activeData['end-placeholder']!==undefined" label="结束占位">
<el-input v-model="activeData['end-placeholder']" placeholder="请输入占位提示"/>
</el-form-item>
<el-form-item v-if="activeData.span!==undefined" label="表单栅格">
<el-slider v-model="activeData.span" :marks="{12:''}" :max="24" :min="1" @change="spanChange"/>
</el-form-item>
<el-form-item v-if="activeData.layout==='rowFormItem'" label="栅格间隔">
<el-input-number v-model="activeData.gutter" :min="0" placeholder="栅格间隔"/>
</el-form-item>
<el-form-item v-if="activeData.layout==='rowFormItem'" label="布局模式">
<el-radio-group v-model="activeData.type">
<el-radio-button label="default"/>
<el-radio-button label="flex"/>
</el-radio-group>
</el-form-item>
<el-form-item v-if="activeData.justify!==undefined&&activeData.type==='flex'" label="水平排列">
<el-select v-model="activeData.justify" :style="{width: '100%'}" placeholder="请选择水平排列">
<el-option
v-for="(item, index) in justifyOptions"
:key="index"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="activeData.align!==undefined&&activeData.type==='flex'" label="垂直排列">
<el-radio-group v-model="activeData.align">
<el-radio-button label="top"/>
<el-radio-button label="middle"/>
<el-radio-button label="bottom"/>
</el-radio-group>
</el-form-item>
<el-form-item v-if="activeData.labelWidth!==undefined" label="标签宽度">
<el-input v-model.number="activeData.labelWidth" placeholder="请输入标签宽度" type="number"/>
</el-form-item>
<el-form-item v-if="activeData.style&&activeData.style.width!==undefined" label="组件宽度">
<el-input v-model="activeData.style.width" clearable placeholder="请输入组件宽度"/>
</el-form-item>
<el-form-item v-if="activeData.vModel!==undefined" label="默认值">
<el-input
:value="setDefaultValue(activeData.defaultValue)"
placeholder="请输入默认值"
@input="onDefaultValueInput"
/>
</el-form-item>
<el-form-item v-if="activeData.tag==='el-checkbox-group'" label="至少应选">
<el-input-number
:min="0"
:value="activeData.min"
placeholder="至少应选"
@input="$set(activeData, 'min', $event?$event:undefined)"
/>
</el-form-item>
<el-form-item v-if="activeData.tag==='el-checkbox-group'" label="最多可选">
<el-input-number
:min="0"
:value="activeData.max"
placeholder="最多可选"
@input="$set(activeData, 'max', $event?$event:undefined)"
/>
</el-form-item>
<el-form-item v-if="activeData.prepend!==undefined" label="前缀">
<el-input v-model="activeData.prepend" placeholder="请输入前缀"/>
</el-form-item>
<el-form-item v-if="activeData.append!==undefined" label="后缀">
<el-input v-model="activeData.append" placeholder="请输入后缀"/>
</el-form-item>
<el-form-item v-if="activeData['prefix-icon']!==undefined" label="前图标">
<el-input v-model="activeData['prefix-icon']" placeholder="请输入前图标名称">
<el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('prefix-icon')">
选择
</el-button>
</el-input>
</el-form-item>
<el-form-item v-if="activeData['suffix-icon'] !== undefined" label="后图标">
<el-input v-model="activeData['suffix-icon']" placeholder="请输入后图标名称">
<el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('suffix-icon')">
选择
</el-button>
</el-input>
</el-form-item>
<el-form-item v-if="activeData.tag === 'el-cascader'" label="选项分隔符">
<el-input v-model="activeData.separator" placeholder="请输入选项分隔符"/>
</el-form-item>
<el-form-item v-if="activeData.autosize !== undefined" label="最小行数">
<el-input-number v-model="activeData.autosize.minRows" :min="1" placeholder="最小行数"/>
</el-form-item>
<el-form-item v-if="activeData.autosize !== undefined" label="最大行数">
<el-input-number v-model="activeData.autosize.maxRows" :min="1" placeholder="最大行数"/>
</el-form-item>
<el-form-item v-if="activeData.min !== undefined" label="最小值">
<el-input-number v-model="activeData.min" placeholder="最小值"/>
</el-form-item>
<el-form-item v-if="activeData.max !== undefined" label="最大值">
<el-input-number v-model="activeData.max" placeholder="最大值"/>
</el-form-item>
<el-form-item v-if="activeData.step !== undefined" label="步长">
<el-input-number v-model="activeData.step" placeholder="步数"/>
</el-form-item>
<el-form-item v-if="activeData.tag === 'el-input-number'" label="精度">
<el-input-number v-model="activeData.precision" :min="0" placeholder="精度"/>
</el-form-item>
<el-form-item v-if="activeData.tag === 'el-input-number'" label="按钮位置">
<el-radio-group v-model="activeData['controls-position']">
<el-radio-button label="">
默认
</el-radio-button>
<el-radio-button label="right">
右侧
</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item v-if="activeData.maxlength !== undefined" label="最多输入">
<el-input v-model="activeData.maxlength" placeholder="请输入字符长度">
<template slot="append">
个字符
</template>
</el-input>
</el-form-item>
<el-form-item v-if="activeData['active-text'] !== undefined" label="开启提示">
<el-input v-model="activeData['active-text']" placeholder="请输入开启提示"/>
</el-form-item>
<el-form-item v-if="activeData['inactive-text'] !== undefined" label="关闭提示">
<el-input v-model="activeData['inactive-text']" placeholder="请输入关闭提示"/>
</el-form-item>
<el-form-item v-if="activeData['active-value'] !== undefined" label="开启值">
<el-input
:value="setDefaultValue(activeData['active-value'])"
placeholder="请输入开启值"
@input="onSwitchValueInput($event, 'active-value')"
/>
</el-form-item>
<el-form-item v-if="activeData['inactive-value'] !== undefined" label="关闭值">
<el-input
:value="setDefaultValue(activeData['inactive-value'])"
placeholder="请输入关闭值"
@input="onSwitchValueInput($event, 'inactive-value')"
/>
</el-form-item>
<el-form-item
v-if="activeData.type !== undefined && 'el-date-picker' === activeData.tag"
label="时间类型"
>
<el-select
v-model="activeData.type"
:style="{ width: '100%' }"
placeholder="请选择时间类型"
@change="dateTypeChange"
>
<el-option
v-for="(item, index) in dateOptions"
:key="index"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="activeData.name !== undefined" label="文件字段名">
<el-input v-model="activeData.name" placeholder="请输入上传文件字段名"/>
</el-form-item>
<el-form-item v-if="activeData.accept !== undefined" label="文件类型">
<el-select
v-model="activeData.accept"
:style="{ width: '100%' }"
clearable
placeholder="请选择文件类型"
>
<el-option label="图片" value="image/*"/>
<el-option label="视频" value="video/*"/>
<el-option label="音频" value="audio/*"/>
<el-option label="excel" value=".xls,.xlsx"/>
<el-option label="word" value=".doc,.docx"/>
<el-option label="pdf" value=".pdf"/>
<el-option label="txt" value=".txt"/>
</el-select>
</el-form-item>
<el-form-item v-if="activeData.fileSize !== undefined" label="文件大小">
<el-input v-model.number="activeData.fileSize" placeholder="请输入文件大小">
<el-select slot="append" v-model="activeData.sizeUnit" :style="{ width: '66px' }">
<el-option label="KB" value="KB"/>
<el-option label="MB" value="MB"/>
<el-option label="GB" value="GB"/>
</el-select>
</el-input>
</el-form-item>
<el-form-item v-if="activeData.action !== undefined" label="上传地址">
<el-input v-model="activeData.action" clearable placeholder="请输入上传地址"/>
</el-form-item>
<el-form-item v-if="activeData['list-type'] !== undefined" label="列表类型">
<el-radio-group v-model="activeData['list-type']" size="small">
<el-radio-button label="text">
text
</el-radio-button>
<el-radio-button label="picture">
picture
</el-radio-button>
<el-radio-button label="picture-card">
picture-card
</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item
v-if="activeData.buttonText !== undefined"
v-show="'picture-card' !== activeData['list-type']"
label="按钮文字"
>
<el-input v-model="activeData.buttonText" placeholder="请输入按钮文字"/>
</el-form-item>
<el-form-item v-if="activeData['range-separator'] !== undefined" label="分隔符">
<el-input v-model="activeData['range-separator']" placeholder="请输入分隔符"/>
</el-form-item>
<el-form-item v-if="activeData['picker-options'] !== undefined" label="时间段">
<el-input
v-model="activeData['picker-options'].selectableRange"
placeholder="请输入时间段"
/>
</el-form-item>
<el-form-item v-if="activeData.format !== undefined" label="时间格式">
<el-input
:value="activeData.format"
placeholder="请输入时间格式"
@input="setTimeValue($event)"
/>
</el-form-item>
<template v-if="['el-checkbox-group', 'el-radio-group', 'el-select'].indexOf(activeData.tag) > -1">
<el-divider>选项</el-divider>
<draggable
:animation="340"
:list="activeData.options"
group="selectItem"
handle=".option-drag"
>
<div v-for="(item, index) in activeData.options" :key="index" class="select-item">
<div class="select-line-icon option-drag">
<i class="el-icon-s-operation"/>
</div>
<el-input v-model="item.label" placeholder="选项名" size="small"/>
<el-input
:value="item.value"
placeholder="选项值"
size="small"
@input="setOptionValue(item, $event)"
/>
<div class="close-btn select-line-icon" @click="activeData.options.splice(index, 1)">
<i class="el-icon-remove-outline"/>
</div>
</div>
</draggable>
<div style="margin-left: 20px;">
<el-button
icon="el-icon-circle-plus-outline"
style="padding-bottom: 0"
type="text"
@click="addSelectItem"
>
添加选项
</el-button>
</div>
<el-divider/>
</template>
<template v-if="['el-cascader'].indexOf(activeData.tag) > -1">
<el-divider>选项</el-divider>
<el-form-item label="数据类型">
<el-radio-group v-model="activeData.dataType" size="small">
<el-radio-button label="dynamic">
动态数据
</el-radio-button>
<el-radio-button label="static">
静态数据
</el-radio-button>
</el-radio-group>
</el-form-item>
<template v-if="activeData.dataType === 'dynamic'">
<el-form-item label="标签键名">
<el-input v-model="activeData.labelKey" placeholder="请输入标签键名"/>
</el-form-item>
<el-form-item label="值键名">
<el-input v-model="activeData.valueKey" placeholder="请输入值键名"/>
</el-form-item>
<el-form-item label="子级键名">
<el-input v-model="activeData.childrenKey" placeholder="请输入子级键名"/>
</el-form-item>
</template>
<el-tree
v-if="activeData.dataType === 'static'"
:data="activeData.options"
:expand-on-click-node="false"
:render-content="renderContent"
draggable
node-key="id"
/>
<div v-if="activeData.dataType === 'static'" style="margin-left: 20px">
<el-button
icon="el-icon-circle-plus-outline"
style="padding-bottom: 0"
type="text"
@click="addTreeItem"
>
添加父级
</el-button>
</div>
<el-divider/>
</template>
<el-form-item v-if="activeData.optionType !== undefined" label="选项样式">
<el-radio-group v-model="activeData.optionType">
<el-radio-button label="default">
默认
</el-radio-button>
<el-radio-button label="button">
按钮
</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item v-if="activeData['active-color'] !== undefined" label="开启颜色">
<el-color-picker v-model="activeData['active-color']"/>
</el-form-item>
<el-form-item v-if="activeData['inactive-color'] !== undefined" label="关闭颜色">
<el-color-picker v-model="activeData['inactive-color']"/>
</el-form-item>
<el-form-item v-if="activeData['allow-half'] !== undefined" label="允许半选">
<el-switch v-model="activeData['allow-half']"/>
</el-form-item>
<el-form-item v-if="activeData['show-text'] !== undefined" label="辅助文字">
<el-switch v-model="activeData['show-text']" @change="rateTextChange"/>
</el-form-item>
<el-form-item v-if="activeData['show-score'] !== undefined" label="显示分数">
<el-switch v-model="activeData['show-score']" @change="rateScoreChange"/>
</el-form-item>
<el-form-item v-if="activeData['show-stops'] !== undefined" label="显示间断点">
<el-switch v-model="activeData['show-stops']"/>
</el-form-item>
<el-form-item v-if="activeData.range !== undefined" label="范围选择">
<el-switch v-model="activeData.range" @change="rangeChange"/>
</el-form-item>
<el-form-item
v-if="activeData.border !== undefined && activeData.optionType === 'default'"
label="是否带边框"
>
<el-switch v-model="activeData.border"/>
</el-form-item>
<el-form-item v-if="activeData.tag === 'el-color-picker'" label="颜色格式">
<el-select
v-model="activeData['color-format']"
:style="{ width: '100%' }"
placeholder="请选择颜色格式"
@change="colorFormatChange"
>
<el-option
v-for="(item, index) in colorFormatOptions"
:key="index"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-if="activeData.size !== undefined &&
(activeData.optionType === 'button' ||
activeData.border ||
activeData.tag === 'el-color-picker')"
label="选项尺寸"
>
<el-radio-group v-model="activeData.size">
<el-radio-button label="medium">
中等
</el-radio-button>
<el-radio-button label="small">
较小
</el-radio-button>
<el-radio-button label="mini">
迷你
</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item v-if="activeData['show-word-limit'] !== undefined" label="输入统计">
<el-switch v-model="activeData['show-word-limit']"/>
</el-form-item>
<el-form-item v-if="activeData.tag === 'el-input-number'" label="严格步数">
<el-switch v-model="activeData['step-strictly']"/>
</el-form-item>
<el-form-item v-if="activeData.tag === 'el-cascader'" label="是否多选">
<el-switch v-model="activeData.props.props.multiple"/>
</el-form-item>
<el-form-item v-if="activeData.tag === 'el-cascader'" label="展示全路径">
<el-switch v-model="activeData['show-all-levels']"/>
</el-form-item>
<el-form-item v-if="activeData.tag === 'el-cascader'" label="可否筛选">
<el-switch v-model="activeData.filterable"/>
</el-form-item>
<el-form-item v-if="activeData.clearable !== undefined" label="能否清空">
<el-switch v-model="activeData.clearable"/>
</el-form-item>
<el-form-item v-if="activeData.showTip !== undefined" label="显示提示">
<el-switch v-model="activeData.showTip"/>
</el-form-item>
<el-form-item v-if="activeData.multiple !== undefined" label="多选文件">
<el-switch v-model="activeData.multiple"/>
</el-form-item>
<el-form-item v-if="activeData['auto-upload'] !== undefined" label="自动上传">
<el-switch v-model="activeData['auto-upload']"/>
</el-form-item>
<el-form-item v-if="activeData.readonly !== undefined" label="是否只读">
<el-switch v-model="activeData.readonly"/>
</el-form-item>
<el-form-item v-if="activeData.disabled !== undefined" label="是否禁用">
<el-switch v-model="activeData.disabled"/>
</el-form-item>
<el-form-item v-if="activeData.tag === 'el-select'" label="是否可搜索">
<el-switch v-model="activeData.filterable"/>
</el-form-item>
<el-form-item v-if="activeData.tag === 'el-select'" label="是否多选">
<el-switch v-model="activeData.multiple" @change="multipleChange"/>
</el-form-item>
<el-form-item v-if="activeData.required !== undefined" label="是否必填">
<el-switch v-model="activeData.required"/>
</el-form-item>
<template v-if="activeData.layoutTree">
<el-divider>布局结构树</el-divider>
<el-tree
:data="[activeData]"
:props="layoutTreeProps"
default-expand-all
draggable
node-key="renderKey"
>
<span slot-scope="{ node, data }">
<span class="node-label">
<svg-icon :icon-class="data.tagIcon" class="node-icon"/>
{{ node.label }}
</span>
</span>
</el-tree>
</template>
<template v-if="activeData.layout === 'colFormItem' && activeData.tag !== 'el-button'">
<el-divider>正则校验</el-divider>
<div
v-for="(item, index) in activeData.regList"
:key="index"
class="reg-item"
>
<span class="close-btn" @click="activeData.regList.splice(index, 1)">
<i class="el-icon-close"/>
</span>
<el-form-item label="表达式">
<el-input v-model="item.pattern" placeholder="请输入正则"/>
</el-form-item>
<el-form-item label="错误提示" style="margin-bottom:0">
<el-input v-model="item.message" placeholder="请输入错误提示"/>
</el-form-item>
</div>
<div style="margin-left: 20px">
<el-button icon="el-icon-circle-plus-outline" type="text" @click="addReg">
添加规则
</el-button>
</div>
</template>
</el-form>
<!-- 表单属性 -->
<el-form v-show="currentTab === 'form'" label-width="90px" size="small">
<el-form-item label="表单名">
<el-input v-model="formConf.formRef" placeholder="请输入表单名ref"/>
</el-form-item>
<el-form-item label="表单模型">
<el-input v-model="formConf.formModel" placeholder="请输入数据模型"/>
</el-form-item>
<el-form-item label="校验模型">
<el-input v-model="formConf.formRules" placeholder="请输入校验模型"/>
</el-form-item>
<el-form-item label="表单尺寸">
<el-radio-group v-model="formConf.size">
<el-radio-button label="medium">
中等
</el-radio-button>
<el-radio-button label="small">
较小
</el-radio-button>
<el-radio-button label="mini">
迷你
</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="标签对齐">
<el-radio-group v-model="formConf.labelPosition">
<el-radio-button label="left">
左对齐
</el-radio-button>
<el-radio-button label="right">
右对齐
</el-radio-button>
<el-radio-button label="top">
顶部对齐
</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="标签宽度">
<el-input-number v-model="formConf.labelWidth" placeholder="标签宽度"/>
</el-form-item>
<el-form-item label="栅格间隔">
<el-input-number v-model="formConf.gutter" :min="0" placeholder="栅格间隔"/>
</el-form-item>
<el-form-item label="禁用表单">
<el-switch v-model="formConf.disabled"/>
</el-form-item>
<el-form-item label="表单按钮">
<el-switch v-model="formConf.formBtns"/>
</el-form-item>
<el-form-item label="显示未选中组件边框">
<el-switch v-model="formConf.unFocusedComponentBorder"/>
</el-form-item>
</el-form>
</el-scrollbar>
</div>
<treeNode-dialog :visible.sync="dialogVisible" title="添加选项" @commit="addNode"/>
<icons-dialog :current="activeData[currentIconModel]" :visible.sync="iconsVisible" @select="setIcon"/>
</div>
</template>
<script>
import {isArray} from 'util'
import draggable from 'vuedraggable'
import TreeNodeDialog from './TreeNodeDialog'
import {isNumberStr} from '@/utils/index'
import IconsDialog from './IconsDialog'
import {inputComponents, selectComponents} from '@/utils/generator/config'
const dateTimeFormat = {
date: 'yyyy-MM-dd',
week: 'yyyy 第 WW 周',
month: 'yyyy-MM',
year: 'yyyy',
datetime: 'yyyy-MM-dd HH:mm:ss',
daterange: 'yyyy-MM-dd',
monthrange: 'yyyy-MM',
datetimerange: 'yyyy-MM-dd HH:mm:ss'
}
export default {
components: {
draggable,
TreeNodeDialog,
IconsDialog
},
props: ['showField', 'activeData', 'formConf'],
data() {
return {
currentTab: 'field',
currentNode: null,
dialogVisible: false,
iconsVisible: false,
currentIconModel: null,
dateTypeOptions: [
{
label: '日(date)',
value: 'date'
},
{
label: '周(week)',
value: 'week'
},
{
label: '月(month)',
value: 'month'
},
{
label: '年(year)',
value: 'year'
},
{
label: '日期时间(datetime)',
value: 'datetime'
}
],
dateRangeTypeOptions: [
{
label: '日期范围(daterange)',
value: 'daterange'
},
{
label: '月范围(monthrange)',
value: 'monthrange'
},
{
label: '日期时间范围(datetimerange)',
value: 'datetimerange'
}
],
colorFormatOptions: [
{
label: 'hex',
value: 'hex'
},
{
label: 'rgb',
value: 'rgb'
},
{
label: 'rgba',
value: 'rgba'
},
{
label: 'hsv',
value: 'hsv'
},
{
label: 'hsl',
value: 'hsl'
}
],
justifyOptions: [
{
label: 'start',
value: 'start'
},
{
label: 'end',
value: 'end'
},
{
label: 'center',
value: 'center'
},
{
label: 'space-around',
value: 'space-around'
},
{
label: 'space-between',
value: 'space-between'
}
],
layoutTreeProps: {
label(data, node) {
return data.componentName || `${data.label}: ${data.vModel}`
}
}
}
},
computed: {
documentLink() {
return (
this.activeData.document
|| 'https://element.eleme.cn/#/zh-CN/component/installation'
)
},
dateOptions() {
if (
this.activeData.type !== undefined
&& this.activeData.tag === 'el-date-picker'
) {
if (this.activeData['start-placeholder'] === undefined) {
return this.dateTypeOptions
}
return this.dateRangeTypeOptions
}
return []
},
tagList() {
return [
{
label: '输入型组件',
options: inputComponents
},
{
label: '选择型组件',
options: selectComponents
}
]
}
},
methods: {
addReg() {
this.activeData.regList.push({
pattern: '',
message: ''
})
},
addSelectItem() {
this.activeData.options.push({
label: '',
value: ''
})
},
addTreeItem() {
++this.idGlobal
this.dialogVisible = true
this.currentNode = this.activeData.options
},
renderContent(h, {node, data, store}) {
return (
<div class="custom-tree-node">
<span>{node.label}</span>
<span class="node-operation">
<i on-click={() => this.append(data)}
class="el-icon-plus"
title="添加"
></i>
<i on-click={() => this.remove(node, data)}
class="el-icon-delete"
title="删除"
></i>
</span>
</div>
)
},
append(data) {
if (!data.children) {
this.$set(data, 'children', [])
}
this.dialogVisible = true
this.currentNode = data.children
},
remove(node, data) {
const {parent} = node
const children = parent.data.children || parent.data
const index = children.findIndex(d => d.id === data.id)
children.splice(index, 1)
},
addNode(data) {
this.currentNode.push(data)
},
setOptionValue(item, val) {
item.value = isNumberStr(val) ? +val : val
},
setDefaultValue(val) {
if (Array.isArray(val)) {
return val.join(',')
}
if (['string', 'number'].indexOf(val) > -1) {
return val
}
if (typeof val === 'boolean') {
return `${val}`
}
return val
},
onDefaultValueInput(str) {
if (isArray(this.activeData.defaultValue)) {
//
this.$set(
this.activeData,
'defaultValue',
str.split(',').map(val => (isNumberStr(val) ? +val : val))
)
} else if (['true', 'false'].indexOf(str) > -1) {
//
this.$set(this.activeData, 'defaultValue', JSON.parse(str))
} else {
//
this.$set(
this.activeData,
'defaultValue',
isNumberStr(str) ? +str : str
)
}
},
onSwitchValueInput(val, name) {
if (['true', 'false'].indexOf(val) > -1) {
this.$set(this.activeData, name, JSON.parse(val))
} else {
this.$set(this.activeData, name, isNumberStr(val) ? +val : val)
}
},
setTimeValue(val, type) {
const valueFormat = type === 'week' ? dateTimeFormat.date : val
this.$set(this.activeData, 'defaultValue', null)
this.$set(this.activeData, 'value-format', valueFormat)
this.$set(this.activeData, 'format', val)
},
spanChange(val) {
this.formConf.span = val
},
multipleChange(val) {
this.$set(this.activeData, 'defaultValue', val ? [] : '')
},
dateTypeChange(val) {
this.setTimeValue(dateTimeFormat[val], val)
},
rangeChange(val) {
this.$set(
this.activeData,
'defaultValue',
val ? [this.activeData.min, this.activeData.max] : this.activeData.min
)
},
rateTextChange(val) {
if (val) this.activeData['show-score'] = false
},
rateScoreChange(val) {
if (val) this.activeData['show-text'] = false
},
colorFormatChange(val) {
this.activeData.defaultValue = null
this.activeData['show-alpha'] = val.indexOf('a') > -1
this.activeData.renderKey = +new Date() // renderKey,
},
openIconsDialog(model) {
this.iconsVisible = true
this.currentIconModel = model
},
setIcon(val) {
this.activeData[this.currentIconModel] = val
},
tagChange(tagIcon) {
let target = inputComponents.find(item => item.tagIcon === tagIcon)
if (!target) target = selectComponents.find(item => item.tagIcon === tagIcon)
this.$emit('tag-change', target)
}
}
}
</script>
<style lang="scss" scoped>
.right-board {
width: 350px;
position: absolute;
right: 0;
top: 0;
padding-top: 3px;
.field-box {
position: relative;
height: calc(100vh - 42px);
box-sizing: border-box;
overflow: hidden;
}
.el-scrollbar {
height: 100%;
}
}
.select-item {
display: flex;
border: 1px dashed #fff;
box-sizing: border-box;
& .close-btn {
cursor: pointer;
color: #f56c6c;
}
& .el-input + .el-input {
margin-left: 4px;
}
}
.select-item + .select-item {
margin-top: 4px;
}
.select-item.sortable-chosen {
border: 1px dashed #409eff;
}
.select-line-icon {
line-height: 32px;
font-size: 22px;
padding: 0 4px;
color: #777;
}
.option-drag {
cursor: move;
}
.time-range {
.el-date-editor {
width: 227px;
}
::v-deep .el-icon-time {
display: none;
}
}
.document-link {
position: absolute;
display: block;
width: 26px;
height: 26px;
top: 0;
left: 0;
cursor: pointer;
background: #409eff;
z-index: 1;
border-radius: 0 0 6px 0;
text-align: center;
line-height: 26px;
color: #fff;
font-size: 18px;
}
.node-label {
font-size: 14px;
}
.node-icon {
color: #bebfc3;
}
</style>

View File

@ -1,152 +0,0 @@
<template>
<div>
<el-dialog
:close-on-click-modal="false"
:modal-append-to-body="false"
v-bind="$attrs"
@close="onClose"
@open="onOpen"
v-on="$listeners"
>
<el-row :gutter="0">
<el-form
ref="elForm"
:model="formData"
:rules="rules"
label-width="100px"
size="small"
>
<el-col :span="24">
<el-form-item
label="选项名"
prop="label"
>
<el-input
v-model="formData.label"
clearable
placeholder="请输入选项名"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item
label="选项值"
prop="value"
>
<el-input
v-model="formData.value"
clearable
placeholder="请输入选项值"
>
<el-select
slot="append"
v-model="dataType"
:style="{width: '100px'}"
>
<el-option
v-for="(item, index) in dataTypeOptions"
:key="index"
:disabled="item.disabled"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-input>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div slot="footer">
<el-button
type="primary"
@click="handleConfirm"
>
确定
</el-button>
<el-button @click="close">
取消
</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {isNumberStr} from '@/utils/index'
export default {
components: {},
inheritAttrs: false,
props: [],
data() {
return {
id: 100,
formData: {
label: undefined,
value: undefined
},
rules: {
label: [
{
required: true,
message: '请输入选项名',
trigger: 'blur'
}
],
value: [
{
required: true,
message: '请输入选项值',
trigger: 'blur'
}
]
},
dataType: 'string',
dataTypeOptions: [
{
label: '字符串',
value: 'string'
},
{
label: '数字',
value: 'number'
}
]
}
},
computed: {},
watch: {
// eslint-disable-next-line func-names
'formData.value': function (val) {
this.dataType = isNumberStr(val) ? 'number' : 'string'
}
},
created() {
},
mounted() {
},
methods: {
onOpen() {
this.formData = {
label: undefined,
value: undefined
}
},
onClose() {
},
close() {
this.$emit('update:visible', false)
},
handleConfirm() {
this.$refs.elForm.validate(valid => {
if (!valid) return
if (this.dataType === 'number') {
this.formData.value = parseFloat(this.formData.value)
}
this.formData.id = this.id++
this.$emit('commit', this.formData)
this.close()
})
}
}
}
</script>

View File

@ -1,837 +0,0 @@
<template>
<div class="container">
<div class="left-board">
<div class="logo-wrapper">
<div class="logo">
<img :src="logo" alt="logo"> Form Generator
</div>
</div>
<el-scrollbar class="left-scrollbar">
<div class="components-list">
<div class="components-title">
<svg-icon icon-class="component"/>
输入型组件
</div>
<draggable
:clone="cloneComponent"
:group="{ name: 'componentsGroup', pull: 'clone', put: false }"
:list="inputComponents"
:sort="false"
class="components-draggable"
draggable=".components-item"
@end="onEnd"
>
<div
v-for="(element, index) in inputComponents" :key="index" class="components-item"
@click="addComponent(element)"
>
<div class="components-body">
<svg-icon :icon-class="element.tagIcon"/>
{{ element.label }}
</div>
</div>
</draggable>
<div class="components-title">
<svg-icon icon-class="component"/>
选择型组件
</div>
<draggable
:clone="cloneComponent"
:group="{ name: 'componentsGroup', pull: 'clone', put: false }"
:list="selectComponents"
:sort="false"
class="components-draggable"
draggable=".components-item"
@end="onEnd"
>
<div
v-for="(element, index) in selectComponents"
:key="index"
class="components-item"
@click="addComponent(element)"
>
<div class="components-body">
<svg-icon :icon-class="element.tagIcon"/>
{{ element.label }}
</div>
</div>
</draggable>
<div class="components-title">
<svg-icon icon-class="component"/>
布局型组件
</div>
<draggable
:clone="cloneComponent" :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
:list="layoutComponents" :sort="false"
class="components-draggable" draggable=".components-item" @end="onEnd"
>
<div
v-for="(element, index) in layoutComponents" :key="index" class="components-item"
@click="addComponent(element)"
>
<div class="components-body">
<svg-icon :icon-class="element.tagIcon"/>
{{ element.label }}
</div>
</div>
</draggable>
</div>
</el-scrollbar>
</div>
<div class="center-board">
<div class="action-bar">
<el-button icon="el-icon-download" type="text" @click="download">
导出vue文件
</el-button>
<el-button class="copy-btn-main" icon="el-icon-document-copy" type="text" @click="copy">
复制代码
</el-button>
<el-button class="delete-btn" icon="el-icon-delete" type="text" @click="empty">
清空
</el-button>
</div>
<el-scrollbar class="center-scrollbar">
<el-row :gutter="formConf.gutter" class="center-board-row">
<el-form
:disabled="formConf.disabled"
:label-position="formConf.labelPosition"
:label-width="formConf.labelWidth + 'px'"
:size="formConf.size"
>
<draggable :animation="340" :list="drawingList" class="drawing-board" group="componentsGroup">
<draggable-item
v-for="(element, index) in drawingList"
:key="element.renderKey"
:active-id="activeId"
:drawing-list="drawingList"
:element="element"
:form-conf="formConf"
:index="index"
@activeItem="activeFormItem"
@copyItem="drawingItemCopy"
@deleteItem="drawingItemDelete"
/>
</draggable>
<div v-show="!drawingList.length" class="empty-info">
从左侧拖入或点选组件进行表单设计
</div>
</el-form>
</el-row>
</el-scrollbar>
</div>
<right-panel
:active-data="activeData"
:form-conf="formConf"
:show-field="!!drawingList.length"
@tag-change="tagChange"
/>
<code-type-dialog
:show-file-name="showFileName"
:visible.sync="dialogVisible"
title="选择生成类型"
@confirm="generate"
/>
<input id="copyNode" type="hidden">
</div>
</template>
<script>
import draggable from 'vuedraggable'
import beautifier from 'js-beautify'
import ClipboardJS from 'clipboard'
import render from '@/utils/generator/render'
import RightPanel from './RightPanel'
import {formConf, inputComponents, layoutComponents, selectComponents} from '@/utils/generator/config'
import {beautifierConf, titleCase} from '@/utils/index'
import {cssStyle, makeUpHtml, vueScript, vueTemplate} from '@/utils/generator/html'
import {makeUpJs} from '@/utils/generator/js'
import {makeUpCss} from '@/utils/generator/css'
import drawingDefault from '@/utils/generator/drawingDefault'
import logo from '@/assets/logo/logo.png'
import CodeTypeDialog from './CodeTypeDialog'
import DraggableItem from './DraggableItem'
let oldActiveId
let tempActiveData
export default {
components: {
draggable,
render,
RightPanel,
CodeTypeDialog,
DraggableItem
},
data() {
return {
logo,
idGlobal: 100,
formConf,
inputComponents,
selectComponents,
layoutComponents,
labelWidth: 100,
drawingList: drawingDefault,
drawingData: {},
activeId: drawingDefault[0].formId,
drawerVisible: false,
formData: {},
dialogVisible: false,
generateConf: null,
showFileName: false,
activeData: drawingDefault[0]
}
},
created() {
// firefox
document.body.ondrop = event => {
event.preventDefault()
event.stopPropagation()
}
},
watch: {
// eslint-disable-next-line func-names
'activeData.label': function (val, oldVal) {
if (
this.activeData.placeholder === undefined
|| !this.activeData.tag
|| oldActiveId !== this.activeId
) {
return
}
this.activeData.placeholder = this.activeData.placeholder.replace(oldVal, '') + val
},
activeId: {
handler(val) {
oldActiveId = val
},
immediate: true
}
},
mounted() {
const clipboard = new ClipboardJS('#copyNode', {
text: trigger => {
const codeStr = this.generateCode()
this.$notify({
title: '成功',
message: '代码已复制到剪切板,可粘贴。',
type: 'success'
})
return codeStr
}
})
clipboard.on('error', e => {
this.$message.error('代码复制失败')
})
},
methods: {
activeFormItem(element) {
this.activeData = element
this.activeId = element.formId
},
onEnd(obj, a) {
if (obj.from !== obj.to) {
this.activeData = tempActiveData
this.activeId = this.idGlobal
}
},
addComponent(item) {
const clone = this.cloneComponent(item)
this.drawingList.push(clone)
this.activeFormItem(clone)
},
cloneComponent(origin) {
const clone = JSON.parse(JSON.stringify(origin))
clone.formId = ++this.idGlobal
clone.span = formConf.span
clone.renderKey = +new Date() // renderKey
if (!clone.layout) clone.layout = 'colFormItem'
if (clone.layout === 'colFormItem') {
clone.vModel = `field${this.idGlobal}`
clone.placeholder !== undefined && (clone.placeholder += clone.label)
tempActiveData = clone
} else if (clone.layout === 'rowFormItem') {
delete clone.label
clone.componentName = `row${this.idGlobal}`
clone.gutter = this.formConf.gutter
tempActiveData = clone
}
return tempActiveData
},
AssembleFormData() {
this.formData = {
fields: JSON.parse(JSON.stringify(this.drawingList)),
...this.formConf
}
},
generate(data) {
const func = this[`exec${titleCase(this.operationType)}`]
this.generateConf = data
func && func(data)
},
execRun(data) {
this.AssembleFormData()
this.drawerVisible = true
},
execDownload(data) {
const codeStr = this.generateCode()
const blob = new Blob([codeStr], {type: 'text/plain;charset=utf-8'})
this.$download.saveAs(blob, data.fileName)
},
execCopy(data) {
document.getElementById('copyNode').click()
},
empty() {
this.$confirm('确定要清空所有组件吗?', '提示', {type: 'warning'}).then(
() => {
this.drawingList = []
}
)
},
drawingItemCopy(item, parent) {
let clone = JSON.parse(JSON.stringify(item))
clone = this.createIdAndKey(clone)
parent.push(clone)
this.activeFormItem(clone)
},
createIdAndKey(item) {
item.formId = ++this.idGlobal
item.renderKey = +new Date()
if (item.layout === 'colFormItem') {
item.vModel = `field${this.idGlobal}`
} else if (item.layout === 'rowFormItem') {
item.componentName = `row${this.idGlobal}`
}
if (Array.isArray(item.children)) {
item.children = item.children.map(childItem => this.createIdAndKey(childItem))
}
return item
},
drawingItemDelete(index, parent) {
parent.splice(index, 1)
this.$nextTick(() => {
const len = this.drawingList.length
if (len) {
this.activeFormItem(this.drawingList[len - 1])
}
})
},
generateCode() {
const {type} = this.generateConf
this.AssembleFormData()
const script = vueScript(makeUpJs(this.formData, type))
const html = vueTemplate(makeUpHtml(this.formData, type))
const css = cssStyle(makeUpCss(this.formData))
return beautifier.html(html + script + css, beautifierConf.html)
},
download() {
this.dialogVisible = true
this.showFileName = true
this.operationType = 'download'
},
run() {
this.dialogVisible = true
this.showFileName = false
this.operationType = 'run'
},
copy() {
this.dialogVisible = true
this.showFileName = false
this.operationType = 'copy'
},
tagChange(newTag) {
newTag = this.cloneComponent(newTag)
newTag.vModel = this.activeData.vModel
newTag.formId = this.activeId
newTag.span = this.activeData.span
delete this.activeData.tag
delete this.activeData.tagIcon
delete this.activeData.document
Object.keys(newTag).forEach(key => {
if (this.activeData[key] !== undefined
&& typeof this.activeData[key] === typeof newTag[key]) {
newTag[key] = this.activeData[key]
}
})
this.activeData = newTag
this.updateDrawingList(newTag, this.drawingList)
},
updateDrawingList(newTag, list) {
const index = list.findIndex(item => item.formId === this.activeId)
if (index > -1) {
list.splice(index, 1, newTag)
} else {
list.forEach(item => {
if (Array.isArray(item.children)) this.updateDrawingList(newTag, item.children)
})
}
}
}
}
</script>
<style lang='scss'>
.editor-tabs {
background: #121315;
.el-tabs__header {
margin: 0;
border-bottom-color: #121315;
.el-tabs__nav {
border-color: #121315;
}
}
.el-tabs__item {
height: 32px;
line-height: 32px;
color: #888a8e;
border-left: 1px solid #121315 !important;
background: #363636;
margin-right: 5px;
user-select: none;
}
.el-tabs__item.is-active {
background: #1e1e1e;
border-bottom-color: #1e1e1e !important;
color: #fff;
}
.el-icon-edit {
color: #f1fa8c;
}
.el-icon-document {
color: #a95812;
}
}
// home
.right-scrollbar {
.el-scrollbar__view {
padding: 12px 18px 15px 15px;
}
}
.left-scrollbar .el-scrollbar__wrap {
box-sizing: border-box;
overflow-x: hidden !important;
margin-bottom: 0 !important;
}
.center-tabs {
.el-tabs__header {
margin-bottom: 0 !important;
}
.el-tabs__item {
width: 50%;
text-align: center;
}
.el-tabs__nav {
width: 100%;
}
}
.reg-item {
padding: 12px 6px;
background: #f8f8f8;
position: relative;
border-radius: 4px;
.close-btn {
position: absolute;
right: -6px;
top: -6px;
display: block;
width: 16px;
height: 16px;
line-height: 16px;
background: rgba(0, 0, 0, 0.2);
border-radius: 50%;
color: #fff;
text-align: center;
z-index: 1;
cursor: pointer;
font-size: 12px;
&:hover {
background: rgba(210, 23, 23, 0.5)
}
}
& + .reg-item {
margin-top: 18px;
}
}
.action-bar {
& .el-button + .el-button {
margin-left: 15px;
}
& i {
font-size: 20px;
vertical-align: middle;
position: relative;
top: -1px;
}
}
.custom-tree-node {
width: 100%;
font-size: 14px;
.node-operation {
float: right;
}
i[class*="el-icon"] + i[class*="el-icon"] {
margin-left: 6px;
}
.el-icon-plus {
color: #409EFF;
}
.el-icon-delete {
color: #157a0c;
}
}
.left-scrollbar .el-scrollbar__view {
overflow-x: hidden;
}
.el-rate {
display: inline-block;
vertical-align: text-top;
}
.el-upload__tip {
line-height: 1.2;
}
$selectedColor: #f6f7ff;
$lighterBlue: #409EFF;
.container {
position: relative;
width: 100%;
height: 100%;
}
.components-list {
padding: 8px;
box-sizing: border-box;
height: 100%;
.components-item {
display: inline-block;
width: 48%;
margin: 1%;
transition: transform 0ms !important;
}
}
.components-draggable {
padding-bottom: 20px;
}
.components-title {
font-size: 14px;
color: #222;
margin: 6px 2px;
.svg-icon {
color: #666;
font-size: 18px;
}
}
.components-body {
padding: 8px 10px;
background: $selectedColor;
font-size: 12px;
cursor: move;
border: 1px dashed $selectedColor;
border-radius: 3px;
.svg-icon {
color: #777;
font-size: 15px;
}
&:hover {
border: 1px dashed #787be8;
color: #787be8;
.svg-icon {
color: #787be8;
}
}
}
.left-board {
width: 260px;
position: absolute;
left: 0;
top: 0;
height: 100vh;
}
.left-scrollbar {
height: calc(100vh - 42px);
overflow: hidden;
}
.center-scrollbar {
height: calc(100vh - 42px);
overflow: hidden;
border-left: 1px solid #f1e8e8;
border-right: 1px solid #f1e8e8;
box-sizing: border-box;
}
.center-board {
height: 100vh;
width: auto;
margin: 0 350px 0 260px;
box-sizing: border-box;
}
.empty-info {
position: absolute;
top: 46%;
left: 0;
right: 0;
text-align: center;
font-size: 18px;
color: #ccb1ea;
letter-spacing: 4px;
}
.action-bar {
position: relative;
height: 42px;
text-align: right;
padding: 0 15px;
box-sizing: border-box;;
border: 1px solid #f1e8e8;
border-top: none;
border-left: none;
.delete-btn {
color: #F56C6C;
}
}
.logo-wrapper {
position: relative;
height: 42px;
background: #fff;
border-bottom: 1px solid #f1e8e8;
box-sizing: border-box;
}
.logo {
position: absolute;
left: 12px;
top: 6px;
line-height: 30px;
color: #00afff;
font-weight: 600;
font-size: 17px;
white-space: nowrap;
> img {
width: 30px;
height: 30px;
vertical-align: top;
}
.github {
display: inline-block;
vertical-align: sub;
margin-left: 15px;
> img {
height: 22px;
}
}
}
.center-board-row {
padding: 12px 12px 15px 12px;
box-sizing: border-box;
& > .el-form {
// 69 = 12+15+42
height: calc(100vh - 69px);
}
}
.drawing-board {
height: 100%;
position: relative;
.components-body {
padding: 0;
margin: 0;
font-size: 0;
}
.sortable-ghost {
position: relative;
display: block;
overflow: hidden;
&::before {
content: " ";
position: absolute;
left: 0;
right: 0;
top: 0;
height: 3px;
background: rgb(89, 89, 223);
z-index: 2;
}
}
.components-item.sortable-ghost {
width: 100%;
height: 60px;
background-color: $selectedColor;
}
.active-from-item {
& > .el-form-item {
background: $selectedColor;
border-radius: 6px;
}
& > .drawing-item-copy, & > .drawing-item-delete {
display: initial;
}
& > .component-name {
color: $lighterBlue;
}
}
.el-form-item {
margin-bottom: 15px;
}
}
.drawing-item {
position: relative;
cursor: move;
&.unfocus-bordered:not(.activeFromItem) > div:first-child {
border: 1px dashed #ccc;
}
.el-form-item {
padding: 12px 10px;
}
}
.drawing-row-item {
position: relative;
cursor: move;
box-sizing: border-box;
border: 1px dashed #ccc;
border-radius: 3px;
padding: 0 2px;
margin-bottom: 15px;
.drawing-row-item {
margin-bottom: 2px;
}
.el-col {
margin-top: 22px;
}
.el-form-item {
margin-bottom: 0;
}
.drag-wrapper {
min-height: 80px;
}
&.active-from-item {
border: 1px dashed $lighterBlue;
}
.component-name {
position: absolute;
top: 0;
left: 0;
font-size: 12px;
color: #bbb;
display: inline-block;
padding: 0 6px;
}
}
.drawing-item, .drawing-row-item {
&:hover {
& > .el-form-item {
background: $selectedColor;
border-radius: 6px;
}
& > .drawing-item-copy, & > .drawing-item-delete {
display: initial;
}
}
& > .drawing-item-copy, & > .drawing-item-delete {
display: none;
position: absolute;
top: -10px;
width: 22px;
height: 22px;
line-height: 22px;
text-align: center;
border-radius: 50%;
font-size: 12px;
border: 1px solid;
cursor: pointer;
z-index: 1;
}
& > .drawing-item-copy {
right: 56px;
border-color: $lighterBlue;
color: $lighterBlue;
background: #fff;
&:hover {
background: $lighterBlue;
color: #fff;
}
}
& > .drawing-item-delete {
right: 24px;
border-color: #F56C6C;
color: #F56C6C;
background: #fff;
&:hover {
background: #F56C6C;
color: #fff;
}
}
}
</style>

View File

@ -1,60 +0,0 @@
<template>
<el-form ref="basicInfoForm" :model="info" :rules="rules" label-width="150px">
<el-row>
<el-col :span="12">
<el-form-item label="表名称" prop="tableName">
<el-input v-model="info.tableName" placeholder="请输入仓库名称"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="表描述" prop="tableComment">
<el-input v-model="info.tableComment" placeholder="请输入"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实体类名称" prop="className">
<el-input v-model="info.className" placeholder="请输入"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="作者" prop="functionAuthor">
<el-input v-model="info.functionAuthor" placeholder="请输入"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="info.remark" :rows="3" type="textarea"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<script>
export default {
props: {
info: {
type: Object,
default: null
}
},
data() {
return {
rules: {
tableName: [
{required: true, message: "请输入表名称", trigger: "blur"}
],
tableComment: [
{required: true, message: "请输入表描述", trigger: "blur"}
],
className: [
{required: true, message: "请输入实体类名称", trigger: "blur"}
],
functionAuthor: [
{required: true, message: "请输入作者", trigger: "blur"}
]
}
};
}
};
</script>

View File

@ -1,234 +0,0 @@
<template>
<el-card>
<el-tabs v-model="activeName">
<el-tab-pane label="基本信息" name="basic">
<basic-info-form ref="basicInfo" :info="info"/>
</el-tab-pane>
<el-tab-pane label="字段信息" name="columnInfo">
<el-table ref="dragTable" :data="columns" :max-height="tableHeight" row-key="columnId">
<el-table-column class-name="allowDrag" label="序号" min-width="5%" type="index"/>
<el-table-column
:show-overflow-tooltip="true"
label="字段列名"
min-width="10%"
prop="columnName"
/>
<el-table-column label="字段描述" min-width="10%">
<template slot-scope="scope">
<el-input v-model="scope.row.columnComment"></el-input>
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="物理类型"
min-width="10%"
prop="columnType"
/>
<el-table-column label="Java类型" min-width="11%">
<template slot-scope="scope">
<el-select v-model="scope.row.javaType">
<el-option label="Long" value="Long"/>
<el-option label="String" value="String"/>
<el-option label="Integer" value="Integer"/>
<el-option label="Double" value="Double"/>
<el-option label="BigDecimal" value="BigDecimal"/>
<el-option label="Date" value="Date"/>
<el-option label="Boolean" value="Boolean"/>
</el-select>
</template>
</el-table-column>
<el-table-column label="java属性" min-width="10%">
<template slot-scope="scope">
<el-input v-model="scope.row.javaField"></el-input>
</template>
</el-table-column>
<el-table-column label="插入" min-width="5%">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isInsert" false-label="0" true-label="1"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="编辑" min-width="5%">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isEdit" false-label="0" true-label="1"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="列表" min-width="5%">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isList" false-label="0" true-label="1"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="查询" min-width="5%">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isQuery" false-label="0" true-label="1"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="查询方式" min-width="10%">
<template slot-scope="scope">
<el-select v-model="scope.row.queryType">
<el-option label="=" value="EQ"/>
<el-option label="!=" value="NE"/>
<el-option label=">" value="GT"/>
<el-option label=">=" value="GTE"/>
<el-option label="<" value="LT"/>
<el-option label="<=" value="LTE"/>
<el-option label="LIKE" value="LIKE"/>
<el-option label="BETWEEN" value="BETWEEN"/>
</el-select>
</template>
</el-table-column>
<el-table-column label="必填" min-width="5%">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isRequired" false-label="0" true-label="1"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="显示类型" min-width="12%">
<template slot-scope="scope">
<el-select v-model="scope.row.htmlType">
<el-option label="文本框" value="input"/>
<el-option label="文本域" value="textarea"/>
<el-option label="下拉框" value="select"/>
<el-option label="单选框" value="radio"/>
<el-option label="复选框" value="checkbox"/>
<el-option label="日期控件" value="datetime"/>
<el-option label="图片上传" value="imageUpload"/>
<el-option label="文件上传" value="fileUpload"/>
<el-option label="富文本控件" value="editor"/>
</el-select>
</template>
</el-table-column>
<el-table-column label="字典类型" min-width="12%">
<template slot-scope="scope">
<el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择">
<el-option
v-for="dict in dictOptions"
:key="dict.dictType"
:label="dict.dictName"
:value="dict.dictType">
<span style="float: left">{{ dict.dictName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ dict.dictType }}</span>
</el-option>
</el-select>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="生成信息" name="genInfo">
<gen-info-form ref="genInfo" :info="info" :menus="menus" :tables="tables"/>
</el-tab-pane>
</el-tabs>
<el-form label-width="100px">
<el-form-item style="text-align: center;margin-left:-100px;margin-top:10px;">
<el-button type="primary" @click="submitForm()"></el-button>
<el-button @click="close()"></el-button>
</el-form-item>
</el-form>
</el-card>
</template>
<script>
import {getGenTable, updateGenTable} from "@/api/tool/gen";
import {optionselect as getDictOptionselect} from "@/api/system/dict/type";
import {listMenu as getMenuTreeselect} from "@/api/system/menu";
import basicInfoForm from "./basicInfoForm";
import genInfoForm from "./genInfoForm";
import Sortable from 'sortablejs'
export default {
name: "GenEdit",
components: {
basicInfoForm,
genInfoForm
},
data() {
return {
// name
activeName: "columnInfo",
//
tableHeight: document.documentElement.scrollHeight - 245 + "px",
//
tables: [],
//
columns: [],
//
dictOptions: [],
//
menus: [],
//
info: {}
};
},
created() {
const tableId = this.$route.params && this.$route.params.tableId;
if (tableId) {
//
getGenTable(tableId).then(res => {
this.columns = res.data.rows;
this.info = res.data.info;
this.tables = res.data.tables;
});
/** 查询字典下拉列表 */
getDictOptionselect().then(response => {
this.dictOptions = response.data;
});
/** 查询菜单下拉列表 */
getMenuTreeselect().then(response => {
this.menus = this.handleTree(response.data, "menuId");
});
}
},
methods: {
/** 提交按钮 */
submitForm() {
const basicForm = this.$refs.basicInfo.$refs.basicInfoForm;
const genForm = this.$refs.genInfo.$refs.genInfoForm;
Promise.all([basicForm, genForm].map(this.getFormPromise)).then(res => {
const validateResult = res.data.every(item => !!item);
if (validateResult) {
const genTable = Object.assign({}, basicForm.model, genForm.model);
genTable.columns = this.columns;
genTable.params = {
treeCode: genTable.treeCode,
treeName: genTable.treeName,
treeParentCode: genTable.treeParentCode,
parentMenuId: genTable.parentMenuId
};
updateGenTable(genTable).then(res => {
this.$modal.msgSuccess(res.data.msg);
if (res.code === 200) {
this.close();
}
});
} else {
this.$modal.msgError("表单校验未通过,请重新检查提交内容");
}
});
},
getFormPromise(form) {
return new Promise(resolve => {
form.validate(res => {
resolve(res);
});
});
},
/** 关闭按钮 */
close() {
const obj = {path: "/tool/gen", query: {t: Date.now(), pageNum: this.$route.query.pageNum}};
this.$tab.closeOpenPage(obj);
}
},
mounted() {
const el = this.$refs.dragTable.$el.querySelectorAll(".el-table__body-wrapper > table > tbody")[0];
const sortable = Sortable.create(el, {
handle: ".allowDrag",
onEnd: evt => {
const targetRow = this.columns.splice(evt.oldIndex, 1)[0];
this.columns.splice(evt.newIndex, 0, targetRow);
for (let index in this.columns) {
this.columns[index].sort = parseInt(index) + 1;
}
}
});
}
};
</script>

View File

@ -1,300 +0,0 @@
<template>
<el-form ref="genInfoForm" :model="info" :rules="rules" label-width="150px">
<el-row>
<el-col :span="12">
<el-form-item prop="tplCategory">
<span slot="label">生成模板</span>
<el-select v-model="info.tplCategory" @change="tplSelectChange">
<el-option label="单表(增删改查)" value="crud"/>
<el-option label="树表(增删改查)" value="tree"/>
<el-option label="主子表(增删改查)" value="sub"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="packageName">
<span slot="label">
生成包路径
<el-tooltip content="生成在哪个java包下例如 com.muyu.system" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-input v-model="info.packageName"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="moduleName">
<span slot="label">
生成模块名
<el-tooltip content="可理解为子系统名,例如 system" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-input v-model="info.moduleName"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="businessName">
<span slot="label">
生成业务名
<el-tooltip content="可理解为功能英文名,例如 user" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-input v-model="info.businessName"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="functionName">
<span slot="label">
生成功能名
<el-tooltip content="用作类描述,例如 用户" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-input v-model="info.functionName"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item>
<span slot="label">
上级菜单
<el-tooltip content="分配到指定菜单下,例如 系统管理" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<treeselect
v-model="info.parentMenuId"
:append-to-body="true"
:normalizer="normalizer"
:options="menus"
:show-count="true"
placeholder="请选择系统菜单"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="genType">
<span slot="label">
生成代码方式
<el-tooltip content="默认为zip压缩包下载也可以自定义生成路径" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-radio v-model="info.genType" label="0">zip</el-radio>
<el-radio v-model="info.genType" label="1"></el-radio>
</el-form-item>
</el-col>
<el-col v-if="info.genType == '1'" :span="24">
<el-form-item prop="genPath">
<span slot="label">
自定义路径
<el-tooltip content="填写磁盘绝对路径若不填写则生成到当前Web项目下" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-input v-model="info.genPath">
<el-dropdown slot="append">
<el-button type="primary">
最近路径快速选择
<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="info.genPath = '/'">恢复默认的生成基础路径</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="info.tplCategory == 'tree'">
<h4 class="form-header">其他信息</h4>
<el-col :span="12">
<el-form-item>
<span slot="label">
树编码字段
<el-tooltip content="树显示的编码字段名, 如dept_id" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-select v-model="info.treeCode" placeholder="请选择">
<el-option
v-for="(column, index) in info.columns"
:key="index"
:label="column.columnName + '' + column.columnComment"
:value="column.columnName"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item>
<span slot="label">
树父编码字段
<el-tooltip content="树显示的父编码字段名, 如parent_Id" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-select v-model="info.treeParentCode" placeholder="请选择">
<el-option
v-for="(column, index) in info.columns"
:key="index"
:label="column.columnName + '' + column.columnComment"
:value="column.columnName"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item>
<span slot="label">
树名称字段
<el-tooltip content="树节点的显示名称字段名, 如dept_name" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-select v-model="info.treeName" placeholder="请选择">
<el-option
v-for="(column, index) in info.columns"
:key="index"
:label="column.columnName + '' + column.columnComment"
:value="column.columnName"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="info.tplCategory == 'sub'">
<h4 class="form-header">关联信息</h4>
<el-col :span="12">
<el-form-item>
<span slot="label">
关联子表的表名
<el-tooltip content="关联子表的表名, 如sys_user" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange">
<el-option
v-for="(table, index) in tables"
:key="index"
:label="table.tableName + '' + table.tableComment"
:value="table.tableName"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item>
<span slot="label">
子表关联的外键名
<el-tooltip content="子表关联的外键名, 如user_id" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-select v-model="info.subTableFkName" placeholder="请选择">
<el-option
v-for="(column, index) in subColumns"
:key="index"
:label="column.columnName + '' + column.columnComment"
:value="column.columnName"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<script>
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
components: {Treeselect},
props: {
info: {
type: Object,
default: null
},
tables: {
type: Array,
default: null
},
menus: {
type: Array,
default: []
},
},
data() {
return {
subColumns: [],
rules: {
tplCategory: [
{required: true, message: "请选择生成模板", trigger: "blur"}
],
packageName: [
{required: true, message: "请输入生成包路径", trigger: "blur"}
],
moduleName: [
{required: true, message: "请输入生成模块名", trigger: "blur"}
],
businessName: [
{required: true, message: "请输入生成业务名", trigger: "blur"}
],
functionName: [
{required: true, message: "请输入生成功能名", trigger: "blur"}
],
}
};
},
created() {
},
watch: {
'info.subTableName': function (val) {
this.setSubTableColumns(val);
}
},
methods: {
/** 转换菜单数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.menuId,
label: node.menuName,
children: node.children
};
},
/** 选择子表名触发 */
subSelectChange(value) {
this.info.subTableFkName = '';
},
/** 选择生成模板触发 */
tplSelectChange(value) {
if (value !== 'sub') {
this.info.subTableName = '';
this.info.subTableFkName = '';
}
},
/** 设置关联外键 */
setSubTableColumns(value) {
for (var item in this.tables) {
const name = this.tables[item].tableName;
if (value === name) {
this.subColumns = this.tables[item].columns;
break;
}
}
}
}
};
</script>

View File

@ -1,118 +0,0 @@
<template>
<!-- 导入表 -->
<el-dialog :visible.sync="visible" append-to-body title="导入表" top="5vh" width="800px">
<el-form ref="queryForm" :inline="true" :model="queryParams" size="small">
<el-form-item label="表名称" prop="tableName">
<el-input
v-model="queryParams.tableName"
clearable
placeholder="请输入表名称"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="表描述" prop="tableComment">
<el-input
v-model="queryParams.tableComment"
clearable
placeholder="请输入表描述"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row>
<el-table ref="table" :data="dbTableList" height="260px" @row-click="clickRow"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column :show-overflow-tooltip="true" label="表名称" prop="tableName"></el-table-column>
<el-table-column :show-overflow-tooltip="true" label="表描述" prop="tableComment"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="更新时间" prop="updateTime"></el-table-column>
</el-table>
<pagination
v-show="total>0"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum"
:total="total"
@pagination="getList"
/>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleImportTable"> </el-button>
<el-button @click="visible = false"> </el-button>
</div>
</el-dialog>
</template>
<script>
import {importTable, listDbTable} from "@/api/tool/gen";
export default {
data() {
return {
//
visible: false,
//
tables: [],
//
total: 0,
//
dbTableList: [],
//
queryParams: {
pageNum: 1,
pageSize: 10,
tableName: undefined,
tableComment: undefined
}
};
},
methods: {
//
show() {
this.getList();
this.visible = true;
},
clickRow(row) {
this.$refs.table.toggleRowSelection(row);
},
//
handleSelectionChange(selection) {
this.tables = selection.map(item => item.tableName);
},
//
getList() {
listDbTable(this.queryParams).then(res => {
this.dbTableList = res.data.rows;
this.total = res.data.total;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 导入按钮操作 */
handleImportTable() {
const tableNames = this.tables.join(",");
if (tableNames == "") {
this.$modal.msgError("请选择要导入的表");
return;
}
importTable({tables: tableNames}).then(res => {
this.$modal.msgSuccess(res.data.msg);
this.visible = false;
this.$emit("ok");
});
}
}
};
</script>

View File

@ -1,352 +0,0 @@
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px" size="small">
<el-form-item label="表名称" prop="tableName">
<el-input
v-model="queryParams.tableName"
clearable
placeholder="请输入表名称"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="表描述" prop="tableComment">
<el-input
v-model="queryParams.tableComment"
clearable
placeholder="请输入表描述"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 240px"
type="daterange"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['tool:gen:code']"
icon="el-icon-download"
plain
size="mini"
type="primary"
@click="handleGenTable"
>生成
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['tool:gen:import']"
icon="el-icon-upload"
plain
size="mini"
type="info"
@click="openImportTable"
>导入
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['tool:gen:edit']"
:disabled="single"
icon="el-icon-edit"
plain
size="mini"
type="success"
@click="handleEditTable"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['tool:gen:remove']"
:disabled="multiple"
icon="el-icon-delete"
plain
size="mini"
type="danger"
@click="handleDelete"
>删除
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"></el-table-column>
<el-table-column align="center" label="序号" type="index" width="50">
<template slot-scope="scope">
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
align="center"
label="表名称"
prop="tableName"
width="120"
/>
<el-table-column
:show-overflow-tooltip="true"
align="center"
label="表描述"
prop="tableComment"
width="120"
/>
<el-table-column
:show-overflow-tooltip="true"
align="center"
label="实体"
prop="className"
width="120"
/>
<el-table-column align="center" label="创建时间" prop="createTime" width="160"/>
<el-table-column align="center" label="更新时间" prop="updateTime" width="160"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template slot-scope="scope">
<el-button
v-hasPermi="['tool:gen:preview']"
icon="el-icon-view"
size="small"
type="text"
@click="handlePreview(scope.row)"
>预览
</el-button>
<el-button
v-hasPermi="['tool:gen:edit']"
icon="el-icon-edit"
size="small"
type="text"
@click="handleEditTable(scope.row)"
>编辑
</el-button>
<el-button
v-hasPermi="['tool:gen:remove']"
icon="el-icon-delete"
size="small"
type="text"
@click="handleDelete(scope.row)"
>删除
</el-button>
<el-button
v-hasPermi="['tool:gen:edit']"
icon="el-icon-refresh"
size="small"
type="text"
@click="handleSynchDb(scope.row)"
>同步
</el-button>
<el-button
v-hasPermi="['tool:gen:code']"
icon="el-icon-download"
size="small"
type="text"
@click="handleGenTable(scope.row)"
>生成代码
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum"
:total="total"
@pagination="getList"
/>
<!-- 预览界面 -->
<el-dialog :title="preview.title" :visible.sync="preview.open" append-to-body class="scrollbar" top="5vh"
width="80%">
<el-tabs v-model="preview.activeName">
<el-tab-pane
v-for="(value, key) in preview.data"
:key="key"
:label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
:name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
>
<el-link v-clipboard:copy="value" v-clipboard:success="clipboardSuccess" :underline="false"
icon="el-icon-document-copy" style="float:right">复制
</el-link>
<pre><code class="hljs" v-html="highlightedCode(value, key)"></code></pre>
</el-tab-pane>
</el-tabs>
</el-dialog>
<import-table ref="import" @ok="handleQuery"/>
</div>
</template>
<script>
import {delTable, genCode, listTable, previewTable, synchDb} from "@/api/tool/gen";
import importTable from "./importTable";
import hljs from "highlight.js/lib/highlight";
import "highlight.js/styles/github-gist.css";
hljs.registerLanguage("java", require("highlight.js/lib/languages/java"));
hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"));
hljs.registerLanguage("html", require("highlight.js/lib/languages/xml"));
hljs.registerLanguage("vue", require("highlight.js/lib/languages/xml"));
hljs.registerLanguage("javascript", require("highlight.js/lib/languages/javascript"));
hljs.registerLanguage("sql", require("highlight.js/lib/languages/sql"));
export default {
name: "Gen",
components: {importTable},
data() {
return {
//
loading: true,
//
uniqueId: "",
//
ids: [],
//
tableNames: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
tableList: [],
//
dateRange: "",
//
queryParams: {
pageNum: 1,
pageSize: 10,
tableName: undefined,
tableComment: undefined
},
//
preview: {
open: false,
title: "代码预览",
data: {},
activeName: "domain.java"
}
};
},
created() {
this.getList();
},
activated() {
const time = this.$route.query.t;
if (time != null && time != this.uniqueId) {
this.uniqueId = time;
this.queryParams.pageNum = Number(this.$route.query.pageNum);
this.getList();
}
},
methods: {
/** 查询表集合 */
getList() {
this.loading = true;
listTable(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.tableList = response.data.rows;
this.total = response.data.total;
this.loading = false;
}
);
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 生成代码操作 */
handleGenTable(row) {
const tableNames = row.tableName || this.tableNames;
if (tableNames == "") {
this.$modal.msgError("请选择要生成的数据");
return;
}
if (row.genType === "1") {
genCode(row.tableName).then(response => {
this.$modal.msgSuccess("成功生成到自定义路径:" + row.genPath);
});
} else {
this.$download.zip("/code/gen/batchGenCode?tables=" + tableNames, "muyu.zip");
}
},
/** 同步数据库操作 */
handleSynchDb(row) {
const tableName = row.tableName;
this.$modal.confirm('确认要强制同步"' + tableName + '"表结构吗?').then(function () {
return synchDb(tableName);
}).then(() => {
this.$modal.msgSuccess("同步成功");
}).catch(() => {
});
},
/** 打开导入表弹窗 */
openImportTable() {
this.$refs.import.show();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
/** 预览按钮 */
handlePreview(row) {
previewTable(row.tableId).then(response => {
this.preview.data = response.data;
this.preview.open = true;
this.preview.activeName = "domain.java";
});
},
/** 高亮显示 */
highlightedCode(code, key) {
const vmName = key.substring(key.lastIndexOf("/") + 1, key.indexOf(".vm"));
var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length);
const result = hljs.highlight(language, code || "", true);
return result.value || '&nbsp;';
},
/** 复制代码成功 */
clipboardSuccess() {
this.$modal.msgSuccess("复制成功");
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.tableId);
this.tableNames = selection.map(item => item.tableName);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
/** 修改按钮操作 */
handleEditTable(row) {
const tableId = row.tableId || this.ids[0];
const tableName = row.tableName || this.tableNames[0];
const params = {pageNum: this.queryParams.pageNum};
this.$tab.openPage("修改[" + tableName + "]生成配置", '/tool/gen-edit/index/' + tableId, params);
},
/** 删除按钮操作 */
handleDelete(row) {
const tableIds = row.tableId || this.ids;
this.$modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项?').then(function () {
return delTable(tableIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
}
}
};
</script>

View File

@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
const name = process.env.VUE_APP_TITLE || '智能车联管理系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口