Sfoglia il codice sorgente

任务调度cron组件-用若依的组件重构,放开编辑

threethousanddream 2 settimane fa
parent
commit
3ae22f07a9

+ 156 - 0
src/components/Crontab/day.vue

@@ -0,0 +1,156 @@
+<template>
+  <el-form size="small">
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="1">
+        日,允许的通配符[, - * ? / L W]
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="2">
+        不指定
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="3">
+        周期从
+        <el-input-number v-model='cycle01' :min="1" :max="30"/>
+        -
+        <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 2" :max="31"/>
+        日
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="4">
+        从
+        <el-input-number v-model='average01' :min="1" :max="30"/>
+        号开始,每
+        <el-input-number v-model='average02' :min="1" :max="31 - average01 || 1"/>
+        日执行一次
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="5">
+        每月
+        <el-input-number v-model='workday' :min="1" :max="31"/>
+        号最近的那个工作日
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="6">
+        本月最后一天
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="7" style="margin-right: 10px;">指定</el-radio>
+      <el-select @click="radioValue=7" clearable v-model="checkboxList" placeholder="可多选" multiple style="flex: 1">
+        <el-option v-for="item in 31" :key="item" :value="item">{{ item }}</el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      radioValue: 1,
+      workday: 1,
+      cycle01: 1,
+      cycle02: 2,
+      average01: 1,
+      average02: 1,
+      checkboxList: [],
+    }
+  },
+  name: 'crontab-day',
+  props: ['check', 'cron'],
+  methods: {
+    // 单选按钮值变化时
+    radioChange() {
+      ('day rachange');
+      if (this.radioValue !== 2 && this.cron.week !== '?') {
+        this.$emit('update', 'week', '?', 'day')
+      }
+      switch (this.radioValue) {
+        case 1:
+          this.$emit('update', 'day', '*');
+          break;
+        case 2:
+          this.$emit('update', 'day', '?');
+          break;
+        case 3:
+          this.$emit('update', 'day', this.cycleTotal);
+          break;
+        case 4:
+          this.$emit('update', 'day', this.averageTotal);
+          break;
+        case 5:
+          this.$emit('update', 'day', this.workday + 'W');
+          break;
+        case 6:
+          this.$emit('update', 'day', 'L');
+          break;
+        case 7:
+          this.$emit('update', 'day', this.checkboxString);
+          break;
+      }
+      ('day rachange end');
+    },
+    // 周期两个值变化时
+    cycleChange() {
+      if (this.radioValue == '3') {
+        this.$emit('update', 'day', this.cycleTotal);
+      }
+    },
+    // 平均两个值变化时
+    averageChange() {
+      if (this.radioValue == '4') {
+        this.$emit('update', 'day', this.averageTotal);
+      }
+    },
+    // 最近工作日值变化时
+    workdayChange() {
+      if (this.radioValue == '5') {
+        this.$emit('update', 'day', this.workdayCheck + 'W');
+      }
+    },
+    // checkbox值变化时
+    checkboxChange() {
+      if (this.radioValue == '7') {
+        this.$emit('update', 'day', this.checkboxString);
+      }
+    }
+  },
+  watch: {
+    'radioValue': 'radioChange',
+    'cycleTotal': 'cycleChange',
+    'averageTotal': 'averageChange',
+    'workdayCheck': 'workdayChange',
+    'checkboxString': 'checkboxChange',
+  },
+  computed: {
+    // 计算两个周期值
+    cycleTotal: function () {
+      const cycle01 = this.check(this.cycle01, 1, 30)
+      const cycle02 = this.check(this.cycle02, cycle01 ? cycle01 + 1 : 2, 31, 31)
+      return cycle01 + '-' + cycle02;
+    },
+    // 计算平均用到的值
+    averageTotal: function () {
+      const average01 = this.check(this.average01, 1, 30)
+      const average02 = this.check(this.average02, 1, 31 - average01 || 0)
+      return average01 + '/' + average02;
+    },
+    // 计算工作日格式
+    workdayCheck: function () {
+      const workday = this.check(this.workday, 1, 31)
+      return workday;
+    },
+    // 计算勾选的checkbox值合集
+    checkboxString: function () {
+      let str = this.checkboxList.join();
+      return str == '' ? '*' : str;
+    }
+  }
+}
+</script>

+ 118 - 0
src/components/Crontab/hour.vue

@@ -0,0 +1,118 @@
+<template>
+  <el-form size="small">
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="1">
+        小时,允许的通配符[, - * /]
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="2">
+        周期从
+        <el-input-number v-model='cycle01' :min="0" :max="22"/>
+        -
+        <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 1" :max="23"/>
+        小时
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="3">
+        从
+        <el-input-number v-model='average01' :min="0" :max="22"/>
+        小时开始,每
+        <el-input-number v-model='average02' :min="1" :max="23 - average01 || 0"/>
+        小时执行一次
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="4" style="margin-right: 10px;">指定</el-radio>
+      <el-select @click="radioValue=4" clearable v-model="checkboxList" placeholder="可多选" multiple style="flex: 1">
+        <el-option v-for="item in 24" :key="item" :value="item-1">{{ item - 1 }}</el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      radioValue: 1,
+      cycle01: 0,
+      cycle02: 1,
+      average01: 0,
+      average02: 1,
+      checkboxList: [],
+    }
+  },
+  name: 'crontab-hour',
+  props: ['check', 'cron'],
+  methods: {
+    // 单选按钮值变化时
+    radioChange() {
+      if (this.cron.min === '*') {
+        this.$emit('update', 'min', '0', 'hour');
+      }
+      if (this.cron.second === '*') {
+        this.$emit('update', 'second', '0', 'hour');
+      }
+      switch (this.radioValue) {
+        case 1:
+          this.$emit('update', 'hour', '*')
+          break;
+        case 2:
+          this.$emit('update', 'hour', this.cycleTotal);
+          break;
+        case 3:
+          this.$emit('update', 'hour', this.averageTotal);
+          break;
+        case 4:
+          this.$emit('update', 'hour', this.checkboxString);
+          break;
+      }
+    },
+    // 周期两个值变化时
+    cycleChange() {
+      if (this.radioValue == '2') {
+        this.$emit('update', 'hour', this.cycleTotal);
+      }
+    },
+    // 平均两个值变化时
+    averageChange() {
+      if (this.radioValue == '3') {
+        this.$emit('update', 'hour', this.averageTotal);
+      }
+    },
+    // checkbox值变化时
+    checkboxChange() {
+      if (this.radioValue == '4') {
+        this.$emit('update', 'hour', this.checkboxString);
+      }
+    }
+  },
+  watch: {
+    'radioValue': 'radioChange',
+    'cycleTotal': 'cycleChange',
+    'averageTotal': 'averageChange',
+    'checkboxString': 'checkboxChange'
+  },
+  computed: {
+    // 计算两个周期值
+    cycleTotal: function () {
+      const cycle01 = this.check(this.cycle01, 0, 22)
+      const cycle02 = this.check(this.cycle02, cycle01 ? cycle01 + 1 : 1, 23)
+      return cycle01 + '-' + cycle02;
+    },
+    // 计算平均用到的值
+    averageTotal: function () {
+      const average01 = this.check(this.average01, 0, 22)
+      const average02 = this.check(this.average02, 1, 23 - average01 || 0)
+      return average01 + '/' + average02;
+    },
+    // 计算勾选的checkbox值合集
+    checkboxString: function () {
+      let str = this.checkboxList.join();
+      return str == '' ? '*' : str;
+    }
+  }
+}
+</script>

+ 430 - 0
src/components/Crontab/index.vue

@@ -0,0 +1,430 @@
+<template>
+  <div>
+    <el-tabs type="border-card">
+      <el-tab-pane label="秒" v-if="shouldHide('second')">
+        <CrontabSecond
+          @update="updateCrontabValue"
+          :check="checkNumber"
+          :cron="crontabValueObj"
+          ref="cronsecond"
+        />
+      </el-tab-pane>
+
+      <el-tab-pane label="分钟" v-if="shouldHide('min')">
+        <CrontabMin
+          @update="updateCrontabValue"
+          :check="checkNumber"
+          :cron="crontabValueObj"
+          ref="cronmin"
+        />
+      </el-tab-pane>
+
+      <el-tab-pane label="小时" v-if="shouldHide('hour')">
+        <CrontabHour
+          @update="updateCrontabValue"
+          :check="checkNumber"
+          :cron="crontabValueObj"
+          ref="cronhour"
+        />
+      </el-tab-pane>
+
+      <el-tab-pane label="日" v-if="shouldHide('day')">
+        <CrontabDay
+          @update="updateCrontabValue"
+          :check="checkNumber"
+          :cron="crontabValueObj"
+          ref="cronday"
+        />
+      </el-tab-pane>
+
+      <el-tab-pane label="月" v-if="shouldHide('month')">
+        <CrontabMonth
+          @update="updateCrontabValue"
+          :check="checkNumber"
+          :cron="crontabValueObj"
+          ref="cronmonth"
+        />
+      </el-tab-pane>
+
+      <el-tab-pane label="周" v-if="shouldHide('week')">
+        <CrontabWeek
+          @update="updateCrontabValue"
+          :check="checkNumber"
+          :cron="crontabValueObj"
+          ref="cronweek"
+        />
+      </el-tab-pane>
+
+      <el-tab-pane label="年" v-if="shouldHide('year')">
+        <CrontabYear
+          @update="updateCrontabValue"
+          :check="checkNumber"
+          :cron="crontabValueObj"
+          ref="cronyear"
+        />
+      </el-tab-pane>
+    </el-tabs>
+
+    <div class="popup-main">
+      <div class="popup-result">
+        <p class="title">时间表达式</p>
+        <table>
+          <thead>
+            <th v-for="item of tabTitles" width="40" :key="item">{{item}}</th>
+            <th>Cron 表达式</th>
+          </thead>
+          <tbody>
+            <td>
+              <span>{{crontabValueObj.second}}</span>
+            </td>
+            <td>
+              <span>{{crontabValueObj.min}}</span>
+            </td>
+            <td>
+              <span>{{crontabValueObj.hour}}</span>
+            </td>
+            <td>
+              <span>{{crontabValueObj.day}}</span>
+            </td>
+            <td>
+              <span>{{crontabValueObj.month}}</span>
+            </td>
+            <td>
+              <span>{{crontabValueObj.week}}</span>
+            </td>
+            <td>
+              <span>{{crontabValueObj.year}}</span>
+            </td>
+            <td>
+              <span>{{crontabValueString}}</span>
+            </td>
+          </tbody>
+        </table>
+      </div>
+      <CrontabResult :ex="crontabValueString"></CrontabResult>
+
+      <div class="pop_btn">
+        <el-button size="small" type="primary" @click="submitFill">确定</el-button>
+        <el-button size="small" type="warning" @click="clearCron">重置</el-button>
+        <el-button size="small" @click="hidePopup">取消</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import CrontabSecond from "./second.vue";
+import CrontabMin from "./min.vue";
+import CrontabHour from "./hour.vue";
+import CrontabDay from "./day.vue";
+import CrontabMonth from "./month.vue";
+import CrontabWeek from "./week.vue";
+import CrontabYear from "./year.vue";
+import CrontabResult from "./result.vue";
+
+export default {
+  data() {
+    return {
+      tabTitles: ["秒", "分钟", "小时", "日", "月", "周", "年"],
+      tabActive: 0,
+      myindex: 0,
+      crontabValueObj: {
+        second: "*",
+        min: "*",
+        hour: "*",
+        day: "*",
+        month: "*",
+        week: "?",
+        year: "",
+      },
+    };
+  },
+  name: "vcrontab",
+  props: ["expression", "hideComponent"],
+  methods: {
+    shouldHide(key) {
+      if (this.hideComponent && this.hideComponent.includes(key)) return false;
+      return true;
+    },
+    resolveExp() {
+      // 反解析 表达式
+      if (this.expression) {
+        let arr = this.expression.split(" ");
+        if (arr.length >= 6) {
+          //6 位以上是合法表达式
+          let obj = {
+            second: arr[0],
+            min: arr[1],
+            hour: arr[2],
+            day: arr[3],
+            month: arr[4],
+            week: arr[5],
+            year: arr[6] ? arr[6] : "",
+          };
+          this.crontabValueObj = {
+            ...obj,
+          };
+          for (let i in obj) {
+            if (obj[i]) this.changeRadio(i, obj[i]);
+          }
+        }
+      } else {
+        // 没有传入的表达式 则还原
+        this.clearCron();
+      }
+    },
+    // tab切换值
+    tabCheck(index) {
+      this.tabActive = index;
+    },
+    // 由子组件触发,更改表达式组成的字段值
+    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", "month"],
+        refName = "cron" + name,
+        insValue;
+
+      if (!this.$refs[refName]) return;
+
+      if (arr.includes(name)) {
+        if (value === "*") {
+          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];
+          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];
+          insValue = 3;
+        } else {
+          insValue = 4;
+          this.$refs[refName].checkboxList = value.split(",");
+        }
+      } else if (name == "day") {
+        if (value === "*") {
+          insValue = 1;
+        } else if (value == "?") {
+          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];
+          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];
+          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]);
+          insValue = 5;
+        } else if (value === "L") {
+          insValue = 6;
+        } else {
+          this.$refs[refName].checkboxList = value.split(",");
+          insValue = 7;
+        }
+      } else if (name == "week") {
+        if (value === "*") {
+          insValue = 1;
+        } else if (value == "?") {
+          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];
+          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];
+          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]);
+          insValue = 5;
+        } else {
+          this.$refs[refName].checkboxList = value.split(",");
+          insValue = 6;
+        }
+      } else if (name == "year") {
+        if (value == "") {
+          insValue = 1;
+        } else if (value == "*") {
+          insValue = 2;
+        } else if (value.indexOf("-") > -1) {
+          insValue = 3;
+        } else if (value.indexOf("/") > -1) {
+          insValue = 4;
+        } else {
+          this.$refs[refName].checkboxList = value.split(",");
+          insValue = 5;
+        }
+      }
+      this.$refs[refName].radioValue = insValue;
+    },
+    // 表单选项的子组件校验数字格式(通过-props传递)
+    checkNumber(value, minLimit, maxLimit) {
+      // 检查必须为整数
+      value = Math.floor(value);
+      if (value < minLimit) {
+        value = minLimit;
+      } else if (value > maxLimit) {
+        value = maxLimit;
+      }
+      return value;
+    },
+    // 隐藏弹窗
+    hidePopup() {
+      this.$emit("hide");
+    },
+    // 填充表达式
+    submitFill() {
+      this.$emit("fill", this.crontabValueString);
+      this.hidePopup();
+    },
+    clearCron() {
+      // 还原选择项
+      ("准备还原");
+      this.crontabValueObj = {
+        second: "*",
+        min: "*",
+        hour: "*",
+        day: "*",
+        month: "*",
+        week: "?",
+        year: "",
+      };
+      for (let j in this.crontabValueObj) {
+        this.changeRadio(j, this.crontabValueObj[j]);
+      }
+    },
+  },
+  computed: {
+    crontabValueString: function() {
+      let obj = this.crontabValueObj;
+      let str =
+        obj.second +
+        " " +
+        obj.min +
+        " " +
+        obj.hour +
+        " " +
+        obj.day +
+        " " +
+        obj.month +
+        " " +
+        obj.week +
+        (obj.year == "" ? "" : " " + obj.year);
+      return str;
+    },
+  },
+  components: {
+    CrontabSecond,
+    CrontabMin,
+    CrontabHour,
+    CrontabDay,
+    CrontabMonth,
+    CrontabWeek,
+    CrontabYear,
+    CrontabResult,
+  },
+  watch: {
+    expression: "resolveExp",
+    hideComponent(value) {
+      // 隐藏部分组件
+    },
+  },
+  mounted: function() {
+    this.resolveExp();
+  },
+};
+</script>
+<style scoped>
+.pop_btn {
+  text-align: center;
+  margin-top: 20px;
+}
+.popup-main {
+  position: relative;
+  margin: 10px auto;
+  background: #fff;
+  border-radius: 5px;
+  font-size: 12px;
+  overflow: hidden;
+}
+.popup-title {
+  overflow: hidden;
+  line-height: 34px;
+  padding-top: 6px;
+  background: #f2f2f2;
+}
+.popup-result {
+  box-sizing: border-box;
+  line-height: 24px;
+  margin: 25px auto;
+  padding: 15px 10px 10px;
+  border: 1px solid #ccc;
+  position: relative;
+}
+.popup-result .title {
+  position: absolute;
+  top: -28px;
+  left: 50%;
+  width: 140px;
+  font-size: 14px;
+  margin-left: -70px;
+  text-align: center;
+  line-height: 30px;
+  background: #fff;
+}
+.popup-result table {
+  text-align: center;
+  width: 100%;
+  margin: 0 auto;
+}
+.popup-result table span {
+  display: block;
+  width: 100%;
+  font-family: arial;
+  line-height: 30px;
+  height: 30px;
+  white-space: nowrap;
+  overflow: hidden;
+  border: 1px solid #e8e8e8;
+}
+.popup-result-scroll {
+  font-size: 12px;
+  line-height: 24px;
+  height: 10em;
+  overflow-y: auto;
+}
+</style>

+ 114 - 0
src/components/Crontab/min.vue

@@ -0,0 +1,114 @@
+<template>
+  <el-form size="small">
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="1">
+        分钟,允许的通配符[, - * /]
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="2">
+        周期从
+        <el-input-number v-model='cycle01' :min="0" :max="58"/>
+        -
+        <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 1" :max="59"/>
+        分钟
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="3">
+        从
+        <el-input-number v-model='average01' :min="0" :max="58"/>
+        分钟开始,每
+        <el-input-number v-model='average02' :min="1" :max="59 - average01 || 0"/>
+        分钟执行一次
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="4" style="margin-right: 10px;">指定</el-radio>
+      <el-select @click="radioValue=4" clearable v-model="checkboxList" placeholder="可多选" multiple style="flex: 1">
+        <el-option v-for="item in 60" :key="item" :value="item-1">{{ item - 1 }}</el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      radioValue: 1,
+      cycle01: 1,
+      cycle02: 2,
+      average01: 0,
+      average02: 1,
+      checkboxList: [],
+    }
+  },
+  name: 'crontab-min',
+  props: ['check', 'cron'],
+  methods: {
+    // 单选按钮值变化时
+    radioChange() {
+      switch (this.radioValue) {
+        case 1:
+          this.$emit('update', 'min', '*', 'min');
+          break;
+        case 2:
+          this.$emit('update', 'min', this.cycleTotal, 'min');
+          break;
+        case 3:
+          this.$emit('update', 'min', this.averageTotal, 'min');
+          break;
+        case 4:
+          this.$emit('update', 'min', this.checkboxString, 'min');
+          break;
+      }
+    },
+    // 周期两个值变化时
+    cycleChange() {
+      if (this.radioValue == '2') {
+        this.$emit('update', 'min', this.cycleTotal, 'min');
+      }
+    },
+    // 平均两个值变化时
+    averageChange() {
+      if (this.radioValue == '3') {
+        this.$emit('update', 'min', this.averageTotal, 'min');
+      }
+    },
+    // checkbox值变化时
+    checkboxChange() {
+      if (this.radioValue == '4') {
+        this.$emit('update', 'min', this.checkboxString, 'min');
+      }
+    },
+
+  },
+  watch: {
+    'radioValue': 'radioChange',
+    'cycleTotal': 'cycleChange',
+    'averageTotal': 'averageChange',
+    'checkboxString': 'checkboxChange',
+  },
+  computed: {
+    // 计算两个周期值
+    cycleTotal: function () {
+      const cycle01 = this.check(this.cycle01, 0, 58)
+      const cycle02 = this.check(this.cycle02, cycle01 ? cycle01 + 1 : 1, 59)
+      return cycle01 + '-' + cycle02;
+    },
+    // 计算平均用到的值
+    averageTotal: function () {
+      const average01 = this.check(this.average01, 0, 58)
+      const average02 = this.check(this.average02, 1, 59 - average01 || 0)
+      return average01 + '/' + average02;
+    },
+    // 计算勾选的checkbox值合集
+    checkboxString: function () {
+      let str = this.checkboxList.join();
+      return str == '' ? '*' : str;
+    }
+  }
+}
+</script>

+ 112 - 0
src/components/Crontab/month.vue

@@ -0,0 +1,112 @@
+<template>
+  <el-form size='small'>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="1">
+        月,允许的通配符[, - * /]
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="2">
+        周期从
+        <el-input-number v-model='cycle01' :min="1" :max="11"/>
+        -
+        <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 2" :max="12"/>
+        月
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="3">
+        从
+        <el-input-number v-model='average01' :min="1" :max="11"/>
+        月开始,每
+        <el-input-number v-model='average02' :min="1" :max="12 - average01 || 0"/>
+        月月执行一次
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="4" style="margin-right: 10px;">指定</el-radio>
+      <el-select @click="radioValue=4" clearable v-model="checkboxList" placeholder="可多选" multiple style="flex:1">
+        <el-option v-for="item in 12" :key="item" :value="item">{{ item }}</el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      radioValue: 1,
+      cycle01: 1,
+      cycle02: 2,
+      average01: 1,
+      average02: 1,
+      checkboxList: [],
+    }
+  },
+  name: 'crontab-month',
+  props: ['check', 'cron'],
+  methods: {
+    // 单选按钮值变化时
+    radioChange() {
+      switch (this.radioValue) {
+        case 1:
+          this.$emit('update', 'month', '*');
+          break;
+        case 2:
+          this.$emit('update', 'month', this.cycleTotal);
+          break;
+        case 3:
+          this.$emit('update', 'month', this.averageTotal);
+          break;
+        case 4:
+          this.$emit('update', 'month', this.checkboxString);
+          break;
+      }
+    },
+    // 周期两个值变化时
+    cycleChange() {
+      if (this.radioValue == '2') {
+        this.$emit('update', 'month', this.cycleTotal);
+      }
+    },
+    // 平均两个值变化时
+    averageChange() {
+      if (this.radioValue == '3') {
+        this.$emit('update', 'month', this.averageTotal);
+      }
+    },
+    // checkbox值变化时
+    checkboxChange() {
+      if (this.radioValue == '4') {
+        this.$emit('update', 'month', this.checkboxString);
+      }
+    }
+  },
+  watch: {
+    'radioValue': 'radioChange',
+    'cycleTotal': 'cycleChange',
+    'averageTotal': 'averageChange',
+    'checkboxString': 'checkboxChange'
+  },
+  computed: {
+    // 计算两个周期值
+    cycleTotal: function () {
+      const cycle01 = this.check(this.cycle01, 1, 11)
+      const cycle02 = this.check(this.cycle02, cycle01 ? cycle01 + 1 : 2, 12)
+      return cycle01 + '-' + cycle02;
+    },
+    // 计算平均用到的值
+    averageTotal: function () {
+      const average01 = this.check(this.average01, 1, 11)
+      const average02 = this.check(this.average02, 1, 12 - average01 || 0)
+      return average01 + '/' + average02;
+    },
+    // 计算勾选的checkbox值合集
+    checkboxString: function () {
+      let str = this.checkboxList.join();
+      return str == '' ? '*' : str;
+    }
+  }
+}
+</script>

+ 559 - 0
src/components/Crontab/result.vue

@@ -0,0 +1,559 @@
+<template>
+	<div class="popup-result">
+		<p class="title">最近5次运行时间</p>
+		<ul class="popup-result-scroll">
+			<template v-if='isShow'>
+				<li v-for='item in resultList' :key="item">{{item}}</li>
+			</template>
+			<li v-else>计算结果中...</li>
+		</ul>
+	</div>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			dayRule: '',
+			dayRuleSup: '',
+			dateArr: [],
+			resultList: [],
+			isShow: false
+		}
+	},
+	name: 'crontab-result',
+	methods: {
+		// 表达式值变化时,开始去计算结果
+		expressionChange() {
+
+			// 计算开始-隐藏结果
+			this.isShow = false;
+			// 获取规则数组[0秒、1分、2时、3日、4月、5星期、6年]
+			let ruleArr = this.ex.split(' ');
+			// 用于记录进入循环的次数
+			let nums = 0;
+			// 用于暂时存符号时间规则结果的数组
+			let resultArr = [];
+			// 获取当前时间精确至[年、月、日、时、分、秒]
+			let nTime = new Date();
+			let nYear = nTime.getFullYear();
+			let nMonth = nTime.getMonth() + 1;
+			let nDay = nTime.getDate();
+			let nHour = nTime.getHours();
+			let nMin = nTime.getMinutes();
+			let nSecond = nTime.getSeconds();
+			// 根据规则获取到近100年可能年数组、月数组等等
+			this.getSecondArr(ruleArr[0]);
+			this.getMinArr(ruleArr[1]);
+			this.getHourArr(ruleArr[2]);
+			this.getDayArr(ruleArr[3]);
+			this.getMonthArr(ruleArr[4]);
+			this.getWeekArr(ruleArr[5]);
+			this.getYearArr(ruleArr[6], nYear);
+			// 将获取到的数组赋值-方便使用
+			let sDate = this.dateArr[0];
+			let mDate = this.dateArr[1];
+			let hDate = this.dateArr[2];
+			let DDate = this.dateArr[3];
+			let MDate = this.dateArr[4];
+			let YDate = this.dateArr[5];
+			// 获取当前时间在数组中的索引
+			let sIdx = this.getIndex(sDate, nSecond);
+			let mIdx = this.getIndex(mDate, nMin);
+			let hIdx = this.getIndex(hDate, nHour);
+			let DIdx = this.getIndex(DDate, nDay);
+			let MIdx = this.getIndex(MDate, nMonth);
+			let YIdx = this.getIndex(YDate, nYear);
+			// 重置月日时分秒的函数(后面用的比较多)
+			const resetSecond = function () {
+				sIdx = 0;
+				nSecond = sDate[sIdx]
+			}
+			const resetMin = function () {
+				mIdx = 0;
+				nMin = mDate[mIdx]
+				resetSecond();
+			}
+			const resetHour = function () {
+				hIdx = 0;
+				nHour = hDate[hIdx]
+				resetMin();
+			}
+			const resetDay = function () {
+				DIdx = 0;
+				nDay = DDate[DIdx]
+				resetHour();
+			}
+			const resetMonth = function () {
+				MIdx = 0;
+				nMonth = MDate[MIdx]
+				resetDay();
+			}
+			// 如果当前年份不为数组中当前值
+			if (nYear !== YDate[YIdx]) {
+				resetMonth();
+			}
+			// 如果当前月份不为数组中当前值
+			if (nMonth !== MDate[MIdx]) {
+				resetDay();
+			}
+			// 如果当前“日”不为数组中当前值
+			if (nDay !== DDate[DIdx]) {
+				resetHour();
+			}
+			// 如果当前“时”不为数组中当前值
+			if (nHour !== hDate[hIdx]) {
+				resetMin();
+			}
+			// 如果当前“分”不为数组中当前值
+			if (nMin !== mDate[mIdx]) {
+				resetSecond();
+			}
+
+			// 循环年份数组
+			goYear: for (let Yi = YIdx; Yi < YDate.length; Yi++) {
+				let YY = YDate[Yi];
+				// 如果到达最大值时
+				if (nMonth > MDate[MDate.length - 1]) {
+					resetMonth();
+					continue;
+				}
+				// 循环月份数组
+				goMonth: for (let Mi = MIdx; Mi < MDate.length; Mi++) {
+					// 赋值、方便后面运算
+					let MM = MDate[Mi];
+					MM = MM < 10 ? '0' + MM : MM;
+					// 如果到达最大值时
+					if (nDay > DDate[DDate.length - 1]) {
+						resetDay();
+						if (Mi == MDate.length - 1) {
+							resetMonth();
+							continue goYear;
+						}
+						continue;
+					}
+					// 循环日期数组
+					goDay: for (let Di = DIdx; Di < DDate.length; Di++) {
+						// 赋值、方便后面运算
+						let DD = DDate[Di];
+						let thisDD = DD < 10 ? '0' + DD : DD;
+
+						// 如果到达最大值时
+						if (nHour > hDate[hDate.length - 1]) {
+							resetHour();
+							if (Di == DDate.length - 1) {
+								resetDay();
+								if (Mi == MDate.length - 1) {
+									resetMonth();
+									continue goYear;
+								}
+								continue goMonth;
+							}
+							continue;
+						}
+
+						// 判断日期的合法性,不合法的话也是跳出当前循环
+						if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && this.dayRule !== 'workDay' && this.dayRule !== 'lastWeek' && this.dayRule !== 'lastDay') {
+							resetDay();
+							continue goMonth;
+						}
+						// 如果日期规则中有值时
+						if (this.dayRule == 'lastDay') {
+							// 如果不是合法日期则需要将前将日期调到合法日期即月末最后一天
+
+							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
+								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
+									DD--;
+
+									thisDD = DD < 10 ? '0' + DD : DD;
+								}
+							}
+						} else if (this.dayRule == 'workDay') {
+							// 校验并调整如果是2月30号这种日期传进来时需调整至正常月底
+							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
+								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
+									DD--;
+									thisDD = DD < 10 ? '0' + DD : DD;
+								}
+							}
+							// 获取达到条件的日期是星期X
+							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week');
+							// 当星期日时
+							if (thisWeek == 1) {
+								// 先找下一个日,并判断是否为月底
+								DD++;
+								thisDD = DD < 10 ? '0' + DD : DD;
+								// 判断下一日已经不是合法日期
+								if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
+									DD -= 3;
+								}
+							} else if (thisWeek == 7) {
+								// 当星期6时只需判断不是1号就可进行操作
+								if (this.dayRuleSup !== 1) {
+									DD--;
+								} else {
+									DD += 2;
+								}
+							}
+						} else if (this.dayRule == 'weekDay') {
+							// 如果指定了是星期几
+							// 获取当前日期是属于星期几
+							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week');
+							// 校验当前星期是否在星期池(dayRuleSup)中
+							if (this.dayRuleSup.indexOf(thisWeek) < 0) {
+								// 如果到达最大值时
+								if (Di == DDate.length - 1) {
+									resetDay();
+									if (Mi == MDate.length - 1) {
+										resetMonth();
+										continue goYear;
+									}
+									continue goMonth;
+								}
+								continue;
+							}
+						} else if (this.dayRule == 'assWeek') {
+							// 如果指定了是第几周的星期几
+							// 获取每月1号是属于星期几
+							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week');
+							if (this.dayRuleSup[1] >= thisWeek) {
+								DD = (this.dayRuleSup[0] - 1) * 7 + this.dayRuleSup[1] - thisWeek + 1;
+							} else {
+								DD = this.dayRuleSup[0] * 7 + this.dayRuleSup[1] - thisWeek + 1;
+							}
+						} else if (this.dayRule == 'lastWeek') {
+							// 如果指定了每月最后一个星期几
+							// 校验并调整如果是2月30号这种日期传进来时需调整至正常月底
+							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
+								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
+									DD--;
+									thisDD = DD < 10 ? '0' + DD : DD;
+								}
+							}
+							// 获取月末最后一天是星期几
+							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week');
+							// 找到要求中最近的那个星期几
+							if (this.dayRuleSup < thisWeek) {
+								DD -= thisWeek - this.dayRuleSup;
+							} else if (this.dayRuleSup > thisWeek) {
+								DD -= 7 - (this.dayRuleSup - thisWeek)
+							}
+						}
+						// 判断时间值是否小于10置换成“05”这种格式
+						DD = DD < 10 ? '0' + DD : DD;
+
+						// 循环“时”数组
+						goHour: for (let hi = hIdx; hi < hDate.length; hi++) {
+							let hh = hDate[hi] < 10 ? '0' + hDate[hi] : hDate[hi]
+
+							// 如果到达最大值时
+							if (nMin > mDate[mDate.length - 1]) {
+								resetMin();
+								if (hi == hDate.length - 1) {
+									resetHour();
+									if (Di == DDate.length - 1) {
+										resetDay();
+										if (Mi == MDate.length - 1) {
+											resetMonth();
+											continue goYear;
+										}
+										continue goMonth;
+									}
+									continue goDay;
+								}
+								continue;
+							}
+							// 循环"分"数组
+							goMin: for (let mi = mIdx; mi < mDate.length; mi++) {
+								let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi];
+
+								// 如果到达最大值时
+								if (nSecond > sDate[sDate.length - 1]) {
+									resetSecond();
+									if (mi == mDate.length - 1) {
+										resetMin();
+										if (hi == hDate.length - 1) {
+											resetHour();
+											if (Di == DDate.length - 1) {
+												resetDay();
+												if (Mi == MDate.length - 1) {
+													resetMonth();
+													continue goYear;
+												}
+												continue goMonth;
+											}
+											continue goDay;
+										}
+										continue goHour;
+									}
+									continue;
+								}
+								// 循环"秒"数组
+								goSecond: for (let si = sIdx; si <= sDate.length - 1; si++) {
+									let ss = sDate[si] < 10 ? '0' + sDate[si] : sDate[si];
+									// 添加当前时间(时间合法性在日期循环时已经判断)
+									if (MM !== '00' && DD !== '00') {
+										resultArr.push(YY + '-' + MM + '-' + DD + ' ' + hh + ':' + mm + ':' + ss)
+										nums++;
+									}
+									// 如果条数满了就退出循环
+									if (nums == 5) break goYear;
+									// 如果到达最大值时
+									if (si == sDate.length - 1) {
+										resetSecond();
+										if (mi == mDate.length - 1) {
+											resetMin();
+											if (hi == hDate.length - 1) {
+												resetHour();
+												if (Di == DDate.length - 1) {
+													resetDay();
+													if (Mi == MDate.length - 1) {
+														resetMonth();
+														continue goYear;
+													}
+													continue goMonth;
+												}
+												continue goDay;
+											}
+											continue goHour;
+										}
+										continue goMin;
+									}
+								} //goSecond
+							} //goMin
+						}//goHour
+					}//goDay
+				}//goMonth
+			}
+			// 判断100年内的结果条数
+			if (resultArr.length == 0) {
+				this.resultList = ['没有达到条件的结果!'];
+			} else {
+				this.resultList = resultArr;
+				if (resultArr.length !== 5) {
+					this.resultList.push('最近100年内只有上面' + resultArr.length + '条结果!')
+				}
+			}
+			// 计算完成-显示结果
+			this.isShow = true;
+
+
+		},
+		// 用于计算某位数字在数组中的索引
+		getIndex(arr, value) {
+			if (value <= arr[0] || value > arr[arr.length - 1]) {
+				return 0;
+			} else {
+				for (let i = 0; i < arr.length - 1; i++) {
+					if (value > arr[i] && value <= arr[i + 1]) {
+						return i + 1;
+					}
+				}
+			}
+		},
+		// 获取"年"数组
+		getYearArr(rule, year) {
+			this.dateArr[5] = this.getOrderArr(year, year + 100);
+			if (rule !== undefined) {
+				if (rule.indexOf('-') >= 0) {
+					this.dateArr[5] = this.getCycleArr(rule, year + 100, false)
+				} else if (rule.indexOf('/') >= 0) {
+					this.dateArr[5] = this.getAverageArr(rule, year + 100)
+				} else if (rule !== '*') {
+					this.dateArr[5] = this.getAssignArr(rule)
+				}
+			}
+		},
+		// 获取"月"数组
+		getMonthArr(rule) {
+			this.dateArr[4] = this.getOrderArr(1, 12);
+			if (rule.indexOf('-') >= 0) {
+				this.dateArr[4] = this.getCycleArr(rule, 12, false)
+			} else if (rule.indexOf('/') >= 0) {
+				this.dateArr[4] = this.getAverageArr(rule, 12)
+			} else if (rule !== '*') {
+				this.dateArr[4] = this.getAssignArr(rule)
+			}
+		},
+		// 获取"日"数组-主要为日期规则
+		getWeekArr(rule) {
+			// 只有当日期规则的两个值均为“”时则表达日期是有选项的
+			if (this.dayRule == '' && this.dayRuleSup == '') {
+				if (rule.indexOf('-') >= 0) {
+					this.dayRule = 'weekDay';
+					this.dayRuleSup = this.getCycleArr(rule, 7, false)
+				} else if (rule.indexOf('#') >= 0) {
+					this.dayRule = 'assWeek';
+					let matchRule = rule.match(/[0-9]{1}/g);
+					this.dayRuleSup = [Number(matchRule[1]), Number(matchRule[0])];
+					this.dateArr[3] = [1];
+					if (this.dayRuleSup[1] == 7) {
+						this.dayRuleSup[1] = 0;
+					}
+				} else if (rule.indexOf('L') >= 0) {
+					this.dayRule = 'lastWeek';
+					this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0]);
+					this.dateArr[3] = [31];
+					if (this.dayRuleSup == 7) {
+						this.dayRuleSup = 0;
+					}
+				} else if (rule !== '*' && rule !== '?') {
+					this.dayRule = 'weekDay';
+					this.dayRuleSup = this.getAssignArr(rule)
+				}
+			}
+		},
+		// 获取"日"数组-少量为日期规则
+		getDayArr(rule) {
+			this.dateArr[3] = this.getOrderArr(1, 31);
+			this.dayRule = '';
+			this.dayRuleSup = '';
+			if (rule.indexOf('-') >= 0) {
+				this.dateArr[3] = this.getCycleArr(rule, 31, false)
+				this.dayRuleSup = 'null';
+			} else if (rule.indexOf('/') >= 0) {
+				this.dateArr[3] = this.getAverageArr(rule, 31)
+				this.dayRuleSup = 'null';
+			} else if (rule.indexOf('W') >= 0) {
+				this.dayRule = 'workDay';
+				this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0]);
+				this.dateArr[3] = [this.dayRuleSup];
+			} else if (rule.indexOf('L') >= 0) {
+				this.dayRule = 'lastDay';
+				this.dayRuleSup = 'null';
+				this.dateArr[3] = [31];
+			} else if (rule !== '*' && rule !== '?') {
+				this.dateArr[3] = this.getAssignArr(rule)
+				this.dayRuleSup = 'null';
+			} else if (rule == '*') {
+				this.dayRuleSup = 'null';
+			}
+		},
+		// 获取"时"数组
+		getHourArr(rule) {
+			this.dateArr[2] = this.getOrderArr(0, 23);
+			if (rule.indexOf('-') >= 0) {
+				this.dateArr[2] = this.getCycleArr(rule, 24, true)
+			} else if (rule.indexOf('/') >= 0) {
+				this.dateArr[2] = this.getAverageArr(rule, 23)
+			} else if (rule !== '*') {
+				this.dateArr[2] = this.getAssignArr(rule)
+			}
+		},
+		// 获取"分"数组
+		getMinArr(rule) {
+			this.dateArr[1] = this.getOrderArr(0, 59);
+			if (rule.indexOf('-') >= 0) {
+				this.dateArr[1] = this.getCycleArr(rule, 60, true)
+			} else if (rule.indexOf('/') >= 0) {
+				this.dateArr[1] = this.getAverageArr(rule, 59)
+			} else if (rule !== '*') {
+				this.dateArr[1] = this.getAssignArr(rule)
+			}
+		},
+		// 获取"秒"数组
+		getSecondArr(rule) {
+			this.dateArr[0] = this.getOrderArr(0, 59);
+			if (rule.indexOf('-') >= 0) {
+				this.dateArr[0] = this.getCycleArr(rule, 60, true)
+			} else if (rule.indexOf('/') >= 0) {
+				this.dateArr[0] = this.getAverageArr(rule, 59)
+			} else if (rule !== '*') {
+				this.dateArr[0] = this.getAssignArr(rule)
+			}
+		},
+		// 根据传进来的min-max返回一个顺序的数组
+		getOrderArr(min, max) {
+			let arr = [];
+			for (let i = min; i <= max; i++) {
+				arr.push(i);
+			}
+			return arr;
+		},
+		// 根据规则中指定的零散值返回一个数组
+		getAssignArr(rule) {
+			let arr = [];
+			let assiginArr = rule.split(',');
+			for (let i = 0; i < assiginArr.length; i++) {
+				arr[i] = Number(assiginArr[i])
+			}
+			arr.sort(this.compare)
+			return arr;
+		},
+		// 根据一定算术规则计算返回一个数组
+		getAverageArr(rule, limit) {
+			let arr = [];
+			let agArr = rule.split('/');
+			let min = Number(agArr[0]);
+			let step = Number(agArr[1]);
+			while (min <= limit) {
+				arr.push(min);
+				min += step;
+			}
+			return arr;
+		},
+		// 根据规则返回一个具有周期性的数组
+		getCycleArr(rule, limit, status) {
+			// status--表示是否从0开始(则从1开始)
+			let arr = [];
+			let cycleArr = rule.split('-');
+			let min = Number(cycleArr[0]);
+			let max = Number(cycleArr[1]);
+			if (min > max) {
+				max += limit;
+			}
+			for (let i = min; i <= max; i++) {
+				let add = 0;
+				if (status == false && i % limit == 0) {
+					add = limit;
+				}
+				arr.push(Math.round(i % limit + add))
+			}
+			arr.sort(this.compare)
+			return arr;
+		},
+		// 比较数字大小(用于Array.sort)
+		compare(value1, value2) {
+			if (value2 - value1 > 0) {
+				return -1;
+			} else {
+				return 1;
+			}
+		},
+		// 格式化日期格式如:2017-9-19 18:04:33
+		formatDate(value, type) {
+			// 计算日期相关值
+			let time = typeof value == 'number' ? new Date(value) : value;
+			let Y = time.getFullYear();
+			let M = time.getMonth() + 1;
+			let D = time.getDate();
+			let h = time.getHours();
+			let m = time.getMinutes();
+			let s = time.getSeconds();
+			let week = time.getDay();
+			// 如果传递了type的话
+			if (type == undefined) {
+				return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
+			} else if (type == 'week') {
+				// 在quartz中 1为星期日
+				return week + 1;
+			}
+		},
+		// 检查日期是否存在
+		checkDate(value) {
+			let time = new Date(value);
+			let format = this.formatDate(time)
+			return value === format;
+		}
+	},
+	watch: {
+		'ex': 'expressionChange'
+	},
+	props: ['ex'],
+	mounted: function () {
+		// 初始化 获取一次结果
+		this.expressionChange();
+	}
+}
+
+</script>

+ 115 - 0
src/components/Crontab/second.vue

@@ -0,0 +1,115 @@
+<template>
+  <el-form size="small">
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="1">
+        秒,允许的通配符[, - * /]
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="2">
+        周期从
+        <el-input-number v-model='cycle01' :min="0" :max="58"/>
+        -
+        <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 1" :max="59"/>
+        秒
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="3">
+        从
+        <el-input-number v-model='average01' :min="0" :max="58"/>
+        秒开始,每
+        <el-input-number v-model='average02' :min="1" :max="59 - average01 || 0"/>
+        秒执行一次
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="4" style="margin-right: 10px;">指定</el-radio>
+      <el-select @click="radioValue=4" clearable v-model="checkboxList" placeholder="可多选" multiple style="flex: 1">
+        <el-option v-for="item in 60" :key="item" :value="item-1">{{ item - 1 }}</el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      radioValue: 1,
+      cycle01: 1,
+      cycle02: 2,
+      average01: 0,
+      average02: 1,
+      checkboxList: [],
+    }
+  },
+  name: 'crontab-second',
+  props: ['check', 'radioParent'],
+  methods: {
+    // 单选按钮值变化时
+    radioChange() {
+      switch (this.radioValue) {
+        case 1:
+          this.$emit('update', 'second', '*', 'second');
+          break;
+        case 2:
+          this.$emit('update', 'second', this.cycleTotal);
+          break;
+        case 3:
+          this.$emit('update', 'second', this.averageTotal);
+          break;
+        case 4:
+          this.$emit('update', 'second', this.checkboxString);
+          break;
+      }
+    },
+    // 周期两个值变化时
+    cycleChange() {
+      if (this.radioValue == '2') {
+        this.$emit('update', 'second', this.cycleTotal);
+      }
+    },
+    // 平均两个值变化时
+    averageChange() {
+      if (this.radioValue == '3') {
+        this.$emit('update', 'second', this.averageTotal);
+      }
+    },
+    // checkbox值变化时
+    checkboxChange() {
+      if (this.radioValue == '4') {
+        this.$emit('update', 'second', this.checkboxString);
+      }
+    }
+  },
+  watch: {
+    'radioValue': 'radioChange',
+    'cycleTotal': 'cycleChange',
+    'averageTotal': 'averageChange',
+    'checkboxString': 'checkboxChange',
+    radioParent() {
+      this.radioValue = this.radioParent
+    }
+  },
+  computed: {
+    // 计算两个周期值
+    cycleTotal: function () {
+      const cycle01 = this.check(this.cycle01, 0, 58)
+      const cycle02 = this.check(this.cycle02, cycle01 ? cycle01 + 1 : 1, 59)
+      return cycle01 + '-' + cycle02;
+    },
+    // 计算平均用到的值
+    averageTotal: function () {
+      const average01 = this.check(this.average01, 0, 58)
+      const average02 = this.check(this.average02, 1, 59 - average01 || 0)
+      return average01 + '/' + average02;
+    },
+    // 计算勾选的checkbox值合集
+    checkboxString: function () {
+      let str = this.checkboxList.join();
+      return str == '' ? '*' : str;
+    }
+  }
+}
+</script>

+ 202 - 0
src/components/Crontab/week.vue

@@ -0,0 +1,202 @@
+<template>
+  <el-form size='small'>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="1">
+        周,允许的通配符[, - * ? / L #]
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="2">
+        不指定
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="3">
+        周期从星期
+        <el-select clearable v-model="cycle01">
+          <el-option
+            v-for="(item,index) of weekList"
+            :key="index"
+            :label="item.value"
+            :value="item.key"
+            :disabled="item.key === 1"
+          >{{ item.value }}
+          </el-option>
+        </el-select>
+        -
+        <el-select clearable v-model="cycle02">
+          <el-option
+            v-for="(item,index) of weekList"
+            :key="index"
+            :label="item.value"
+            :value="item.key"
+            :disabled="item.key < cycle01 && item.key !== 1"
+          >{{ item.value }}
+          </el-option>
+        </el-select>
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="4">
+        第
+        <el-input-number v-model='average01' :min="1" :max="4"/>
+        周的星期
+        <el-select clearable v-model="average02">
+          <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">
+            {{ item.value }}
+          </el-option>
+        </el-select>
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="5">
+        本月最后一个星期
+        <el-select clearable v-model="weekday">
+          <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">
+            {{ item.value }}
+          </el-option>
+        </el-select>
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio v-model='radioValue' :label="6" style="margin-right: 10px;">指定</el-radio>
+      <el-select @click="radioValue=6" clearable v-model="checkboxList" placeholder="可多选" multiple style="flex:1">
+        <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="String(item.key)">
+          {{ item.value }}
+        </el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      radioValue: 2,
+      weekday: 2,
+      cycle01: 2,
+      cycle02: 3,
+      average01: 1,
+      average02: 2,
+      checkboxList: [],
+      weekList: [
+        {
+          key: 2,
+          value: '星期一'
+        },
+        {
+          key: 3,
+          value: '星期二'
+        },
+        {
+          key: 4,
+          value: '星期三'
+        },
+        {
+          key: 5,
+          value: '星期四'
+        },
+        {
+          key: 6,
+          value: '星期五'
+        },
+        {
+          key: 7,
+          value: '星期六'
+        },
+        {
+          key: 1,
+          value: '星期日'
+        }
+      ],
+    }
+  },
+  name: 'crontab-week',
+  props: ['check', 'cron'],
+  methods: {
+    // 单选按钮值变化时
+    radioChange() {
+      if (this.radioValue !== 2 && this.cron.day !== '?') {
+        this.$emit('update', 'day', '?', 'week');
+      }
+      switch (this.radioValue) {
+        case 1:
+          this.$emit('update', 'week', '*');
+          break;
+        case 2:
+          this.$emit('update', 'week', '?');
+          break;
+        case 3:
+          this.$emit('update', 'week', this.cycleTotal);
+          break;
+        case 4:
+          this.$emit('update', 'week', this.averageTotal);
+          break;
+        case 5:
+          this.$emit('update', 'week', this.weekdayCheck + 'L');
+          break;
+        case 6:
+          this.$emit('update', 'week', this.checkboxString);
+          break;
+      }
+    },
+
+    // 周期两个值变化时
+    cycleChange() {
+      if (this.radioValue == '3') {
+        this.$emit('update', 'week', this.cycleTotal);
+      }
+    },
+    // 平均两个值变化时
+    averageChange() {
+      if (this.radioValue == '4') {
+        this.$emit('update', 'week', this.averageTotal);
+      }
+    },
+    // 最近工作日值变化时
+    weekdayChange() {
+      if (this.radioValue == '5') {
+        this.$emit('update', 'week', this.weekday + 'L');
+      }
+    },
+    // checkbox值变化时
+    checkboxChange() {
+      if (this.radioValue == '6') {
+        this.$emit('update', 'week', this.checkboxString);
+      }
+    },
+  },
+  watch: {
+    'radioValue': 'radioChange',
+    'cycleTotal': 'cycleChange',
+    'averageTotal': 'averageChange',
+    'weekdayCheck': 'weekdayChange',
+    'checkboxString': 'checkboxChange',
+  },
+  computed: {
+    // 计算两个周期值
+    cycleTotal: function () {
+      this.cycle01 = this.check(this.cycle01, 1, 7)
+      this.cycle02 = this.check(this.cycle02, 1, 7)
+      return this.cycle01 + '-' + this.cycle02;
+    },
+    // 计算平均用到的值
+    averageTotal: function () {
+      this.average01 = this.check(this.average01, 1, 4)
+      this.average02 = this.check(this.average02, 1, 7)
+      return this.average02 + '#' + this.average01;
+    },
+    // 最近的工作日(格式)
+    weekdayCheck: function () {
+      this.weekday = this.check(this.weekday, 1, 7)
+      return this.weekday;
+    },
+    // 计算勾选的checkbox值合集
+    checkboxString: function () {
+      let str = this.checkboxList.join();
+      return str == '' ? '*' : str;
+    }
+  }
+}
+</script>

+ 125 - 0
src/components/Crontab/year.vue

@@ -0,0 +1,125 @@
+<template>
+  <el-form size="small">
+    <el-form-item>
+      <el-radio :label="1" v-model='radioValue'>
+        不填,允许的通配符[, - * /]
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio :label="2" v-model='radioValue'>
+        每年
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio :label="3" v-model='radioValue'>
+        周期从
+        <el-input-number v-model='cycle01' :min='fullYear' :max="2098"/>
+        -
+        <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : fullYear + 1" :max="2099"/>
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio :label="4" v-model='radioValue'>
+        从
+        <el-input-number v-model='average01' :min='fullYear' :max="2098"/>
+        年开始,每
+        <el-input-number v-model='average02' :min="1" :max="2099 - average01 || fullYear"/>
+        年执行一次
+      </el-radio>
+    </el-form-item>
+    <el-form-item>
+      <el-radio :label="5" v-model='radioValue' style="margin-right: 10px;">指定</el-radio>
+      <el-select @click="radioValue=5" clearable v-model="checkboxList" placeholder="可多选" multiple style="flex: 1">
+        <el-option v-for="item in 9" :key="item" :value="item - 1 + fullYear" :label="item -1 + fullYear"/>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      fullYear: 0,
+      radioValue: 1,
+      cycle01: 0,
+      cycle02: 0,
+      average01: 0,
+      average02: 1,
+      checkboxList: [],
+    }
+  },
+  name: 'crontab-year',
+  props: ['check', 'month', 'cron'],
+  methods: {
+    // 单选按钮值变化时
+    radioChange() {
+      switch (this.radioValue) {
+        case 1:
+          this.$emit('update', 'year', '');
+          break;
+        case 2:
+          this.$emit('update', 'year', '*');
+          break;
+        case 3:
+          this.$emit('update', 'year', this.cycleTotal);
+          break;
+        case 4:
+          this.$emit('update', 'year', this.averageTotal);
+          break;
+        case 5:
+          this.$emit('update', 'year', this.checkboxString);
+          break;
+      }
+    },
+    // 周期两个值变化时
+    cycleChange() {
+      if (this.radioValue == '3') {
+        this.$emit('update', 'year', this.cycleTotal);
+      }
+    },
+    // 平均两个值变化时
+    averageChange() {
+      if (this.radioValue == '4') {
+        this.$emit('update', 'year', this.averageTotal);
+      }
+    },
+    // checkbox值变化时
+    checkboxChange() {
+      if (this.radioValue == '5') {
+        this.$emit('update', 'year', this.checkboxString);
+      }
+    }
+  },
+  watch: {
+    'radioValue': 'radioChange',
+    'cycleTotal': 'cycleChange',
+    'averageTotal': 'averageChange',
+    'checkboxString': 'checkboxChange'
+  },
+  computed: {
+    // 计算两个周期值
+    cycleTotal: function () {
+      const cycle01 = this.check(this.cycle01, this.fullYear, 2098)
+      const cycle02 = this.check(this.cycle02, cycle01 ? cycle01 + 1 : this.fullYear + 1, 2099)
+      return cycle01 + '-' + cycle02;
+    },
+    // 计算平均用到的值
+    averageTotal: function () {
+      const average01 = this.check(this.average01, this.fullYear, 2098)
+      const average02 = this.check(this.average02, 1, 2099 - average01 || this.fullYear)
+      return average01 + '/' + average02;
+    },
+    // 计算勾选的checkbox值合集
+    checkboxString: function () {
+      return this.checkboxList.join();
+    }
+  },
+  mounted: function () {
+    // 仅获取当前年份
+    this.fullYear = Number(new Date().getFullYear());
+    this.cycle01 = this.fullYear
+    this.average01 = this.fullYear
+  }
+}
+</script>

+ 0 - 168
src/components/cronComp/cron.vue

@@ -1,168 +0,0 @@
-<template lang="html">
-  <div class="cron" :val="value_">
-    <el-tabs v-model="activeName">
-      <!-- <el-tab-pane label="秒" name="s">
-        <second-and-minute v-model="sVal" lable="秒"></second-and-minute >
-      </el-tab-pane> -->
-      <el-tab-pane label="分" name="m">
-        <second-and-minute v-model="mVal" lable="分"></second-and-minute >
-      </el-tab-pane>
-      <el-tab-pane label="时" name="h">
-        <hour v-model="hVal" lable="时"></hour>
-      </el-tab-pane>
-      <el-tab-pane label="日" name="d">
-        <day v-model="dVal" lable="日"></day>
-      </el-tab-pane>
-      <el-tab-pane label="月" name="month">
-        <month v-model="monthVal" lable="月"></month>
-      </el-tab-pane>
-      <el-tab-pane label="周" name="week">
-        <week v-model="weekVal" lable="周"></week>
-      </el-tab-pane>
-      <el-tab-pane label="年" name="year">
-        <year v-model="yearVal" lable="年"></year>
-      </el-tab-pane>
-    </el-tabs>
-    <!-- table -->
-    <el-table
-       :data="tableData"
-       size="mini"
-       border
-       style="width: 100%;">
-       <el-table-column
-         prop="sVal"
-         label="秒"
-         width="70">
-       </el-table-column>
-       <el-table-column
-         prop="mVal"
-         label="分"
-         width="70">
-       </el-table-column>
-       <el-table-column
-         prop="hVal"
-         label="时"
-         width="70">
-       </el-table-column>
-       <el-table-column
-         prop="dVal"
-         label="日"
-         width="70">
-       </el-table-column>
-       <el-table-column
-         prop="monthVal"
-         label="月"
-         width="70">
-       </el-table-column>
-       <el-table-column
-         prop="weekVal"
-         label="周"
-         width="70">
-       </el-table-column>
-       <el-table-column
-         prop="yearVal"
-         label="年">
-       </el-table-column>
-     </el-table>
-  </div>
-</template>
-
-<script>
-import SecondAndMinute from './cron/secondAndMinute'
-import hour from './cron/hour'
-import day from './cron/day'
-import month from './cron/month'
-import week from './cron/week'
-import year from './cron/year'
-export default {
-  props: {
-    modelValue: {
-      type: String
-    }
-  },
-  data () {
-    return {
-      //
-      activeName: 'm',
-      sVal: '',
-      mVal: '',
-      hVal: '',
-      dVal: '',
-      monthVal: '',
-      weekVal: '',
-      yearVal: ''
-    }
-  },
-  watch: {
-    'modelValue' (a, b) {
-      this.updateVal()
-    },
-    dVal(val,val2){
-    }
-  },
-  computed: {
-    tableData () {
-      return [{
-        sVal: this.sVal,
-        mVal: this.mVal,
-        hVal: this.hVal,
-        dVal: this.dVal,
-        monthVal: this.monthVal,
-        weekVal: this.weekVal,
-        yearVal: this.yearVal
-      }]
-    },
-    value_ () {
-      if (!this.dVal && !this.weekVal) {
-        return ''
-      }
-      if (this.dVal === '?' && this.weekVal === '?') {
-        // alert('日期与星期不可以同时为“不指定”')
-      }
-      if (this.dVal !== '?' && this.weekVal !== '?') {
-        // alert('日期与星期必须有一个为“不指定”')
-      }
-      let v = `${this.sVal} ${this.mVal} ${this.hVal} ${this.dVal} ${this.monthVal} ${this.weekVal} ${this.yearVal}`
-      if (v !== this.modelValue) {
-        this.$emit('update:modelValue', v)
-      }
-      return v
-    }
-  },
-  methods: {
-    updateVal () {
-      if (!this.modelValue) {
-        return
-      }
-      let arrays = this.modelValue.split(' ')
-      this.sVal = arrays[0]
-      this.mVal = arrays[1]
-      this.hVal = arrays[2]
-      this.dVal = arrays[3]
-      this.monthVal = arrays[4]
-      this.weekVal = arrays[5]
-      this.yearVal = arrays[6]
-    }
-  },
-  created () {
-    this.updateVal()
-  },
-  components: {
-    SecondAndMinute, hour, day, month, week, year
-  }
-}
-</script>
-
-<style lang="css">
-.cron {
-  width: 100%;
-  text-align: left;
-  padding: 10px;
-  background: #fff;
-  /* border: 1px solid #dcdfe6; */
-  box-shadow: 0 2px 4px 0 rgba(0,0,0,.1), 0 0 6px 0 rgba(0,0,0,.04);
-}
-.cron-m-b-10 {
-  margin-bottom: 10px;
-}
-</style>

+ 0 - 163
src/components/cronComp/cron/day.vue

@@ -1,163 +0,0 @@
-<template lang="html">
-  <div :val="value_">
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="1" size="mini" border>每日</el-radio>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="5" size="mini" border>不指定</el-radio>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="2" size="mini" border>周期</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">从</span>
-      <el-input-number @change="type = '2'" v-model="cycle.start" :min="1" :max="31" size="mini" style="width: 100px;"></el-input-number>
-      <span style="margin-left: 5px; margin-right: 5px;">至</span>
-      <el-input-number @change="type = '2'" v-model="cycle.end" :min="2" :max="31" size="mini" style="width: 100px;"></el-input-number>
-      日
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="3" size="mini" border>循环</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">从</span>
-      <el-input-number @change="type = '3'" v-model="loop.start" :min="1" :max="31" size="mini" style="width: 100px;"></el-input-number>
-      <span style="margin-left: 5px; margin-right: 5px;">日开始,每</span>
-      <el-input-number @change="type = '3'" v-model="loop.end" :min="1" :max="31" size="mini" style="width: 100px;"></el-input-number>
-      日执行一次
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="8" size="mini" border>工作日</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">本月</span>
-      <el-input-number @change="type = '8'" v-model="work" :min="1" :max="7" size="mini" style="width: 100px;"></el-input-number>
-      号,最近的工作日
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="6" size="mini" border>本月最后一天</el-radio>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="4" size="mini" border>指定</el-radio>
-      <el-checkbox-group v-model="appoint">
-        <div>
-          <el-checkbox @change="type = '4'"  v-for="i in 31" :key="i" :label="(i)+''" :style="{marginLeft:'10px',width:'40px'}"></el-checkbox>
-        </div>
-        <!-- <div  v-for="i in 4" :key="i" style="margin-left: 10px;  line-height: 25px;">
-          <el-checkbox @change="type = '4'"  v-for="j in 10" v-if="parseInt((i - 1) + '' + (j )) < 32 && !(i === 1 && j === 1)" :key="j" :label="(i - 1) + '' + (j)"></el-checkbox>
-        </div> -->
-      </el-checkbox-group>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    modelValue: {
-      type: String,
-      default: '?'
-    }
-  },
-  data () {
-    return {
-      type: '5', // 类型
-      cycle: { // 周期
-        start: 0,
-        end: 0
-      },
-      loop: { // 循环
-        start: 0,
-        end: 0
-      },
-      week: { // 指定周
-        start: 0,
-        end: 0
-      },
-      work: 0,
-      last: 0,
-      appoint: [] // 指定
-    }
-  },
-  computed: {
-    value_ () {
-      let result = []
-      switch (this.type) {
-        case '1': // 每秒
-          result.push('*')
-          break
-        case '2': // 周期
-          result.push(`${this.cycle.start}-${this.cycle.end}`)
-          break
-        case '3': // 循环
-          result.push(`${this.loop.start}/${this.loop.end}`)
-          break
-        case '4': // 指定
-          result.push(this.appoint.join(','))
-          break
-        case '6': // 最后
-          result.push(`${this.last === 0 ? '' : this.last}L`)
-          break
-        case '7': // 指定周
-          result.push(`${this.week.start}#${this.week.end}`)
-          break
-        case '8': // 工作日
-          result.push(`${this.work}W`)
-          break
-        default: // 不指定
-          result.push('?')
-          break
-      };
-      this.$emit('update:modelValue', result.join(''))
-      return result.join('')
-    }
-  },
-  watch: {
-    'modelValue' (a, b) {
-      this.updateVal()
-    }
-  },
-  methods: {
-    updateVal () {
-      if (!this.modelValue) {
-        return
-      }
-      if (this.modelValue === '?') {
-        this.type = '5'
-      } else if (this.modelValue.indexOf('-') !== -1) { // 2周期
-        if (this.modelValue.split('-').length === 2) {
-          this.type = '2'
-          this.cycle.start = this.modelValue.split('-')[0]
-          this.cycle.end = this.modelValue.split('-')[1]
-        }
-      } else if (this.modelValue.indexOf('/') !== -1) { // 3循环
-        if (this.modelValue.split('/').length === 2) {
-          this.type = '3'
-          this.loop.start = this.modelValue.split('/')[0]
-          this.loop.end = this.modelValue.split('/')[1]
-        }
-      } else if (this.modelValue.indexOf('*') !== -1) { // 1每
-        this.type = '1'
-      } else if (this.modelValue.indexOf('L') !== -1) { // 6最后
-        this.type = '6'
-        this.last = this.modelValue.replace('L', '')
-      } else if (this.modelValue.indexOf('#') !== -1) { // 7指定周
-        if (this.modelValue.split('#').length === 2) {
-          this.type = '7'
-          this.week.start = this.modelValue.split('#')[0]
-          this.week.end = this.modelValue.split('#')[1]
-        }
-      } else if (this.modelValue.indexOf('W') !== -1) { // 8工作日
-        this.type = '8'
-        this.work = this.modelValue.replace('W', '')
-      } else { // *
-        this.type = '4'
-        this.appoint = this.modelValue.split(',')
-      }
-    }
-  },
-  created () {
-    this.updateVal()
-  }
-}
-</script>
-
-<style lang="css">
-.el-checkbox+.el-checkbox {
-    margin-left: 10px;
-}
-</style>

+ 0 - 145
src/components/cronComp/cron/hour.vue

@@ -1,145 +0,0 @@
-<template lang="html">
-  <div :val="value_">
-    <!-- <div class="cron-m-b-10">
-      <el-radio v-model="type" label="1" size="mini" border>每时</el-radio>
-    </div> -->
-    <!-- <div class="cron-m-b-10">
-      <el-radio v-model="type" label="2" size="mini" border>周期</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">从</span>
-      <el-input-number @change="type = '2'" v-model="cycle.start" :min="0" :max="23" size="mini" style="width: 100px;"></el-input-number>
-      <span style="margin-left: 5px; margin-right: 5px;">至</span>
-      <el-input-number @change="type = '2'" v-model="cycle.end" :min="2" :max="23" size="mini" style="width: 100px;"></el-input-number>
-      时
-    </div> -->
-    <!-- <div class="cron-m-b-10">
-      <el-radio v-model="type" label="3" size="mini" border>循环</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">从</span>
-      <el-input-number @change="type = '3'" v-model="loop.start" :min="0" :max="23" size="mini" style="width: 100px;"></el-input-number>
-      <span style="margin-left: 5px; margin-right: 5px;">时开始,每</span>
-      <el-input-number @change="type = '3'" v-model="loop.end" :min="1" :max="23" size="mini" style="width: 100px;"></el-input-number>
-      时执行一次
-    </div> -->
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="4" size="mini" border>指定</el-radio>
-      <el-checkbox-group v-model="appoint">
-        <div  v-for="i in 2" :key="i" style="margin-left: 10px;  line-height: 25px;">
-          <el-checkbox @change="type = '4'"  v-for="j in 10"  :key="j" :label="(i - 1) + '' + (j - 1)"></el-checkbox>
-        </div>
-        <div  v-for="i in 1" :key="i" style="margin-left: 10px;  line-height: 25px;">
-          <el-checkbox @change="type = '4'"  v-for="j in 4"  :key="j" :label="(2) + '' + (j - 1)"></el-checkbox>
-        </div>
-      </el-checkbox-group>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    modelValue: {
-      type: String,
-      default: '*'
-    }
-  },
-  data () {
-    return {
-      type: '1', // 类型
-      cycle: { // 周期
-        start: 0,
-        end: 0
-      },
-      loop: { // 循环
-        start: 0,
-        end: 0
-      },
-      week: { // 指定周
-        start: 0,
-        end: 0
-      },
-      work: 0,
-      last: 0,
-      appoint: [] // 指定
-    }
-  },
-  computed: {
-    value_ () {
-      let result = []
-      switch (this.type) {
-        case '1': // 每秒
-          result.push('*')
-          break
-        case '2': // 年期
-          result.push(`${this.cycle.start}-${this.cycle.end}`)
-          break
-        case '3': // 循环
-          result.push(`${this.loop.start}/${this.loop.end}`)
-          break
-        case '4': // 指定
-          result.push(this.appoint.join(','))
-          break
-        case '6': // 最后
-          result.push(`${this.last === 0 ? '' : this.last}L`)
-          break
-        default: // 不指定
-          result.push('?')
-          break
-      };
-      this.$emit('update:modelValue', result.join(''))
-      return result.join('')
-    }
-  },
-  watch: {
-    'modelValue' (a, b) {
-      this.updateVal()
-    }
-  },
-  methods: {
-    updateVal () {
-      if (!this.modelValue) {
-        return
-      }
-      if (this.modelValue === '?') {
-        this.type = '5'
-      } else if (this.modelValue.indexOf('-') !== -1) { // 2周期
-        if (this.modelValue.split('-').length === 2) {
-          this.type = '2'
-          this.cycle.start = this.modelValue.split('-')[0]
-          this.cycle.end = this.modelValue.split('-')[1]
-        }
-      } else if (this.modelValue.indexOf('/') !== -1) { // 3循环
-        if (this.modelValue.split('/').length === 2) {
-          this.type = '3'
-          this.loop.start = this.modelValue.split('/')[0]
-          this.loop.end = this.modelValue.split('/')[1]
-        }
-      } else if (this.modelValue.indexOf('*') !== -1) { // 1每
-        this.type = '1'
-      } else if (this.modelValue.indexOf('L') !== -1) { // 6最后
-        this.type = '6'
-        this.last = this.modelValue.replace('L', '')
-      } else if (this.modelValue.indexOf('#') !== -1) { // 7指定周
-        if (this.modelValue.split('#').length === 2) {
-          this.type = '7'
-          this.week.start = this.modelValue.split('#')[0]
-          this.week.end = this.modelValue.split('#')[1]
-        }
-      } else if (this.modelValue.indexOf('W') !== -1) { // 8工作日
-        this.type = '8'
-        this.work = this.modelValue.replace('W', '')
-      } else { // *
-        this.type = '4'
-        this.appoint = this.modelValue.split(',')
-      }
-    }
-  },
-  created () {
-    this.updateVal()
-  }
-}
-</script>
-
-<style lang="css">
-.el-checkbox+.el-checkbox {
-    margin-left: 10px;
-}
-</style>

+ 0 - 143
src/components/cronComp/cron/month.vue

@@ -1,143 +0,0 @@
-<template lang="html">
-  <div :val="value_">
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="1" size="mini" border>每月</el-radio>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="5" size="mini" border>不指定</el-radio>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="2" size="mini" border>周期</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">从</span>
-      <el-input-number @change="type = '2'" v-model="cycle.start" :min="1" :max="12" size="mini" style="width: 100px;"></el-input-number>
-      <span style="margin-left: 5px; margin-right: 5px;">至</span>
-      <el-input-number @change="type = '2'" v-model="cycle.end" :min="2" :max="12" size="mini" style="width: 100px;"></el-input-number>
-      月
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="3" size="mini" border>循环</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">从</span>
-      <el-input-number @change="type = '3'" v-model="loop.start" :min="1" :max="12" size="mini" style="width: 100px;"></el-input-number>
-      <span style="margin-left: 5px; margin-right: 5px;">月开始,每</span>
-      <el-input-number @change="type = '3'" v-model="loop.end" :min="1" :max="12" size="mini" style="width: 100px;"></el-input-number>
-      月执行一次
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="4" size="mini" border>指定</el-radio>
-      <el-checkbox-group v-model="appoint" style="margin-left: 0px;  line-height: 25px;">
-          <el-checkbox @change="type = '4'"  v-for="i in 12" :key="i" :label="i"></el-checkbox>
-      </el-checkbox-group>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    modelValue: {
-      type: String,
-      default: '*'
-    }
-  },
-  data () {
-    return {
-      type: '1', // 类型
-      cycle: { // 周期
-        start: 0,
-        end: 0
-      },
-      loop: { // 循环
-        start: 0,
-        end: 0
-      },
-      week: { // 指定周
-        start: 0,
-        end: 0
-      },
-      work: 0,
-      last: 0,
-      appoint: [] // 指定
-    }
-  },
-  computed: {
-    value_ () {
-      let result = []
-      switch (this.type) {
-        case '1': // 每秒
-          result.push('*')
-          break
-        case '2': // 年期
-          result.push(`${this.cycle.start}-${this.cycle.end}`)
-          break
-        case '3': // 循环
-          result.push(`${this.loop.start}/${this.loop.end}`)
-          break
-        case '4': // 指定
-          result.push(this.appoint.join(','))
-          break
-        case '6': // 最后
-          result.push(`${this.last === 0 ? '' : this.last}L`)
-          break
-        default: // 不指定
-          result.push('?')
-          break
-      };
-      this.$emit('update:modelValue', result.join(''))
-      return result.join('')
-    }
-  },
-  watch: {
-    'modelValue' (a, b) {
-      this.updateVal()
-    }
-  },
-  methods: {
-    updateVal () {
-      if (!this.modelValue) {
-        return
-      }
-      if (this.modelValue === '?') {
-        this.type = '5'
-      } else if (this.modelValue.indexOf('-') !== -1) { // 2周期
-        if (this.modelValue.split('-').length === 2) {
-          this.type = '2'
-          this.cycle.start = this.modelValue.split('-')[0]
-          this.cycle.end = this.modelValue.split('-')[1]
-        }
-      } else if (this.modelValue.indexOf('/') !== -1) { // 3循环
-        if (this.modelValue.split('/').length === 2) {
-          this.type = '3'
-          this.loop.start = this.modelValue.split('/')[0]
-          this.loop.end = this.modelValue.split('/')[1]
-        }
-      } else if (this.modelValue.indexOf('*') !== -1) { // 1每
-        this.type = '1'
-      } else if (this.modelValue.indexOf('L') !== -1) { // 6最后
-        this.type = '6'
-        this.last = this.modelValue.replace('L', '')
-      } else if (this.modelValue.indexOf('#') !== -1) { // 7指定周
-        if (this.modelValue.split('#').length === 2) {
-          this.type = '7'
-          this.week.start = this.modelValue.split('#')[0]
-          this.week.end = this.modelValue.split('#')[1]
-        }
-      } else if (this.modelValue.indexOf('W') !== -1) { // 8工作日
-        this.type = '8'
-        this.work = this.modelValue.replace('W', '')
-      } else { // *
-        this.type = '4'
-        this.appoint = this.modelValue.split(',')
-      }
-    }
-  },
-  created () {
-    this.updateVal()
-  }
-}
-</script>
-
-<style lang="css">
-.el-checkbox+.el-checkbox {
-    margin-left: 10px;
-}
-</style>

+ 0 - 150
src/components/cronComp/cron/secondAndMinute.vue

@@ -1,150 +0,0 @@
-<!-- 秒,分钟 -->
-<template lang="html">
-  <div :val="value_">
-    <!-- <div class="cron-m-b-10">
-      <el-radio v-model="type" label="1" size="mini" border>每{{lable}}</el-radio>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="2" size="mini" border>周期</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">从</span>
-      <el-input-number @change="type = '2'" v-model="cycle.start" :min="1" :max="59" size="mini" style="width: 100px;"></el-input-number>
-      <span style="margin-left: 5px; margin-right: 5px;">至</span>
-      <el-input-number @change="type = '2'" v-model="cycle.end" :min="2" :max="59" size="mini" style="width: 100px;"></el-input-number>
-      {{lable}}
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="3" size="mini" border>循环</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">从</span>
-      <el-input-number @change="type = '3'" v-model="loop.start" :min="0" :max="59" size="mini" style="width: 100px;"></el-input-number>
-      <span style="margin-left: 5px; margin-right: 5px;">{{lable}}开始,每</span>
-      <el-input-number @change="type = '3'" v-model="loop.end" :min="1" :max="59" size="mini" style="width: 100px;"></el-input-number>
-      {{lable}}执行一次
-    </div> -->
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="4" size="mini" border>指定</el-radio>
-      <el-checkbox-group v-model="appoint">
-        <div  v-for="i in 6" :key="i" style="margin-left: 10px; line-height: 25px;">
-          <el-checkbox @change="type = '4'"  v-for="j in 10" :key="j" :label="(i - 1) + '' + (j - 1)"></el-checkbox>
-        </div>
-      </el-checkbox-group>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    modelValue: {
-      type: String,
-      default: '*'
-    },
-    lable: {
-      type: String
-    }
-  },
-  data () {
-    return {
-      type: '1', // 类型
-      cycle: { // 周期
-        start: 0,
-        end: 0
-      },
-      loop: { // 循环
-        start: 0,
-        end: 0
-      },
-      week: { // 指定周
-        start: 0,
-        end: 0
-      },
-      work: 0,
-      last: 0,
-      appoint: [] // 指定
-    }
-  },
-  computed: {
-    value_ () {
-      let result = []
-      switch (this.type) {
-        case '1': // 每秒
-          result.push('*')
-          break
-        case '2': // 年期
-          result.push(`${this.cycle.start}-${this.cycle.end}`)
-          break
-        case '3': // 循环
-          result.push(`${this.loop.start}/${this.loop.end}`)
-          break
-        case '4': // 指定
-          result.push(this.appoint.join(','))
-          break
-        case '6': // 最后
-          result.push(`${this.last === 0 ? '' : this.last}L`)
-          break
-        default: // 不指定
-          result.push('?')
-          break
-      };
-      this.$emit('update:modelValue', result.join(''))
-      return result.join('')
-    }
-  },
-  watch: {
-    'modelValue' (a, b) {
-      this.updateVal()
-    }
-  },
-  methods: {
-    updateVal () {
-      if (!this.modelValue) {
-        return
-      }
-      if (this.modelValue === '?') {
-        this.type = '5'
-      } else if (this.modelValue.indexOf('-') !== -1) { // 2周期
-        if (this.modelValue.split('-').length === 2) {
-          this.type = '2'
-          this.cycle.start = this.modelValue.split('-')[0]
-          this.cycle.end = this.modelValue.split('-')[1]
-        }
-      } else if (this.modelValue.indexOf('/') !== -1) { // 3循环
-        if (this.modelValue.split('/').length === 2) {
-          this.type = '3'
-          this.loop.start = this.modelValue.split('/')[0]
-          this.loop.end = this.modelValue.split('/')[1]
-        }
-      } else if (this.modelValue.indexOf('*') !== -1) { // 1每
-        this.type = '1'
-      } else if (this.modelValue.indexOf('L') !== -1) { // 6最后
-        this.type = '6'
-        this.last = this.modelValue.replace('L', '')
-      } else if (this.modelValue.indexOf('#') !== -1) { // 7指定周
-        if (this.modelValue.split('#').length === 2) {
-          this.type = '7'
-          this.week.start = this.modelValue.split('#')[0]
-          this.week.end = this.modelValue.split('#')[1]
-        }
-      } else if (this.modelValue.indexOf('W') !== -1) { // 8工作日
-        this.type = '8'
-        this.work = this.modelValue.replace('W', '')
-      } else { // *
-        this.type = '4'
-        this.appoint = this.modelValue.split(',')
-      }
-    }
-  },
-  created () {
-    this.updateVal()
-  }
-}
-</script>
-
-<style lang="css">
-.el-checkbox+.el-checkbox {
-    margin-left: 10px;
-}
-.cron-m-b-10 {
-  margin-bottom: 10px;
-}
-
-</style>

+ 0 - 157
src/components/cronComp/cron/week.vue

@@ -1,157 +0,0 @@
-<template lang="html">
-  <div :val="value_">
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="1" size="mini" border>每周</el-radio>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="5" size="mini" border>不指定</el-radio>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="2" size="mini" border>周期</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">从星期</span>
-      <el-input-number @change="type = '2'" v-model="cycle.start" :min="1" :max="7" size="mini" style="width: 100px;"></el-input-number>
-      <span style="margin-left: 5px; margin-right: 5px;">至星期</span>
-      <el-input-number @change="type = '2'" v-model="cycle.end" :min="2" :max="7" size="mini" style="width: 100px;"></el-input-number>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="3" size="mini" border>循环</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">从星期</span>
-      <el-input-number @change="type = '3'" v-model="loop.start" :min="1" :max="7" size="mini" style="width: 100px;"></el-input-number>
-      <span style="margin-left: 5px; margin-right: 5px;">开始,每</span>
-      <el-input-number @change="type = '3'" v-model="loop.end" :min="1" :max="7" size="mini" style="width: 100px;"></el-input-number>
-      天执行一次
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="7" size="mini" border>指定周</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">本月第</span>
-      <el-input-number @change="type = '7'" v-model="week.start" :min="1" :max="4" size="mini" style="width: 100px;"></el-input-number>
-      <span style="margin-left: 5px; margin-right: 5px;">周,星期</span>
-      <el-input-number @change="type = '7'" v-model="week.end" :min="1" :max="7" size="mini" style="width: 100px;"></el-input-number>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="6" size="mini" border>本月最后一个</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">星期</span>
-      <el-input-number @change="type = '6'" v-model="last" :min="1" :max="7" size="mini" style="width: 100px;"></el-input-number>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="4" size="mini" border>指定</el-radio>
-      <el-checkbox-group v-model="appoint" style="margin-left: 5px;  line-height: 25px;">
-          <el-checkbox @change="type = '4'"  v-for="i in 7" :key="i" :label="i"></el-checkbox>
-      </el-checkbox-group>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    modelValue: {
-      type: String,
-      default: '*'
-    }
-  },
-  data () {
-    return {
-      type: '1', // 类型
-      cycle: { // 周期
-        start: 0,
-        end: 0
-      },
-      loop: { // 循环
-        start: 0,
-        end: 0
-      },
-      week: { // 指定周
-        start: 0,
-        end: 0
-      },
-      work: 0,
-      last: 0,
-      appoint: [] // 指定
-    }
-  },
-  computed: {
-    value_ () {
-      let result = []
-      switch (this.type) {
-        case '1': // 每秒
-          result.push('*')
-          break
-        case '2': // 年期
-          result.push(`${this.cycle.start}-${this.cycle.end}`)
-          break
-        case '3': // 循环
-          result.push(`${this.loop.start}/${this.loop.end}`)
-          break
-        case '4': // 指定
-          result.push(this.appoint.join(','))
-          break
-        case '6': // 最后
-          result.push(`${this.last === 0 ? '' : this.last}L`)
-          break
-        case '7': // 指定周
-          result.push(`${this.week.start}#${this.week.end}`)
-          break
-        default: // 不指定
-          result.push('?')
-          break
-      };
-      this.$emit('update:modelValue', result.join(''))
-      return result.join('')
-    }
-  },
-  watch: {
-    'modelValue' (a, b) {
-      this.updateVal()
-    }
-  },
-  methods: {
-    updateVal () {
-      if (!this.modelValue) {
-        return
-      }
-      if (this.modelValue === '?') {
-        this.type = '5'
-      } else if (this.modelValue.indexOf('-') !== -1) { // 2周期
-        if (this.modelValue.split('-').length === 2) {
-          this.type = '2'
-          this.cycle.start = this.modelValue.split('-')[0]
-          this.cycle.end = this.modelValue.split('-')[1]
-        }
-      } else if (this.modelValue.indexOf('/') !== -1) { // 3循环
-        if (this.modelValue.split('/').length === 2) {
-          this.type = '3'
-          this.loop.start = this.modelValue.split('/')[0]
-          this.loop.end = this.modelValue.split('/')[1]
-        }
-      } else if (this.modelValue.indexOf('*') !== -1) { // 1每
-        this.type = '1'
-      } else if (this.modelValue.indexOf('L') !== -1) { // 6最后
-        this.type = '6'
-        this.last = this.modelValue.replace('L', '')
-      } else if (this.modelValue.indexOf('#') !== -1) { // 7指定周
-        if (this.modelValue.split('#').length === 2) {
-          this.type = '7'
-          this.week.start = this.modelValue.split('#')[0]
-          this.week.end = this.modelValue.split('#')[1]
-        }
-      } else if (this.modelValue.indexOf('W') !== -1) { // 8工作日
-        this.type = '8'
-        this.work = this.modelValue.replace('W', '')
-      } else { // *
-        this.type = '4'
-        this.appoint = this.modelValue.split(',')
-      }
-    }
-  },
-  created () {
-    this.updateVal()
-  }
-}
-</script>
-
-<style lang="css">
-.el-checkbox+.el-checkbox {
-    margin-left: 10px;
-}
-</style>

+ 0 - 130
src/components/cronComp/cron/year.vue

@@ -1,130 +0,0 @@
-<template lang="html">
-  <div :val="value_">
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="1" size="mini" border>每年</el-radio>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="5" size="mini" border>不指定</el-radio>
-    </div>
-    <div class="cron-m-b-10">
-      <el-radio v-model="type" label="2" size="mini" border>周期</el-radio>
-      <span style="margin-left: 10px; margin-right: 5px;">从</span>
-      <el-input-number @change="type = '2'" v-model="cycle.start" :min="2000" size="mini" style="width: 100px;"></el-input-number>
-      <span style="margin-left: 5px; margin-right: 5px;">至</span>
-      <el-input-number @change="type = '2'" v-model="cycle.end" :min="2000"  size="mini" style="width: 100px;"></el-input-number>
-      年
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    modelValue: {
-      type: String,
-      default: '*'
-    }
-  },
-  data () {
-    let year = new Date().getFullYear()
-    return {
-      type: '1', // 类型
-      cycle: { // 周期
-        start: year,
-        end: year
-      },
-      loop: { // 循环
-        start: 0,
-        end: 0
-      },
-      week: { // 指定周
-        start: 0,
-        end: 0
-      },
-      work: 0,
-      last: 0,
-      appoint: [] // 指定
-    }
-  },
-  computed: {
-    value_ () {
-      let result = []
-      switch (this.type) {
-        case '1': // 每秒
-          result.push('*')
-          break
-        case '2': // 年期
-          result.push(`${this.cycle.start}-${this.cycle.end}`)
-          break
-        case '3': // 循环
-          result.push(`${this.loop.start}/${this.loop.end}`)
-          break
-        case '4': // 指定
-          result.push(this.appoint.join(','))
-          break
-        case '6': // 最后
-          result.push(`${this.last === 0 ? '' : this.last}L`)
-          break
-        default: // 不指定
-          result.push('?')
-          break
-      };
-      this.$emit('update:modelValue', result.join(''))
-      return result.join('')
-    }
-  },
-  watch: {
-    'modelValue' (a, b) {
-      this.updateVal()
-    }
-  },
-  methods: {
-    updateVal () {
-      if (!this.modelValue) {
-        return
-      }
-      if (this.modelValue === '?') {
-        this.type = '5'
-      } else if (this.modelValue.indexOf('-') !== -1) { // 2周期
-        if (this.modelValue.split('-').length === 2) {
-          this.type = '2'
-          this.cycle.start = this.modelValue.split('-')[0]
-          this.cycle.end = this.modelValue.split('-')[1]
-        }
-      } else if (this.modelValue.indexOf('/') !== -1) { // 3循环
-        if (this.modelValue.split('/').length === 2) {
-          this.type = '3'
-          this.loop.start = this.modelValue.split('/')[0]
-          this.loop.end = this.modelValue.split('/')[1]
-        }
-      } else if (this.modelValue.indexOf('*') !== -1) { // 1每
-        this.type = '1'
-      } else if (this.modelValue.indexOf('L') !== -1) { // 6最后
-        this.type = '6'
-        this.last = this.modelValue.replace('L', '')
-      } else if (this.modelValue.indexOf('#') !== -1) { // 7指定周
-        if (this.modelValue.split('#').length === 2) {
-          this.type = '7'
-          this.week.start = this.modelValue.split('#')[0]
-          this.week.end = this.modelValue.split('#')[1]
-        }
-      } else if (this.modelValue.indexOf('W') !== -1) { // 8工作日
-        this.type = '8'
-        this.work = this.modelValue.replace('W', '')
-      } else { // *
-        this.type = '4'
-        this.appoint = this.modelValue.split(',')
-      }
-    }
-  },
-  created () {
-    this.updateVal()
-  }
-}
-</script>
-
-<style lang="css">
-.el-checkbox+.el-checkbox {
-    margin-left: 10px;
-}
-</style>

File diff suppressed because it is too large
+ 1 - 1
src/util/auth.js


+ 15 - 11
src/views/batchTask/list.vue

@@ -82,15 +82,14 @@
       </el-table>
       <my-page :conf="state.page" @getData="getData"></my-page>
     </div>
-    <!-- 任务调度弹窗  需要生成一个 jobcron表达式 控件-->
-    <el-dialog width="1000px" append-to-body v-model="tirrgerShow" title="任务调度" class="instance-err-dialog"
-               @close="closeCron">
-      <el-form :model="paramsTriggerObj" ref="triggerForm" :rules="triggerFormRules" label-width="100px">
-        <el-form-item label="任务调度">
-          <vue3Cron @change="changeCron" v-model="paramsTriggerObj.jobCron"></vue3Cron>
-        </el-form-item>
-        <el-form-item label="CRON预览" prop="jobCron">
-          <el-input v-model="paramsTriggerObj.jobCron" disabled></el-input>
+    <el-dialog width="600px" append-to-body v-model="tirrgerShow" title="任务调度" class="instance-err-dialog">
+      <el-form :model="paramsTriggerObj" ref="triggerForm" :rules="triggerFormRules" label-width="120px">
+        <el-form-item label="CRON表达式" prop="jobCron">
+          <el-input v-model="paramsTriggerObj.jobCron">
+            <template #append>
+              <el-button type="primary" @click="state.showCron = true">生成表达式</el-button>
+            </template>
+          </el-input>
         </el-form-item>
         <el-form-item label="任务调度状态">
           <el-switch
@@ -165,6 +164,11 @@
         <el-button size="small" style="width: 100px" type="primary" @click="onSaveAuth">确定</el-button>
       </div>
     </el-dialog>
+    <el-dialog v-model="state.showCron" append-to-body width="600">
+      <crontab
+        @hide="state.showCron=false" @fill="paramsTriggerObj.jobCron=$event" :expression="paramsTriggerObj.jobCron"
+      ></crontab>
+    </el-dialog>
   </div>
 </template>
 <script setup>
@@ -174,7 +178,7 @@ import store from "@/store";
 import router from "@/router";
 import {jobList, jobRun, jobCheck, jobDelete, jobScheduleSet} from '@/api/batch'
 import {ElMessage, ElMessageBox} from "element-plus";
-import vue3Cron from '@/components/cronComp/cron.vue'
+import Crontab from '@/components/Crontab'
 import util from "@/util";
 import {getAuthByBatch, groupPage, saveAuthByBatch, typeList} from "@/api/system";
 const state = reactive({
@@ -188,6 +192,7 @@ const state = reactive({
   randomIndex: util.getRandomStr(10),
   allAuthList: [],
   triggerStatus: '',
+  showCron: false,
 })
 let paramsTriggerObj = ref({
   jobCron: '0 00 00 * * ? *',
@@ -205,7 +210,6 @@ const selectedAuth = computed(() => {
   let ids = state.selectedIds;
   return state.allAuthList.reduce((r, i) => r.concat(i.children), []).filter(i => ids.includes(i.id));
 })
-
 onMounted(() => {
   getData()
   typeList().then(res => {

+ 16 - 21
src/views/job/list.vue

@@ -84,14 +84,14 @@
     </div>
   </div>
   <!-- 任务调度弹窗  需要生成一个 jobcron表达式 控件-->
-  <el-dialog width="1000px" append-to-body v-model="tirrgerShow" title="任务调度" class="instance-err-dialog"
-             @close="closeCron">
-    <el-form :model="paramsTriggerObj" ref="triggerForm" :rules="triggerFormRules" label-width="100px">
-      <el-form-item label="任务调度">
-        <vue3Cron @change="changeCron" v-model="paramsTriggerObj.jobCron"></vue3Cron>
-      </el-form-item>
-      <el-form-item label="CRON预览" prop="jobCron">
-        <el-input v-model="paramsTriggerObj.jobCron" disabled></el-input>
+  <el-dialog width="600px" append-to-body v-model="tirrgerShow" title="任务调度" class="instance-err-dialog">
+    <el-form :model="paramsTriggerObj" ref="triggerForm" :rules="triggerFormRules" label-width="120px">
+      <el-form-item label="CRON表达式" prop="jobCron">
+        <el-input v-model="paramsTriggerObj.jobCron">
+          <template #append>
+            <el-button type="primary" @click="state.showCron = true">生成表达式</el-button>
+          </template>
+        </el-input>
       </el-form-item>
       <el-form-item label="任务调度状态">
         <el-switch
@@ -166,6 +166,11 @@
       <el-button size="small" style="width: 100px" type="primary" @click="onSaveAuth">确定</el-button>
     </div>
   </el-dialog>
+  <el-dialog v-model="state.showCron" append-to-body width="600">
+    <crontab
+      @hide="state.showCron=false" @fill="paramsTriggerObj.jobCron=$event" :expression="paramsTriggerObj.jobCron"
+    ></crontab>
+  </el-dialog>
 </template>
 <script setup>
 import {computed, onMounted, reactive, ref, watch} from "vue";
@@ -176,9 +181,8 @@ import {ElMessage, ElMessageBox} from "element-plus";
 import store from "@/store";
 import jobCategory from '@/components/jobCategory'
 import myPage from '@/components/myPage'
-import vue3Cron from '@/components/cronComp/cron.vue'
+import Crontab from '@/components/Crontab'
 import {deleteJob} from '@/api/job'
-import {async} from "@antv/x6/lib/registry/marker/async";
 import {getAuthByEtl, typeList, groupPage, saveAuthByEtl} from '@/api/system'
 import util from "@/util";
 onMounted(() => {
@@ -211,7 +215,8 @@ const state = reactive({
   selectedIds: [],
   randomIndex: util.getRandomStr(10),
   allAuthList: [],
-  triggerStatus: ''
+  triggerStatus: '',
+  showCron: false,
 })
 const selectedAuth = computed(() => {
   let ids = state.selectedIds;
@@ -303,8 +308,6 @@ const onEdit = job => {
   if (inner) {
     let link = location.origin + '/etl'
     link += '?inner=1#' + url
-    console.log(location.origin)
-    console.log(link)
     window.open(link)
   } else {
     router.push(url)
@@ -354,14 +357,6 @@ let paramsTriggerObj = ref({
   triggerStatus: 0,
   jobId: '',
 })
-function closeCron() {
-  // paramsTriggerObj 初始化
-  paramsTriggerObj.value = {
-    jobCron: '0 00 00 * * ? *',
-    triggerStatus: 0,
-    jobId: '',
-  }
-}
 function setTriggerStatus(row, status) {
 
   paramsTriggerObj.value = {

+ 15 - 8
src/views/sqlTask/list.vue

@@ -81,15 +81,16 @@
     </div>
     <!-- 任务调度弹窗  需要生成一个 jobcron表达式 控件-->
     <el-dialog
-      width="1000px" append-to-body v-model="tirrgerShow" class="instance-err-dialog"
+      width="600px" append-to-body v-model="tirrgerShow" class="instance-err-dialog"
       :title="`【${paramsTriggerObj.jobName}】任务调度`"
     >
-      <el-form :model="paramsTriggerObj" ref="triggerForm" :rules="triggerFormRules" label-width="100px">
-        <el-form-item label="任务调度">
-          <vue3Cron v-model="paramsTriggerObj.jobCron"></vue3Cron>
-        </el-form-item>
-        <el-form-item label="CRON预览" prop="jobCron">
-          <el-input v-model="paramsTriggerObj.jobCron" disabled></el-input>
+      <el-form :model="paramsTriggerObj" ref="triggerForm" :rules="triggerFormRules" label-width="120px">
+        <el-form-item label="CRON表达式" prop="jobCron">
+          <el-input v-model="paramsTriggerObj.jobCron">
+            <template #append>
+              <el-button type="primary" @click="state.showCron = true">生成表达式</el-button>
+            </template>
+          </el-input>
         </el-form-item>
         <el-form-item label="任务调度状态">
           <el-switch
@@ -164,6 +165,11 @@
         <el-button size="small" style="width: 100px" type="primary" @click="onSaveAuth">确定</el-button>
       </div>
     </el-dialog>
+    <el-dialog v-model="state.showCron" append-to-body width="600">
+      <crontab
+        @hide="state.showCron=false" @fill="paramsTriggerObj.jobCron=$event" :expression="paramsTriggerObj.jobCron"
+      ></crontab>
+    </el-dialog>
   </div>
 </template>
 <script setup>
@@ -173,7 +179,7 @@ import store from "@/store";
 import router from "@/router";
 import {jobList, jobRun, jobCheck, jobDelete, jobScheduleSet} from '@/api/sql'
 import {ElMessage, ElMessageBox} from "element-plus";
-import vue3Cron from '@/components/cronComp/cron.vue'
+import Crontab from '@/components/Crontab'
 import util from "@/util";
 import {getAuthBySql, groupPage, saveAuthBySql, typeList} from "@/api/system";
 const state = reactive({
@@ -187,6 +193,7 @@ const state = reactive({
   randomIndex: util.getRandomStr(10),
   allAuthList: [],
   triggerStatus: '',
+  showCron: false,
 })
 let paramsTriggerObj = ref({
   jobCron: '0 00 00 * * ? *',