Skip to content

Commit 6d648da

Browse files
authored
Merge pull request #83 from modx-pro/feat/datepicker-icon-in-input
Единообразное отображение иконки календаря
2 parents 47885c2 + efaf7e5 commit 6d648da

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

vueManager/src/components/DynamicField.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@
9393
:input-id="fieldConfig.id"
9494
:placeholder="fieldConfig.placeholder"
9595
:disabled="disabled"
96-
:show-icon="fieldConfig.props?.showIcon ?? true"
96+
show-icon
97+
fluid
98+
icon-display="input"
9799
:date-format="fieldConfig.props?.dateFormat ?? 'dd.mm.yy'"
98100
@blur="handleBlur"
99101
/>

vueManager/src/components/OrderView.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2304,10 +2304,12 @@ onMounted(async () => {
23042304
<DatePicker
23052305
v-model="order[field.name]"
23062306
:placeholder="field.placeholder"
2307-
class="w-full"
23082307
date-format="dd.mm.yy"
23092308
show-time
23102309
hour-format="24"
2310+
show-icon
2311+
fluid
2312+
icon-display="input"
23112313
/>
23122314
</template>
23132315

vueManager/src/components/OrdersGrid.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -602,9 +602,10 @@ onMounted(async () => {
602602
:id="`filter-${filter.key}`"
603603
v-model="filterValues[filter.key]"
604604
date-format="dd.mm.yy"
605-
:show-icon="true"
605+
show-icon
606+
fluid
607+
icon-display="input"
606608
:show-button-bar="true"
607-
class="w-full"
608609
@date-select="applyFilters"
609610
/>
610611
</div>
@@ -621,9 +622,10 @@ onMounted(async () => {
621622
v-model="filterValues[filter.key]"
622623
selection-mode="range"
623624
date-format="dd.mm.yy"
624-
:show-icon="true"
625+
show-icon
626+
fluid
627+
icon-display="input"
625628
:show-button-bar="true"
626-
class="w-full"
627629
@date-select="applyFilters"
628630
/>
629631
</div>

0 commit comments

Comments
 (0)