From 5903e40b71e6debe28c830630657d8a4c2d6f992 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 29 Oct 2024 17:09:59 +0800
Subject: [PATCH] =?UTF-8?q?style(=E5=9B=BE=E8=A1=A8):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E8=BE=B9=E6=A1=86=E6=98=BE=E7=A4=BA=E5=9B=BE?=
 =?UTF-8?q?=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/data-visualization/canvas/Shape.vue   |  6 +++---
 .../picture-group/PictureGroupUploadAttr.vue         | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
index c838530947..55ff26fe9b 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
@@ -47,15 +47,15 @@
         @mousedown="handleInnerMouseDownOnShape"
       >
         <Icon v-if="shapeLock" name="dv-lock"><dvLock class="svg-icon iconfont icon-suo" /></Icon>
+        <div class="component-slot" :style="slotStyle">
+          <slot></slot>
+        </div>
         <!--边框背景-->
         <Board
           v-if="svgInnerEnable"
           :style="{ color: element.commonBackground.innerImageColor }"
           :name="commonBackgroundSvgInner"
         ></Board>
-        <div class="component-slot" :style="slotStyle">
-          <slot></slot>
-        </div>
       </div>
       <div
         v-for="item in isActive() ? getPointList() : []"
diff --git a/core/core-frontend/src/custom-component/picture-group/PictureGroupUploadAttr.vue b/core/core-frontend/src/custom-component/picture-group/PictureGroupUploadAttr.vue
index b1b3f9fd19..97088a63fa 100644
--- a/core/core-frontend/src/custom-component/picture-group/PictureGroupUploadAttr.vue
+++ b/core/core-frontend/src/custom-component/picture-group/PictureGroupUploadAttr.vue
@@ -62,11 +62,13 @@ const handleRemove = (file, fileListArray) => {
   snapshotStore.recordSnapshotCache()
 }
 async function upload(file) {
-  uploadFileResult(file.file, fileUrl => {
-    snapshotStore.recordSnapshotCache()
-    element.value.propValue.urlList.unshift({ name: file.file.name, url: fileUrl })
-    useEmitt().emitter.emit('calcData-' + element.value.id)
-  })
+  if (element.value.propValue.urlList.length < 10) {
+    uploadFileResult(file.file, fileUrl => {
+      snapshotStore.recordSnapshotCache()
+      element.value.propValue.urlList.unshift({ name: file.file.name, url: fileUrl })
+      useEmitt().emitter.emit('calcData-' + element.value.id)
+    })
+  }
 }
 
 const onStyleChange = () => {