From e84c2ea62f80b84652d9f974ff08830c3ab1d990 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Tue, 7 Jan 2025 12:17:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E4=BD=BF=E7=94=A8Tag=E6=A0=87=E7=AD=BE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20=20=20-=20[=E5=85=B3=E8=81=94]#[1328147964854272]?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8Tag=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=98=BE=E7=A4=BA=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/13281479648?=
 =?UTF-8?q?54272?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsForm/TsFormSelect.vue | 20 +++++++++++--------
 .../plugins/TsSheet/form-scene-edit.vue       |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/resources/plugins/TsForm/TsFormSelect.vue b/src/resources/plugins/TsForm/TsFormSelect.vue
index d2972b28..09492e41 100755
--- a/src/resources/plugins/TsForm/TsFormSelect.vue
+++ b/src/resources/plugins/TsForm/TsFormSelect.vue
@@ -58,7 +58,7 @@
             @blur="onSelectBlur"
           >
             <div ref="topHead" class="tag-contian" :class="{ 'nowselect-nowrap': multiple && nowrapHead, 'flex-start': isNowrap }">
-              <template v-if="multiple || isSingel">
+              <template v-if="multiple || isUseTagShow">
                 <Tag
                   v-for="(selected, nindex) in selectedList"
                   :key="nindex"
@@ -574,7 +574,7 @@ export default {
       addItem: null,
       readonlyTitle: null,
       hiddenLength: 0,
-      isSingel: false, // 单选，true单选，false否
+      isUseTagShow: false, //是否用标签显示
       moreSearchTip: {
         [this.showName ? this.showName : this.textName]: this.$t('page.searchformore'),
         [this.valueName]: 'moreSearchFlag',
@@ -716,7 +716,7 @@ export default {
         this.multiple ? (this.currentValue = [this.nodeList[0][this.valueName]]) : (this.currentValue = this.nodeList[0][this.valueName]);
         //是单选,进行赋值处理
         this.searchKeyWord = !this.multiple ? '' : '';
-        this.isSingel = !!(this.isSquare && this.currentSearch);
+        this.handleTagShow();
         this.onChangeValue();
       }
     },
@@ -744,7 +744,7 @@ export default {
         this.getDataByAjax(params, this.url, 'cancelAxios1').then(res => {
           this.nodeList = res.nodeList || [];
           this.nodeList && this.nodeList.length > 20 && this.search === null ? (this.currentSearch = true) : (this.currentSearch = this.search); //当search参数值不存在时  如果长度大于20增加搜索功能，
-          this.isSingel = !!(this.isSquare && this.currentSearch); // 可搜索时，并且显示tag标签时，才使用tag标签的样式
+          this.handleTagShow();
           this.setDefaultValue(); //默认选中第一个
           this.initValueByNodeList();
         });
@@ -775,7 +775,7 @@ export default {
         this.nodeList && this.nodeList.length > 20 && this.search === null ? (this.currentSearch = true) : (this.currentSearch = this.search); //当search参数值不存在时  如果长度大于20增加搜索功能，
         this.setDefaultValue();
         this.initValueByNodeList();
-        this.isSingel = !!(this.isSquare && this.currentSearch); // 可搜索并且是tag标签时，才显示tag标签的样式
+        this.handleTagShow();
         this.handleEchoFailedDefaultValue();
       }
     },
@@ -987,7 +987,7 @@ export default {
         if (!this.multiple) {
           //是单选,进行赋值处理
           this.searchKeyWord = '';
-          this.isSingel = !!(this.isSquare && this.currentSearch);
+          this.handleTagShow();
         }
         if (this.needCallback) {
           //成功回调设置为false
@@ -1181,7 +1181,7 @@ export default {
         this.multiple ? this.currentValue.splice(index, 1) : (this.currentValue = null);
       }
       this.multiple ? (this.searchKeyWord = '') : this.hideOption();
-      this.isSingel = !!(this.isSquare && this.currentSearch);
+      this.handleTagShow();
       this.onChangeValue();
       this.scrollTop();
     },
@@ -1438,6 +1438,10 @@ export default {
         utils.equalStr(arr, str) && (index = 0);
       }
       return index;
+    },
+    handleTagShow() {
+      // 处理下拉框选中内容后，是否用tag展示
+      this.isUseTagShow = !!this.isSquare;
     }
   },
   computed: {
@@ -1517,7 +1521,7 @@ export default {
           style.display = 'none';
         }
         if (!this.multiple) {
-          if (keyword || this.getPlaceholder || (this.isSingel && this.selectedList.length > 0) || (!this.multiple && this.currentSearch && !this.isSquare)) {
+          if (keyword || this.getPlaceholder || (this.isUseTagShow && this.selectedList.length > 0) || (!this.multiple && this.currentSearch && !this.isSquare)) {
             Object.assign(style, { maxWidth: '100%', minWidth: '14px', width: this.calculateInputWidth(keyword) * 14 + 14 + 'px' });
           } else {
             style.width = '100%';
diff --git a/src/resources/plugins/TsSheet/form-scene-edit.vue b/src/resources/plugins/TsSheet/form-scene-edit.vue
index b2bdcca9..8f95f561 100644
--- a/src/resources/plugins/TsSheet/form-scene-edit.vue
+++ b/src/resources/plugins/TsSheet/form-scene-edit.vue
@@ -485,6 +485,7 @@ export default {
       }
     },
     selectCell(cell, component) {
+      console.log('selectCell', cell, component);
       this.disabled = false;
       if (component && cell.component && cell.component.hasOwnProperty('inherit') && cell.component.inherit && component.uuid !== cell.component.uuid) {
         this.disabled = true;
-- 
Gitee


From 8ccfe49f6db6962581c86cd47d2667a961cd4bd9 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Tue, 7 Jan 2025 12:18:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E4=BD=BF=E7=94=A8Tag=E6=A0=87=E7=AD=BE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1328147964854272?=
 =?UTF-8?q?]=E4=B8=8B=E6=8B=89=E6=A1=86=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8Tag?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/13?=
 =?UTF-8?q?28147964854272?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form-scene-edit.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/resources/plugins/TsSheet/form-scene-edit.vue b/src/resources/plugins/TsSheet/form-scene-edit.vue
index 8f95f561..b2bdcca9 100644
--- a/src/resources/plugins/TsSheet/form-scene-edit.vue
+++ b/src/resources/plugins/TsSheet/form-scene-edit.vue
@@ -485,7 +485,6 @@ export default {
       }
     },
     selectCell(cell, component) {
-      console.log('selectCell', cell, component);
       this.disabled = false;
       if (component && cell.component && cell.component.hasOwnProperty('inherit') && cell.component.inherit && component.uuid !== cell.component.uuid) {
         this.disabled = true;
-- 
Gitee