bfg-common 1.4.414 → 1.4.415

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

@@ -208,8 +208,7 @@ 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 indexArray = 0 // index of feedbackImg itself
 let isDrawing = false
 let startDrawingX: number | null = null
 let startDrawingY: number | null = null
@@ -248,7 +247,7 @@ const onTakeScreenshot = (): void => {
       feedbackImg.value.height
     )
     drawingArray.length = 0
-    indexArray.value = 0
+    indexArray = 0
     drawingArray.push(
       context.getImageData(
         0,
@@ -277,7 +276,7 @@ const onUploadFile = (): void => {
       feedbackImg.value.height = img.height
       context.drawImage(img, 0, 0, img.width, img.height)
       drawingArray.length = 0
-      indexArray.value = 0
+      indexArray = 0
       drawingArray.push(
         context.getImageData(
           0,
@@ -358,7 +357,7 @@ const stop = (event: MouseEvent): void => {
         feedbackImg.value.height
       )
     )
-    indexArray.value += 1
+    indexArray += 1
   }
 }
 const onRemoveScreenshot = (): void => {
@@ -387,11 +386,11 @@ const clearAll = (): void => {
   const context = feedbackImg.value.getContext('2d')
   // drawColor = ''
   // drawWidth = ''
-  if (indexArray.value <= 0) return
-  while (indexArray.value > 0) {
+  if (indexArray <= 0) return
+  while (indexArray > 0) {
     drawingArray.pop()
-    indexArray.value -= 1
-    context.putImageData(drawingArray[indexArray.value], 0, 0)
+    indexArray -= 1
+    context.putImageData(drawingArray[indexArray], 0, 0)
   }
 }
 
@@ -408,10 +407,10 @@ const onUndoLast = (): void => {
   drawColor = ''
   drawWidth = ''
   const context = feedbackImg.value.getContext('2d')
-  if (indexArray.value > 0) {
-    indexArray.value -= 1
+  if (indexArray > 0) {
+    indexArray -= 1
     drawingArray.pop()
-    context.putImageData(drawingArray[indexArray.value], 0, 0)
+    context.putImageData(drawingArray[indexArray], 0, 0)
   }
 }
 

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.415",
   "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'
-  }
-}