bfg-common 1.4.328 → 1.4.330
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -63,13 +63,19 @@
|
|
|
63
63
|
<common-select-input
|
|
64
64
|
v-model="model.frq_ordinal_number"
|
|
65
65
|
:data="frequencyOnOrdinalNumber"
|
|
66
|
-
:class="[
|
|
66
|
+
:class="[
|
|
67
|
+
'radio__select ordinary-day',
|
|
68
|
+
!isDisabledMonthlyDayField && 'disabled',
|
|
69
|
+
]"
|
|
67
70
|
/>
|
|
68
71
|
|
|
69
72
|
<common-select-input
|
|
70
73
|
v-model="model.frq_week_day"
|
|
71
74
|
:data="frequencyOnWeeksDays"
|
|
72
|
-
:class="[
|
|
75
|
+
:class="[
|
|
76
|
+
'radio__select week-days',
|
|
77
|
+
!isDisabledMonthlyDayField && 'disabled',
|
|
78
|
+
]"
|
|
73
79
|
/>
|
|
74
80
|
</div>
|
|
75
81
|
</div>
|
|
@@ -191,6 +197,18 @@ const setDefaultDateTime = () => {
|
|
|
191
197
|
&__select {
|
|
192
198
|
width: 100%;
|
|
193
199
|
margin-top: 10px;
|
|
200
|
+
:deep(.select-input__inner) {
|
|
201
|
+
max-width: 100% !important;
|
|
202
|
+
}
|
|
203
|
+
&.ordinary-day :deep(select) {
|
|
204
|
+
min-width: 80px;
|
|
205
|
+
}
|
|
206
|
+
&.week-days {
|
|
207
|
+
margin-left: 15px;
|
|
208
|
+
:deep(select) {
|
|
209
|
+
min-width: 110px;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
194
212
|
select {
|
|
195
213
|
width: 80px;
|
|
196
214
|
}
|
|
@@ -54,7 +54,7 @@ export const generateMonthlyCronExpression = (
|
|
|
54
54
|
)
|
|
55
55
|
const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
|
|
56
56
|
|
|
57
|
-
const
|
|
57
|
+
const ordinaryDaysOfMonth = `${frg_interval}#${frq_ordinal_number}`
|
|
58
58
|
|
|
59
59
|
const timestamp = endTimestamp
|
|
60
60
|
? `${startTimestamp}-${endTimestamp}`
|
|
@@ -62,6 +62,6 @@ export const generateMonthlyCronExpression = (
|
|
|
62
62
|
|
|
63
63
|
// Генерируем cron-выражение
|
|
64
64
|
return data.frg_monthly_mode === 'week'
|
|
65
|
-
? `* * * * ${frq_week_day} ${timestamp}:0-0-${
|
|
65
|
+
? `* * * * ${frq_week_day} ${timestamp}:0-0-0-${ordinaryDaysOfMonth}`
|
|
66
66
|
: `* * ${frg_monthly_day} * * ${timestamp}:0-0-0-${frg_interval}`
|
|
67
67
|
}
|