Merge branch 'cool-team-official:5.x' into 5.x

This commit is contained in:
tttclz 2022-06-01 08:34:52 +08:00 committed by GitHub
commit c68ef782e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 945 deletions

View File

@ -1,6 +1,6 @@
{
"name": "front-next",
"version": "5.2.2",
"version": "5.2.3",
"scripts": {
"dev": "vite --host",
"build": "vite build",

View File

@ -1,54 +0,0 @@
export default {
Seconds: {
name: "秒",
every: "每一秒钟",
interval: ["每隔", "秒执行 从", "秒开始"],
specific: "具体秒数(可多选)",
cycle: ["周期从", "到", "秒"]
},
Minutes: {
name: "分",
every: "每一分钟",
interval: ["每隔", "分执行 从", "分开始"],
specific: "具体分钟数(可多选)",
cycle: ["周期从", "到", "分"]
},
Hours: {
name: "时",
every: "每一小时",
interval: ["每隔", "小时执行 从", "小时开始"],
specific: "具体小时数(可多选)",
cycle: ["周期从", "到", "小时"]
},
Day: {
name: "天",
every: "每一天",
intervalWeek: ["每隔", "周执行 从", "开始"],
intervalDay: ["每隔", "天执行 从", "天开始"],
specificWeek: "具体星期几(可多选)",
specificDay: "具体天数(可多选)",
lastDay: "在这个月的最后一天",
lastWeekday: "在这个月的最后一个工作日",
lastWeek: ["在这个月的最后一个"],
beforeEndMonth: ["在本月底前", "天"],
nearestWeekday: ["最近的工作日(周一至周五)至本月", "日"],
someWeekday: ["在这个月的第", "个"]
},
Week: ["天", "一", "二", "三", "四", "五", "六"].map((val) => "星期" + val),
Month: {
name: "月",
every: "每一月",
interval: ["每隔", "月执行 从", "月开始"],
specific: "具体月数(可多选)",
cycle: ["从", "到", "月之间的每个月"]
},
Year: {
name: "年",
every: "每一年",
interval: ["每隔", "年执行 从", "年开始"],
specific: "具体年份(可多选)",
cycle: ["从", "到", "年之间的每一年"]
},
Save: "保存",
Close: "关闭"
};

View File

@ -1,792 +0,0 @@
<template>
<div class="vue-cron">
<el-tabs type="card">
<el-tab-pane>
<template #label> {{ text.Seconds.name }} </template>
<div class="vue-cron__item">
<el-row>
<el-radio v-model="second.cronEvery" label="1">{{
text.Seconds.every
}}</el-radio>
</el-row>
<el-row>
<el-radio v-model="second.cronEvery" label="2"
>{{ text.Seconds.interval[0] }}
<el-input-number
v-model="second.incrementIncrement"
size="small"
:min="1"
:max="60"
/>
{{ text.Seconds.interval[1] || "" }}
<el-input-number
v-model="second.incrementStart"
size="small"
:min="0"
:max="59"
/>
{{ text.Seconds.interval[2] || "" }}
</el-radio>
</el-row>
<el-row>
<el-radio v-model="second.cronEvery" class="long" label="3"
>{{ text.Seconds.specific }}
<el-select v-model="second.specificSpecific" size="small" multiple>
<el-option v-for="val in 60" :key="val" :value="val - 1">{{
val - 1
}}</el-option>
</el-select>
</el-radio>
</el-row>
<el-row>
<el-radio v-model="second.cronEvery" label="4"
>{{ text.Seconds.cycle[0] }}
<el-input-number
v-model="second.rangeStart"
size="small"
:min="1"
:max="60"
/>
{{ text.Seconds.cycle[1] || "" }}
<el-input-number
v-model="second.rangeEnd"
size="small"
:min="0"
:max="59"
/>
{{ text.Seconds.cycle[2] || "" }}
</el-radio>
</el-row>
</div>
</el-tab-pane>
<el-tab-pane>
<template #label>
{{ text.Minutes.name }}
</template>
<div class="vue-cron__item">
<el-row>
<el-radio v-model="minute.cronEvery" label="1">{{
text.Minutes.every
}}</el-radio>
</el-row>
<el-row>
<el-radio v-model="minute.cronEvery" label="2"
>{{ text.Minutes.interval[0] }}
<el-input-number
v-model="minute.incrementIncrement"
size="small"
:min="1"
:max="60"
/>
{{ text.Minutes.interval[1] }}
<el-input-number
v-model="minute.incrementStart"
size="small"
:min="0"
:max="59"
/>
{{ text.Minutes.interval[2] || "" }}
</el-radio>
</el-row>
<el-row>
<el-radio v-model="minute.cronEvery" class="long" label="3"
>{{ text.Minutes.specific }}
<el-select v-model="minute.specificSpecific" size="small" multiple>
<el-option v-for="val in 60" :key="val" :value="val - 1">{{
val - 1
}}</el-option>
</el-select>
</el-radio>
</el-row>
<el-row>
<el-radio v-model="minute.cronEvery" label="4"
>{{ text.Minutes.cycle[0] }}
<el-input-number
v-model="minute.rangeStart"
size="small"
:min="1"
:max="60"
/>
{{ text.Minutes.cycle[1] }}
<el-input-number
v-model="minute.rangeEnd"
size="small"
:min="0"
:max="59"
/>
{{ text.Minutes.cycle[2] }}
</el-radio>
</el-row>
</div>
</el-tab-pane>
<el-tab-pane>
<template #label> {{ text.Hours.name }} </template>
<div class="vue-cron__item">
<el-row>
<el-radio v-model="hour.cronEvery" label="1">{{
text.Hours.every
}}</el-radio>
</el-row>
<el-row>
<el-radio v-model="hour.cronEvery" label="2"
>{{ text.Hours.interval[0] }}
<el-input-number
v-model="hour.incrementIncrement"
size="small"
:min="0"
:max="23"
/>
{{ text.Hours.interval[1] }}
<el-input-number
v-model="hour.incrementStart"
size="small"
:min="0"
:max="23"
/>
{{ text.Hours.interval[2] }}
</el-radio>
</el-row>
<el-row>
<el-radio v-model="hour.cronEvery" class="long" label="3"
>{{ text.Hours.specific }}
<el-select v-model="hour.specificSpecific" size="small" multiple>
<el-option v-for="val in 24" :key="val" :value="val - 1">{{
val - 1
}}</el-option>
</el-select>
</el-radio>
</el-row>
<el-row>
<el-radio v-model="hour.cronEvery" label="4"
>{{ text.Hours.cycle[0] }}
<el-input-number
v-model="hour.rangeStart"
size="small"
:min="0"
:max="23"
/>
{{ text.Hours.cycle[1] }}
<el-input-number
v-model="hour.rangeEnd"
size="small"
:min="0"
:max="23"
/>
{{ text.Hours.cycle[2] }}
</el-radio>
</el-row>
</div>
</el-tab-pane>
<el-tab-pane>
<template #label> {{ text.Day.name }} </template>
<div class="vue-cron__item">
<el-row>
<el-radio v-model="day.cronEvery" label="1">{{ text.Day.every }}</el-radio>
</el-row>
<el-row>
<el-radio v-model="day.cronEvery" label="2"
>{{ text.Day.intervalWeek[0] }}
<el-input-number
v-model="week.incrementIncrement"
size="small"
:min="1"
:max="7"
/>
{{ text.Day.intervalWeek[1] }}
<el-select v-model="week.incrementStart" size="small">
<el-option
v-for="val in 7"
:key="val"
:label="text.Week[val - 1]"
:value="val"
/>
</el-select>
{{ text.Day.intervalWeek[2] }}
</el-radio>
</el-row>
<el-row>
<el-radio v-model="day.cronEvery" label="3"
>{{ text.Day.intervalDay[0] }}
<el-input-number
v-model="day.incrementIncrement"
size="small"
:min="1"
:max="31"
/>
{{ text.Day.intervalDay[1] }}
<el-input-number
v-model="day.incrementStart"
size="small"
:min="1"
:max="31"
/>
{{ text.Day.intervalDay[2] }}
</el-radio>
</el-row>
<el-row>
<el-radio v-model="day.cronEvery" class="long" label="4"
>{{ text.Day.specificWeek }}
<el-select v-model="week.specificSpecific" size="small" multiple>
<el-option
v-for="val in 7"
:key="val"
:label="text.Week[val - 1]"
:value="
['SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT'][val - 1]
"
/>
</el-select>
</el-radio>
</el-row>
<el-row>
<el-radio v-model="day.cronEvery" class="long" label="5"
>{{ text.Day.specificDay }}
<el-select v-model="day.specificSpecific" size="small" multiple>
<el-option v-for="val in 31" :key="val" :value="val">{{
val
}}</el-option>
</el-select>
</el-radio>
</el-row>
<el-row>
<el-radio v-model="day.cronEvery" label="6">{{
text.Day.lastDay
}}</el-radio>
</el-row>
<el-row>
<el-radio v-model="day.cronEvery" label="7">{{
text.Day.lastWeekday
}}</el-radio>
</el-row>
<el-row>
<el-radio v-model="day.cronEvery" label="8"
>{{ text.Day.lastWeek[0] }}
<el-select v-model="day.cronLastSpecificDomDay" size="small">
<el-option
v-for="val in 7"
:key="val"
:label="text.Week[val - 1]"
:value="val"
/>
</el-select>
{{ text.Day.lastWeek[1] || "" }}
</el-radio>
</el-row>
<el-row>
<el-radio v-model="day.cronEvery" label="9">
<el-input-number
v-model="day.cronDaysBeforeEomMinus"
size="small"
:min="1"
:max="31"
/>
{{ text.Day.beforeEndMonth[0] }}
</el-radio>
</el-row>
<el-row>
<el-radio v-model="day.cronEvery" label="10"
>{{ text.Day.nearestWeekday[0] }}
<el-input-number
v-model="day.cronDaysNearestWeekday"
size="small"
:min="1"
:max="31"
/>
{{ text.Day.nearestWeekday[1] }}
</el-radio>
</el-row>
<el-row>
<el-radio v-model="day.cronEvery" label="11"
>{{ text.Day.someWeekday[0] }}
<el-input-number
v-model="week.cronNthDayNth"
size="small"
:min="1"
:max="5"
/>
<el-select
v-model="week.cronNthDayDay"
size="small"
style="margin-left: 5px"
>
<el-option
v-for="val in 7"
:key="val"
:label="text.Week[val - 1]"
:value="val"
/>
</el-select>
{{ text.Day.someWeekday[1] }}
</el-radio>
</el-row>
</div>
</el-tab-pane>
<el-tab-pane>
<template #label>
{{ text.Month.name }}
</template>
<div class="vue-cron__item">
<el-row>
<el-radio v-model="month.cronEvery" label="1">{{
text.Month.every
}}</el-radio>
</el-row>
<el-row>
<el-radio v-model="month.cronEvery" label="2"
>{{ text.Month.interval[0] }}
<el-input-number
v-model="month.incrementIncrement"
size="small"
:min="0"
:max="12"
/>
{{ text.Month.interval[1] }}
<el-input-number
v-model="month.incrementStart"
size="small"
:min="0"
:max="12"
/>
</el-radio>
</el-row>
<el-row>
<el-radio v-model="month.cronEvery" class="long" label="3"
>{{ text.Month.specific }}
<el-select v-model="month.specificSpecific" size="small" multiple>
<el-option v-for="val in 12" :key="val" :label="val" :value="val" />
</el-select>
</el-radio>
</el-row>
<el-row>
<el-radio v-model="month.cronEvery" label="4"
>{{ text.Month.cycle[0] }}
<el-input-number
v-model="month.rangeStart"
size="small"
:min="1"
:max="12"
/>
{{ text.Month.cycle[1] }}
<el-input-number
v-model="month.rangeEnd"
size="small"
:min="1"
:max="12"
/>
</el-radio>
</el-row>
</div>
</el-tab-pane>
<el-tab-pane v-if="showYear || false">
<template #label> {{ text.Year.name }} </template>
<div class="vue-cron__item">
<el-row>
<el-radio v-model="year.cronEvery" label="1">{{
text.Year.every
}}</el-radio>
</el-row>
<el-row>
<el-radio v-model="year.cronEvery" label="2"
>{{ text.Year.interval[0] }}
<el-input-number
v-model="year.incrementIncrement"
size="small"
:min="1"
:max="99"
/>
{{ text.Year.interval[1] }}
<el-input-number
v-model="year.incrementStart"
size="small"
:min="2018"
:max="2118"
/>
</el-radio>
</el-row>
<el-row>
<el-radio v-model="year.cronEvery" class="long" label="3"
>{{ text.Year.specific }}
<el-select
v-model="year.specificSpecific"
size="small"
filterable
multiple
>
<el-option
v-for="val in 100"
:key="val"
:label="2017 + val"
:value="2017 + val"
/>
</el-select>
</el-radio>
</el-row>
<el-row>
<el-radio v-model="year.cronEvery" label="4"
>{{ text.Year.cycle[0] }}
<el-input-number
v-model="year.rangeStart"
size="small"
:min="2018"
:max="2118"
/>
{{ text.Year.cycle[1] }}
<el-input-number
v-model="year.rangeEnd"
size="small"
:min="2018"
:max="2118"
/>
</el-radio>
</el-row>
</div>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import Language from "./cn";
export default {
name: "vue-cron",
props: {
modelValue: {
type: String,
default: ""
},
showYear: Boolean
},
emits: ["update:modelValue", "change"],
data() {
return {
second: {
incrementStart: 3,
incrementIncrement: 5,
specificSpecific: []
},
minute: {
incrementStart: 3,
incrementIncrement: 5,
specificSpecific: []
},
hour: {
incrementStart: 3,
incrementIncrement: 5,
specificSpecific: []
},
day: {
incrementStart: 1,
incrementIncrement: 1,
specificSpecific: [],
cronLastSpecificDomDay: 1
},
week: {
incrementStart: 1,
incrementIncrement: 1,
specificSpecific: [],
cronNthDayDay: 1,
cronNthDayNth: 1
},
month: {
incrementStart: 3,
incrementIncrement: 5,
specificSpecific: []
},
year: {
incrementStart: "2022",
incrementIncrement: 1,
specificSpecific: []
},
output: {
second: "",
minute: "",
hour: "",
day: "",
month: "",
Week: "",
year: ""
}
};
},
computed: {
text() {
return Language;
},
secondsText() {
let seconds = "";
const cronEvery = this.second.cronEvery || "";
switch (cronEvery.toString()) {
case "1":
seconds = "*";
break;
case "2":
seconds = this.second.incrementStart + "/" + this.second.incrementIncrement;
break;
case "3":
this.second.specificSpecific.forEach((val) => {
seconds += val + ",";
});
seconds = seconds.slice(0, -1);
break;
case "4":
seconds = this.second.rangeStart + "-" + this.second.rangeEnd;
break;
}
return seconds;
},
minutesText() {
let minutes = "";
const cronEvery = this.minute.cronEvery || "";
switch (cronEvery.toString()) {
case "1":
minutes = "*";
break;
case "2":
minutes = this.minute.incrementStart + "/" + this.minute.incrementIncrement;
break;
case "3":
this.minute.specificSpecific.forEach((val) => {
minutes += val + ",";
});
minutes = minutes.slice(0, -1);
break;
case "4":
minutes = this.minute.rangeStart + "-" + this.minute.rangeEnd;
break;
}
return minutes;
},
hoursText() {
let hours = "";
const cronEvery = this.hour.cronEvery || "";
switch (cronEvery.toString()) {
case "1":
hours = "*";
break;
case "2":
hours = this.hour.incrementStart + "/" + this.hour.incrementIncrement;
break;
case "3":
this.hour.specificSpecific.forEach((val) => {
hours += val + ",";
});
hours = hours.slice(0, -1);
break;
case "4":
hours = this.hour.rangeStart + "-" + this.hour.rangeEnd;
break;
}
return hours;
},
daysText() {
let days = "";
const cronEvery = this.day.cronEvery || "";
switch (cronEvery.toString()) {
case "1":
break;
case "2":
case "4":
case "11":
days = "?";
break;
case "3":
days = this.day.incrementStart + "/" + this.day.incrementIncrement;
break;
case "5":
this.day.specificSpecific.forEach((val) => {
days += val + ",";
});
days = days.slice(0, -1);
break;
case "6":
days = "L";
break;
case "7":
days = "LW";
break;
case "8":
days = this.day.cronLastSpecificDomDay + "L";
break;
case "9":
days = "L-" + this.day.cronDaysBeforeEomMinus;
break;
case "10":
days = this.day.cronDaysNearestWeekday + "W";
break;
}
return days;
},
weeksText() {
let weeks = "";
const cronEvery = this.day.cronEvery || "";
switch (cronEvery.toString()) {
case "1":
case "3":
case "5":
weeks = "?";
break;
case "2":
weeks = this.week.incrementStart + "/" + this.week.incrementIncrement;
break;
case "4":
this.week.specificSpecific.forEach((val) => {
weeks += val + ",";
});
weeks = weeks.slice(0, -1);
break;
case "6":
case "7":
case "8":
case "9":
case "10":
weeks = "?";
break;
case "11":
weeks = this.week.cronNthDayDay + "#" + this.week.cronNthDayNth;
break;
}
return weeks;
},
monthsText() {
let months = "";
const cronEvery = this.month.cronEvery || "";
switch (cronEvery.toString()) {
case "1":
months = "*";
break;
case "2":
months = this.month.incrementStart + "/" + this.month.incrementIncrement;
break;
case "3":
this.month.specificSpecific.forEach((val) => {
months += val + ",";
});
months = months.slice(0, -1);
break;
case "4":
months = this.month.rangeStart + "-" + this.month.rangeEnd;
break;
}
return months;
},
yearsText() {
let years = "";
const cronEvery = this.year.cronEvery || "";
switch (cronEvery.toString()) {
case "1":
years = "*";
break;
case "2":
years = this.year.incrementStart + "/" + this.year.incrementIncrement;
break;
case "3":
this.year.specificSpecific.forEach((val) => {
years += val + ",";
});
years = years.slice(0, -1);
break;
case "4":
years = this.year.rangeStart + "-" + this.year.rangeEnd;
break;
}
return years;
},
cron() {
return `${this.secondsText || "*"} ${this.minutesText || "*"} ${
this.hoursText || "*"
} ${this.daysText || "*"} ${this.monthsText || "*"} ${this.weeksText || "?"} ${
this.showYear ? this.yearsText || "*" : ""
}`;
}
},
watch: {
data() {
this.rest(this.$data);
},
cron(val) {
this.$emit("update:modelValue", val);
this.$emit("change", val);
}
},
methods: {
rest(data) {
for (const i in data) {
if (data[i] instanceof Object) {
this.rest(data[i]);
} else {
switch (typeof data[i]) {
case "object":
data[i] = [];
break;
case "string":
data[i] = "";
break;
}
}
}
}
}
};
</script>
<style lang="scss" scoped>
.vue-cron {
margin-top: 10px;
:deep(.el-tabs) {
box-shadow: none;
.el-tabs__content {
padding: 0;
}
.el-tabs__header {
margin-bottom: 0;
}
.el-tabs__item {
height: 30px;
line-height: 30px;
}
}
&__item {
max-height: 250px;
overflow: auto;
padding: 10px;
border: 1px solid #eee;
border-top: 0;
border-radius: 0 3px 3px 3px;
.el-row {
min-height: 32px;
line-height: 32px;
.el-radio {
line-height: 32px;
}
:deep(.el-radio__label) {
font-size: 12px;
}
}
}
&__footer {
margin-top: 10px;
text-align: center;
}
}
</style>

View File

@ -1,66 +0,0 @@
import { defineComponent, h, ref, watch } from "vue";
import Cron from "./cron.vue";
export default defineComponent({
name: "cl-cron",
components: {
Cron
},
props: {
modelValue: {
type: String,
default: ""
},
placeholder: {
type: String,
default: "请输入定时策略"
},
disabled: Boolean,
readonly: Boolean
},
emits: ["update:modelValue", "change"],
setup(props, { emit }) {
const cron = ref<string>("");
watch(cron, (val: string) => {
emit("update:modelValue", val);
emit("change", val);
});
watch(
() => props.modelValue,
(val: string) => {
cron.value = val;
},
{
immediate: true
}
);
return {
cron,
open,
close
};
},
render(ctx: any) {
return (
<div class="cl-cron">
<el-input
clearable
disabled={ctx.disabled}
readonly={ctx.readonly}
v-model={ctx.cron}
placeholder={ctx.placeholder}
></el-input>
<cron v-model={ctx.cron} onClose={ctx.close}></cron>
</div>
);
}
});

View File

@ -199,11 +199,7 @@
</div>
<!-- 表单 -->
<cl-form ref="Form">
<template #slot-cron="{ scope }">
<cron v-model="scope.cron" />
</template>
</cl-form>
<cl-form ref="Form" />
</div>
</template>
@ -214,7 +210,6 @@ import Draggable from "vuedraggable/src/vuedraggable";
import { checkPerm } from "/$/base";
import { useCool } from "/@/cool";
import { ContextMenu, useForm } from "@cool-vue/crud";
import Cron from "../components/cron";
import {
Refresh,
CirclePlus,
@ -428,7 +423,6 @@ async function edit(params: any) {
props: {
onChange(v: number) {
if (v == 0) {
Form.value?.setForm("limit", undefined);
Form.value?.setForm("every", undefined);
} else {
Form.value?.setForm("cron", undefined);
@ -442,25 +436,16 @@ async function edit(params: any) {
prop: "cron",
hidden: ({ scope }) => scope.taskType == 1,
component: {
name: "slot-cron"
name: "el-input",
props: {
placeholder: "* * * * * *"
}
},
rules: {
required: true,
message: "cron不能为空"
}
},
{
label: "次数",
prop: "limit",
hidden: ({ scope }) => scope.taskType == 0,
component: {
name: "el-input-number",
props: {
min: 1,
max: 10000
}
}
},
{
label: "间隔(秒)",
prop: "every",
@ -490,18 +475,7 @@ async function edit(params: any) {
{
label: "开始时间",
prop: "startDate",
hidden: ({ scope }: any) => scope.taskType == 1,
component: {
name: "el-date-picker",
props: {
type: "datetime",
"value-format": "YYYY-MM-DD HH:mm:ss"
}
}
},
{
label: "结束时间",
prop: "endDate",
hidden: ({ scope }) => scope.taskType == 1,
component: {
name: "el-date-picker",
props: {