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

fix(pro:tree): add height prop supports, update proTree header height and container padding #1112

Merged
merged 2 commits into from
Sep 2, 2022
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
1 change: 1 addition & 0 deletions packages/pro/tree/demo/Basic.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
class="demo-pro-tree"
placeholder="搜索"
:style="{ height: '400px' }"
:height="321"
:checkable="true"
:dataSource="treeData"
:onSearch="onSearch"
Expand Down
1 change: 1 addition & 0 deletions packages/pro/tree/docs/Api.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
| `empty` | 空数据时的内容 | `string \| EmptyProps \| #empty` | - | - | - |
| `expandIcon` | 树节点展开图标 | `string \| [string, string] \| #expandIcon="{key: VKey, expanded: boolean, node: TreeNode}"` | `['minus-square', 'plus-square']` | - | 当为数组时表示[`展开时图标`,`未展开时图标`] |
| `header` | 树的头部 | `string \| HeaderProps \| #header="{expanded, onClick}"` | - | - | - |
| `height` | 设置虚拟滚动容器高度 | `number` | - | - | - |
| `getKey` | 获取数据的唯一标识 | `string \| (record: any) => VKey` | `key` | - | - |
| `labelKey` | 替代[TreeNode](#TreeNode)中的`label`字段 | `string` | `label` | - | - |
| `leafLineIcon` | 叶子节点的图标,用于替换默认的连接线 | `string \| #leafLineIcon` | - | - | 仅在 `showLine` 时生效 |
Expand Down
1 change: 1 addition & 0 deletions packages/pro/tree/src/ProTree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ export default defineComponent({
expandIcon: props.expandIcon,
empty: props.empty,
getKey: props.getKey,
height: props.height,
labelKey: props.labelKey,
leafLineIcon: props.leafLineIcon,
showLine: props.showLine,
Expand Down
1 change: 1 addition & 0 deletions packages/pro/tree/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const proTreeProps = {
},
getKey: { type: [String, Function] as PropType<string | ((data: TreeNode<any>) => any)>, default: undefined },
header: { type: [String, Object] as PropType<string | HeaderProps>, default: undefined },
height: Number,
labelKey: { type: String, default: undefined },
leafLineIcon: { type: String, default: undefined },
loadChildren: { type: Function as PropType<(node: TreeNode<any>) => Promise<TreeNode<any>[]>>, default: undefined },
Expand Down
3 changes: 1 addition & 2 deletions packages/pro/tree/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@
}

.@{icon-prefix},
.@{header-prefix} {
.@{header-prefix}-content {
height: @pro-tree-header-wrapper-height;
line-height: @pro-tree-header-wrapper-height;
}

& + .@{divider-prefix} {
Expand Down
4 changes: 2 additions & 2 deletions packages/pro/tree/style/themes/default.variable.less
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
@pro-tree-border: 1px solid @color-graphite-l30;
@pro-tree-padding: 4px 0 8px 0;
@pro-tree-padding: 0;
@pro-tree-header-search-wrapper-gap: 4px;
@pro-tree-header-search-wrapper-horizontal-spacing: 12px;
@pro-tree-header-search-wrapper-vertical-spacing: 0;
@pro-tree-search-wrapper-margin-bottom: 8px;
@pro-tree-search-input-suffix-color: @color-graphite-l10;
@pro-tree-header-wrapper-icon-font-size: @font-size-lg;
@pro-tree-header-wrapper-icon-hover-color: @color-primary;
@pro-tree-header-wrapper-height: 32px;
@pro-tree-header-wrapper-height: 38px;
@pro-tree-divider-horizontal-spacing: @pro-tree-header-search-wrapper-horizontal-spacing;
@pro-tree-divider-vertical-spacing: 8px;
@pro-tree-node-padding: 0 0 0 8px;