From eb60b8879e3f55ab1d1904dc7ed4741546c4cc18 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Tue, 18 Jul 2023 18:36:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/5141=E3=80=91=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?JtreeSelect=20=E7=BB=84=E4=BB=B6=20=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/jeecg/components/JCategorySelect.vue  |  3 +--
 .../Form/src/jeecg/components/JTreeDict.vue   |  2 +-
 .../Form/src/jeecg/components/JTreeSelect.vue | 20 ++++++++++++-------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/components/Form/src/jeecg/components/JCategorySelect.vue b/src/components/Form/src/jeecg/components/JCategorySelect.vue
index 5890c2f..c457c92 100644
--- a/src/components/Form/src/jeecg/components/JCategorySelect.vue
+++ b/src/components/Form/src/jeecg/components/JCategorySelect.vue
@@ -77,7 +77,6 @@
       const emitData = ref<any[]>([]);
       const treeData = ref<any[]>([]);
       const treeValue = ref();
-      treeValue.value = '';
       const attrs = useAttrs();
       const [state] = useRuleFormItem(props, 'value', 'change', emitData);
       watch(
@@ -122,7 +121,7 @@
           if(props.multiple){
             treeValue.value = [];
           }else{
-            treeValue.value = null;
+            treeValue.value = { value: null, label: null };
           }
         } else {
           loadDictItem({ ids: props.value }).then((res) => {
diff --git a/src/components/Form/src/jeecg/components/JTreeDict.vue b/src/components/Form/src/jeecg/components/JTreeDict.vue
index 6439290..783d0ce 100644
--- a/src/components/Form/src/jeecg/components/JTreeDict.vue
+++ b/src/components/Form/src/jeecg/components/JTreeDict.vue
@@ -55,7 +55,7 @@
 
   async function loadViewInfo() {
     if (!props.value || props.value == '0') {
-      treeValue.value = null;
+      treeValue.value = { value: null, label: null };
     } else {
       let params = { field: props.field, val: props.value };
       let result = await defHttp.get({ url: Api.view, params });
diff --git a/src/components/Form/src/jeecg/components/JTreeSelect.vue b/src/components/Form/src/jeecg/components/JTreeSelect.vue
index 18343f0..bec6027 100644
--- a/src/components/Form/src/jeecg/components/JTreeSelect.vue
+++ b/src/components/Form/src/jeecg/components/JTreeSelect.vue
@@ -109,7 +109,7 @@
       if(props.multiple){
         treeValue.value = [];
       }else{
-        treeValue.value = null;
+        treeValue.value = { label: null, value: null };
       }
     } else {
       //update-begin-author:taoyan date:2022-11-8 for: issues/4173 Online JTreeSelect控件changeOptions方法未生效
@@ -119,12 +119,18 @@
         let params = { key: props.value };
         let result = await defHttp.get({ url: `${Api.view}${props.dict}`, params }, { isTransformResponse: false });
         if (result.success) {
-          let values = props.value.split(',');
-          treeValue.value = result.result.map((item, index) => ({
-            key: values[index],
-            value: values[index],
-            label: item,
-          }));
+          //update-start-author:liaozhiyang date:2023-7-17 for:【issues/5141】使用JtreeSelect 组件 控制台报错
+          if(props.multiple){
+            let values = props.value.split(',');
+            treeValue.value = result.result.map((item, index) => ({
+              key: values[index],
+              value: values[index],
+              label: item,
+            }));
+          }else{
+            treeValue.value = { key: props.value, value: props.value, label: result.result[0] };
+          }
+          //update-end-author:liaozhiyang date:2023-7-17 for:【issues/5141】使用JtreeSelect 组件 控制台报错
           onLoadTriggleChange(result.result[0]);
         }
       }