wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

生成vue模板导出按钮点击后添加遮罩

This commit is contained in:
RuoYi 2021-05-24 11:34:03 +08:00
parent 504638eb41
commit 7e79c4f249
3 changed files with 69 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
View File

@ -5,13 +5,15 @@ package com.ruoyi.common.utils.uuid;
* *
* @author ruoyi * @author ruoyi
*/ */
public class IdUtils { public class IdUtils
{
/** /**
* 获取随机UUID * 获取随机UUID
* *
* @return 随机UUID * @return 随机UUID
*/ */
public static String randomUUID() { public static String randomUUID()
{
return UUID.randomUUID().toString(); return UUID.randomUUID().toString();
} }
@ -20,7 +22,8 @@ public class IdUtils {
* *
* @return 简化的UUID，去掉了横线 * @return 简化的UUID，去掉了横线
*/ */
public static String simpleUUID() { public static String simpleUUID()
{
return UUID.randomUUID().toString(true); return UUID.randomUUID().toString(true);
} }
@ -29,7 +32,8 @@ public class IdUtils {
* *
* @return 随机UUID * @return 随机UUID
*/ */
public static String fastUUID() { public static String fastUUID()
{
return UUID.fastUUID().toString(); return UUID.fastUUID().toString();
} }
@ -38,7 +42,8 @@ public class IdUtils {
* *
* @return 简化的UUID，去掉了横线 * @return 简化的UUID，去掉了横线
*/ */
public static String fastSimpleUUID() { public static String fastSimpleUUID()
{
return UUID.fastUUID().toString(true); return UUID.fastUUID().toString(true);
} }
} }

7
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -108,6 +108,7 @@
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
:loading="exportLoading"
@click="handleExport" @click="handleExport"
v-hasPermi="['${moduleName}:${businessName}:export']" v-hasPermi="['${moduleName}:${businessName}:export']"
>导出</el-button> >导出</el-button>
@ -354,6 +355,8 @@ export default {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 导出遮罩层
exportLoading: false,
// 选中数组 // 选中数组
ids: [], ids: [],
#if($table.sub) #if($table.sub)
@ -630,10 +633,12 @@ export default {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(function() { }).then(() => {
this.exportLoading = true;
return export${BusinessName}(queryParams); return export${BusinessName}(queryParams);
}).then(response => { }).then(response => {
this.download(response.msg); this.download(response.msg);
this.exportLoading = false;
}) })
} }
} }

77
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
View File

@ -18,7 +18,8 @@ import com.ruoyi.quartz.util.CronUtils;
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysJob extends BaseEntity { public class SysJob extends BaseEntity
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 任务ID */ /** 任务ID */
@ -53,92 +54,118 @@ public class SysJob extends BaseEntity {
@Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停") @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
private String status; private String status;
public Long getJobId() { public Long getJobId()
{
return jobId; return jobId;
} }
public void setJobId(Long jobId) { public void setJobId(Long jobId)
{
this.jobId = jobId; this.jobId = jobId;
} }
@NotBlank(message = "任务名称不能为空") @NotBlank(message = "任务名称不能为空")
@Size(min = 0, max = 64, message = "任务名称不能超过64个字符") @Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
public String getJobName() { public String getJobName()
{
return jobName; return jobName;
} }
public void setJobName(String jobName) { public void setJobName(String jobName)
{
this.jobName = jobName; this.jobName = jobName;
} }
public String getJobGroup() { public String getJobGroup()
{
return jobGroup; return jobGroup;
} }
public void setJobGroup(String jobGroup) { public void setJobGroup(String jobGroup)
{
this.jobGroup = jobGroup; this.jobGroup = jobGroup;
} }
@NotBlank(message = "调用目标字符串不能为空") @NotBlank(message = "调用目标字符串不能为空")
@Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符") @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
public String getInvokeTarget() { public String getInvokeTarget()
{
return invokeTarget; return invokeTarget;
} }
public void setInvokeTarget(String invokeTarget) { public void setInvokeTarget(String invokeTarget)
{
this.invokeTarget = invokeTarget; this.invokeTarget = invokeTarget;
} }
@NotBlank(message = "Cron执行表达式不能为空") @NotBlank(message = "Cron执行表达式不能为空")
@Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符") @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
public String getCronExpression() { public String getCronExpression()
{
return cronExpression; return cronExpression;
} }
public void setCronExpression(String cronExpression) { public void setCronExpression(String cronExpression)
{
this.cronExpression = cronExpression; this.cronExpression = cronExpression;
} }
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date getNextValidTime() { public Date getNextValidTime()
if (StringUtils.isNotEmpty(cronExpression)) { {
if (StringUtils.isNotEmpty(cronExpression))
{
return CronUtils.getNextExecution(cronExpression); return CronUtils.getNextExecution(cronExpression);
} }
return null; return null;
} }
public String getMisfirePolicy() { public String getMisfirePolicy()
{
return misfirePolicy; return misfirePolicy;
} }
public void setMisfirePolicy(String misfirePolicy) { public void setMisfirePolicy(String misfirePolicy)
{
this.misfirePolicy = misfirePolicy; this.misfirePolicy = misfirePolicy;
} }
public String getConcurrent() { public String getConcurrent()
{
return concurrent; return concurrent;
} }
public void setConcurrent(String concurrent) { public void setConcurrent(String concurrent)
{
this.concurrent = concurrent; this.concurrent = concurrent;
} }
public String getStatus() { public String getStatus()
{
return status; return status;
} }
public void setStatus(String status) { public void setStatus(String status)
{
this.status = status; this.status = status;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("jobId", getJobId()) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("jobName", getJobName()).append("jobGroup", getJobGroup()) .append("jobId", getJobId())
.append("cronExpression", getCronExpression()).append("nextValidTime", getNextValidTime()) .append("jobName", getJobName())
.append("misfirePolicy", getMisfirePolicy()).append("concurrent", getConcurrent()) .append("jobGroup", getJobGroup())
.append("status", getStatus()).append("createBy", getCreateBy()).append("createTime", getCreateTime()) .append("cronExpression", getCronExpression())
.append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()) .append("nextValidTime", getNextValidTime())
.append("misfirePolicy", getMisfirePolicy())
.append("concurrent", getConcurrent())
.append("status", getStatus())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString(); .toString();
} }
} }