bfg-common 1.4.414 → 1.4.416

package/components/common/layout/theHeader/feedback/new/New.vue

@@ -87,6 +87,7 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_FeedbackForm } from '~/components/common/feedback/lib/models/interfaces'
 import type { UI_T_FeedbackTab } from '~/components/common/layout/theHeader/feedback/new/tabs/lib/models/types'
 import type { UI_I_FeedbackCanvasOptions } from '~/components/common/layout/theHeader/feedback/new/lib/models/interfaces'
+import { UI_E_FeedbackType } from '~/components/common/layout/theHeader/feedback/new/tabs/lib/models/enums'
 
 const feedbackForm = defineModel<UI_I_FeedbackForm>({ required: true })
 const emits = defineEmits<{
@@ -132,6 +133,11 @@ const onHideModal = (): void => {
     : (options.value.isAnnotateImage = false)
 }
 const onSubmit = (): void => {
+  if (options.value.isAnnotateImage) {
+    options.value.isAnnotateImage = false
+    return
+  }
+
   if (selectedTab.value === 'light-bulb') {
     const targetUrl = 'https://customer.aobfg.ru/' // Ваш URL
     window.open(targetUrl, '_blank')
@@ -141,6 +147,17 @@ const onSubmit = (): void => {
   isValidForm.value = !!feedbackForm.value.description
 
   if (!isValidForm.value) return
+  const canvasData = (
+    document.getElementById('feedbackImg') as HTMLCanvasElement
+  ).toDataURL()
+  const canvasBlankData = (
+    document.getElementById('feedbackImgBlank') as HTMLCanvasElement
+  ).toDataURL()
+
+  const image = canvasData.match(/base64,(.+)/)?.[1] || ''
+  feedbackForm.value.image = canvasData === canvasBlankData ? '' : image
+  feedbackForm.value.type = UI_E_FeedbackType[selectedTab.value]
+
   emits('submit')
 }
 </script>

package/components/common/layout/theHeader/feedback/new/additionalDetails/AdditionalDetails.vue

@@ -103,6 +103,7 @@
           type="default"
           variant="outline"
           class="btn undo"
+          :disabled="isDisabledButton"
           @click="onUndoLast"
         >
           <ui-icon
@@ -121,6 +122,7 @@
         type="default"
         variant="outline"
         class="btn clear-all"
+        :disabled="isDisabledButton"
         @click="clearAll"
       >
         <ui-icon
@@ -208,7 +210,6 @@ const memoryParentModalDialog = ref<string>('')
 const memoryParentMain = ref<string>('')
 
 const drawingArray: any = []
-// const indexArray = 0 // index of feedbackImg itself
 const indexArray = ref<number>(0) // index of feedbackImg itself
 let isDrawing = false
 let startDrawingX: number | null = null
@@ -216,6 +217,8 @@ let startDrawingY: number | null = null
 let drawColor = ''
 let drawWidth = ''
 
+const isDisabledButton = computed<boolean>(() => indexArray.value === 0)
+
 const onTakeScreenshot = (): void => {
   optionsModel.value.hasTakeScreenshot = true
   const value = {

package/components/common/layout/theHeader/feedback/new/tabs/lib/models/enums.ts

@@ -0,0 +1,6 @@
+export enum UI_E_FeedbackType {
+  'warning-outline',
+  'heart-outline',
+  WARNING,
+  'light-bulb',
+}

package/package.json

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

package/components/common/layout/theHeader/feedback/new/tabs/lib/models/interfaces.ts

@@ -1,17 +0,0 @@
-import type {
-  T_MetricTab
-} from '~/components/common/pages/integration/zabbix/content/hosts/details/metrics/lib/models/types'
-
-export interface I_Metric {
-  iconName: T_MetricTab
-  label: string
-  isSelected: boolean
-  on: {
-    label: string
-    color: '#239332' | '#BDC3C7'
-  }
-  off: {
-    label: string
-    color: '#EA3223' | '#BDC3C7'
-  }
-}