innov
/
bee-table
1
0
Fork 0
Code Issues Pull Requests 3 Projects Releases Wiki Activity

tree 合计行bug 临时解决

This commit is contained in:
jonyshi 2018-05-14 15:08:39 +08:00
parent 73add950c5
commit 95b5c7617e
7 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
demo/demolist/Demo18.js
View File

@ -52,7 +52,7 @@ const columns = [
title: "Door No.", title: "Door No.",
dataIndex: "number", dataIndex: "number",
key: "number", key: "number",
width: 100, // width: 100,
sumCol: true, sumCol: true,
} }
] ]
@ -61,26 +61,28 @@ const columns = [
} }
] ]
}, },
{ // {
title: "Company", // title: "Company",
children: [ // children: [
{ // {
title: "Company Address", // title: "Company Address",
dataIndex: "companyAddress", // dataIndex: "companyAddress",
key: "companyAddress" // key: "companyAddress",
}, // width: 100,
{ // },
title: "Company Name", // {
dataIndex: "companyName", // title: "Company Name",
key: "companyName" // dataIndex: "companyName",
} // key: "companyName",
] // width: 100,
}, // }
// ]
// },
{ {
title: "Gender", title: "Gender",
dataIndex: "gender", dataIndex: "gender",
key: "gender", key: "gender",
width: 60, width: 80,
fixed: "right" fixed: "right"
} }
]; ];
@ -134,6 +136,7 @@ class Demo18 extends Component {
columns={columns} columns={columns}
data={data} data={data}
bordered bordered
// scroll={{ x: "130%", y: 140 }}
/> />
</div> </div>
); );

2
demo/index.js
View File

File diff suppressed because one or more lines are too long

10
dist/demo.css vendored
View File

@ -7886,7 +7886,7 @@ ul {
background: rgb(227,242,253); } background: rgb(227,242,253); }
.u-table th, .u-table th,
.u-table td { .u-table td {
padding: 16px 8px; padding: 12px 8px;
word-break: break-all; } word-break: break-all; }
.u-table-row-hover { .u-table-row-hover {
background: #e3f2fd; } background: #e3f2fd; }
@ -7921,19 +7921,19 @@ ul {
overflow-y: auto; overflow-y: auto;
box-sizing: border-box; } box-sizing: border-box; }
.u-table-title { .u-table-title {
padding: 16px 8px; padding: 12px 8px;
border-top: 1px solid #e9e9e9; } border-top: 1px solid #e9e9e9; }
.u-table-content { .u-table-content {
position: relative; } position: relative; }
.u-table-footer { .u-table-footer {
padding: 16px 8px; padding: 12px 8px;
border-bottom: 1px solid #e9e9e9; } border-bottom: 1px solid #e9e9e9; }
.u-table-footer .u-table-scroll { .u-table-footer .u-table-scroll {
overflow-x: hidden; } overflow-x: hidden; }
.u-table-footer .u-table { .u-table-footer .u-table {
margin: -16px -8px; } margin: -12px -8px; }
.u-table-placeholder { .u-table-placeholder {
padding: 16px 8px; padding: 12px 8px;
background: #fff; background: #fff;
border-bottom: 1px solid #e9e9e9; border-bottom: 1px solid #e9e9e9;
text-align: center; text-align: center;

2
dist/demo.css.map vendored
View File

File diff suppressed because one or more lines are too long

38
dist/demo.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
src/Table.scss
View File

@ -7,7 +7,7 @@ $font-size-base: 12px;
$line-height: 1.5; $line-height: 1.5;
$table-border-color: $border-color-base; $table-border-color: $border-color-base;
$table-head-background-color: #f7f7f7; $table-head-background-color: #f7f7f7;
$vertical-padding: 16px; $vertical-padding: 12px;
$horizontal-padding: 8px; $horizontal-padding: 8px;
$table-border-color: #e9e9e9; $table-border-color: #e9e9e9;
@ -140,7 +140,7 @@ $table-move-in-color: $bg-color-base;
} }
&-placeholder { &-placeholder {
padding: 16px 8px; padding: $vertical-padding 8px;
background: #fff; background: #fff;
border-bottom: 1px solid $table-border-color; border-bottom: 1px solid $table-border-color;
text-align: center; text-align: center;