bfg-common 1.4.327 → 1.4.329

package/components/common/layout/theHeader/feedback/Feedback.vue

@@ -1,6 +1,8 @@
 <template>
   <common-layout-the-header-feedback-new
     v-if="isNewView"
+    :is-show-feedback="props.isShowFeedback"
+    :title="localization.common.sendFeedback"
     @hide="onHide"
     @submit="onSubmit"
   />

package/components/common/layout/theHeader/feedback/FeedbackNew.vue

@@ -1,90 +1,27 @@
 <template>
-  <ui-modal
-    show
-    width="560px"
-    test-id="feedback-modal"
-    :title="localization.common.sendFeedback"
-    :texts="texts"
-    class="feedback"
-    @submit="onSubmit"
-    @hide="onHideModal"
-  >
-    <template #content>
-      <ui-modal-block-standard>
-        <div class="description">
-          <span class="description-label text-ellipsis">
-            {{ localization.common.helpUsImprove }}
-          </span>
-          <ui-icon
-            id="feedback-description-info-icon"
-            name="info"
-            width="18"
-            height="18"
-            :color="isShowInfo ? '#008FD6' : '#9DA6AD'"
-            class="info-icon pointer"
-            @click="isShowInfo = !isShowInfo"
-          />
-          <ui-popup-window
-            v-model="isShowInfo"
-            width="232px"
-            :elem-id="'feedback-description-info-icon'"
-          >
-            <div class="common-widget-info">
-              <div class="headline justify-between flex-align-center">
-                <div class="flex-align-center">
-                  <ui-icon-icon3 name="info-2" width="16px" height="16px" />
-                  <span class="title">{{ title }}</span>
-                </div>
-                <ui-icon
-                  name="close"
-                  class="pointer hide-icon"
-                  width="16px"
-                  height="16px"
-                  @click="isShowInfo = false"
-                />
-              </div>
-
-              <div class="common-widget-info-description">
-                {{ infoDescription }}
-              </div>
-            </div>
-          </ui-popup-window>
-        </div>
-
-      </ui-modal-block-standard>
-    </template>
-
-    <template #footerLeftContent><span /></template>
-  </ui-modal>
+  <Teleport to="body">
+    <common-feedback
+      width="576px"
+      :show="props.isShowFeedback"
+      :title="props.title"
+      @hide="emits('hide')"
+      @submit="emits('submit', $event)"
+    />
+  </Teleport>
 </template>
 
 <script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_FeedbackForm } from '~/components/common/feedback/lib/models/interfaces'
 
-// const props = defineProps<{
-//   title: string
-// }>()
-// console.log(props)
-// const emits = defineEmits<{
-//   (event: 'hide'): void
-//   (event: 'submit', value: UI_I_FeedbackForm): void
-// }>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const isShowInfo = ref<boolean>(false)
+const props = defineProps<{
+  isShowFeedback: boolean
+  title: string
+}>()
 
-const infoDescription = ref('')
-
-const texts = {
-  button1: localization.value.common.send,
-}
-
-const onHideModal = (): void => {
-  // emits('hide')
-}
-const onSubmit = (): void => {}
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'submit', value: UI_I_FeedbackForm): void
+}>()
 </script>
 
 <style lang="scss">
@@ -99,5 +36,28 @@ const onSubmit = (): void => {}
 }
 
 .feedback {
+  width: 60px;
+  height: 60px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  fill: #fafafa;
+
+  &-icon {
+    width: 24px;
+    height: 24px;
+    opacity: 0.65;
+    cursor: pointer;
+  }
+  &-icon:hover {
+    opacity: 1;
+  }
+}
+.about-vsphere-dialog-legal-section {
+  color: var(--description-color);
+  a {
+    color: var(--link-visited-color);
+  }
 }
 </style>

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

@@ -63,13 +63,19 @@
         <common-select-input
           v-model="model.frq_ordinal_number"
           :data="frequencyOnOrdinalNumber"
-          :class="['radio__select', !isDisabledMonthlyDayField && 'disabled']"
+          :class="[
+            'radio__select ordinary-day',
+            !isDisabledMonthlyDayField && 'disabled',
+          ]"
         />
 
         <common-select-input
           v-model="model.frq_week_day"
           :data="frequencyOnWeeksDays"
-          :class="['radio__select', !isDisabledMonthlyDayField && 'disabled']"
+          :class="[
+            'radio__select week-days',
+            !isDisabledMonthlyDayField && 'disabled',
+          ]"
         />
       </div>
     </div>
@@ -191,6 +197,16 @@ const setDefaultDateTime = () => {
   &__select {
     width: 100%;
     margin-top: 10px;
+    :deep(.select-input__inner) {
+      max-width: 100% !important;
+    }
+    &.ordinary-day :deep(select) {
+      min-width: 80px;
+    }
+    &.week-days :deep(select) {
+      min-width: 110px;
+      margin-left: 15px;
+    }
     select {
       width: 80px;
     }

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

@@ -25,7 +25,7 @@ export const generateWeeklyCronExpression = (
   const daysOfWeek = frg_on_week_days.join(',')
 
   return endTimestamp
-    ? `* * * * ${daysOfWeek} ${startTimestamp}-${endTimestamp}:0-0-0-${data.frg_interval}`
+    ? `* * * * ${daysOfWeek} ${startTimestamp}-${endTimestamp}:0-0-${data.frg_interval}-0`
     : `* * * * ${daysOfWeek} ${startTimestamp}:0-0-0-${data.frg_interval}`
 }
 
@@ -54,7 +54,7 @@ export const generateMonthlyCronExpression = (
   )
   const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
 
-  const daysOfWeek = `${frq_week_day}#${frq_ordinal_number}`
+  const ordinaryDaysOfMonth = `${frg_interval}#${frq_ordinal_number}`
 
   const timestamp = endTimestamp
     ? `${startTimestamp}-${endTimestamp}`
@@ -62,6 +62,6 @@ export const generateMonthlyCronExpression = (
 
   // Генерируем cron-выражение
   return data.frg_monthly_mode === 'week'
-    ? `* * * * * ${timestamp}:0-0-${frg_interval}-${daysOfWeek}`
-    : `* * ${frg_monthly_day} */${frg_interval} * ${timestamp}:0-0-0-0`
+    ? `* * * * ${frq_week_day} ${timestamp}:0-0-0-${ordinaryDaysOfMonth}`
+    : `* * ${frg_monthly_day} * * ${timestamp}:0-0-0-${frg_interval}`
 }

package/package.json

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