Commit 831bd1adf60104f37972323f0e797c25b408567e
Merge branch 'perf/linkedage-enable-rule' into 'main_dev'
Perf/linkedage enable rule See merge request yunteng/thingskit-front!1001
Showing
1 changed file
with
4 additions
and
2 deletions
| ... | ... | @@ -22,6 +22,7 @@ | 
| 22 | 22 | v-model:value="item.startsOn" | 
| 23 | 23 | value-format="x" | 
| 24 | 24 | format="HH:mm" | 
| 25 | + @change="handleBlur(item.startsOn, item.endsOn, item)" | |
| 25 | 26 | :disabled="!item.enabled || modalStatus" | 
| 26 | 27 | /> | 
| 27 | 28 | <span class="ml-4 mr-4 flex items-center">~</span> | 
| ... | ... | @@ -43,6 +44,7 @@ | 
| 43 | 44 | value-format="x" | 
| 44 | 45 | format="HH:mm" | 
| 45 | 46 | :disabled="modalStatus" | 
| 47 | + @change="handleTimeBlur(timeState.startsOn, timeState.endsOn)" | |
| 46 | 48 | /> | 
| 47 | 49 | <span class="ml-4 mr-4">~</span> | 
| 48 | 50 | <TimePicker | 
| ... | ... | @@ -228,13 +230,13 @@ | 
| 228 | 230 | type: 'ANY_TIME', | 
| 229 | 231 | }); | 
| 230 | 232 | const handleBlur = (eS, eE, item: Recordable) => { | 
| 231 | - if (eS > eE) { | |
| 233 | + if (eS && eE && eS > eE) { | |
| 232 | 234 | item?.endsOn && (item.endsOn = null); | 
| 233 | 235 | return createMessage.warn('开始时间不能大于结束时间'); | 
| 234 | 236 | } | 
| 235 | 237 | }; | 
| 236 | 238 | const handleTimeBlur = (eS, eE) => { | 
| 237 | - if (eS > eE) { | |
| 239 | + if (eS && eE && eS > eE) { | |
| 238 | 240 | timeState.endsOn = null; | 
| 239 | 241 | return createMessage.warn('开始时间不能大于结束时间'); | 
| 240 | 242 | } | ... | ... |