bfg-common 1.4.254 → 1.4.256
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.
- package/assets/localization/local_be.json +1 -0
- package/assets/localization/local_en.json +1 -0
- package/assets/localization/local_hy.json +1 -0
- package/assets/localization/local_kk.json +1 -0
- package/assets/localization/local_ru.json +1 -0
- package/assets/localization/local_zh.json +1 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/Frequency.vue +1 -1
- package/components/common/pages/scheduledTasks/modals/common/frequency/interval/Interval.vue +2 -1
- package/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils.ts +7 -1
- package/components/common/pages/scheduledTasks/modals/common/frequency/startOn/StartOn.vue +42 -34
- package/package.json +1 -1
|
@@ -2214,6 +2214,7 @@
|
|
|
2214
2214
|
"to2": "До",
|
|
2215
2215
|
"resetToDefault": "Сбросить настройки по умолчанию",
|
|
2216
2216
|
"theValueTooLarge": "Значение может быть слишком большим",
|
|
2217
|
+
"theValueTooSmall": "Значение может быть слишком маленьким",
|
|
2217
2218
|
"closed": "Закрыто"
|
|
2218
2219
|
},
|
|
2219
2220
|
"auth": {
|
|
@@ -60,13 +60,19 @@ const getCorrectRuForm = (value: number | string, type: string): string => {
|
|
|
60
60
|
|
|
61
61
|
export const validateField = (
|
|
62
62
|
localization: UI_I_Localization,
|
|
63
|
-
value: string
|
|
63
|
+
value: string,
|
|
64
|
+
checkZero: boolean = false
|
|
64
65
|
): string => {
|
|
65
66
|
// Если поле пустое
|
|
66
67
|
if (!value) {
|
|
67
68
|
return localization.common.fieldRequired
|
|
68
69
|
}
|
|
69
70
|
// Если значение больше 2 символов
|
|
71
|
+
|
|
72
|
+
if (checkZero && value === '0') {
|
|
73
|
+
return localization.common.theValueTooSmall
|
|
74
|
+
}
|
|
75
|
+
|
|
70
76
|
if (value.length > 3) {
|
|
71
77
|
return localization.common.theValueTooLarge
|
|
72
78
|
}
|
|
@@ -4,48 +4,62 @@
|
|
|
4
4
|
{{ localization.scheduledTasks.startOn }}
|
|
5
5
|
</label>
|
|
6
6
|
|
|
7
|
-
<
|
|
7
|
+
<label
|
|
8
|
+
for="frequency-start-on-date"
|
|
9
|
+
class="tooltip tooltip-validation tooltip-xs tooltip-top-left"
|
|
10
|
+
:class="schedulerStartOnErrorText && 'invalid'"
|
|
11
|
+
>
|
|
8
12
|
<input
|
|
9
13
|
id="frequency-start-on-date"
|
|
10
|
-
v-model.lazy="
|
|
14
|
+
v-model.lazy="modelFrequencyLocal.frg_start_on_time"
|
|
11
15
|
data-id="frequency-start-on-date-input"
|
|
12
|
-
|
|
13
|
-
type="text"
|
|
16
|
+
type="datetime-local"
|
|
14
17
|
/>
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
</div>
|
|
18
|
+
|
|
19
|
+
<span class="tooltip-content">
|
|
20
|
+
{{ schedulerStartOnErrorText }}
|
|
21
|
+
</span>
|
|
22
|
+
</label>
|
|
21
23
|
</div>
|
|
22
24
|
</template>
|
|
23
25
|
|
|
24
26
|
<script lang="ts" setup>
|
|
25
27
|
import type { UI_I_Localization } from '~/lib/models/interfaces'
|
|
28
|
+
import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
|
|
26
29
|
|
|
27
|
-
const
|
|
30
|
+
const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
|
|
31
|
+
required: true,
|
|
32
|
+
})
|
|
28
33
|
|
|
29
34
|
const localization = computed<UI_I_Localization>(() => useLocal())
|
|
30
|
-
const { $
|
|
31
|
-
|
|
32
|
-
const calendarDefaultDate = ref<number>(new Date().getTime())
|
|
33
|
-
const currentDateLocal = ref<string>('')
|
|
34
|
-
|
|
35
|
-
const language = computed<string>(() => $store.getters['main/getInterfaceLang'])
|
|
36
|
-
const onUpdateDateTo = (val: number): void => {
|
|
37
|
-
if (!val) return
|
|
35
|
+
// const { $formattedDate, $isDate, $getUnixByDate }: any = useNuxtApp()
|
|
38
36
|
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
watch(currentDateLocal, (newValue) => {
|
|
45
|
-
$isDate(newValue) &&
|
|
46
|
-
(calendarDefaultDate.value = modelTimeLocal.value =
|
|
47
|
-
$getUnixByDate(newValue))
|
|
37
|
+
const schedulerStartOnErrorText = computed<string>(() => {
|
|
38
|
+
return !modelFrequencyLocal.value.frg_start_on_time
|
|
39
|
+
? localization.value.common.fieldRequired
|
|
40
|
+
: ''
|
|
48
41
|
})
|
|
42
|
+
watch(
|
|
43
|
+
schedulerStartOnErrorText,
|
|
44
|
+
(newValue: string) => {
|
|
45
|
+
modelFrequencyLocal.value.isValid = !!newValue
|
|
46
|
+
},
|
|
47
|
+
{ immediate: true }
|
|
48
|
+
)
|
|
49
|
+
|
|
50
|
+
// const onUpdateDateTo = (val: number): void => {
|
|
51
|
+
// if (!val) return
|
|
52
|
+
//
|
|
53
|
+
// modelTimeLocal.value = val // milliseconds
|
|
54
|
+
//
|
|
55
|
+
// currentDateLocal.value = $formattedDate(new Date(val), 'MM.dd.yyyy, hh:mm')
|
|
56
|
+
// }
|
|
57
|
+
//
|
|
58
|
+
// watch(currentDateLocal, (newValue) => {
|
|
59
|
+
// $isDate(newValue) &&
|
|
60
|
+
// (calendarDefaultDate.value = modelTimeLocal.value =
|
|
61
|
+
// $getUnixByDate(newValue))
|
|
62
|
+
// })
|
|
49
63
|
</script>
|
|
50
64
|
|
|
51
65
|
<style lang="scss" scoped>
|
|
@@ -62,10 +76,4 @@ watch(currentDateLocal, (newValue) => {
|
|
|
62
76
|
}
|
|
63
77
|
}
|
|
64
78
|
}
|
|
65
|
-
.datepicker {
|
|
66
|
-
&__input-inner {
|
|
67
|
-
@include flex($align: center);
|
|
68
|
-
margin-left: 15px;
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
79
|
</style>
|