Skip to content

Commit

Permalink
fix：tree点击事件取值不正确
Browse files Browse the repository at this point in the history
  • Loading branch information
@hzh11012 @yangwei9012
hzh11012 authored and yangwei9012 committed Jan 17, 2025
1 parent bed686d commit 7066406
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions docs/zh-CN/components/form/input-tree.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1529,7 +1529,7 @@ true false false [{label: 'A/B/C', value: 'a/b/c'},{label: 'A
| editConfirm (3.6.4 及以上版本) | `[name]: object` 组件的值<br/>`item: object` 编辑的节点信息<br/>`items: object[]`选项集合 | 编辑节点提交时触发 |
| deleteConfirm (3.6.4 及以上版本) | `[name]: string` 组件的值<br/>`item: object` 删除的节点信息<br/>`items: object[]`选项集合 | 删除节点提交时触发 |
| deferLoadFinished (3.6.4 及以上版本) | `[name]: object` 组件的值<br/>`result: object` deferApi 懒加载远程请求成功后返回的数据 <br/>`items: object[]`选项集合 | 懒加载接口远程请求成功时触发 |
| itemClick (6.9.0 以上版本) | `value: any`表单项的值，值格式取决于具体配置<br/>`item: object` 点击的节点信息 | 节点点击时触发 |
| itemClick (6.9.0 以上版本) | `item: Option` 所点击的选项 息 | 节点点击时触发 |
| add（不推荐） | `[name]: object` 新增的节点信息<br/>`items: object[]`选项集合（< 2.3.2 及以下版本 为`options`） | 新增节点提交时触发 |
| edit（不推荐） | `[name]: object` 编辑的节点信息<br/>`items: object[]`选项集合（< 2.3.2 及以下版本 为`options`） | 编辑节点提交时触发 |
| delete（不推荐） | `[name]: object` 删除的节点信息<br/>`items: object[]`选项集合（< 2.3.2 及以下版本 为`options`） | 删除节点提交时触发 |
Expand Down Expand Up @@ -1838,7 +1838,7 @@ true false false [{label: 'A/B/C', value: 'a/b/c'},{label: 'A
{
"actionType": "toast",
"args": {
"msg": "${event.data.tree|json}"
"msg": "${event.data.item|json}"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions docs/zh-CN/components/form/treeselect.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ order: 60
| editConfirm (3.6.4 及以上版本) | `[name]: object` 组件的值<br/>`item: object` 编辑的节点信息<br/>`items: object[]`选项集合 | 编辑节点提交时触发 |
| deleteConfirm (3.6.4 及以上版本) | `[name]: string` 组件的值<br/>`item: object` 删除的节点信息<br/>`items: object[]`选项集合 | 删除节点提交时触发 |
| deferLoadFinished (3.6.4 及以上版本) | `[name]: object` 组件的值<br/>`result: object` deferApi 懒加载远程请求成功后返回的数据 <br/>`items: object[]`选项集合 | 懒加载接口远程请求成功时触发 |
| itemClick (6.9.0 以上版本) | `value: any`表单项的值，值格式取决于具体配置<br/>`item: object` 点击的节点信息 | 节点点击时触发 |
| itemClick (6.9.0 以上版本) | `item: Option` 所点击的选项 | 节点点击时触发 |
| add（不推荐） | `[name]: object` 新增的节点信息<br/>`items: object[]`选项集合（< 2.3.2 及以下版本 为`options`） | 新增节点提交时触发 |
| edit（不推荐） | `[name]: object` 编辑的节点信息<br/>`items: object[]`选项集合（< 2.3.2 及以下版本 为`options`） | 编辑节点提交时触发 |
| delete（不推荐） | `[name]: object` 删除的节点信息<br/>`items: object[]`选项集合（< 2.3.2 及以下版本 为`options`） | 删除节点提交时触发 |
Expand Down Expand Up @@ -832,7 +832,7 @@ order: 60
{
"actionType": "toast",
"args": {
"msg": "${event.data.tree|json}"
"msg": "${event.data.item|json}"
}
}
]
Expand Down
8 changes: 6 additions & 2 deletions packages/amis-editor/src/util.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ export const TREE_BASE_EVENTS = (schema: any) => {
eventLabel: '节点点击',
description: '点击节点触发',
dataSchema: (manager: EditorManager) => {
const {value} = resolveOptionEventDataSchame(manager);
const {itemSchema} = resolveOptionEventDataSchame(manager);

return [
{
Expand All @@ -388,7 +388,11 @@ export const TREE_BASE_EVENTS = (schema: any) => {
type: 'object',
title: '数据',
properties: {
value
item: {
type: 'object',
title: '所点击的选项',
properties: itemSchema
}
}
}
}
Expand Down
5 changes: 1 addition & 4 deletions packages/amis/src/renderers/Form/InputTree.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,10 +547,7 @@ export default class TreeControl extends React.Component<TreeProps, TreeState> {

const rendererEvent = await dispatchEvent(
'itemClick',
createObject(data, {
item,
value: item.value
})
createObject(data, {item})
);

if (rendererEvent?.prevented) {
Expand Down
5 changes: 1 addition & 4 deletions packages/amis/src/renderers/Form/TreeSelect.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,10 +626,7 @@ export default class TreeSelectControl extends React.Component<

const rendererEvent = await dispatchEvent(
'itemClick',
createObject(data, {
item,
value: item.value
})
createObject(data, {item})
);

if (rendererEvent?.prevented) {
Expand Down

0 comments on commit 7066406

Please sign in to comment.