From 70e7d11a73f1c064582e062f6163ed555192dfd1 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Wed, 30 Apr 2025 15:49:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85-=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=EF=BC=9A=E5=A4=B1=E5=8E=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E6=97=A7=E6=95=B0=E6=8D=AE=20=20=20=20-=20[=E5=85=B3?=
 =?UTF-8?q?=E8=81=94]#[1364339037011968]=E5=B7=A5=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85-=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=EF=BC=9A=E5=A4=B1=E5=8E=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E6=97=A7=E6=95=B0=E6=8D=AE=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/13643390370?=
 =?UTF-8?q?11968?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/mixins/formMixins.js            | 39 +++++++++++++
 .../plugins/TsForm/TsFormCheckbox.vue         | 56 +++++++++++--------
 src/resources/plugins/TsForm/TsFormRadio.vue  | 55 +++++++++++-------
 src/resources/plugins/TsForm/TsFormSelect.vue | 19 +------
 src/resources/plugins/TsSheet/form-item.vue   |  2 +
 .../TsSheet/form/component/formcheckbox.vue   |  1 +
 .../TsSheet/form/component/formradio.vue      |  1 +
 .../TsSheet/form/component/formselect.vue     |  1 +
 8 files changed, 113 insertions(+), 61 deletions(-)

diff --git a/src/resources/mixins/formMixins.js b/src/resources/mixins/formMixins.js
index 5dd33766..f2433ffa 100644
--- a/src/resources/mixins/formMixins.js
+++ b/src/resources/mixins/formMixins.js
@@ -50,6 +50,11 @@ export default {
       // 是否自定义值，单个字符串(value:1)可以自定义返回{text:1,value:1}，数组[1]可以自定义返回[{text:1,value:1}]
       type: Boolean,
       default: false
+    },
+    historyValue: {
+      // 历史值(Object包含text,value)存在时，用历史值回显数据（在dynamicUrl初始化时，不调用接口）
+      type: [String, Array, Object],
+      default: null
     }
   },
   methods: {
@@ -280,6 +285,40 @@ export default {
         }
         return value;
       };
+    },
+    handleHistoryValue() {
+      let selectedList = [];
+      return historyData => {
+        let historyValueList = Array.isArray(historyData) ? historyData : [historyData];
+        historyValueList.forEach(item => {
+          if (!this.$utils.isEmpty(item)) {
+            let obj = {};
+            if (typeof item === 'object') {
+              obj[this.valueName] = item.value;
+              obj[this.textName] = item.text;
+            } else {
+              obj[this.valueName] = obj[this.textName] = item;
+            }
+            selectedList.push(obj);
+          }
+        });
+        return selectedList;
+      };
+    },
+    getSelectedText() {
+      return (val) => {
+        const getNodeText = (node) => node && node[this.textName] ? node[this.textName] : '-';
+        let node = this.nodeList.find(item => item[this.valueName] == val);
+        if (node) {
+          return getNodeText(node);
+        } else if (!this.$utils.isEmpty(this.historyValue)) {
+          const nodeList = this.handleHistoryValue(this.historyValue);
+          const nodeItem = nodeList.find(item => item[this.valueName] == val);
+          return getNodeText(nodeItem);
+        } else {
+          return '-';
+        }
+      };
     }
   },
 
diff --git a/src/resources/plugins/TsForm/TsFormCheckbox.vue b/src/resources/plugins/TsForm/TsFormCheckbox.vue
index 12b0d146..442d4e9f 100755
--- a/src/resources/plugins/TsForm/TsFormCheckbox.vue
+++ b/src/resources/plugins/TsForm/TsFormCheckbox.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="form-li">
     <span v-if="readonly" :class="[readonlyClass, readonlyTextHighlightClass]">
-      <template v-if="nodeList && nodeList.length > 0">
+      <template v-if="currentValue && currentValue.length > 0">
         <span
-          v-for="(val, dindex) in currentValue"
+          v-for="(item, dindex) in currentValue"
           :key="dindex"
           style="display:flex;"
         >
-          {{ getText(val) }}
+          {{ getSelectedText(item) }}
           <span v-if="dindex < currentValue.length - 1" class="text-grey tsform-readonly-sperate">{{ sperateText }}</span>
         </span>
       </template>
@@ -133,8 +133,12 @@ export default {
     test() {
       return false;
     },
-    initDataListByUrl: function() {
+    initDataListByUrl() {
       let _this = this;
+      if (this.readonly && !this.$utils.isEmpty(this.historyValue)) {
+        // 只读模式下不需要调接口获取数据
+        return false;
+      }
       if (_this.url) {
         _this.nodeList = [];
         let params = { pageSize: 100 };
@@ -169,22 +173,31 @@ export default {
         // }
       }
     },
-    handleEchoFailedDefaultValue() {
-      // 处理回显失败默认值，回显失败清空默认值
-      if (this.isClearEchoFailedDefaultValue && !this.$utils.isEmpty(this.nodeList)) {
-        let selectedList = [];
-        let valueList = this.currentValue instanceof Array ? this.currentValue : [this.currentValue];
-        valueList.forEach((item, index) => {
-          if (item && !this.nodeList.find((n) => n[this.valueName] == item)) {
-            selectedList.push(item[this.valueName]);
-            this.currentValue.splice(index, 1);
-          }
-        });
-        if (!this.$utils.isEmpty(selectedList)) {
-          this.onChangeValue();
+    handleDisabledNodeList() {
+      if (this.disabled && !this.$utils.isEmpty(this.historyValue)) {
+        const nodeValueSet = new Set(this.nodeList.map(item => item[this.valueName]));
+        const newItems = this.historyValue.filter(item => !nodeValueSet.has(item[this.valueName]));
+        if (Array.isArray(this.nodeList) && newItems.length > 0) {
+          this.nodeList.unshift(...newItems);
         }
       }
     },
+    handleEchoFailedDefaultValue() {
+      // 处理回显失败默认值，回显失败清空默认值
+      // if (this.isClearEchoFailedDefaultValue && !this.$utils.isEmpty(this.nodeList)) {
+      //   let selectedList = [];
+      //   let valueList = this.currentValue instanceof Array ? this.currentValue : [this.currentValue];
+      //   valueList.forEach((item, index) => {
+      //     if (item && !this.nodeList.find((n) => n[this.valueName] == item)) {
+      //       selectedList.push(item[this.valueName]);
+      //       this.currentValue.splice(index, 1);
+      //     }
+      //   });
+      //   if (!this.$utils.isEmpty(selectedList)) {
+      //     this.onChangeValue();
+      //   }
+      // }
+    },
     onChangeValue(val, item) {
       let isSame = JSON.stringify(this.value) == JSON.stringify(this.currentValue);
       let value = this.$utils.deepClone(this.currentValue);
@@ -251,12 +264,6 @@ export default {
       let reslutClass = { 'ivu-checkbox-group-vertical': this.vertical };
       this.className && (reslutClass[this.className] = true);
       return reslutClass;
-    },
-    getText() {
-      return (val) => {
-        let node = this.nodeList.find(item => item[this.valueName] == val);
-        return node && node[this.textName] ? node[this.textName] : '-';
-      };
     }
   },
   watch: {
@@ -274,7 +281,8 @@ export default {
     dataList: {
       handler(newValue) {
         if (!this.url) {
-          this.$set(this, 'nodeList', newValue);
+          this.$set(this, 'nodeList', this.$utils.deepClone(newValue) || []);
+          this.handleDisabledNodeList();
           this.setSelectList();
         }
       },
diff --git a/src/resources/plugins/TsForm/TsFormRadio.vue b/src/resources/plugins/TsForm/TsFormRadio.vue
index 059d32e1..a950783f 100755
--- a/src/resources/plugins/TsForm/TsFormRadio.vue
+++ b/src/resources/plugins/TsForm/TsFormRadio.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="form-li">
-    <span v-if="readonly" :class="[readonlyClass, readonlyTextHighlightClass]">{{ getText }}</span>
+    <span v-if="readonly" :class="[readonlyClass, readonlyTextHighlightClass]">{{ getSelectedText(currentValue) }}</span>
     <div v-else :style="getStyle">
       <RadioGroup
         v-model="currentValue"
@@ -137,8 +137,12 @@ export default {
     this.cancelAxios && this.cancelAxios.cancel();
   },
   methods: {
-    initDataListByUrl: function() {
+    initDataListByUrl() {
       let _this = this;
+      if (this.readonly && !this.$utils.isEmpty(this.historyValue)) {
+        // 只读模式下不需要调接口获取数据
+        return false;
+      }
       if (_this.url) {
         let params = { pageSize: 100 };
         typeof _this.params == 'object' && (params = Object.assign(params, _this.params));
@@ -170,25 +174,41 @@ export default {
             _this.onChangeValue();
           } 
         }
-        
+        this.handleDisableNodeList();
         this.handleEchoFailedDefaultValue();
       }
     },
-    handleEchoFailedDefaultValue() {
-      // 处理回显失败默认值，回显失败清空默认值
-      if (this.isClearEchoFailedDefaultValue && !this.$utils.isEmpty(this.nodeList)) {
-        let selectedList = [];
-        if (this.currentValue) {
-          let selectedItem = this.nodeList.find((item) => item[this.valueName] == this.currentValue);
-          if (!selectedItem) {
-            this.currentValue = null;
+    handleDisableNodeList() {
+      if (this.disabled && !this.$utils.isEmpty(this.historyValue)) {
+        const findItem = this.nodeList.find(item => item[this.valueName] == this.historyValue[this.valueName]);
+        const newItem = {
+          [this.textName]: this.historyValue[this.textName],
+          [this.valueName]: this.historyValue[this.valueName]
+        };
+        if (!findItem) {
+          if (Array.isArray(this.nodeList)) {
+            this.nodeList.unshift(newItem);
+          } else {
+            this.nodeList = [newItem];
           }
         }
-        if (!this.$utils.isEmpty(selectedList)) {
-          this.onChangeValue();
-        }
       }
     },
+    handleEchoFailedDefaultValue() {
+      // 处理回显失败默认值，回显失败清空默认值
+      // if (this.isClearEchoFailedDefaultValue && !this.$utils.isEmpty(this.nodeList)) {
+      //   let selectedList = [];
+      //   if (this.currentValue) {
+      //     let selectedItem = this.nodeList.find((item) => item[this.valueName] == this.currentValue);
+      //     if (!selectedItem) {
+      //       this.currentValue = null;
+      //     }
+      //   }
+      //   if (!this.$utils.isEmpty(selectedList)) {
+      //     this.onChangeValue();
+      //   }
+      // }
+    },
     onChangeValue() {
       let isSame = this.$utils.isSame(this.value, this.currentValue); // 使用isSame比较两个字符串是否一致，避免 '' == 0 为true情况，导致没有emit on-change方法，form表单获取不到值问题
       let value = this.currentValue;
@@ -251,10 +271,6 @@ export default {
       let reslutClass = {};
       this.className && (reslutClass[this.className] = true);
       return reslutClass;
-    },
-    getText() {
-      let node = this.nodeList.find(item => item[this.valueName] == this.currentValue);
-      return node && node[this.textName] ? node[this.textName] : '-';
     }
   },
   watch: {
@@ -270,7 +286,8 @@ export default {
     dataList: {
       handler(newValue) {
         if (!this.url) {
-          this.$set(this, 'nodeList', newValue);
+          this.$set(this, 'nodeList', this.$utils.deepClone(newValue) || []);
+          this.handleDisableNodeList();
           this.setSelectList();
           this.handleEchoFailedDefaultValue();
         }
diff --git a/src/resources/plugins/TsForm/TsFormSelect.vue b/src/resources/plugins/TsForm/TsFormSelect.vue
index f6d99b34..c5fb7183 100755
--- a/src/resources/plugins/TsForm/TsFormSelect.vue
+++ b/src/resources/plugins/TsForm/TsFormSelect.vue
@@ -495,11 +495,6 @@ export default {
       //是否自动选中唯一值
       type: Boolean,
       default: false
-    },
-    historyValue: {
-      // 历史值(Object包含text,value)存在时，用历史值回显数据（在dynamicUrl初始化时，不调用接口）
-      type: [String, Array, Object],
-      default: null
     }
   },
   data() {
@@ -899,19 +894,7 @@ export default {
         return;
       } else if (!this.$utils.isEmpty(this.historyValue)) {
         //历史值回显
-        let historyValueList = Array.isArray(this.historyValue) ? this.historyValue : [this.historyValue];
-        historyValueList.forEach(item => {
-          if (!this.$utils.isEmpty(item)) {
-            let obj = {};
-            if (typeof item === 'object') {
-              obj[this.valueName] = item.value;
-              obj[this.textName] = item.text;
-            } else {
-              obj[this.valueName] = obj[this.textName] = item;
-            }
-            this.selectedList.push(obj);
-          }
-        });
+        this.selectedList = this.handleHistoryValue(this.historyValue);
         return;
       }
       let params = { defaultValue: this.dynamicDefaultValue };
diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index c48f59ce..68547594 100644
--- a/src/resources/plugins/TsSheet/form-item.vue
+++ b/src/resources/plugins/TsSheet/form-item.vue
@@ -97,6 +97,7 @@
         :isCustomValue="isCustomValue"
         :isClearSpecifiedAttr="isClearSpecifiedAttr"
         :externalData="externalData"
+        :historyValue="isCustomValue ? formItemValue : ''"
         @setValue="setValue"
         @resize="$emit('resize')"
         @select="selectFormItem"
@@ -200,6 +201,7 @@ export default {
       default: () => {}
     },
     rowUuid: { type: String } //行uuid，表格组件引用时需要
+    
   },
   data() {
     return {
diff --git a/src/resources/plugins/TsSheet/form/component/formcheckbox.vue b/src/resources/plugins/TsSheet/form/component/formcheckbox.vue
index 83b40016..881570f1 100644
--- a/src/resources/plugins/TsSheet/form/component/formcheckbox.vue
+++ b/src/resources/plugins/TsSheet/form/component/formcheckbox.vue
@@ -11,6 +11,7 @@
       :readonlyTextIsHighlight="readonlyTextIsHighlight"
       :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
       :isCustomValue="isCustomValue"
+      :historyValue="value"
       @change="
         val => {
           setValue(val);
diff --git a/src/resources/plugins/TsSheet/form/component/formradio.vue b/src/resources/plugins/TsSheet/form/component/formradio.vue
index b7863676..e3cabc23 100644
--- a/src/resources/plugins/TsSheet/form/component/formradio.vue
+++ b/src/resources/plugins/TsSheet/form/component/formradio.vue
@@ -12,6 +12,7 @@
       :readonlyTextIsHighlight="readonlyTextIsHighlight"
       :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
       :isCustomValue="isCustomValue"
+      :historyValue="value"
       @change="
         val => {
           setValue(val);
diff --git a/src/resources/plugins/TsSheet/form/component/formselect.vue b/src/resources/plugins/TsSheet/form/component/formselect.vue
index 17d5ae16..4483ff69 100644
--- a/src/resources/plugins/TsSheet/form/component/formselect.vue
+++ b/src/resources/plugins/TsSheet/form/component/formselect.vue
@@ -11,6 +11,7 @@
       :readonlyTextIsHighlight="readonlyTextIsHighlight"
       :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
       :isCustomValue="isCustomValue"
+      :historyValue="value"
       border="border"
       search
       @first="addRow"
-- 
Gitee


From 7cba1a2e83f90217b661c2e1164dc81be19bb04f Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Wed, 14 May 2025 17:34:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85-=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=EF=BC=9A=E5=A4=B1=E5=8E=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E6=97=A7=E6=95=B0=E6=8D=AE=20=20=20=20-=20[=E5=85=B3?=
 =?UTF-8?q?=E8=81=94]#[1364339037011968]=E5=B7=A5=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85-=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=EF=BC=9A=E5=A4=B1=E5=8E=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E6=97=A7=E6=95=B0=E6=8D=AE=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/13643390370?=
 =?UTF-8?q?11968?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form-item.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index 68547594..0cff6cc7 100644
--- a/src/resources/plugins/TsSheet/form-item.vue
+++ b/src/resources/plugins/TsSheet/form-item.vue
@@ -200,8 +200,7 @@ export default {
       type: Object,
       default: () => {}
     },
-    rowUuid: { type: String } //行uuid，表格组件引用时需要
-    
+    rowUuid: { type: String } //行uuid，表格组件引用时需要    
   },
   data() {
     return {
-- 
Gitee


From 02686bb7249fc5c2862f3fe0305ae93f172cdbe2 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Wed, 14 May 2025 17:36:53 +0800
Subject: [PATCH 3/3] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85-=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=EF=BC=9A=E5=A4=B1=E5=8E=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E6=97=A7=E6=95=B0=E6=8D=AE=20=20=20=20-=20[=E5=85=B3?=
 =?UTF-8?q?=E8=81=94]#[1364339037011968]=E5=B7=A5=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85-=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=EF=BC=9A=E5=A4=B1=E5=8E=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E6=97=A7=E6=95=B0=E6=8D=AE=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/13643390370?=
 =?UTF-8?q?11968?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form-item.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index 0cff6cc7..a6c31869 100644
--- a/src/resources/plugins/TsSheet/form-item.vue
+++ b/src/resources/plugins/TsSheet/form-item.vue
@@ -200,7 +200,7 @@ export default {
       type: Object,
       default: () => {}
     },
-    rowUuid: { type: String } //行uuid，表格组件引用时需要    
+    rowUuid: { type: String } //行uuid，表格组件引用时需要
   },
   data() {
     return {
-- 
Gitee