bfg-common 1.4.327 → 1.4.328
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,90 +1,27 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
>
|
|
12
|
-
<template #content>
|
|
13
|
-
<ui-modal-block-standard>
|
|
14
|
-
<div class="description">
|
|
15
|
-
<span class="description-label text-ellipsis">
|
|
16
|
-
{{ localization.common.helpUsImprove }}
|
|
17
|
-
</span>
|
|
18
|
-
<ui-icon
|
|
19
|
-
id="feedback-description-info-icon"
|
|
20
|
-
name="info"
|
|
21
|
-
width="18"
|
|
22
|
-
height="18"
|
|
23
|
-
:color="isShowInfo ? '#008FD6' : '#9DA6AD'"
|
|
24
|
-
class="info-icon pointer"
|
|
25
|
-
@click="isShowInfo = !isShowInfo"
|
|
26
|
-
/>
|
|
27
|
-
<ui-popup-window
|
|
28
|
-
v-model="isShowInfo"
|
|
29
|
-
width="232px"
|
|
30
|
-
:elem-id="'feedback-description-info-icon'"
|
|
31
|
-
>
|
|
32
|
-
<div class="common-widget-info">
|
|
33
|
-
<div class="headline justify-between flex-align-center">
|
|
34
|
-
<div class="flex-align-center">
|
|
35
|
-
<ui-icon-icon3 name="info-2" width="16px" height="16px" />
|
|
36
|
-
<span class="title">{{ title }}</span>
|
|
37
|
-
</div>
|
|
38
|
-
<ui-icon
|
|
39
|
-
name="close"
|
|
40
|
-
class="pointer hide-icon"
|
|
41
|
-
width="16px"
|
|
42
|
-
height="16px"
|
|
43
|
-
@click="isShowInfo = false"
|
|
44
|
-
/>
|
|
45
|
-
</div>
|
|
46
|
-
|
|
47
|
-
<div class="common-widget-info-description">
|
|
48
|
-
{{ infoDescription }}
|
|
49
|
-
</div>
|
|
50
|
-
</div>
|
|
51
|
-
</ui-popup-window>
|
|
52
|
-
</div>
|
|
53
|
-
|
|
54
|
-
</ui-modal-block-standard>
|
|
55
|
-
</template>
|
|
56
|
-
|
|
57
|
-
<template #footerLeftContent><span /></template>
|
|
58
|
-
</ui-modal>
|
|
2
|
+
<Teleport to="body">
|
|
3
|
+
<common-feedback
|
|
4
|
+
width="576px"
|
|
5
|
+
:show="props.isShowFeedback"
|
|
6
|
+
:title="props.title"
|
|
7
|
+
@hide="emits('hide')"
|
|
8
|
+
@submit="emits('submit', $event)"
|
|
9
|
+
/>
|
|
10
|
+
</Teleport>
|
|
59
11
|
</template>
|
|
60
12
|
|
|
61
13
|
<script setup lang="ts">
|
|
62
|
-
import type { UI_I_Localization } from '~/lib/models/interfaces'
|
|
63
14
|
import type { UI_I_FeedbackForm } from '~/components/common/feedback/lib/models/interfaces'
|
|
64
15
|
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
// const emits = defineEmits<{
|
|
70
|
-
// (event: 'hide'): void
|
|
71
|
-
// (event: 'submit', value: UI_I_FeedbackForm): void
|
|
72
|
-
// }>()
|
|
73
|
-
|
|
74
|
-
const localization = computed<UI_I_Localization>(() => useLocal())
|
|
75
|
-
|
|
76
|
-
const isShowInfo = ref<boolean>(false)
|
|
16
|
+
const props = defineProps<{
|
|
17
|
+
isShowFeedback: boolean
|
|
18
|
+
title: string
|
|
19
|
+
}>()
|
|
77
20
|
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
const onHideModal = (): void => {
|
|
85
|
-
// emits('hide')
|
|
86
|
-
}
|
|
87
|
-
const onSubmit = (): void => {}
|
|
21
|
+
const emits = defineEmits<{
|
|
22
|
+
(event: 'hide'): void
|
|
23
|
+
(event: 'submit', value: UI_I_FeedbackForm): void
|
|
24
|
+
}>()
|
|
88
25
|
</script>
|
|
89
26
|
|
|
90
27
|
<style lang="scss">
|
|
@@ -99,5 +36,28 @@ const onSubmit = (): void => {}
|
|
|
99
36
|
}
|
|
100
37
|
|
|
101
38
|
.feedback {
|
|
39
|
+
width: 60px;
|
|
40
|
+
height: 60px;
|
|
41
|
+
display: flex;
|
|
42
|
+
flex-direction: column;
|
|
43
|
+
justify-content: center;
|
|
44
|
+
align-items: center;
|
|
45
|
+
fill: #fafafa;
|
|
46
|
+
|
|
47
|
+
&-icon {
|
|
48
|
+
width: 24px;
|
|
49
|
+
height: 24px;
|
|
50
|
+
opacity: 0.65;
|
|
51
|
+
cursor: pointer;
|
|
52
|
+
}
|
|
53
|
+
&-icon:hover {
|
|
54
|
+
opacity: 1;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
.about-vsphere-dialog-legal-section {
|
|
58
|
+
color: var(--description-color);
|
|
59
|
+
a {
|
|
60
|
+
color: var(--link-visited-color);
|
|
61
|
+
}
|
|
102
62
|
}
|
|
103
63
|
</style>
|
|
@@ -25,7 +25,7 @@ export const generateWeeklyCronExpression = (
|
|
|
25
25
|
const daysOfWeek = frg_on_week_days.join(',')
|
|
26
26
|
|
|
27
27
|
return endTimestamp
|
|
28
|
-
? `* * * * ${daysOfWeek} ${startTimestamp}-${endTimestamp}:0-0
|
|
28
|
+
? `* * * * ${daysOfWeek} ${startTimestamp}-${endTimestamp}:0-0-${data.frg_interval}-0`
|
|
29
29
|
: `* * * * ${daysOfWeek} ${startTimestamp}:0-0-0-${data.frg_interval}`
|
|
30
30
|
}
|
|
31
31
|
|
|
@@ -54,7 +54,7 @@ export const generateMonthlyCronExpression = (
|
|
|
54
54
|
)
|
|
55
55
|
const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
|
|
56
56
|
|
|
57
|
-
const
|
|
57
|
+
const ordinaryDaysOfWeek = `${frq_ordinal_number}`
|
|
58
58
|
|
|
59
59
|
const timestamp = endTimestamp
|
|
60
60
|
? `${startTimestamp}-${endTimestamp}`
|
|
@@ -62,6 +62,6 @@ export const generateMonthlyCronExpression = (
|
|
|
62
62
|
|
|
63
63
|
// Генерируем cron-выражение
|
|
64
64
|
return data.frg_monthly_mode === 'week'
|
|
65
|
-
? `* * * *
|
|
66
|
-
: `* * ${frg_monthly_day}
|
|
65
|
+
? `* * * * ${frq_week_day} ${timestamp}:0-0-${ordinaryDaysOfWeek}-${frg_interval}`
|
|
66
|
+
: `* * ${frg_monthly_day} * * ${timestamp}:0-0-0-${frg_interval}`
|
|
67
67
|
}
|