From 4aa4c57db4e45a558b84dd1f2fd89ee4db4202dc Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Mon, 5 Aug 2024 13:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/6953=E3=80=91JTreeSelect=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=83=BD=E6=94=AF=E6=8C=81antdv=20=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84a-tree-select=20=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=8F=92=E6=A7=BD=20=E3=80=90issues/1283=E3=80=91JtreeSelect?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=88=9D=E5=A7=8B=E8=B0=83=E7=94=A8=E4=BA=86?=
 =?UTF-8?q?=E4=B8=A4=E6=AC=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Form/src/jeecg/components/JTreeSelect.vue | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/jeecgboot-vue3/src/components/Form/src/jeecg/components/JTreeSelect.vue b/jeecgboot-vue3/src/components/Form/src/jeecg/components/JTreeSelect.vue
index 72ceb5b6..44aae735 100644
--- a/jeecgboot-vue3/src/components/Form/src/jeecg/components/JTreeSelect.vue
+++ b/jeecgboot-vue3/src/components/Form/src/jeecg/components/JTreeSelect.vue
@@ -16,6 +16,9 @@
     @search="onSearch"
     :tree-checkable="treeCheckAble"
   >
+    <template #[name]="data" v-for="name in slotNamesGroup" :key="name">
+      <slot :name="name" v-bind="data"></slot>
+    </template>
   </a-tree-select>
 </template>
 <script lang="ts" setup>
@@ -23,12 +26,13 @@
    * 异步树加载组件 通过传入表名 显示字段 存储字段 加载一个树控件
    * <j-tree-select dict="aa_tree_test,aad,id" pid-field="pid" ></j-tree-select>
    * */
-  import { ref, watch, unref, nextTick } from 'vue';
+  import { ref, watch, unref, nextTick, computed } from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { propTypes } from '/@/utils/propTypes';
   import { useAttrs } from '/@/hooks/core/useAttrs';
   import { TreeSelect } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { isObject } from '/@/utils/is';
 
   enum Api {
     url = '/sys/dict/loadTreeData',
@@ -62,6 +66,7 @@
   });
   const attrs = useAttrs();
   const emit = defineEmits(['change', 'update:value']);
+  const slots = defineSlots();
   const { createMessage } = useMessage();
   //树形下拉数据
   const treeData = ref<any[]>([]);
@@ -82,14 +87,15 @@
   /**
    * 监听dict变化
    */
+  // update-begin--author:liaozhiyang---date:20240612---for：【issues/1283】JtreeSelect组件初始调用了两次接口
   watch(
     () => props.dict,
     () => {
       initDictInfo();
       loadRoot();
-    },
-    { deep: true, immediate: true }
+    }
   );
+  // update-end--author:liaozhiyang---date:20240612---for：【issues/1283】JtreeSelect组件初始调用了两次接口
   // update-begin--author:liaozhiyang---date:20240529---for：【TV360X-87】树表编辑时不可选自己及子孙节点当父节点
   watch(
     () => props.hiddenNodeKey,
@@ -394,6 +400,20 @@
       }
     }
   }
+  /**
+   * 2024-07-30
+   * liaozhiyang
+   * 【issues/6953】JTreeSelect 组件能支持antdv 对应的a-tree-select 组件的插槽
+   */
+  const slotNamesGroup = computed(() => {
+    const native: string[] = [];
+    if (isObject(slots)) {
+      for (const name of Object.keys(slots)) {
+        native.push(name);
+      }
+    }
+    return native;
+  });
   // onCreated
   validateProp().then(() => {
     initDictInfo();