From 7e79c4f249b6da5b0176c1d23c4e8d513f063bdd Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 24 五月 2021 11:34:03 +0800
Subject: [PATCH] 生成vue模板导出按钮点击后添加遮罩
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java | 15 +++++--
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 7 +++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java | 79 ++++++++++++++++++++++++++-------------
3 files changed, 69 insertions(+), 32 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
index 6f9577f..0256511 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
@@ -5,13 +5,15 @@
*
* @author ruoyi
*/
-public class IdUtils {
+public class IdUtils
+{
/**
* 鑾峰彇闅忔満UUID
*
* @return 闅忔満UUID
*/
- public static String randomUUID() {
+ public static String randomUUID()
+ {
return UUID.randomUUID().toString();
}
@@ -20,7 +22,8 @@
*
* @return 绠�鍖栫殑UUID锛屽幓鎺変簡妯嚎
*/
- public static String simpleUUID() {
+ public static String simpleUUID()
+ {
return UUID.randomUUID().toString(true);
}
@@ -29,7 +32,8 @@
*
* @return 闅忔満UUID
*/
- public static String fastUUID() {
+ public static String fastUUID()
+ {
return UUID.fastUUID().toString();
}
@@ -38,7 +42,8 @@
*
* @return 绠�鍖栫殑UUID锛屽幓鎺変簡妯嚎
*/
- public static String fastSimpleUUID() {
+ public static String fastSimpleUUID()
+ {
return UUID.fastUUID().toString(true);
}
}
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index cbf3e64..501f2f6 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -108,6 +108,7 @@
plain
icon="el-icon-download"
size="mini"
+ :loading="exportLoading"
@click="handleExport"
v-hasPermi="['${moduleName}:${businessName}:export']"
>瀵煎嚭</el-button>
@@ -354,6 +355,8 @@
return {
// 閬僵灞�
loading: true,
+ // 瀵煎嚭閬僵灞�
+ exportLoading: false,
// 閫変腑鏁扮粍
ids: [],
#if($table.sub)
@@ -630,10 +633,12 @@
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return export${BusinessName}(queryParams);
}).then(response => {
this.download(response.msg);
+ this.exportLoading = false;
})
}
}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
index 9fca0c7..4776e5f 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
@@ -18,7 +18,8 @@
*
* @author ruoyi
*/
-public class SysJob extends BaseEntity {
+public class SysJob extends BaseEntity
+{
private static final long serialVersionUID = 1L;
/** 浠诲姟ID */
@@ -53,92 +54,118 @@
@Excel(name = "浠诲姟鐘舵��", readConverterExp = "0=姝ｅ父,1=鏆傚仠")
private String status;
- public Long getJobId() {
+ public Long getJobId()
+ {
return jobId;
}
- public void setJobId(Long jobId) {
+ public void setJobId(Long jobId)
+ {
this.jobId = jobId;
}
@NotBlank(message = "浠诲姟鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 64, message = "浠诲姟鍚嶇О涓嶈兘瓒呰繃64涓瓧绗�")
- public String getJobName() {
+ public String getJobName()
+ {
return jobName;
}
- public void setJobName(String jobName) {
+ public void setJobName(String jobName)
+ {
this.jobName = jobName;
}
- public String getJobGroup() {
+ public String getJobGroup()
+ {
return jobGroup;
}
- public void setJobGroup(String jobGroup) {
+ public void setJobGroup(String jobGroup)
+ {
this.jobGroup = jobGroup;
}
@NotBlank(message = "璋冪敤鐩爣瀛楃涓蹭笉鑳戒负绌�")
@Size(min = 0, max = 500, message = "璋冪敤鐩爣瀛楃涓查暱搴︿笉鑳借秴杩�500涓瓧绗�")
- public String getInvokeTarget() {
+ public String getInvokeTarget()
+ {
return invokeTarget;
}
- public void setInvokeTarget(String invokeTarget) {
+ public void setInvokeTarget(String invokeTarget)
+ {
this.invokeTarget = invokeTarget;
}
@NotBlank(message = "Cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌�")
@Size(min = 0, max = 255, message = "Cron鎵ц琛ㄨ揪寮忎笉鑳借秴杩�255涓瓧绗�")
- public String getCronExpression() {
+ public String getCronExpression()
+ {
return cronExpression;
}
- public void setCronExpression(String cronExpression) {
+ public void setCronExpression(String cronExpression)
+ {
this.cronExpression = cronExpression;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date getNextValidTime() {
- if (StringUtils.isNotEmpty(cronExpression)) {
+ public Date getNextValidTime()
+ {
+ if (StringUtils.isNotEmpty(cronExpression))
+ {
return CronUtils.getNextExecution(cronExpression);
}
return null;
}
- public String getMisfirePolicy() {
+ public String getMisfirePolicy()
+ {
return misfirePolicy;
}
- public void setMisfirePolicy(String misfirePolicy) {
+ public void setMisfirePolicy(String misfirePolicy)
+ {
this.misfirePolicy = misfirePolicy;
}
- public String getConcurrent() {
+ public String getConcurrent()
+ {
return concurrent;
}
- public void setConcurrent(String concurrent) {
+ public void setConcurrent(String concurrent)
+ {
this.concurrent = concurrent;
}
- public String getStatus() {
+ public String getStatus()
+ {
return status;
}
- public void setStatus(String status) {
+ public void setStatus(String status)
+ {
this.status = status;
}
@Override
public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("jobId", getJobId())
- .append("jobName", getJobName()).append("jobGroup", getJobGroup())
- .append("cronExpression", getCronExpression()).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();
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("jobId", getJobId())
+ .append("jobName", getJobName())
+ .append("jobGroup", getJobGroup())
+ .append("cronExpression", getCronExpression())
+ .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();
}
}
--
Gitblit v1.9.3