KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix】src/components/jero/JEasyCron 修复格式化代码造成的html单引号问题

Browse Source
This commit is contained in:
zhaoxiao
2023-03-03 13:37:03 +08:00
parent 58e9be2a7d
commit b8efff4d56
5 changed files with 98 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/jero/JEasyCron/EasyCron.vue
+39 -39
View File
@@ -1,66 +1,66 @@
<template>
<div class='j-easy-cron'>
<div class='content'>
<div class="j-easy-cron">
<div class="content">
<div>
<a-tabs size='small' v-model='curtab'>
<a-tab-pane tab='秒' key='second' v-if='!hideSecond'>
<second-ui v-model='second' :disabled='disabled'></second-ui>
<a-tabs size="small" v-model="curtab">
<a-tab-pane tab="秒" key="second" v-if="!hideSecond">
<second-ui v-model="second" :disabled="disabled"></second-ui>
</a-tab-pane>
<a-tab-pane tab='分' key='minute'>
<minute-ui v-model='minute' :disabled='disabled'></minute-ui>
<a-tab-pane tab="分" key="minute">
<minute-ui v-model="minute" :disabled="disabled"></minute-ui>
</a-tab-pane>
<a-tab-pane tab='时' key='hour'>
<hour-ui v-model='hour' :disabled='disabled'></hour-ui>
<a-tab-pane tab="时" key="hour">
<hour-ui v-model="hour" :disabled="disabled"></hour-ui>
</a-tab-pane>
<a-tab-pane tab='日' key='day'>
<day-ui v-model='day' :week='week' :disabled='disabled'></day-ui>
<a-tab-pane tab="日" key="day">
<day-ui v-model="day" :week="week" :disabled="disabled"></day-ui>
</a-tab-pane>
<a-tab-pane tab='月' key='month'>
<month-ui v-model='month' :disabled='disabled'></month-ui>
<a-tab-pane tab="月" key="month">
<month-ui v-model="month" :disabled="disabled"></month-ui>
</a-tab-pane>
<a-tab-pane tab='周' key='week'>
<week-ui v-model='week' :day='day' :disabled='disabled'></week-ui>
<a-tab-pane tab="周" key="week">
<week-ui v-model="week" :day="day" :disabled="disabled"></week-ui>
</a-tab-pane>
<a-tab-pane tab='年' key='year' v-if='!hideYear && !hideSecond'>
<year-ui v-model='year' :disabled='disabled'></year-ui>
<a-tab-pane tab="年" key="year" v-if="!hideYear && !hideSecond">
<year-ui v-model="year" :disabled="disabled"></year-ui>
</a-tab-pane>
</a-tabs>
</div>
<a-divider />
<!-- 执行时间预览 -->
<a-row :gutter='8'>
<a-col :span='18' style='margin-top: 22px;'>
<a-row :gutter='8'>
<a-col :span='8' style='margin-bottom: 8px;'>
<a-input addon-before='秒' v-model='inputValues.second' @blur='onInputBlur' />
<a-row :gutter="8">
<a-col :span="18" style="margin-top: 22px;">
<a-row :gutter="8">
<a-col :span="8" style="margin-bottom: 8px;">
<a-input addon-before="秒" v-model="inputValues.second" @blur="onInputBlur" />
</a-col>
<a-col :span='8' style='margin-bottom: 8px;'>
<a-input addon-before='分' v-model='inputValues.minute' @blur='onInputBlur' />
<a-col :span="8" style="margin-bottom: 8px;">
<a-input addon-before="分" v-model="inputValues.minute" @blur="onInputBlur" />
</a-col>
<a-col :span='8' style='margin-bottom: 8px;'>
<a-input addon-before='时' v-model='inputValues.hour' @blur='onInputBlur' />
<a-col :span="8" style="margin-bottom: 8px;">
<a-input addon-before="时" v-model="inputValues.hour" @blur="onInputBlur" />
</a-col>
<a-col :span='8' style='margin-bottom: 8px;'>
<a-input addon-before='日' v-model='inputValues.day' @blur='onInputBlur' />
<a-col :span="8" style="margin-bottom: 8px;">
<a-input addon-before="日" v-model="inputValues.day" @blur="onInputBlur" />
</a-col>
<a-col :span='8' style='margin-bottom: 8px;'>
<a-input addon-before='月' v-model='inputValues.month' @blur='onInputBlur' />
<a-col :span="8" style="margin-bottom: 8px;">
<a-input addon-before="月" v-model="inputValues.month" @blur="onInputBlur" />
</a-col>
<a-col :span='8' style='margin-bottom: 8px;'>
<a-input addon-before='周' v-model='inputValues.week' @blur='onInputBlur' />
<a-col :span="8" style="margin-bottom: 8px;">
<a-input addon-before="周" v-model="inputValues.week" @blur="onInputBlur" />
</a-col>
<a-col :span='8' style='margin-bottom: 8px;'>
<a-input addon-before='年' v-model='inputValues.year' @blur='onInputBlur' />
<a-col :span="8" style="margin-bottom: 8px;">
<a-input addon-before="年" v-model="inputValues.year" @blur="onInputBlur" />
</a-col>
<a-col :span='16' style='margin-bottom: 8px;'>
<a-input addon-before='Cron' v-model='inputValues.cron' @blur='onInputCronBlur' />
<a-col :span="16" style="margin-bottom: 8px;">
<a-input addon-before="Cron" v-model="inputValues.cron" @blur="onInputCronBlur" />
</a-col>
</a-row>
</a-col>
<a-col :span='6'>
<a-col :span="6">
<div>近十次执行时间（不含年）</div>
<a-textarea type='textarea' :value='preTimeList' :rows='5' />
<a-textarea type="textarea" :value="preTimeList" :rows="5" />
</a-col>
</a-row>
</div>
@@ -304,7 +304,7 @@ export default {
}
</script>
<style scoped lang='less'>
<style scoped lang="less">
.j-easy-cron {
/deep/ .content {
jero-web/src/components/jero/JEasyCron/tabs/day.vue
+32 -32
View File
@@ -1,50 +1,50 @@
<template>
<div class='config-list'>
<a-radio-group v-model='type'>
<div class='item'>
<a-radio value='TYPE_NOT_SET' class='choice' :disabled='disableChoice'>不设置</a-radio>
<span class='tip-info'>日和周只能设置其中之一</span>
<div class="config-list">
<a-radio-group v-model="type">
<div class="item">
<a-radio value="TYPE_NOT_SET" class="choice" :disabled="disableChoice">不设置</a-radio>
<span class="tip-info">日和周只能设置其中之一</span>
</div>
<div class='item'>
<a-radio value='TYPE_EVERY' class='choice' :disabled='disableChoice'>每日</a-radio>
<div class="item">
<a-radio value="TYPE_EVERY" class="choice" :disabled="disableChoice">每日</a-radio>
</div>
<div class='item'>
<a-radio value='TYPE_RANGE' class='choice' :disabled='disableChoice'>区间</a-radio>
<div class="item">
<a-radio value="TYPE_RANGE" class="choice" :disabled="disableChoice">区间</a-radio>
从
<a-input-number :disabled='type!==TYPE_RANGE || disableChoice' :max='maxValue' :min='minValue' :precision='0' class='w60'
v-model='valueRange.start' />
<a-input-number :disabled="type!==TYPE_RANGE || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueRange.start" />
日
至
<a-input-number :disabled='type!==TYPE_RANGE || disableChoice' :max='maxValue' :min='minValue' :precision='0' class='w60'
v-model='valueRange.end' />
<a-input-number :disabled="type!==TYPE_RANGE || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueRange.end" />
日
</div>
<div class='item'>
<a-radio value='TYPE_LOOP' class='choice' :disabled='disableChoice'>循环</a-radio>
<div class="item">
<a-radio value="TYPE_LOOP" class="choice" :disabled="disableChoice">循环</a-radio>
从
<a-input-number :disabled='type!==TYPE_LOOP || disableChoice' :max='maxValue' :min='minValue' :precision='0' class='w60'
v-model='valueLoop.start' />
<a-input-number :disabled="type!==TYPE_LOOP || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueLoop.start" />
日开始，间隔
<a-input-number :disabled='type!==TYPE_LOOP || disableChoice' :max='maxValue' :min='minValue' :precision='0' class='w60'
v-model='valueLoop.interval' />
<a-input-number :disabled="type!==TYPE_LOOP || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueLoop.interval" />
日
</div>
<div class='item'>
<a-radio value='TYPE_WORK' class='choice' :disabled='disableChoice'>工作日</a-radio>
<div class="item">
<a-radio value="TYPE_WORK" class="choice" :disabled="disableChoice">工作日</a-radio>
本月
<a-input-number :disabled='type!==TYPE_WORK || disableChoice' :max='maxValue' :min='minValue' :precision='0' class='w60'
v-model='valueWork' />
<a-input-number :disabled="type!==TYPE_WORK || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueWork" />
日，最近的工作日
</div>
<div class='item'>
<a-radio value='TYPE_LAST' class='choice' :disabled='disableChoice'>最后一日</a-radio>
<div class="item">
<a-radio value="TYPE_LAST" class="choice" :disabled="disableChoice">最后一日</a-radio>
</div>
<div class='item'>
<a-radio value='TYPE_SPECIFY' class='choice' :disabled='disableChoice'>指定</a-radio>
<div class='list'>
<a-checkbox-group v-model='valueList'>
<template v-for='i of specifyRange'>
<a-checkbox class='list-check-item' :key='`key-${i}`' :value='i' :disabled='type!==TYPE_SPECIFY || disabled'>{{ i }}</a-checkbox>
<div class="item">
<a-radio value="TYPE_SPECIFY" class="choice" :disabled="disableChoice">指定</a-radio>
<div class="list">
<a-checkbox-group v-model="valueList">
<template v-for="i of specifyRange">
<a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{ i }}</a-checkbox>
</template>
</a-checkbox-group>
</div>
@@ -101,6 +101,6 @@ export default {
}
</script>
<style lang='less' scoped>
<style lang="less" scoped>
@import "mixin.less";
</style>
jero-web/src/components/jero/JEasyCron/tabs/hour.vue
+10 -6
View File
@@ -7,18 +7,22 @@
<div class="item">
<a-radio value="TYPE_RANGE" class="choice" :disabled="disabled">区间</a-radio>
从
<a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.start"/>
<a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueRange.start" />
时
至
<a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.end"/>
<a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueRange.end" />
时
</div>
<div class="item">
<a-radio value="TYPE_LOOP" class="choice" :disabled="disabled">循环</a-radio>
从
<a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.start"/>
<a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueLoop.start" />
时开始，间隔
<a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.interval"/>
<a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueLoop.interval" />
时
</div>
<div class="item">
@@ -26,7 +30,7 @@
<div class="list">
<a-checkbox-group v-model="valueList">
<template v-for="i in specifyRange">
<a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{i}}</a-checkbox>
<a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{ i }}</a-checkbox>
</template>
</a-checkbox-group>
</div>
@@ -63,5 +67,5 @@ export default {
</script>
<style lang="less" scoped>
@import "mixin.less";
@import "mixin.less";
</style>
jero-web/src/components/jero/JEasyCron/tabs/minute.vue
+10 -6
View File
@@ -7,18 +7,22 @@
<div class="item">
<a-radio value="TYPE_RANGE" class="choice" :disabled="disabled">区间</a-radio>
从
<a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.start"/>
<a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueRange.start" />
分
至
<a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.end"/>
<a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueRange.end" />
分
</div>
<div class="item">
<a-radio value="TYPE_LOOP" class="choice" :disabled="disabled">循环</a-radio>
从
<a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.start"/>
<a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueLoop.start" />
分开始，间隔
<a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.interval"/>
<a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueLoop.interval" />
分
</div>
<div class="item">
@@ -26,7 +30,7 @@
<div class="list">
<a-checkbox-group v-model="valueList">
<template v-for="i in specifyRange">
<a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{i}}</a-checkbox>
<a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{ i }}</a-checkbox>
</template>
</a-checkbox-group>
</div>
@@ -63,5 +67,5 @@ export default {
</script>
<style lang="less" scoped>
@import "mixin.less";
@import "mixin.less";
</style>
jero-web/src/components/jero/JEasyCron/tabs/week.vue
+7 -6
View File
@@ -10,13 +10,13 @@
从
<a-select v-model="valueRange.start" class="w80" :disabled="type!==TYPE_RANGE || disableChoice">
<template v-for="(v, k) of WEEK_MAP">
<a-select-option :value="v" :key='v'>{{k}}</a-select-option>
<a-select-option :value="v" :key="v">{{ k }}</a-select-option>
</template>
</a-select>
至
<a-select v-model="valueRange.end" class="w80" :disabled="type!==TYPE_RANGE || disableChoice">
<template v-for="(v, k) of WEEK_MAP">
<a-select-option :value="v" :key='v'>{{k}}</a-select-option>
<a-select-option :value="v" :key="v">{{ k }}</a-select-option>
</template>
</a-select>
</div>
@@ -25,11 +25,12 @@
从
<a-select v-model="valueLoop.start" class="w80" :disabled="type!==TYPE_LOOP || disableChoice">
<template v-for="(v, k) of WEEK_MAP">
<a-select-option :value="v" :key='v'>{{k}}</a-select-option>
<a-select-option :value="v" :key="v">{{ k }}</a-select-option>
</template>
</a-select>
开始，间隔
<a-input-number :disabled="type!==TYPE_LOOP || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.interval"/>
<a-input-number :disabled="type!==TYPE_LOOP || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60"
v-model="valueLoop.interval" />
天
</div>
<div class="item">
@@ -37,7 +38,7 @@
<div class="list">
<a-checkbox-group v-model="valueList">
<template v-for="i in specifyRange">
<a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{i}}</a-checkbox>
<a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{ i }}</a-checkbox>
</template>
</a-checkbox-group>
</div>
@@ -114,5 +115,5 @@ export default {
</script>
<style lang="less" scoped>
@import "mixin.less";
@import "mixin.less";
</style>