bfg-common 1.4.273 → 1.4.275

package/components/common/pages/scheduledTasks/modals/common/frequency/lib/models/types.ts

@@ -0,0 +1,7 @@
+export type UI_T_FrequencyType =
+  | 'once'
+  | 'after-startup'
+  | 'hour'
+  | 'day'
+  | 'week'
+  | 'month'

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

@@ -100,6 +100,7 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import type { UI_I_InitialValidationFields } from '~/components/common/pages/scheduledTasks/modals/common/newTaskForm/lib/models/interfaces'
+import type { UI_T_FrequencyType } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/models/types'
 import { frequencyMethodFunc } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/config/frequencyOptions'
 
 const props = defineProps<{
@@ -128,15 +129,14 @@ const frequencyMethodOptions = computed<UI_I_SelectInputItem[]>(() =>
 watch(
   model,
   (newValue: UI_I_ScheduleNewTasksForm) => {
-    console.log(newValue, '444444')
-    const date = newValue.frg_on_time && new Date(newValue.frg_on_time)
-    newValue.cron = generateOnceCronExpression(date)
+    newValue.cron = generateCronExpression(newValue.frequency, newValue)
   },
   { deep: true }
 )
 
-const generateOnceCronExpression = (date: Date | null): any => {
-  if(!date) return
+const generateOnceCronExpression = (date: Date): any => {
+  if (!date) return
+
   const minutes = date.getMinutes()
   const hours = date.getHours()
   const day = date.getDate()
@@ -144,7 +144,41 @@ const generateOnceCronExpression = (date: Date | null): any => {
   const dayOfWeek = '*' // Для одноразовой задачи день недели неважен
 
   // Генерируем cron-выражение
-  const cronExpression = `${minutes} ${hours} ${day} ${month} ${dayOfWeek} once`
+  return `${minutes} ${hours} ${day} ${month} ${dayOfWeek} once`
+}
+
+const generateCronExpression = (
+  runType: UI_T_FrequencyType,
+  interval: UI_I_ScheduleNewTasksForm
+): string => {
+  let cronExpression
+
+  // Генерируем cron-выражение на основе runType
+  switch (runType) {
+    case 'once':
+      const date = interval.frg_on_time && new Date(interval.frg_on_time)
+      cronExpression = generateOnceCronExpression(date)
+      break
+    case 'after-startup':
+      const delay = `*/${interval.frg_after_startup}`
+      cronExpression = `${delay} * * * * after_procurator_startup` // Выполняется каждые N минут после запуска  procurator_startup
+      break
+    case 'hour':
+      cronExpression = `* * * * *` // Выполнение каждые N дней в полночь
+      break
+    case 'day':
+      cronExpression = `* * * * *` // Выполнение каждые N дней в полночь
+      break
+    case 'week':
+      cronExpression = `* * * * *` // Выполнение раз в неделю
+      break
+    case 'month':
+      cronExpression = `* * * * *` // Выполнение раз в неделю
+      break
+    default:
+      cronExpression = '* * * * *'
+  }
+
   return cronExpression
 }
 </script>

package/components/common/pages/scheduledTasks/modals/lib/config/createScheduledTask.ts

@@ -1,10 +1,9 @@
-import type {
-  UI_I_ScheduleNewTasksForm,
-} from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 
 export const scheduledTaskDefaultFormFunc = (): UI_I_ScheduleNewTasksForm => {
   return {
     isValid: true,
+    cron: '* * * * *',
     task_name: '',
     description: '',
     ntfn_target: '',

package/package.json

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