|
42 | 42 |
|
43 | 43 | <div class="row"> |
44 | 44 | <div class="col"> |
45 | | - <div data-cy="unselected-container"> |
46 | | - <div class="row border-top"> |
47 | | - <div class="col-1"></div> |
48 | | - <div class="col-1 d-flex align-items-center"> |
49 | | - <input type="radio" class="form-check" @click="defaultOptionClick($event)" name="defaultOptionGroup" v-model="defaultOptionKey" :value="''" data-cy="inspector-options-unselected"> |
50 | | - </div> |
51 | | - <div class="col-6" style="cursor:grab"> |
52 | | - {{ $t('Unselected') }} |
53 | | - </div> |
54 | | - </div> |
55 | | - </div> |
| 45 | + <div data-cy="unselected-container"> |
| 46 | + <div class="row border-top"> |
| 47 | + <div class="col-1"/> |
| 48 | + <div class="col-1 d-flex align-items-center"> |
| 49 | + <input type="radio" class="form-check" @click="defaultOptionClick($event)" name="defaultOptionGroup" v-model="defaultOptionKey" :value="''" data-cy="inspector-options-unselected"> |
| 50 | + </div> |
| 51 | + <div class="col-6" style="cursor:grab"> |
| 52 | + {{ $t('Unselected') }} |
| 53 | + </div> |
| 54 | + </div> |
| 55 | + </div> |
56 | 56 | <draggable @update="updateSort" :element="'div'" v-model="optionsList" group="options" @start="drag=true" @end="drag=false" > |
57 | 57 | <div v-for="(option, index) in optionsList" :key="option.value"> |
58 | 58 | <div v-if="removeIndex === index"> |
@@ -504,35 +504,35 @@ export default { |
504 | 504 | this.jsonError = ''; |
505 | 505 | }, |
506 | 506 | defaultOptionClick(event) { |
507 | | - const {value} = event.target; |
508 | | - this.defaultOptionKey = value; |
509 | | - this.setDefaultValue(); |
510 | | - }, |
511 | | - setDefaultValue() { |
512 | | - if (this.valueTypeReturned === 'single') { |
513 | | - return this.selectedControl.config.defaultValue = { |
514 | | - mode: 'basic', |
515 | | - value: this.defaultOptionKey |
516 | | - }; |
517 | | - } |
518 | | - // if the Unselected option was selected |
519 | | - if (this.valueTypeReturned === 'object' && this.defaultOptionKey === '') { |
520 | | - return this.selectedControl.config.defaultValue = { |
521 | | - mode: 'basic', |
522 | | - value: this.defaultOptionKey |
523 | | - } |
524 | | - } |
525 | | - if (this.valueTypeReturned === 'object' && this.defaultOptionKey !== '') { |
526 | | - this.optionsList.find(option => { |
527 | | - if (option.value === this.defaultOptionKey) { |
528 | | - return this.selectedControl.config.defaultValue = { |
529 | | - mode: 'js', |
530 | | - value: `return ${JSON.stringify(option)}` |
531 | | - } |
532 | | - } |
533 | | - }); |
534 | | - } |
535 | | - }, |
| 507 | + const {value} = event.target; |
| 508 | + this.defaultOptionKey = value; |
| 509 | + this.setDefaultValue(); |
| 510 | + }, |
| 511 | + setDefaultValue() { |
| 512 | + if (this.valueTypeReturned === 'single') { |
| 513 | + return this.selectedControl.config.defaultValue = { |
| 514 | + mode: 'basic', |
| 515 | + value: this.defaultOptionKey, |
| 516 | + }; |
| 517 | + } |
| 518 | + // if the Unselected option was selected |
| 519 | + if (this.valueTypeReturned === 'object' && this.defaultOptionKey === '') { |
| 520 | + return this.selectedControl.config.defaultValue = { |
| 521 | + mode: 'basic', |
| 522 | + value: this.defaultOptionKey, |
| 523 | + }; |
| 524 | + } |
| 525 | + if (this.valueTypeReturned === 'object' && this.defaultOptionKey !== '') { |
| 526 | + this.optionsList.find(option => { |
| 527 | + if (option.value === this.defaultOptionKey) { |
| 528 | + return this.selectedControl.config.defaultValue = { |
| 529 | + mode: 'js', |
| 530 | + value: `return ${JSON.stringify(option)}`, |
| 531 | + }; |
| 532 | + } |
| 533 | + }); |
| 534 | + } |
| 535 | + }, |
536 | 536 | rowCss(index) { |
537 | 537 | return index % 2 === 0 ? 'striped' : 'bg-default'; |
538 | 538 | }, |
|
0 commit comments