bfg-common 1.4.278 → 1.4.281

package/components/common/pages/scheduledTasks/modals/common/frequency/on/On.vue

@@ -6,7 +6,7 @@
 
     <common-pages-scheduled-tasks-modals-common-frequency-on-select-week
       v-if="props.type === 'week'"
-      v-model="model.frg_on_week_days"
+      v-model="model"
     />
 
     <div v-if="props.type === 'month'" class="">

package/components/common/pages/scheduledTasks/modals/common/frequency/on/selectWeek/SelectWeek.vue

@@ -18,38 +18,42 @@
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_SelectWeekDayTab } from '~/components/common/pages/scheduledTasks/modals/common/frequency/on/selectWeek/lib/models/interfaces'
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import { weekDaysFunc } from '~/components/common/pages/scheduledTasks/modals/common/frequency/on/selectWeek/lib/config/weekOptions'
 
-const modelWeekDaysLocal = defineModel<number[]>({ required: true })
+const modelFrequency = defineModel<UI_I_ScheduleNewTasksForm>({
+  required: true,
+})
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const onSelectDay = (value: number): void => {
-  const index = modelWeekDaysLocal.value?.indexOf(value)
+  const index = modelFrequency.value?.frg_on_week_days.indexOf(value)
 
   if (index === -1) {
-    modelWeekDaysLocal.value.push(value)
-    modelWeekDaysLocal.value.sort((a: number, b: number) => a - b)
+    modelFrequency.value.frg_on_week_days.push(value)
+    modelFrequency.value.frg_on_week_days.sort((a: number, b: number) => a - b)
   } else {
-    modelWeekDaysLocal.value = modelWeekDaysLocal.value?.filter(
-      (_: number, key: number) => key !== index
-    )
+    modelFrequency.value.frg_on_week_days =
+      modelFrequency.value?.frg_on_week_days.filter(
+        (_: number, key: number) => key !== index
+      )
   }
 }
 
 const tabs = computed<UI_I_SelectWeekDayTab[]>(() =>
-  weekDaysFunc(localization.value, modelWeekDaysLocal.value)
+  weekDaysFunc(localization.value, modelFrequency.value.frg_on_week_days)
 )
 
-// watch(
-//   tabs,
-//   (newValue: UI_I_SelectWeekDayTab[]) => {
-//     modelWeekDaysLocal.value = newValue
-//       .filter((tab) => tab.isActive)
-//       .map((tab) => tab.value)
-//   },
-//   { immediate: true }
-// )
+watch(
+  modelFrequency,
+  (newValue: UI_I_ScheduleNewTasksForm) => {
+    modelFrequency.value.isValid = !newValue.frg_on_week_days.length
+  },
+  {
+    immediate: true,
+  }
+)
 </script>
 
 <style lang="scss" scoped>

package/components/common/pages/scheduledTasks/modals/common/newTaskForm/NewTaskForm.vue

@@ -155,7 +155,7 @@ const generateHourlyCronExpression = (delay: string, date: Date): any => {
   // Генерируем cron-выражение
   return `${minutes} ${hours}/${delay} * * *`
 }
-const generateDaylyCronExpression = (delay: string, date: Date): any => {
+const generateDaylyCronExpression = (delay: string, date: Date): string => {
   if (!date) return
 
   const minutes = date.getMinutes()
@@ -165,6 +165,25 @@ const generateDaylyCronExpression = (delay: string, date: Date): any => {
   // Генерируем cron-выражение
   return `${minutes} ${hours} ${day}/${delay} * *`
 }
+const generateWeeklyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
+  const { frg_on_week_days } = data
+
+  // Генерируем cron-выражение
+  return `* * * * ${frg_on_week_days.join(',')}`
+}
+const generateMonthlyCronExpression = (delay: string, date: Date): string => {
+  if (!date) return
+
+  const minutes = date.getMinutes()
+  const hours = date.getHours()
+  const day = date.getDate()
+  const month = date.getMonth() + 1
+
+  // Генерируем cron-выражение
+  return `${minutes} ${hours} ${day} ${month}/${delay} *`
+}
 
 const generateCronExpression = (
   runType: UI_T_FrequencyType,
@@ -175,8 +194,9 @@ const generateCronExpression = (
   // Генерируем cron-выражение на основе runType
   switch (runType) {
     case 'once':
-      const date = interval.frg_on_time && new Date(interval.frg_on_time)
-      cronExpression = generateOnceCronExpression(date)
+      cronExpression = generateOnceCronExpression(
+        new Date(interval.frg_on_time)
+      )
       break
     case 'after-startup':
       const delay =
@@ -186,22 +206,28 @@ const generateCronExpression = (
       cronExpression = `${delay} * * * * after_procurator_startup` // Выполняется каждые N минут после запуска  procurator_startup
       break
     case 'hour':
-      const hourlyDelay = `*/${interval.frg_interval}`
-      const date =
-        interval.frg_start_on_time && new Date(interval.frg_start_on_time)
-      cronExpression = generateHourlyCronExpression(hourlyDelay, date)
+      const hourlyDelay = interval.frg_interval
+      cronExpression = generateHourlyCronExpression(
+        hourlyDelay,
+        new Date(interval.frg_start_on_time)
+      )
       break
     case 'day':
-      const daylyDelay = `*/${interval.frg_interval}`
-      const date =
-        interval.frg_start_on_time && new Date(interval.frg_start_on_time)
-      cronExpression = generateDaylyCronExpression(daylyDelay, date)
+      const dayDelay = interval.frg_interval
+      cronExpression = generateDaylyCronExpression(
+        dayDelay,
+        new Date(interval.frg_start_on_time)
+      )
       break
     case 'week':
-      cronExpression = `* * * * *` // Выполнение раз в неделю
+      cronExpression = generateWeeklyCronExpression(interval)
       break
     case 'month':
-      cronExpression = `* * * * *` // Выполнение раз в неделю
+      const monthDelay = interval.frg_interval
+      cronExpression = generateMonthlyCronExpression(
+        monthDelay,
+        new Date(interval.frg_start_on_time)
+      )
       break
     default:
       cronExpression = '* * * * *'

package/package.json

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