From 8cb6b6421949c3a9cfdc408b4b7fb21e72e6f8da Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 14 Jan 2025 17:10:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A6=81=E6=AD=A2=E6=8A=8A=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E7=A7=BB=E5=8A=A8=E5=88=B0=E3=80=90=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E3=80=91=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/utils/utils.ts               |  2 +-
 .../src/views/common/DeResourceTree.vue             | 12 ++++++------
 .../src/views/visualized/data/dataset/index.vue     | 13 +++++++------
 .../src/views/visualized/data/datasource/index.vue  | 13 +++++++------
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/core/core-frontend/src/utils/utils.ts b/core/core-frontend/src/utils/utils.ts
index e67cef41ee..ceb6eb0921 100644
--- a/core/core-frontend/src/utils/utils.ts
+++ b/core/core-frontend/src/utils/utils.ts
@@ -245,7 +245,7 @@ export const isFreeFolder = (node, flag) => {
   const freeRootId = (Number(oid) + flag).toString()
   let cNode = node
   while (cNode) {
-    const data = node.data
+    const data = cNode.data
     const id = data['id']
     if (id === freeRootId) {
       return true
diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue
index e657ef120b..b2223ce75f 100644
--- a/core/core-frontend/src/views/common/DeResourceTree.vue
+++ b/core/core-frontend/src/views/common/DeResourceTree.vue
@@ -541,14 +541,14 @@ const sortTypeChange = sortType => {
   state.curSortType = sortType
 }
 
-const proxyHandleDrop = (arg1, arg2, arg3) => {
-  const flagArray = ['dashboard', 'datav', 'dataset', 'datasource']
+const proxyAllowDrop = (arg1, arg2) => {
+  const flagArray = ['dashboard', 'dataV', 'dataset', 'datasource']
   const flag = flagArray.findIndex(item => item === curCanvasType.value)
   if (flag < 0 || !isFreeFolder(arg2, flag + 1)) {
-    handleDrop(arg1, arg2, arg3)
-    return
+    return allowDrop(arg1, arg2)
   }
   ElMessage.warning(t('free.save_error'))
+  return false
 }
 
 watch(filterText, val => {
@@ -697,8 +697,8 @@ defineExpose({
         @node-collapse="nodeCollapse"
         @node-click="nodeClick"
         @node-drag-start="handleDragStart"
-        :allow-drop="allowDrop"
-        @node-drop="proxyHandleDrop"
+        :allow-drop="proxyAllowDrop"
+        @node-drop="handleDrop"
         draggable
       >
         <template #default="{ node, data }">
diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue
index 6e334f24fb..b041a8360b 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@@ -783,14 +783,15 @@ const getMenuList = (val: boolean) => {
         }
       ].concat(menuList)
 }
-const proxyHandleDrop = (arg1, arg2, arg3) => {
-  const flagArray = ['dashboard', 'datav', 'dataset', 'datasource']
+
+const proxyAllowDrop = (arg1, arg2) => {
+  const flagArray = ['dashboard', 'dataV', 'dataset', 'datasource']
   const flag = flagArray.findIndex(item => item === 'dataset')
   if (flag < 0 || !isFreeFolder(arg2, flag + 1)) {
-    handleDrop(arg1, arg2, arg3)
-    return
+    return allowDrop(arg1, arg2)
   }
   ElMessage.warning(t('free.save_error'))
+  return false
 }
 </script>
 
@@ -901,8 +902,8 @@ const proxyHandleDrop = (arg1, arg2, arg3) => {
             expand-on-click-node
             highlight-current
             @node-drag-start="handleDragStart"
-            :allow-drop="allowDrop"
-            @node-drop="proxyHandleDrop"
+            :allow-drop="proxyAllowDrop"
+            @node-drop="handleDrop"
             draggable
             @node-expand="nodeExpand"
             @node-collapse="nodeCollapse"
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index 36719ca0c7..369165a53a 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -1009,14 +1009,15 @@ const loadInit = () => {
     state.curSortType = historyTreeSort
   }
 }
-const proxyHandleDrop = (arg1, arg2, arg3) => {
-  const flagArray = ['dashboard', 'datav', 'dataset', 'datasource']
+
+const proxyAllowDrop = (arg1, arg2) => {
+  const flagArray = ['dashboard', 'dataV', 'dataset', 'datasource']
   const flag = flagArray.findIndex(item => item === 'datasource')
   if (flag < 0 || !isFreeFolder(arg2, flag + 1)) {
-    handleDrop(arg1, arg2, arg3)
-    return
+    return allowDrop(arg1, arg2)
   }
   ElMessage.warning(t('free.save_error'))
+  return false
 }
 onMounted(() => {
   const dsId = wsCache.get('ds-info-id') || route.params.id
@@ -1160,8 +1161,8 @@ const getMenuList = (val: boolean) => {
             :data="state.datasourceTree"
             :props="defaultProps"
             @node-drag-start="handleDragStart"
-            :allow-drop="allowDrop"
-            @node-drop="proxyHandleDrop"
+            :allow-drop="proxyAllowDrop"
+            @node-drop="handleDrop"
             draggable
             @node-click="handleNodeClick"
           >