From 0231569d130b70aca38faef9dfeb41e7afdf2e45 Mon Sep 17 00:00:00 2001
From: Wugaoliang <wugaoliang@xiaomi.com>
Date: Mon, 28 Jun 2021 21:04:58 +0800
Subject: [PATCH 1/4] fix: #1812

---
 components/tree/Tree.js            | 2 +-
 components/tree/customTreeNode.jsx | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/tree/Tree.js b/components/tree/Tree.js
index 425abff14..0381c1c7c 100644
--- a/components/tree/Tree.js
+++ b/components/tree/Tree.js
@@ -396,7 +396,7 @@ const Tree = (props) => {
                   m.onClick(node)
                 } else {
                   if (m.type === 'editNode') {
-                    editNode(node)
+                    editNode(node, e)
                   }
                   if (m.type === 'addSiblingNode') {
                     addSiblingNode(node)
diff --git a/components/tree/customTreeNode.jsx b/components/tree/customTreeNode.jsx
index 4034ac8c4..5c50eda12 100644
--- a/components/tree/customTreeNode.jsx
+++ b/components/tree/customTreeNode.jsx
@@ -105,6 +105,7 @@ const CustomTreeNode = ({
           onContextMenu={(e) => {
             if (editable && !node.disabled) {
               e.preventDefault()
+              console.log('e', e, ref)
               setMenuVisible(node.id)
             }
           }}

From 66ab9ac1321492e7d2c1ec39cbf026d105e365bc Mon Sep 17 00:00:00 2001
From: wugaoliang <wugaoliang@xiaomi.com>
Date: Tue, 29 Jun 2021 09:00:50 +0800
Subject: [PATCH 2/4] fix: #1812

---
 components/tree/Tree.js            | 12 +++++++++---
 components/tree/customTreeNode.jsx |  1 -
 docs/demo/tree/section-edit.jsx    | 12 ++++++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/components/tree/Tree.js b/components/tree/Tree.js
index 0381c1c7c..28a47a63d 100644
--- a/components/tree/Tree.js
+++ b/components/tree/Tree.js
@@ -1,4 +1,4 @@
-import React, { useState, useCallback, useEffect } from 'react'
+import React, { useState, useCallback, useEffect, useRef } from 'react'
 import BaseTree from './BaseTree'
 import Input from '../input'
 import Button from '../button'
@@ -76,7 +76,7 @@ const Tree = (props) => {
   useEffect(() => {
     updateCacheData(data)
   }, [data])
-
+  const contextMenuFun = useRef()
   const [menuVisible, setMenuVisible] = useState(null)
   const [modalVisible, setModalVisible] = useState(null)
 
@@ -333,6 +333,8 @@ const Tree = (props) => {
         if (result === true) {
           updateCacheData(dataCache)
           onSave(nodeEdited, dataCache)
+        } else {
+          cancelAddNode(enode)
         }
       } else {
         updateCacheData(dataCache)
@@ -372,6 +374,9 @@ const Tree = (props) => {
     },
     [cacheData, _deleteNode]
   )
+  useEffect(() => {
+    contextMenuFun.current = { editNode, addChildNode, addSiblingNode, deleteNode }
+  }, [editNode, addChildNode, addSiblingNode, deleteNode])
 
   const menuRender = useCallback(
     (node) => {
@@ -384,6 +389,7 @@ const Tree = (props) => {
       if (contextMenu) {
         menu = contextMenu(node)
       }
+
       return (
         <ul className={`${PREFIX}__menu theme__${theme}`}>
           {menu.map((m, index) => (
@@ -393,7 +399,7 @@ const Tree = (props) => {
               onClick={(e) => {
                 e.stopPropagation()
                 if (m.onClick) {
-                  m.onClick(node)
+                  m.onClick(node, contextMenuFun.current)
                 } else {
                   if (m.type === 'editNode') {
                     editNode(node, e)
diff --git a/components/tree/customTreeNode.jsx b/components/tree/customTreeNode.jsx
index 5c50eda12..4034ac8c4 100644
--- a/components/tree/customTreeNode.jsx
+++ b/components/tree/customTreeNode.jsx
@@ -105,7 +105,6 @@ const CustomTreeNode = ({
           onContextMenu={(e) => {
             if (editable && !node.disabled) {
               e.preventDefault()
-              console.log('e', e, ref)
               setMenuVisible(node.id)
             }
           }}
diff --git a/docs/demo/tree/section-edit.jsx b/docs/demo/tree/section-edit.jsx
index 987b50fb4..904f35afb 100644
--- a/docs/demo/tree/section-edit.jsx
+++ b/docs/demo/tree/section-edit.jsx
@@ -127,22 +127,26 @@ class Demo extends React.Component {
                 return  [{
                   title:'编辑',
                   type: 'editNode'
-                }, {
+                }, 
+                {
                   title: '自定义 Title-1',
                   onClick: (item) => {
                     alert(JSON.stringify(item))
                   }
-                }, {
+                }, 
+                {
                   type: 'editNode',
                   title: '自定义 Title-2'
-                }, {
+                }, 
+                {
                   title: '自定义 Title-3',
                   type: 'editNode',
                   onClick: (item, node) => {
                     console.log('执行内置事件')
                     node.editNode(item)
                   }
-                }, {
+                }, 
+                {
                   title: '自定义 Title-4',
                   onClick: (item, node) => {
                     console.log('自定义编辑节点事件')

From d97dfb4c51cdae53e630f4101cfdd85f5eb9d713 Mon Sep 17 00:00:00 2001
From: wugaoliang <wugaoliang@xiaomi.com>
Date: Tue, 29 Jun 2021 09:04:46 +0800
Subject: [PATCH 3/4] fix: #1812

---
 CHANGELOG.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a672d32f5..81645fe50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - 新增 `From` 组件 setListItemFieldsValue 方法, 设置表单中From.List的指定项的值[#1760](https://github.com/XiaoMi/hiui/issues/1760)
 - 新增 `Table` 组件 onLoadChildren 方法, 树形表格下异步加载子数据 [#1725](https://github.com/XiaoMi/hiui/issues/1725)
 - 新增 `Badge` 组件 offset 属性设置状态点的位置偏移 [#1786](https://github.com/XiaoMi/hiui/issues/1786)
+- 新增 `Slider` 组件 showRangeLabel 属性设置是否显示范围值 [#1783](https://github.com/XiaoMi/hiui/issues/1783)
 - 优化 `Table` 组件树形表格，允许控制指定节点的展开收起 [#1784](https://github.com/XiaoMi/hiui/issues/1784)
 - 优化 `Grid` 组件接受原生属性 [#1609](https://github.com/XiaoMi/hiui/issues/1609)
 - 优化 `Select` onChang 回调方法中，获取全部选项详细内容 [#1726](https://github.com/XiaoMi/hiui/issues/1726)
@@ -22,9 +23,11 @@
 - 修复 `Tree` 组件 editable 受控状态下，编辑菜单显示问题 [#1761](https://github.com/XiaoMi/hiui/issues/1761)
 - 修复 `Tree` LegacyTree 组件 draggable 为 true 时，节点展开且无法选中节点问题 [#1781](https://github.com/XiaoMi/hiui/issues/1781)
 - 修复 `Slider` 组件 max、min 受控问题，Modal 中不能拖拽 [#1783](https://github.com/XiaoMi/hiui/issues/1783)
-- 新增 `Slider` 组件 showRangeLabel 属性设置是否显示范围值 [#1783](https://github.com/XiaoMi/hiui/issues/1783)
-- 修复 `DataePicker` 组件 yearrange、monthrange 无法通过 min、max 限制时间区间问题 [#1780](https://github.com/XiaoMi/hiui/issues/1780)
+- 修复 `DatePicker` 组件 yearrange、monthrange 无法通过 min、max 限制时间区间问题 [#1780](https://github.com/XiaoMi/hiui/issues/1780)
 - 修复 `Form` 组件值校验问题 [#1802](https://github.com/XiaoMi/hiui/issues/1802)
+- 修复 `Tree` 自定义右侧菜单参数错误问题 [#1812](https://github.com/XiaoMi/hiui/issues/1812)
+- 修复 `Tree` 在 onBeforeSave 返回 false后依然可以新增子节点问题 [#1813](https://github.com/XiaoMi/hiui/issues/1813)
+
 # 3.6.1
 - 修复部分组件 'regeneratorRuntime is not defined' 问题 [#1719](https://github.com/XiaoMi/hiui/issues/1719)
 - 修复 `Slider` max 和min 受控问题 [#1703](https://github.com/XiaoMi/hiui/issues/1703)

From 12d951953cc8a2a710067f3e8cbe76ccb4690245 Mon Sep 17 00:00:00 2001
From: wugaoliang <wugaoliang@xiaomi.com>
Date: Tue, 29 Jun 2021 09:06:30 +0800
Subject: [PATCH 4/4] fix: #1812

---
 components/tree/Tree.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/tree/Tree.js b/components/tree/Tree.js
index 28a47a63d..a8539b112 100644
--- a/components/tree/Tree.js
+++ b/components/tree/Tree.js
@@ -402,7 +402,7 @@ const Tree = (props) => {
                   m.onClick(node, contextMenuFun.current)
                 } else {
                   if (m.type === 'editNode') {
-                    editNode(node, e)
+                    editNode(node)
                   }
                   if (m.type === 'addSiblingNode') {
                     addSiblingNode(node)