From d8d5ae857f411b93f59dc40cbd643c0c5db38334 Mon Sep 17 00:00:00 2001
From: YuanFeng <770153798@qq.com>
Date: Tue, 26 Nov 2024 01:14:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E7=A8=BF=E4=BB=B6?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DraftDesign/components/DesignPropEdit.vue | 33 +++++++++++++++----
 .../DraftDesign/components/DesignPropEdit.vue | 33 +++++++++++++++----
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue
index 15f02a1..2268da4 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue
@@ -208,7 +208,13 @@
                                 style="width: 64px; height: 64px"
                                 fit="contain"
                                 :src="img.url"
-                                :preview-src-list="[img.url]"/>
+                                :preview-src-list="[img.url]">
+                                <template #error>
+                                  <div class="image-slot">
+                                   <span>Empty</span>
+                                  </div>
+                                </template>
+                              </el-image>
                               <div>
                                 <el-select-v2
                                   v-model="that.propInfo[tmp.key].dataInfo[index].showLabel"
@@ -217,6 +223,7 @@
                                   placeholder="Please select"
                                   clearable
                                   @change="changeIconData(index,tmp.key)"
+                                  @clear="that.propInfo[tmp.key].dataInfo[index].url = ''"
                                   @select="handleSelect(i,tmp.key)"
                                   :defaultValue="''"
                                   :no-match-text="'Data Empty'"
@@ -1186,10 +1193,7 @@ const checkPropInfo = (info) => {
             if (langSort.length === 0) {
               langSort = allLang
             }
-            let str = newInfo[key].dataInfo[0].ratio;
-            if (str === null || str === undefined || str === -1) {
-              str = ''
-            }
+
             let mergeLabel = [];
             for (let j = 0; j < langSort.length; j++) {
               for (let k = 0; k < langList.length; k++) {
@@ -1207,7 +1211,13 @@ const checkPropInfo = (info) => {
             let resArr = [];
             for (let j = 0; j < newArr.length; j++) {
               newArr[j].label = mergeLabelStr
-              resArr.push(newArr[j])
+              console.log("newArr[j].showLabel",newArr[j].showLabel)
+              if(!newArr[j].showLabel){
+                newArr[j].url = ''
+              }
+              resArr.push({
+                ...newArr[j]
+              });
             }
             newInfo[key].dataInfo = resArr;
           }
@@ -1321,7 +1331,16 @@ defineExpose({
   text-orientation: upright; /* 保持文字直立 */
   padding: 6px;
 }
-
+.image-slot {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  background: var(--el-fill-color-light);
+  color: var(--el-text-color-secondary);
+  font-size: 10px;
+}
 :deep(.el-input__wrapper) {
   position: relative;
 
diff --git a/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue b/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue
index 15f02a1..2268da4 100644
--- a/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue
+++ b/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue
@@ -208,7 +208,13 @@
                                 style="width: 64px; height: 64px"
                                 fit="contain"
                                 :src="img.url"
-                                :preview-src-list="[img.url]"/>
+                                :preview-src-list="[img.url]">
+                                <template #error>
+                                  <div class="image-slot">
+                                   <span>Empty</span>
+                                  </div>
+                                </template>
+                              </el-image>
                               <div>
                                 <el-select-v2
                                   v-model="that.propInfo[tmp.key].dataInfo[index].showLabel"
@@ -217,6 +223,7 @@
                                   placeholder="Please select"
                                   clearable
                                   @change="changeIconData(index,tmp.key)"
+                                  @clear="that.propInfo[tmp.key].dataInfo[index].url = ''"
                                   @select="handleSelect(i,tmp.key)"
                                   :defaultValue="''"
                                   :no-match-text="'Data Empty'"
@@ -1186,10 +1193,7 @@ const checkPropInfo = (info) => {
             if (langSort.length === 0) {
               langSort = allLang
             }
-            let str = newInfo[key].dataInfo[0].ratio;
-            if (str === null || str === undefined || str === -1) {
-              str = ''
-            }
+
             let mergeLabel = [];
             for (let j = 0; j < langSort.length; j++) {
               for (let k = 0; k < langList.length; k++) {
@@ -1207,7 +1211,13 @@ const checkPropInfo = (info) => {
             let resArr = [];
             for (let j = 0; j < newArr.length; j++) {
               newArr[j].label = mergeLabelStr
-              resArr.push(newArr[j])
+              console.log("newArr[j].showLabel",newArr[j].showLabel)
+              if(!newArr[j].showLabel){
+                newArr[j].url = ''
+              }
+              resArr.push({
+                ...newArr[j]
+              });
             }
             newInfo[key].dataInfo = resArr;
           }
@@ -1321,7 +1331,16 @@ defineExpose({
   text-orientation: upright; /* 保持文字直立 */
   padding: 6px;
 }
-
+.image-slot {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  background: var(--el-fill-color-light);
+  color: var(--el-text-color-secondary);
+  font-size: 10px;
+}
 :deep(.el-input__wrapper) {
   position: relative;