bfg-common 1.4.298 → 1.4.299

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

@@ -9,11 +9,11 @@
       v-model="model"
     />
 
-    <div v-if="props.type === 'month'" class="">
+    <div v-if="props.type === 'month'">
       <div class="on-time__radio radio">
         <input
           id="on-time-monthly-by-day"
-          v-model="selectedTimeMode"
+          v-model="model.frg_monthly_mode"
           data-id="on-time-monthly-by-day"
           type="radio"
           value="day"
@@ -49,7 +49,7 @@
       <div class="on-time__radio radio">
         <input
           id="on-time-monthly-by-week"
-          v-model="selectedTimeMode"
+          v-model="model.frg_monthly_mode"
           data-id="on-time-monthly-by-week"
           type="radio"
           value="week"
@@ -115,8 +115,6 @@ const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const selectedTimeMode = ref<'day' | 'week'>('day')
-
 const frequencyOnWeeksDays = computed<UI_I_SelectInputItem[]>(() => {
   return frequencyOnWeeksDaysFunc(localization.value)
 })
@@ -125,7 +123,7 @@ const frequencyOnOrdinalNumber = computed<UI_I_SelectInputItem[]>(() => {
 })
 
 const isDisabledMonthlyDayField = computed<boolean>(
-  () => selectedTimeMode.value === 'week'
+  () => model.value.frg_monthly_mode === 'week'
 )
 
 const isInitTimeIntervalValidation = ref<boolean>(false)

package/components/common/pages/scheduledTasks/modals/common/frequency/on/lib/config/options.ts

@@ -7,31 +7,31 @@ export const frequencyOnWeeksDaysFunc = (
   return [
     {
       label: localization.common.sunday,
-      value: 'sunday',
+      value: 6,
     },
     {
       label: localization.common.monday,
-      value: 'monday',
+      value: 1,
     },
     {
       label: localization.common.tuesday,
-      value: 'tuesday',
+      value: 2,
     },
     {
       label: localization.common.wednesday,
-      value: 'wednesday',
+      value: 3,
     },
     {
       label: localization.common.thursday,
-      value: 'thursday',
+      value: 4,
     },
     {
       label: localization.common.friday,
-      value: 'friday',
+      value: 5,
     },
     {
       label: localization.common.saturday,
-      value: 'saturday',
+      value: 0,
     },
   ]
 }
@@ -42,23 +42,23 @@ export const frequencyOnOrdinalNumberFunc = (
   return [
     {
       label: localization.scheduledTasks.first,
-      value: '',
+      value: 1,
     },
     {
       label: localization.scheduledTasks.second,
-      value: 'once',
+      value: 2,
     },
     {
       label: localization.scheduledTasks.third,
-      value: 'after-startup',
+      value: 3,
     },
     {
       label: localization.scheduledTasks.fourth,
-      value: 'hour',
+      value: 4,
     },
     {
       label: localization.common.last,
-      value: 'day',
+      value: 5,
     },
   ]
 }

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

@@ -178,15 +178,19 @@ const generateWeeklyCronExpression = (
 const generateMonthlyCronExpression = (
   data: UI_I_ScheduleNewTasksForm
 ): string => {
-  const { frg_interval, frg_monthly_day } = data
+  const { frg_interval, frg_monthly_day, frq_week_day, frq_ordinal_number } =
+    data
 
   const startOn = new Date(data.frg_start_on_time)
   const end = new Date(data.frg_end_time)
 
   console.log(startOn, end)
+  const month = data.frg_monthly_mode === 'week' ? '*' : frg_monthly_day
+  const cronWeekly = `${frq_week_day}#${frq_ordinal_number}`
+  const dayOfWeek = data.frg_monthly_mode === 'week' ? cronWeekly : '*'
 
   // Генерируем cron-выражение
-  return `* * ${frg_monthly_day} */${frg_interval} *`
+  return `* * ${month} */${frg_interval} ${dayOfWeek}`
 }
 
 const generateCronExpression = (

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

@@ -13,6 +13,7 @@ export const scheduledTaskDefaultFormFunc = (): UI_I_ScheduleNewTasksForm => {
     frg_interval: 1,
     frg_end_time: '',
     frg_start_on_time: '',
+    frg_monthly_mode: 'day',
     frg_monthly_day: 0,
     frq_week_day: '',
     frq_ordinal_number: '',

package/components/common/pages/scheduledTasks/modals/lib/models/interfaces.ts

@@ -11,6 +11,7 @@ export interface UI_I_ScheduleNewTasksForm {
   frg_interval: number
   frg_end_time: string
   frg_start_on_time: string
+  frg_monthly_mode: 'day' | 'week'
   frg_monthly_day: number
   frq_ordinal_number: string
   frq_week_day: UI_T_FrequencyWeeksDays

package/package.json

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