Commit 7cbcfb696e00e00c610b596ad871a8bf39f9c373
Merge branch 'perf/linkedage-enable-ruleB' into 'main_dev'
perf: 优化时间选择 See merge request yunteng/thingskit-front!997
Showing
1 changed file
with
4 additions
and
2 deletions
@@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
26 | /> | 26 | /> |
27 | <span class="ml-4 mr-4 flex items-center">~</span> | 27 | <span class="ml-4 mr-4 flex items-center">~</span> |
28 | <TimePicker | 28 | <TimePicker |
29 | - @change="handleBlur(item.startsOn, item.endsOn)" | 29 | + @change="handleBlur(item.startsOn, item.endsOn, item)" |
30 | placeholder="结束时间" | 30 | placeholder="结束时间" |
31 | v-model:value="item.endsOn" | 31 | v-model:value="item.endsOn" |
32 | value-format="x" | 32 | value-format="x" |
@@ -227,13 +227,15 @@ | @@ -227,13 +227,15 @@ | ||
227 | const scheduleData = ref({ | 227 | const scheduleData = ref({ |
228 | type: 'ANY_TIME', | 228 | type: 'ANY_TIME', |
229 | }); | 229 | }); |
230 | - const handleBlur = (eS, eE) => { | 230 | + const handleBlur = (eS, eE, item: Recordable) => { |
231 | if (eS > eE) { | 231 | if (eS > eE) { |
232 | + item?.endsOn && (item.endsOn = null); | ||
232 | return createMessage.warn('开始时间不能大于结束时间'); | 233 | return createMessage.warn('开始时间不能大于结束时间'); |
233 | } | 234 | } |
234 | }; | 235 | }; |
235 | const handleTimeBlur = (eS, eE) => { | 236 | const handleTimeBlur = (eS, eE) => { |
236 | if (eS > eE) { | 237 | if (eS > eE) { |
238 | + timeState.endsOn = null; | ||
237 | return createMessage.warn('开始时间不能大于结束时间'); | 239 | return createMessage.warn('开始时间不能大于结束时间'); |
238 | } | 240 | } |
239 | }; | 241 | }; |