Skip to content

Commit a0be19f

Browse files
committed
Merged the changes from 2 people
1 parent 7c7b570 commit a0be19f

2 files changed

Lines changed: 51 additions & 46 deletions

File tree

  • modules/farm_fd2_examples/src/entrypoints

modules/farm_fd2_examples/src/entrypoints/crop_selector/App.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@
9191
</tr>
9292
</thead>
9393
<tbody>
94+
<tr>
95+
<td>ready</td>
96+
<td></td>
97+
</tr>
9498
<tr>
9599
<td>update:selected</td>
96100
<td>{{ form.selected }}</td>

modules/farm_fd2_examples/src/entrypoints/picker_base/App.vue

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -26,40 +26,29 @@
2626
<tr>
2727
<th>Prop</th>
2828
<th>Control</th>
29+
<th>Value</th>
2930
</tr>
3031
</thead>
3132
<tbody>
3233
<tr>
33-
<td>required</td>
34-
<td>
35-
<BFormCheckbox
36-
id="required-checkbox"
37-
data-cy="required-checkbox"
38-
switch
39-
v-model="required"
40-
/>
41-
</td>
42-
</tr>
43-
<tr>
44-
<td>showValidityStyling</td>
45-
<td>
46-
<BFormCheckbox
47-
id="styling-checkbox"
48-
data-cy="styling-checkbox"
49-
switch
50-
v-model="validity.showStyling"
51-
/>
52-
</td>
53-
</tr>
54-
<tr>
55-
<td>showAllButton</td>
34+
<td>options</td>
5635
<td>
57-
<BFormCheckbox
58-
id="show-all-button-checkbox"
59-
data-cy="show-all-button-checkbox"
60-
switch
61-
v-model="showAllButton"
62-
/>
36+
<BButton
37+
id="add-option-button"
38+
data-cy="add-option-button"
39+
variant="outline-primary"
40+
size="sm"
41+
v-on:click="
42+
index = this.options.indexOf('six');
43+
if (index > -1) {
44+
this.options.splice(index, 1);
45+
} else {
46+
this.options.push('six');
47+
}
48+
"
49+
>
50+
Toggle sixth option
51+
</BButton>
6352
</td>
6453
</tr>
6554
<tr>
@@ -84,24 +73,36 @@
8473
</td>
8574
</tr>
8675
<tr>
87-
<td>options</td>
76+
<td>required</td>
8877
<td>
89-
<BButton
90-
id="add-option-button"
91-
data-cy="add-option-button"
92-
variant="outline-primary"
93-
size="sm"
94-
v-on:click="
95-
index = this.options.indexOf('six');
96-
if (index > -1) {
97-
this.options.splice(index, 1);
98-
} else {
99-
this.options.push('six');
100-
}
101-
"
102-
>
103-
Toggle sixth option
104-
</BButton>
78+
<BFormCheckbox
79+
id="required-checkbox"
80+
data-cy="required-checkbox"
81+
switch
82+
v-model="required"
83+
/>
84+
</td>
85+
</tr>
86+
<tr>
87+
<td>showAllButton</td>
88+
<td>
89+
<BFormCheckbox
90+
id="show-all-button-checkbox"
91+
data-cy="show-all-button-checkbox"
92+
switch
93+
v-model="showAllButton"
94+
/>
95+
</td>
96+
</tr>
97+
<tr>
98+
<td>showValidityStyling</td>
99+
<td>
100+
<BFormCheckbox
101+
id="styling-checkbox"
102+
data-cy="styling-checkbox"
103+
switch
104+
v-model="validity.showStyling"
105+
/>
105106
</td>
106107
</tr>
107108
</tbody>

0 commit comments

Comments
 (0)