bfg-common 1.5.709 → 1.5.711

package/components/common/layout/theHeader/TheHeader.vue

@@ -3,6 +3,7 @@
     v-if="props.newView"
     v-model:security="security"
     v-model:new-view-local="newViewLocal"
+    v-model:time-format="timeFormat"
     :is-show-main-menu="props.isShowMainMenu"
     :company-name="props.companyName"
     :beta-text="props.betaText"
@@ -13,7 +14,6 @@
     :selected-language-type="props.selectedLanguageType"
     :selected-lang="props.selectedLang"
     :new-view="props.newView"
-    :time-format="props.timeFormat"
     :project="props.project"
     :is-dark-theme="props.isDarkTheme"
     :remote-console="props.remoteConsole"
@@ -25,7 +25,6 @@
     @reset-preference="emits('reset-preference')"
     @hide-preference="emits('hide-preference')"
     @global-refresh="emits('global-refresh')"
-    @update-time-format="emits('update-time-format', $event)"
     @change-theme-mode="emits('change-theme-mode')"
     @update-language="emits('update-language', $event)"
     @update-is-browser="emits('update-is-browser', $event)"
@@ -38,6 +37,7 @@
     v-else
     v-model:security="security"
     v-model:new-view-local="newViewLocal"
+    v-model:time-format="timeFormat"
     :company-name="props.companyName"
     :beta-text="props.betaText"
     :global-refresh-loading="props.globalRefreshLoading"
@@ -47,7 +47,6 @@
     :selected-language-type="props.selectedLanguageType"
     :selected-lang="props.selectedLang"
     :new-view="props.newView"
-    :time-format="props.timeFormat"
     :project="props.project"
     :remote-console="props.remoteConsole"
     :vm-cluster="props.vmCluster"
@@ -57,7 +56,6 @@
     @show-preference="emits('show-preference')"
     @hide-preference="emits('hide-preference')"
     @global-refresh="emits('global-refresh')"
-    @update-time-format="emits('update-time-format', $event)"
     @change-theme-mode="emits('change-theme-mode')"
     @update-language="emits('update-language', $event)"
     @update-is-browser="emits('update-is-browser', $event)"
@@ -80,6 +78,7 @@ import { checkIsTokenExpired } from '~/lib/utils/token'
 
 const security = defineModel<boolean>('security')
 const newViewLocal = defineModel<boolean>('newViewLocal')
+const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
 
 const props = withDefaults(
   defineProps<{
@@ -96,7 +95,6 @@ const props = withDefaults(
     remoteConsole: string
     vmCluster: boolean
     newView: boolean
-    timeFormat: string
     isDarkTheme: boolean
     isPauseReconnect: boolean
     expireTimeFromState: number
@@ -118,7 +116,6 @@ const emits = defineEmits<{
   (event: 'reset-preference'): void
   (event: 'hide-preference'): void
   (event: 'change-theme-mode'): void
-  (event: 'update-time-format', value: UI_T_TimeValue): void
   (event: 'update-language', value: UI_I_Dropdown): void
   (event: 'update-is-browser', value: string): void
   (event: 'update-remote-console', value: string): void

package/components/common/layout/theHeader/TheHeaderNew.vue

@@ -103,9 +103,9 @@
           <common-layout-the-header-user-menu
             v-model:security="security"
             v-model:new-view-local="newViewLocal"
+            v-model:time-format="timeFormat"
             :hostname="props.hostname"
             :is-preference="isPreference"
-            :time-format="props.timeFormat"
             :selected-language-type="props.selectedLanguageType"
             :selected-language="props.selectedLang"
             :new-view="props.newView"
@@ -118,7 +118,6 @@
             @reset-preference="emits('reset-preference')"
             @hide-preference="emits('hide-preference')"
             @change-theme-mode="emits('change-theme-mode')"
-            @update-time-format="emits('update-time-format', $event)"
             @update-language="emits('update-language', $event)"
             @update-is-browser="emits('update-is-browser', $event)"
             @update-remote-console="emits('update-remote-console', $event)"
@@ -141,6 +140,7 @@ import type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMen
 
 const security = defineModel<boolean>('security')
 const newViewLocal = defineModel<boolean>('newViewLocal')
+const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
 
 const props = defineProps<{
   isShowMainMenu: boolean
@@ -156,7 +156,6 @@ const props = defineProps<{
   remoteConsole: string
   vmCluster: boolean
   newView: boolean
-  timeFormat: string
   isDarkTheme: boolean
   securityLoader: boolean // для Сферы
   recovery: UI_I_Recovery | null // для Сферы
@@ -169,7 +168,6 @@ const emits = defineEmits<{
   (event: 'reset-preference'): void
   (event: 'hide-preference'): void
   (event: 'change-theme-mode'): void
-  (event: 'update-time-format', value: UI_T_TimeValue): void
   (event: 'update-language', value: UI_I_Dropdown): void
   (event: 'update-is-browser', value: string): void
   (event: 'update-remote-console', value: string): void

package/components/common/layout/theHeader/TheHeaderOld.vue

@@ -60,9 +60,9 @@
         <common-layout-the-header-user-menu
           v-model:security="security"
           v-model:new-view-local="newViewLocal"
+          v-model:time-format="timeFormat"
           :hostname="props.hostname"
           :is-preference="props.isPreference"
-          :time-format="props.timeFormat"
           :selected-language-type="props.selectedLanguageType"
           :selected-language="props.selectedLang.value"
           :new-view="props.newView"
@@ -74,7 +74,6 @@
           @show-preference="emits('show-preference')"
           @hide-preference="emits('hide-preference')"
           @change-theme-mode="emits('change-theme-mode')"
-          @update-time-format="emits('update-time-format', $event)"
           @update-language="onUpdateLanguage"
           @update-is-browser="emits('update-is-browser', $event)"
           @update-remote-console="emits('update-remote-console', $event)"
@@ -110,6 +109,7 @@ import { findInLocals } from '~/components/common/selectLanguage/lib/utils/utils
 
 const security = defineModel<boolean>('security')
 const newViewLocal = defineModel<boolean>('newViewLocal')
+const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
 
 const props = defineProps<{
   companyName: string
@@ -124,7 +124,6 @@ const props = defineProps<{
   remoteConsole: string
   vmCluster: boolean
   newView: boolean
-  timeFormat: string
   securityLoader: boolean // для Сферы
   recovery: UI_I_Recovery | null // для Сферы
 }>()
@@ -135,7 +134,6 @@ const emits = defineEmits<{
   (event: 'show-preference'): void
   (event: 'hide-preference'): void
   (event: 'change-theme-mode'): void
-  (event: 'update-time-format', value: UI_T_TimeValue): void
   (event: 'update-language', value: UI_I_Dropdown): void
   (event: 'update-is-browser', value: string): void
   (event: 'update-remote-console', value: string): void

package/components/common/layout/theHeader/userMenu/UserMenu.vue

@@ -22,7 +22,7 @@
       v-if="props.isPreference"
       v-model:security="security"
       v-model:new-view-local="newViewLocal"
-      :time-format="props.timeFormat"
+      v-model:time-format="timeFormat"
       :new-view="props.newView"
       :selected-language-type="props.selectedLanguageType"
       :selected-language="props.selectedLanguage"
@@ -33,7 +33,6 @@
       :recovery="props.recovery"
       @hide="emits('hide-preference')"
       @reset="emits('reset-preference')"
-      @update-time-format="emits('update-time-format', $event)"
       @update-language="emits('update-language', $event)"
       @update-is-browser="emits('update-is-browser', $event)"
       @update-remote-console="emits('update-remote-console', $event)"
@@ -52,13 +51,13 @@ import type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMen
 
 const security = defineModel<boolean>('security')
 const newViewLocal = defineModel<boolean>('newViewLocal')
+const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
 
 const props = defineProps<{
   hostname: string
   project: UI_T_Project
   isPreference: boolean
   newView: boolean
-  timeFormat: UI_T_TimeValue
   selectedLanguageType: UI_T_LangValue
   selectedLanguage: UI_I_Dropdown | string
   remoteConsole: string
@@ -71,7 +70,6 @@ const emits = defineEmits<{
   (event: 'reset-preference'): void
   (event: 'hide-preference'): void
   (event: 'change-theme-mode'): void
-  (event: 'update-time-format', value: UI_T_TimeValue): void
   (event: 'update-language', value: UI_I_Dropdown): void
   (event: 'update-is-browser', value: string): void
   (event: 'update-remote-console', value: string): void

package/components/common/layout/theHeader/userMenu/modals/preferences/Preferences.vue

@@ -3,8 +3,8 @@
     v-if="props.newView"
     v-model:security="security"
     v-model:new-view-local="newViewLocal"
+    v-model:time-format="timeFormat"
     :project="props.project"
-    :time-format="props.timeFormat"
     :new-view="props.newView"
     :selected-language-type="props.selectedLanguageType"
     :selected-language="props.selectedLanguage"
@@ -14,7 +14,6 @@
     :recovery="props.recovery"
     @hide="emits('hide')"
     @reset="emits('reset')"
-    @update-time-format="emits('update-time-format', $event)"
     @update-language="emits('update-language', $event)"
     @update-is-browser="emits('update-is-browser', $event)"
     @update-remote-console="emits('update-remote-console', $event)"
@@ -26,8 +25,8 @@
     v-else
     v-model:security="security"
     v-model:new-view-local="newViewLocal"
+    v-model:time-format="timeFormat"
     :project="props.project"
-    :time-format="props.timeFormat"
     :new-view="props.newView"
     :selected-language-type="props.selectedLanguageType"
     :selected-language="props.selectedLanguage"
@@ -36,7 +35,6 @@
     :security-loader="props.securityLoader"
     :recovery="props.recovery"
     @hide="emits('hide')"
-    @update-time-format="emits('update-time-format', $event)"
     @update-language="emits('update-language', $event)"
     @update-is-browser="emits('update-is-browser', $event)"
     @update-remote-console="emits('update-remote-console', $event)"
@@ -54,10 +52,10 @@ import type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMen
 
 const security = defineModel<boolean>('security')
 const newViewLocal = defineModel<boolean>('newViewLocal')
+const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
 
 const props = defineProps<{
   project: UI_T_Project
-  timeFormat: UI_T_TimeValue
   newView: boolean
   selectedLanguageType: UI_T_LangValue
   selectedLanguage: UI_I_Dropdown | string
@@ -70,7 +68,6 @@ const props = defineProps<{
 const emits = defineEmits<{
   (event: 'hide'): void
   (event: 'reset'): void
-  (event: 'update-time-format', value: UI_T_TimeValue): void
   (event: 'update-language', value: UI_I_Dropdown): void
   (event: 'update-is-browser', value: string): void
   (event: 'update-remote-console', value: string): void

package/components/common/layout/theHeader/userMenu/modals/preferences/PreferencesNew.vue

@@ -13,9 +13,8 @@
       <ui-modal-block-standard>
         <ui-modal-block-form-standard>
           <common-layout-the-header-user-menu-modals-preferences-time-format
+            v-model:time-format="timeFormat"
             :new-view="props.newView"
-            :time-format="props.timeFormat"
-            @update-time-format="emits('update-time-format', $event)"
           />
         </ui-modal-block-form-standard>
 
@@ -74,10 +73,10 @@ import type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMen
 
 const security = defineModel<boolean>('security')
 const newViewLocal = defineModel<boolean>('newViewLocal')
+const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
 
 const props = defineProps<{
   project: UI_T_Project
-  timeFormat: UI_T_TimeValue
   selectedLanguage: UI_I_Dropdown
   selectedLanguageType: UI_T_LangValue
   newView: boolean
@@ -87,7 +86,6 @@ const props = defineProps<{
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
-  (event: 'update-time-format', value: UI_T_TimeValue): void
   (event: 'update-language', value: UI_I_Dropdown): void
   (event: 'update-is-browser', value: string): void
   (event: 'update-remote-console', value: string): void

package/components/common/layout/theHeader/userMenu/modals/preferences/PreferencesOld.vue

@@ -17,9 +17,8 @@
 
       <common-layout-the-header-user-menu-modals-preferences-time-format
         v-if="selectedTab === 'time-tab'"
+        v-model:time-format="timeFormat"
         :new-view="props.newView"
-        :time-format="props.timeFormat"
-        @update-time-format="emits('update-time-format', $event)"
       />
 
       <common-layout-the-header-user-menu-modals-preferences-change-language
@@ -91,10 +90,10 @@ import { preferencesTabs } from '~/components/common/layout/theHeader/userMenu/m
 
 const security = defineModel<boolean>('security')
 const newViewLocal = defineModel<boolean>('newViewLocal')
+const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
 
 const props = defineProps<{
   project: UI_T_Project
-  timeFormat: UI_T_TimeValue
   selectedLanguage: UI_T_LangValue
   selectedLanguageType: UI_T_LangValue
   newView: boolean
@@ -105,7 +104,6 @@ const props = defineProps<{
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
-  (event: 'update-time-format', value: UI_T_TimeValue): void
   (event: 'update-language', value: string): void
   (event: 'update-is-browser', value: string): void
   (event: 'update-remote-console', value: string): void

package/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/TimeFormat.vue

@@ -1,54 +1,41 @@
-<template>
-  <component
-    :is="currentComponent"
-    v-model="timeItem"
-    :description="description"
-    :format-options="formatOptions"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_RadioItem } from '~/components/common/layout/theHeader/userMenu/lib/models/interfaces'
-import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
-import { formatOptionsFunc } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/config/formatOptions'
-
-const props = defineProps<{
-  timeFormat: UI_T_TimeValue
-  newView: boolean
-}>()
-
-const emits = defineEmits<{
-  (event: 'update-time-format', value: UI_T_TimeValue): void
-}>()
-
-const currentComponent = computed(() =>
-  props.newView
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const config = useRuntimeConfig()
-
-const description = computed<string>(() =>
-  localization.value.common.timeFormatDesc.replaceAll(
-    '{trademark}',
-    String(config.public[`TRADEMARK_${useEnvLanguage()}`])
-  )
-)
-
-const formatOptions = readonly<UI_I_RadioItem[]>(
-  formatOptionsFunc(localization.value)
-)
-
-const timeItem = computed<UI_T_TimeValue>({
-  get() {
-    return props.timeFormat
-  },
-  set(newValue: UI_T_TimeValue) {
-    emits('update-time-format', newValue)
-  },
-})
-</script>
+<template>
+  <component
+    :is="currentComponent"
+    v-model="timeFormat"
+    :description="description"
+    :format-options="formatOptions"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_RadioItem } from '~/components/common/layout/theHeader/userMenu/lib/models/interfaces'
+import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
+import { formatOptionsFunc } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/config/formatOptions'
+
+const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
+const props = defineProps<{
+  newView: boolean
+}>()
+
+const currentComponent = computed(() =>
+  props.newView
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const config = useRuntimeConfig()
+
+const description = computed<string>(() =>
+  localization.value.common.timeFormatDesc.replaceAll(
+    '{trademark}',
+    String(config.public[`TRADEMARK_${useEnvLanguage()}`])
+  )
+)
+
+const formatOptions = readonly<UI_I_RadioItem[]>(
+  formatOptionsFunc(localization.value)
+)
+</script>

package/package.json

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