From ef3bab359243ddfb09575eee173182a7b68d2b2b Mon Sep 17 00:00:00 2001 From: chiayin Date: Tue, 26 Mar 2024 12:54:47 +0800 Subject: [PATCH] fix: Issues #217, Time Picker Change done. --- .../Conformance/ConformanceSidebar.vue | 66 ++++++++++++------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue index e51442a..ea68f02 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar.vue @@ -281,11 +281,7 @@ export default { case 'Self loop(s)': disabled = false; break; - default: - break; }; - default: - break; } break; case 'Activity duration': // Rule Type 選 Activity duration 的行為 @@ -305,10 +301,13 @@ export default { if(this.selectCfmPtEteEnd) disabled = false; break; case 'Start & End': - if(this.selectCfmPtEteSEStart && this.selectCfmPtEteSEEnd) disabled = false; + if(!this.isSubmit) { + if(this.selectCfmPtEteSEStart && this.selectCfmPtEteSEEnd) disabled = false; + } else { + if((!this.selectCfmPtEteSEStart && this.selectCfmPtEteSEEnd) || (this.selectCfmPtEteSEStart && !this.selectCfmPtEteSEEnd)) disabled = true; + else disabled = false; + } break; - default: - break; }; break; case 'Partial': @@ -320,14 +319,15 @@ export default { if(this.selectCfmPtPEnd) disabled = false; break; case 'From & To': - if(this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd) disabled = false; + if(!this.isSubmit) { + if(this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd) disabled = false; + } else { + if((!this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd) || (this.selectCfmPtPSEStart && !this.selectCfmPtPSEEnd)) disabled = true; + else disabled = false; + } break; - default: - break; }; break; - default: - break; }; break; case 'Waiting time': // Rule Type 選 Waiting time 的行為 @@ -344,9 +344,12 @@ export default { if(this.selectCfmWtEteEnd) disabled = false; break; case 'Start & End': - if(this.selectCfmWtEteSEStart && this.selectCfmWtEteSEEnd) disabled = false; - break; - default: + if(!this.isSubmit) { + if(this.selectCfmWtEteSEStart && this.selectCfmWtEteSEEnd) disabled = false; + } else { + if((!this.selectCfmWtEteSEStart && this.selectCfmWtEteSEEnd) || (this.selectCfmWtEteSEStart && !this.selectCfmWtEteSEEnd)) disabled = true; + else disabled = false; + } break; }; break; @@ -359,14 +362,15 @@ export default { if(this.selectCfmWtPEnd) disabled = false; break; case 'From & To': - if(this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd) disabled = false; - break; - default: + if(!this.isSubmit) { + if(this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd) disabled = false; + } else { + if((!this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd) || (this.selectCfmWtPSEStart && !this.selectCfmWtPSEEnd)) disabled = true; + else disabled = false; + } break; }; break; - default: - break; }; break; case 'Cycle time': // Rule Type 選 Cycle time 的行為 @@ -381,14 +385,15 @@ export default { if(this.selectCfmCtEteEnd) disabled = false; break; case 'Start & End': - if(this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd) disabled = false; - break; - default: + if(!this.isSubmit) { + if(this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd) disabled = false; + } else { + if((!this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd) || (this.selectCfmCtEteSEStart && !this.selectCfmCtEteSEEnd)) disabled = true; + else disabled = false; + } break; }; break; - default: - break; }; return this.isDisabled = disabled; }, @@ -443,6 +448,7 @@ export default { break; case 'task-duration': // Rule Type 選 Activity duration 的行為 this.selectedRuleType = 'Activity duration'; + this.selectDurationData = [rule.task]; this.isSubmitDurationData = [rule.task]; this.isSubmitDurationTime = { min: rule.min, max: rule.max}; break; @@ -456,6 +462,7 @@ export default { this.selectedRuleType = 'Processing time'; this.selectedProcessScope = 'End to end'; this.selectedActSeqMore = 'Start'; + this.selectCfmPtEteStart = rule.task; this.isSubmitCfmPtEteStart = [ {category: 'Start', task: rule.task} ]; @@ -465,6 +472,7 @@ export default { this.selectedRuleType = 'Processing time'; this.selectedProcessScope = 'End to end'; this.selectedActSeqMore = 'End'; + this.selectCfmPtEteEnd = rule.task; this.isSubmitCfmPtEteEnd = [ {category: 'End', task: rule.task} ]; @@ -484,6 +492,7 @@ export default { this.selectedRuleType = 'Processing time'; this.selectedProcessScope = 'Partial'; this.selectedActSeqFromTo = 'From'; + this.selectCfmPtPStart = rule.task; this.isSubmitCfmPtPStart = [ {category: 'From', task: rule.task} ]; @@ -493,6 +502,7 @@ export default { this.selectedRuleType = 'Processing time'; this.selectedProcessScope = 'Partial'; this.selectedActSeqFromTo = 'To'; + this.selectCfmPtPEnd = rule.task; this.isSubmitCfmPtPEnd = [ {category: 'To', task: rule.task} ]; @@ -519,6 +529,7 @@ export default { this.selectedRuleType = 'Waiting time'; this.selectedProcessScope = 'End to end'; this.selectedActSeqMore = 'Start'; + this.selectCfmWtEteStart = rule.task; this.isSubmitCfmWtEteStart = [ {category: 'Start', task: rule.task} ]; @@ -528,6 +539,7 @@ export default { this.selectedRuleType = 'Waiting time'; this.selectedProcessScope = 'End to end'; this.selectedActSeqMore = 'End'; + this.selectCfmWtEteEnd = rule.task; this.isSubmitCfmWtEteEnd = [ {category: 'End', task: rule.task} ]; @@ -548,6 +560,7 @@ export default { this.selectedRuleType = 'Waiting time'; this.selectedProcessScope = 'Partial'; this.selectedActSeqFromTo = 'From'; + this.selectCfmWtPStart = rule.task; this.isSubmitCfmWtPStart = [ {category: 'From', task: rule.task} ]; @@ -557,6 +570,7 @@ export default { this.selectedRuleType = 'Waiting time'; this.selectedProcessScope = 'Partial'; this.selectedActSeqFromTo = 'To'; + this.selectCfmWtPEnd = rule.task; this.isSubmitCfmWtPEnd = [ {category: 'To', task: rule.task} ]; @@ -583,6 +597,7 @@ export default { this.selectedRuleType = 'Cycle time'; this.selectedProcessScope = 'End to end'; this.selectedActSeqMore = 'Start'; + this.selectCfmCtEteStart = rule.task; this.isSubmitCfmCtEteStart = [ {category: 'Start', task: rule.task} ]; @@ -592,6 +607,7 @@ export default { this.selectedRuleType = 'Cycle time'; this.selectedProcessScope = 'End to end'; this.selectedActSeqMore = 'End'; + this.selectCfmCtEteEnd = rule.task; this.isSubmitCfmCtEteEnd = [ {category: 'End', task: rule.task} ];