From cd4119b26a65b1cf07face7ebd640e5292deaf5f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 08 Sep 2021 09:31:37 +0800
Subject: [PATCH] 修正单词拼写错误
---
ruoyi-ui/src/components/Crontab/index.vue | 142 +++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/ruoyi-ui/src/components/Crontab/index.vue b/ruoyi-ui/src/components/Crontab/index.vue
index 629bad7..27b4ab3 100644
--- a/ruoyi-ui/src/components/Crontab/index.vue
+++ b/ruoyi-ui/src/components/Crontab/index.vue
@@ -2,59 +2,59 @@
<div>
<el-tabs type="border-card">
<el-tab-pane label="秒" v-if="shouldHide('second')">
- <CrontabSecond @update="updateContabValue" :check="checkNumber" ref="cronsecond" />
+ <CrontabSecond @update="updateCrontabValue" :check="checkNumber" ref="cronsecond" />
</el-tab-pane>
<el-tab-pane label="分钟" v-if="shouldHide('min')">
<CrontabMin
- @update="updateContabValue"
+ @update="updateCrontabValue"
:check="checkNumber"
- :cron="contabValueObj"
+ :cron="crontabValueObj"
ref="cronmin"
/>
</el-tab-pane>
<el-tab-pane label="小时" v-if="shouldHide('hour')">
<CrontabHour
- @update="updateContabValue"
+ @update="updateCrontabValue"
:check="checkNumber"
- :cron="contabValueObj"
+ :cron="crontabValueObj"
ref="cronhour"
/>
</el-tab-pane>
<el-tab-pane label="日" v-if="shouldHide('day')">
<CrontabDay
- @update="updateContabValue"
+ @update="updateCrontabValue"
:check="checkNumber"
- :cron="contabValueObj"
+ :cron="crontabValueObj"
ref="cronday"
/>
</el-tab-pane>
- <el-tab-pane label="月" v-if="shouldHide('mouth')">
- <CrontabMouth
- @update="updateContabValue"
+ <el-tab-pane label="月" v-if="shouldHide('month')">
+ <CrontabMonth
+ @update="updateCrontabValue"
:check="checkNumber"
- :cron="contabValueObj"
- ref="cronmouth"
+ :cron="crontabValueObj"
+ ref="cronmonth"
/>
</el-tab-pane>
<el-tab-pane label="周" v-if="shouldHide('week')">
<CrontabWeek
- @update="updateContabValue"
+ @update="updateCrontabValue"
:check="checkNumber"
- :cron="contabValueObj"
+ :cron="crontabValueObj"
ref="cronweek"
/>
</el-tab-pane>
<el-tab-pane label="年" v-if="shouldHide('year')">
<CrontabYear
- @update="updateContabValue"
+ @update="updateCrontabValue"
:check="checkNumber"
- :cron="contabValueObj"
+ :cron="crontabValueObj"
ref="cronyear"
/>
</el-tab-pane>
@@ -70,33 +70,33 @@
</thead>
<tbody>
<td>
- <span>{{contabValueObj.second}}</span>
+ <span>{{crontabValueObj.second}}</span>
</td>
<td>
- <span>{{contabValueObj.min}}</span>
+ <span>{{crontabValueObj.min}}</span>
</td>
<td>
- <span>{{contabValueObj.hour}}</span>
+ <span>{{crontabValueObj.hour}}</span>
</td>
<td>
- <span>{{contabValueObj.day}}</span>
+ <span>{{crontabValueObj.day}}</span>
</td>
<td>
- <span>{{contabValueObj.mouth}}</span>
+ <span>{{crontabValueObj.month}}</span>
</td>
<td>
- <span>{{contabValueObj.week}}</span>
+ <span>{{crontabValueObj.week}}</span>
</td>
<td>
- <span>{{contabValueObj.year}}</span>
+ <span>{{crontabValueObj.year}}</span>
</td>
<td>
- <span>{{contabValueString}}</span>
+ <span>{{crontabValueString}}</span>
</td>
</tbody>
</table>
</div>
- <CrontabResult :ex="contabValueString"></CrontabResult>
+ <CrontabResult :ex="crontabValueString"></CrontabResult>
<div class="pop_btn">
<el-button size="small" type="primary" @click="submitFill">确定</el-button>
@@ -112,7 +112,7 @@
import CrontabMin from "./min.vue";
import CrontabHour from "./hour.vue";
import CrontabDay from "./day.vue";
-import CrontabMouth from "./mouth.vue";
+import CrontabMonth from "./month.vue";
import CrontabWeek from "./week.vue";
import CrontabYear from "./year.vue";
import CrontabResult from "./result.vue";
@@ -123,12 +123,12 @@
tabTitles: ["秒", "分钟", "小时", "日", "月", "周", "年"],
tabActive: 0,
myindex: 0,
- contabValueObj: {
+ crontabValueObj: {
second: "*",
min: "*",
hour: "*",
day: "*",
- mouth: "*",
+ month: "*",
week: "?",
year: "",
},
@@ -142,7 +142,7 @@
return true;
},
resolveExp() {
- //反解析 表达式
+ // 反解析 表达式
if (this.expression) {
let arr = this.expression.split(" ");
if (arr.length >= 6) {
@@ -152,11 +152,11 @@
min: arr[1],
hour: arr[2],
day: arr[3],
- mouth: arr[4],
+ month: arr[4],
week: arr[5],
year: arr[6] ? arr[6] : "",
};
- this.contabValueObj = {
+ this.crontabValueObj = {
...obj,
};
for (let i in obj) {
@@ -164,7 +164,7 @@
}
}
} else {
- //没有传入的表达式 则还原
+ // 没有传入的表达式 则还原
this.clearCron();
}
},
@@ -173,122 +173,122 @@
this.tabActive = index;
},
// 由子组件触发，更改表达式组成的字段值
- updateContabValue(name, value, from) {
- "updateContabValue", name, value, from;
- this.contabValueObj[name] = value;
+ updateCrontabValue(name, value, from) {
+ "updateCrontabValue", name, value, from;
+ this.crontabValueObj[name] = value;
if (from && from !== name) {
console.log(`来自组件 ${from} 改变了 ${name} ${value}`);
this.changeRadio(name, value);
}
},
- //赋值到组件
+ // 赋值到组件
changeRadio(name, value) {
- let arr = ["second", "min", "hour", "mouth"],
+ let arr = ["second", "min", "hour", "month"],
refName = "cron" + name,
- insVlaue;
+ insValue;
if (!this.$refs[refName]) return;
if (arr.includes(name)) {
if (value === "*") {
- insVlaue = 1;
+ insValue = 1;
} else if (value.indexOf("-") > -1) {
let indexArr = value.split("-");
isNaN(indexArr[0])
? (this.$refs[refName].cycle01 = 0)
: (this.$refs[refName].cycle01 = indexArr[0]);
this.$refs[refName].cycle02 = indexArr[1];
- insVlaue = 2;
+ insValue = 2;
} else if (value.indexOf("/") > -1) {
let indexArr = value.split("/");
isNaN(indexArr[0])
? (this.$refs[refName].average01 = 0)
: (this.$refs[refName].average01 = indexArr[0]);
this.$refs[refName].average02 = indexArr[1];
- insVlaue = 3;
+ insValue = 3;
} else {
- insVlaue = 4;
+ insValue = 4;
this.$refs[refName].checkboxList = value.split(",");
}
} else if (name == "day") {
if (value === "*") {
- insVlaue = 1;
+ insValue = 1;
} else if (value == "?") {
- insVlaue = 2;
+ insValue = 2;
} else if (value.indexOf("-") > -1) {
let indexArr = value.split("-");
isNaN(indexArr[0])
? (this.$refs[refName].cycle01 = 0)
: (this.$refs[refName].cycle01 = indexArr[0]);
this.$refs[refName].cycle02 = indexArr[1];
- insVlaue = 3;
+ insValue = 3;
} else if (value.indexOf("/") > -1) {
let indexArr = value.split("/");
isNaN(indexArr[0])
? (this.$refs[refName].average01 = 0)
: (this.$refs[refName].average01 = indexArr[0]);
this.$refs[refName].average02 = indexArr[1];
- insVlaue = 4;
+ insValue = 4;
} else if (value.indexOf("W") > -1) {
let indexArr = value.split("W");
isNaN(indexArr[0])
? (this.$refs[refName].workday = 0)
: (this.$refs[refName].workday = indexArr[0]);
- insVlaue = 5;
+ insValue = 5;
} else if (value === "L") {
- insVlaue = 6;
+ insValue = 6;
} else {
this.$refs[refName].checkboxList = value.split(",");
- insVlaue = 7;
+ insValue = 7;
}
} else if (name == "week") {
if (value === "*") {
- insVlaue = 1;
+ insValue = 1;
} else if (value == "?") {
- insVlaue = 2;
+ insValue = 2;
} else if (value.indexOf("-") > -1) {
let indexArr = value.split("-");
isNaN(indexArr[0])
? (this.$refs[refName].cycle01 = 0)
: (this.$refs[refName].cycle01 = indexArr[0]);
this.$refs[refName].cycle02 = indexArr[1];
- insVlaue = 3;
+ insValue = 3;
} else if (value.indexOf("#") > -1) {
let indexArr = value.split("#");
isNaN(indexArr[0])
? (this.$refs[refName].average01 = 1)
: (this.$refs[refName].average01 = indexArr[0]);
this.$refs[refName].average02 = indexArr[1];
- insVlaue = 4;
+ insValue = 4;
} else if (value.indexOf("L") > -1) {
let indexArr = value.split("L");
isNaN(indexArr[0])
? (this.$refs[refName].weekday = 1)
: (this.$refs[refName].weekday = indexArr[0]);
- insVlaue = 5;
+ insValue = 5;
} else {
this.$refs[refName].checkboxList = value.split(",");
- insVlaue = 7;
+ insValue = 7;
}
} else if (name == "year") {
if (value == "") {
- insVlaue = 1;
+ insValue = 1;
} else if (value == "*") {
- insVlaue = 2;
+ insValue = 2;
} else if (value.indexOf("-") > -1) {
- insVlaue = 3;
+ insValue = 3;
} else if (value.indexOf("/") > -1) {
- insVlaue = 4;
+ insValue = 4;
} else {
this.$refs[refName].checkboxList = value.split(",");
- insVlaue = 5;
+ insValue = 5;
}
}
- this.$refs[refName].radioValue = insVlaue;
+ this.$refs[refName].radioValue = insValue;
},
// 表单选项的子组件校验数字格式（通过-props传递）
checkNumber(value, minLimit, maxLimit) {
- //检查必须为整数
+ // 检查必须为整数
value = Math.floor(value);
if (value < minLimit) {
value = minLimit;
@@ -303,29 +303,29 @@
},
// 填充表达式
submitFill() {
- this.$emit("fill", this.contabValueString);
+ this.$emit("fill", this.crontabValueString);
this.hidePopup();
},
clearCron() {
// 还原选择项
("准备还原");
- this.contabValueObj = {
+ this.crontabValueObj = {
second: "*",
min: "*",
hour: "*",
day: "*",
- mouth: "*",
+ month: "*",
week: "?",
year: "",
};
- for (let j in this.contabValueObj) {
- this.changeRadio(j, this.contabValueObj[j]);
+ for (let j in this.crontabValueObj) {
+ this.changeRadio(j, this.crontabValueObj[j]);
}
},
},
computed: {
- contabValueString: function() {
- let obj = this.contabValueObj;
+ crontabValueString: function() {
+ let obj = this.crontabValueObj;
let str =
obj.second +
" " +
@@ -335,7 +335,7 @@
" " +
obj.day +
" " +
- obj.mouth +
+ obj.month +
" " +
obj.week +
(obj.year == "" ? "" : " " + obj.year);
@@ -347,7 +347,7 @@
CrontabMin,
CrontabHour,
CrontabDay,
- CrontabMouth,
+ CrontabMonth,
CrontabWeek,
CrontabYear,
CrontabResult,
--
Gitblit v1.9.3