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

chore(Table): 添加表格默认类型 #659

Merged
merged 31 commits into from Mar 14, 2022
Merged
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c8c43e3
fix: 组件显示问题:Steps 点状步骤条显示问题 #554
cuilanxin Mar 3, 2022
fd61d0e
Merge branch 'master' of github.com:cuilanxin/uiw
cuilanxin Mar 3, 2022
81c6048
chore: form支持TreeChecked 树形选择控件 #605
cuilanxin Mar 4, 2022
d385a1c
Merge branch 'uiwjs:master' into master
cuilanxin Mar 4, 2022
907cdba
Merge branch 'uiwjs:master' into master
cuilanxin Mar 4, 2022
27245dd
feat: 表单增加TreeChecked #605
cuilanxin Mar 4, 2022
16d8b6d
Merge branch 'uiwjs:master' into master
cuilanxin Mar 7, 2022
c4b2470
fix(Table): footer属性内的元素,和Table表格长度不一致 #621
cuilanxin Mar 7, 2022
0126578
feat(Tabs): 选项卡过多,超过宽度时,收缩超出部分 #559 (#626)
nullptr-z Mar 8, 2022
98cf3a3
Merge branch 'uiwjs:master' into master
cuilanxin Mar 8, 2022
bb7f93f
chore(Form): Select 跟Input 在表单中使用,错误样式统一 #622
cuilanxin Mar 8, 2022
68b5896
Merge branch 'uiwjs:master' into master
cuilanxin Mar 8, 2022
af0bef0
chore(Tabs): 隐藏当pane过时的滚动条,优化下拉选项样式
cuilanxin Mar 8, 2022
e137bd6
chore(Tabs): 隐藏当pane过时的滚动条,优化下拉选项样式
cuilanxin Mar 8, 2022
8f2f891
feat(Tree): 初始值失效
cuilanxin Mar 8, 2022
2aad5c3
Merge branch 'uiwjs:master' into master
cuilanxin Mar 8, 2022
1879e78
Merge branch 'uiwjs:master' into master
cuilanxin Mar 9, 2022
19c9c5e
chore(Tree): 增加Tree组件在Form中使用的例子,修改Tree onChange参数
cuilanxin Mar 9, 2022
f91f62c
chore: 更新上游代码
cuilanxin Mar 10, 2022
a9c34af
chore(Form): 优化在fields属性中写onChange 属性没有event类型提示
cuilanxin Mar 10, 2022
55b0ad9
chore(Form): 优化类型
cuilanxin Mar 10, 2022
25352bc
Merge branch 'uiwjs:master' into master
cuilanxin Mar 10, 2022
54f7c31
Merge branch 'master' of git://github.com/uiwjs/uiw
cuilanxin Mar 10, 2022
ea987c2
fix(DatePicker): 修复二月三月时间问题 #635
cuilanxin Mar 10, 2022
a83f975
Merge branch 'master' of git://github.com/uiwjs/uiw
cuilanxin Mar 11, 2022
6968e30
fix(DatePicker): 修复时间选中提示背景展示问题
cuilanxin Mar 11, 2022
6f72bd7
Merge branch 'uiwjs:master' into master
cuilanxin Mar 11, 2022
e207efb
chore(Table): 优化table columns render属性类型提示
cuilanxin Mar 11, 2022
19f9f3a
Merge branch 'uiwjs:master' into master
cuilanxin Mar 13, 2022
9db23a7
Merge branch 'uiwjs:master' into master
cuilanxin Mar 14, 2022
625e5ac
chore(Table): 添加表格默认类型
cuilanxin Mar 14, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/react-table/src/index.tsx
Expand Up @@ -4,7 +4,7 @@ import Thead from './Thead';
import { getLevelItems, getAllColumnsKeys } from './util';
import './style/index.less';

export type TableColumns<T extends { [key: string]: V }, V = any> = {
export type TableColumns<T = any, V = any> = {
title?: string | ((data: TableColumns<T, V>, rowNum: number, colNum: number) => JSX.Element) | JSX.Element;
key?: string;
width?: number;
Expand All @@ -16,7 +16,7 @@ export type TableColumns<T extends { [key: string]: V }, V = any> = {
[key: string]: any;
};

export interface TableProps<T extends { [key: string]: V }, V> extends IProps, Omit<HTMLDivProps, 'title'> {
export interface TableProps<T extends { [key: string]: V } = any, V = any> extends IProps, Omit<HTMLDivProps, 'title'> {
prefixCls?: string;
columns?: TableColumns<T, V>[];
data?: Array<T>;
Expand Down