Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf(tree): 改进beforeRightClick回调支持对菜单进行更多配置 #608

Merged
merged 1 commit into from
May 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions src/components/Tree/src/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@
import { filter } from '/@/utils/helper/treeHelper';

import { useTree } from './useTree';
import { useContextMenu, ContextMenuItem } from '/@/hooks/web/useContextMenu';
import { useContextMenu } from '/@/hooks/web/useContextMenu';
import { useExpose } from '/@/hooks/core/useExpose';
import { useDesign } from '/@/hooks/web/useDesign';

import { basicProps } from './props';
import { CreateContextOptions } from '/@/components/ContextMenu';

interface State {
expandedKeys: Keys;
Expand Down Expand Up @@ -128,18 +129,20 @@

async function handleRightClick({ event, node }: Recordable) {
const { rightMenuList: menuList = [], beforeRightClick } = props;
let rightMenuList: ContextMenuItem[] = [];
let contextMenuOptions: CreateContextOptions = { event, items: [] };

if (beforeRightClick && isFunction(beforeRightClick)) {
rightMenuList = await beforeRightClick(node);
let result = await beforeRightClick(node, event);
if (Array.isArray(result)) {
contextMenuOptions.items = result;
} else {
Object.assign(contextMenuOptions, result);
}
} else {
rightMenuList = menuList;
contextMenuOptions.items = menuList;
}
if (!rightMenuList.length) return;
createContextMenu({
event,
items: rightMenuList,
});
if (!contextMenuOptions.items?.length) return;
createContextMenu(contextMenuOptions);
}

function setExpandedKeys(keys: Keys) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Tree/src/props.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { PropType } from 'vue';
import type { ReplaceFields, ActionItem, Keys, CheckKeys } from './types';
import type { ReplaceFields, ActionItem, Keys, CheckKeys, ContextMenuOptions } from './types';
import type { ContextMenuItem } from '/@/hooks/web/useContextMenu';
import type { TreeDataItem } from 'ant-design-vue/es/tree/Tree';
import { propTypes } from '/@/utils/propTypes';
Expand Down Expand Up @@ -53,7 +53,7 @@ export const basicProps = {
},

beforeRightClick: {
type: Function as PropType<(...arg: any) => ContextMenuItem[]>,
type: Function as PropType<(...arg: any) => ContextMenuItem[] | ContextMenuOptions>,
default: null,
},

Expand Down
7 changes: 7 additions & 0 deletions src/components/Tree/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { TreeDataItem } from 'ant-design-vue/es/tree/Tree';
import { ContextMenuItem } from '/@/hooks/web/useContextMenu';
export interface ActionItem {
render: (record: Recordable) => any;
show?: boolean | ((record: Recordable) => boolean);
Expand Down Expand Up @@ -40,3 +41,9 @@ export interface InsertNodeParams {
list?: TreeDataItem[];
push?: 'push' | 'unshift';
}

export interface ContextMenuOptions {
icon?: string;
styles?: any;
items?: ContextMenuItem[];
}