From c7a2de5f0d742777787275b3445714481b5d6ac5 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 6 Sep 2023 23:39:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E8=83=8C=E6=99=AF=E4=B8=8D=E9=80=8F=E6=98=8E?=
 =?UTF-8?q?=E5=BA=A60=E7=9A=84=E6=97=B6=E5=80=99=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/Preview.vue      | 40 +++++++++----------
 .../src/views/panel/edit/ComponentWait.vue    |  2 +-
 core/frontend/src/views/panel/edit/index.vue  |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue
index 06e7422bee..b9cb8c81d1 100644
--- a/core/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/core/frontend/src/components/canvas/components/editor/Preview.vue
@@ -145,32 +145,32 @@
 </template>
 
 <script>
-import { getStyle } from '@/components/canvas/utils/style'
-import { mapState } from 'vuex'
+import {getStyle} from '@/components/canvas/utils/style'
+import {mapState} from 'vuex'
 import ComponentWrapper from './ComponentWrapper'
-import { changeStyleWithScale } from '@/components/canvas/utils/translate'
-import { uuid } from 'vue-uuid'
-import { deepCopy, imgUrlTrans } from '@/components/canvas/utils/utils'
+import {changeStyleWithScale} from '@/components/canvas/utils/translate'
+import {uuid} from 'vue-uuid'
+import {deepCopy, imgUrlTrans} from '@/components/canvas/utils/utils'
 import eventBus from '@/components/canvas/utils/eventBus'
 import elementResizeDetectorMaker from 'element-resize-detector'
 import CanvasOptBar from '@/components/canvas/components/editor/CanvasOptBar'
 import bus from '@/utils/bus'
-import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil'
-import { hasDataPermission } from '@/utils/permission'
-import { activeWatermark } from '@/components/canvas/tools/watermark'
-import { proxyUserLoginInfo, userLoginInfo } from '@/api/systemInfo/userLogin'
+import {buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch} from '@/utils/conditionUtil'
+import {hasDataPermission} from '@/utils/permission'
+import {activeWatermark} from '@/components/canvas/tools/watermark'
+import {proxyUserLoginInfo, userLoginInfo} from '@/api/systemInfo/userLogin'
 import html2canvas from 'html2canvasde'
-import { queryAll } from '@/api/panel/pdfTemplate'
+import {queryAll} from '@/api/panel/pdfTemplate'
 import PDFPreExport from '@/views/panel/export/PDFPreExport'
-import { listenGlobalKeyDownPreview } from '@/components/canvas/utils/shortcutKey'
+import {listenGlobalKeyDownPreview} from '@/components/canvas/utils/shortcutKey'
 import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog'
 import {hexColorToRGBA} from "@/views/chart/chart/util";
-import { isMobile } from '@/utils/index'
-  
+import {isMobile} from '@/utils/index'
+
 
 const erd = elementResizeDetectorMaker()
 export default {
-  components: { UserViewDialog, ComponentWrapper, CanvasOptBar, PDFPreExport },
+  components: {UserViewDialog, ComponentWrapper, CanvasOptBar, PDFPreExport},
   model: {
     prop: 'show',
     event: 'change'
@@ -207,14 +207,14 @@ export default {
     componentData: {
       type: Array,
       required: false,
-      default: function() {
+      default: function () {
         return []
       }
     },
     canvasStyleData: {
       type: Object,
       required: false,
-      default: function() {
+      default: function () {
         return {}
       }
     },
@@ -346,7 +346,7 @@ export default {
             background: `url(${imgUrlTrans(styleInfo.imageUrl)}) no-repeat`
           }
         } else if (styleInfo.backgroundType === 'color') {
-          const colorRGBA = hexColorToRGBA(styleInfo.color, styleInfo.alpha||100)
+          const colorRGBA = hexColorToRGBA(styleInfo.color, styleInfo.alpha === undefined ? 100 : styleInfo.alpha)
           style = {
             background: colorRGBA
           }
@@ -649,7 +649,7 @@ export default {
     },
     clearAllLinkage() {
       this.$store.commit('clearPanelLinkageInfo')
-      bus.$emit('clear_panel_linkage', { viewId: 'all' })
+      bus.$emit('clear_panel_linkage', {viewId: 'all'})
     },
     changeStyleWithScale,
     getStyle,
@@ -708,13 +708,13 @@ export default {
     },
     exportViewImg() {
       this.imageDownloading = true
-      this.$refs['userViewDialog-canvas-main'].exportViewImg(()=>{
+      this.$refs['userViewDialog-canvas-main'].exportViewImg(() => {
         this.imageDownloading = false
       })
     },
     deselectCurComponent(e) {
       if (!this.isClickComponent) {
-        this.$store.commit('setCurComponent', { component: null, index: null })
+        this.$store.commit('setCurComponent', {component: null, index: null})
         if (this.$refs?.['canvas-opt-bar']) {
           this.$refs['canvas-opt-bar'].setWidgetStatus()
         }
diff --git a/core/frontend/src/views/panel/edit/ComponentWait.vue b/core/frontend/src/views/panel/edit/ComponentWait.vue
index fc31b760e3..7b5ce57e9d 100644
--- a/core/frontend/src/views/panel/edit/ComponentWait.vue
+++ b/core/frontend/src/views/panel/edit/ComponentWait.vue
@@ -82,7 +82,7 @@ export default {
             background: `url(${imgUrlTrans(styleInfo.imageUrl)}) no-repeat`
           }
         } else if (styleInfo.backgroundType === 'color') {
-          const colorRGBA = hexColorToRGBA(styleInfo.color, styleInfo.alpha||100)
+          const colorRGBA = hexColorToRGBA(styleInfo.color, styleInfo.alpha === undefined ? 100 : styleInfo.alpha)
           style = {
             background: colorRGBA
           }
diff --git a/core/frontend/src/views/panel/edit/index.vue b/core/frontend/src/views/panel/edit/index.vue
index 4ad1055a18..91d7ff559a 100644
--- a/core/frontend/src/views/panel/edit/index.vue
+++ b/core/frontend/src/views/panel/edit/index.vue
@@ -723,7 +723,7 @@ export default {
             background: `url(${imgUrlTrans(styleInfo.imageUrl)}) no-repeat`
           }
         } else if (styleInfo.backgroundType === 'color') {
-          const colorRGBA = hexColorToRGBA(styleInfo.color, styleInfo.alpha||100)
+          const colorRGBA = hexColorToRGBA(styleInfo.color, styleInfo.alpha === undefined ? 100 : styleInfo.alpha)
           style = {
             background: colorRGBA
           }