bfg-common 1.4.253 → 1.4.255

package/assets/localization/local_be.json

@@ -2208,6 +2208,7 @@
     "to2": "К",
     "resetToDefault": "Скінуць да стандартных",
     "theValueTooLarge": "Значэнне можа быць занадта вялікім",
+    "theValueTooSmall": "Значэнне можа быць занадта малым",
     "closed": "Закрыты"
   },
   "auth": {

package/assets/localization/local_en.json

@@ -2212,6 +2212,7 @@
     "to2": "To",
     "resetToDefault": "Reset To Default",
     "theValueTooLarge": "The value may be too large",
+    "theValueTooSmall": "The value may be too small",
     "closed": "Closed"
   },
   "auth": {

package/assets/localization/local_hy.json

@@ -2212,6 +2212,7 @@
     "to2": "Դեպի",
     "resetToDefault": "Վերականգնել լռելյայնին",
     "theValueTooLarge": "Արժեքը կարող է չափազանց մեծ լինել",
+    "theValueTooSmall": "Արժեքը կարող է չափազանց փոքր լինել",
     "closed": "Փակված է"
   },
   "auth": {

package/assets/localization/local_kk.json

@@ -2211,6 +2211,7 @@
     "to2": "К",
     "resetToDefault": "Әдепкіге қайта орнату",
     "theValueTooLarge": "Мән тым үлкен болуы мүмкін",
+    "theValueTooSmall": "Мән тым аз болуы мүмкін",
     "closed": "Жабық"
   },
   "auth": {

package/assets/localization/local_ru.json

@@ -2214,6 +2214,7 @@
     "to2": "До",
     "resetToDefault": "Сбросить настройки по умолчанию",
     "theValueTooLarge": "Значение может быть слишком большим",
+    "theValueTooSmall": "Значение может быть слишком маленьким",
     "closed": "Закрыто"
   },
   "auth": {

package/assets/localization/local_zh.json

@@ -2210,6 +2210,7 @@
     "to2": "到",
     "resetToDefault": "重置为默认值",
     "theValueTooLarge": "该值可能太大",
+    "theValueTooSmall": "该值可能太小",
     "closed": "关闭"
   },
   "auth": {

package/components/common/pages/scheduledTasks/modals/common/frequency/Frequency.vue

@@ -7,7 +7,7 @@
 
     <common-pages-scheduled-tasks-modals-common-frequency-interval
       v-if="showTimeInterval"
-      v-model="model.frg_interval"
+      v-model="model"
       :type="props.type"
     />
 

package/components/common/pages/scheduledTasks/modals/common/frequency/interval/Interval.vue

@@ -11,7 +11,7 @@
     >
       <input
         id="frequency-time-interval"
-        v-model="modelIntervalLocal"
+        v-model="modelFrequencyLocal.frg_interval"
         data-id="frequency-time-interval-input"
         type="text"
         @input="onInitTimeIntervalValidation"
@@ -31,6 +31,7 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import {
   defineIntervalSuffixLabelFunc,
   validateField,
@@ -39,7 +40,9 @@ import {
 const props = defineProps<{
   type: string
 }>()
-const modelIntervalLocal = defineModel<string>({ required: true })
+const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
+  required: true,
+})
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -51,8 +54,18 @@ const onInitTimeIntervalValidation = (): void => {
 const timeIntervalErrorText = computed<string>(() => {
   if (!isInitTimeIntervalValidation.value) return ''
 
-  return validateField(localization.value, modelIntervalLocal.value)
+  return validateField(
+    localization.value,
+    modelFrequencyLocal.value.frg_interval
+  )
 })
+watch(
+  timeIntervalErrorText,
+  (newValue: string) => {
+    modelFrequencyLocal.value.isValid = !!newValue
+  },
+  { immediate: true }
+)
 
 const intervalSuffixLabel = computed(() => {
   const lang = useLocalStorage('lang')
@@ -60,7 +73,7 @@ const intervalSuffixLabel = computed(() => {
   return defineIntervalSuffixLabelFunc(
     localization.value,
     props.type,
-    modelIntervalLocal.value,
+    modelFrequencyLocal.value.frg_interval,
     lang
   )
 })

package/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils.ts

@@ -60,13 +60,19 @@ const getCorrectRuForm = (value: number | string, type: string): string => {
 
 export const validateField = (
   localization: UI_I_Localization,
-  value: string
+  value: string,
+  checkZero: boolean = false
 ): string => {
   // Если поле пустое
   if (!value) {
     return localization.common.fieldRequired
   }
   // Если значение больше 2 символов
+
+  if (checkZero && value === '0') {
+    return localization.common.theValueTooSmall
+  }
+
   if (value.length > 3) {
     return localization.common.theValueTooLarge
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.253",
+  "version": "1.4.255",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",