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

merge

This commit is contained in:
wanghaoo 2019-02-21 19:45:44 +08:00
parent dcf9b235aa 0f0707f552
commit e1e99843f2
7 changed files with 264 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
build/Table.css
View File

@ -178,13 +178,25 @@
.u-table th ::last-child {
overflow: hidden; }
.u-table td {
border-bottom: 1px solid #e9e9e9; }
border-bottom: 1px solid rgb(233,233,233); }
.u-table td a {
color: rgb(30,136,229); }
.u-table td a:hover {
color: rgb(66,165,245); }
.u-table td a:active {
color: rgb(21,101,192); }
.u-table tr:hover {
background: #E7F2FC; }
background: rgb(227,242,253); }
.u-table tr:hover td .uf-eye {
visibility: visible !important; }
.u-table tr tr a {
color: rgb(30,136,229); }
.u-table tr tr a:hover {
color: rgb(66,165,245); }
.u-table tr tr a:active {
color: rgb(21,101,192); }
.u-table tr.tr-row-hover {
background: #E7F2FC; }
background: rgb(227,242,253); }
.u-table th,
.u-table td {
padding: 12px 8px;
@ -197,23 +209,24 @@
.u-table tr.filterable th .filterContext {
height: 35px; }
.u-table-row-hover {
background: #e3f2fd; }
background: rgb(227,242,253); }
.u-table-scroll {
overflow: auto; }
.u-table-bordered table {
border: 1px solid #e9e9e9;
border: 1px solid rgb(233,233,233);
box-sizing: border-box;
table-layout: fixed; }
.u-table-bordered th {
border-bottom: 1px solid #e9e9e9;
border-bottom: 1px solid rgb(233,233,233);
box-sizing: border-box; }
.u-table-bordered th,
.u-table-bordered td {
border-right: 1px solid #e9e9e9;
border-right: 1px solid rgb(233,233,233);
box-sizing: border-box; }
.u-table-header {
overflow: hidden;
background: #f7f7f7; }
background: rgb(247,247,247);
color: rgb(102, 102, 102); }
.u-table.fixed-height td {
padding: 0px 8px; }
.u-table-fixed-header .u-table-body {
@ -235,12 +248,12 @@
box-sizing: border-box; }
.u-table-title {
padding: 12px 8px;
border-top: 1px solid #e9e9e9; }
border-top: 1px solid rgb(233,233,233); }
.u-table-content {
position: relative; }
.u-table-footer {
padding: 12px 8px;
border-bottom: 1px solid #e9e9e9; }
border-bottom: 1px solid rgb(233,233,233); }
.u-table-footer .u-table-scroll {
overflow-x: hidden; }
.u-table-footer .u-table {
@ -248,7 +261,7 @@
.u-table-placeholder {
padding: 12px 8px;
background: #fff;
border-bottom: 1px solid #e9e9e9;
border-bottom: 1px solid rgb(233,233,233);
text-align: center;
position: relative; }
.u-table-expand-icon-col {
@ -261,7 +274,7 @@
height: 16px;
text-align: center;
line-height: 16px;
border: 1px solid #e9e9e9;
border: 1px solid rgb(233,233,233);
user-select: none;
background: #fff;
margin-right: 10px; }
@ -273,6 +286,8 @@
content: "-"; }
.u-table-row-collapsed:after, .u-table-expanded-row-collapsed:after {
content: "+"; }
.u-table-row.selected {
background: rgb(227,242,253); }
.u-table tr.u-table-expanded-row {
background: #f7f7f7; }
.u-table tr.u-table-expanded-row:hover {
@ -335,7 +350,8 @@
.u-table-thead .filter-wrap .filter-btns {
min-width: 58px; }
.u-table-thead th {
background: #f7f7f7;
background: rgb(247,247,247);
color: rgb(102, 102, 102);
background-clip: padding-box;
-moz-user-select: -moz-none;
-khtml-user-select: none;
@ -387,7 +403,7 @@
.u-table-thead .th-drag {
cursor: move; }
.u-table-thead .th-drag:hover {
background: #e3f2fd; }
background: rgb(227,242,253); }
.u-table-thead .th-drag-hover {
background: #ccc; }
.u-table-thead-th {
@ -466,7 +482,7 @@
.u-table.bordered th,
.u-table.bordered td {
border: 1px solid #e9e9e9; }
border: 1px solid rgb(233,233,233); }
.move-enter,
.move-appear {

46
dist/demo.css vendored
View File

@ -8619,13 +8619,25 @@ ul {
.u-table th ::last-child {
overflow: hidden; }
.u-table td {
border-bottom: 1px solid #e9e9e9; }
border-bottom: 1px solid rgb(233,233,233); }
.u-table td a {
color: rgb(30,136,229); }
.u-table td a:hover {
color: rgb(66,165,245); }
.u-table td a:active {
color: rgb(21,101,192); }
.u-table tr:hover {
background: #E7F2FC; }
background: rgb(227,242,253); }
.u-table tr:hover td .uf-eye {
visibility: visible !important; }
.u-table tr tr a {
color: rgb(30,136,229); }
.u-table tr tr a:hover {
color: rgb(66,165,245); }
.u-table tr tr a:active {
color: rgb(21,101,192); }
.u-table tr.tr-row-hover {
background: #E7F2FC; }
background: rgb(227,242,253); }
.u-table th,
.u-table td {
padding: 12px 8px;
@ -8638,23 +8650,24 @@ ul {
.u-table tr.filterable th .filterContext {
height: 35px; }
.u-table-row-hover {
background: #e3f2fd; }
background: rgb(227,242,253); }
.u-table-scroll {
overflow: auto; }
.u-table-bordered table {
border: 1px solid #e9e9e9;
border: 1px solid rgb(233,233,233);
box-sizing: border-box;
table-layout: fixed; }
.u-table-bordered th {
border-bottom: 1px solid #e9e9e9;
border-bottom: 1px solid rgb(233,233,233);
box-sizing: border-box; }
.u-table-bordered th,
.u-table-bordered td {
border-right: 1px solid #e9e9e9;
border-right: 1px solid rgb(233,233,233);
box-sizing: border-box; }
.u-table-header {
overflow: hidden;
background: #f7f7f7; }
background: rgb(247,247,247);
color: rgb(102, 102, 102); }
.u-table.fixed-height td {
padding: 0px 8px; }
.u-table-fixed-header .u-table-body {
@ -8676,12 +8689,12 @@ ul {
box-sizing: border-box; }
.u-table-title {
padding: 12px 8px;
border-top: 1px solid #e9e9e9; }
border-top: 1px solid rgb(233,233,233); }
.u-table-content {
position: relative; }
.u-table-footer {
padding: 12px 8px;
border-bottom: 1px solid #e9e9e9; }
border-bottom: 1px solid rgb(233,233,233); }
.u-table-footer .u-table-scroll {
overflow-x: hidden; }
.u-table-footer .u-table {
@ -8689,7 +8702,7 @@ ul {
.u-table-placeholder {
padding: 12px 8px;
background: #fff;
border-bottom: 1px solid #e9e9e9;
border-bottom: 1px solid rgb(233,233,233);
text-align: center;
position: relative; }
.u-table-expand-icon-col {
@ -8702,7 +8715,7 @@ ul {
height: 16px;
text-align: center;
line-height: 16px;
border: 1px solid #e9e9e9;
border: 1px solid rgb(233,233,233);
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
@ -8717,6 +8730,8 @@ ul {
content: "-"; }
.u-table-row-collapsed:after, .u-table-expanded-row-collapsed:after {
content: "+"; }
.u-table-row.selected {
background: rgb(227,242,253); }
.u-table tr.u-table-expanded-row {
background: #f7f7f7; }
.u-table tr.u-table-expanded-row:hover {
@ -8782,7 +8797,8 @@ ul {
.u-table-thead .filter-wrap .filter-btns {
min-width: 58px; }
.u-table-thead th {
background: #f7f7f7;
background: rgb(247,247,247);
color: rgb(102, 102, 102);
background-clip: padding-box;
-moz-user-select: -moz-none;
-webkit-user-select: none;
@ -8830,7 +8846,7 @@ ul {
.u-table-thead .th-drag {
cursor: move; }
.u-table-thead .th-drag:hover {
background: #e3f2fd; }
background: rgb(227,242,253); }
.u-table-thead .th-drag-hover {
background: #ccc; }
.u-table-thead-th {
@ -8909,7 +8925,7 @@ ul {
.u-table.bordered th,
.u-table.bordered td {
border: 1px solid #e9e9e9; }
border: 1px solid rgb(233,233,233); }
.move-enter,
.move-appear {

2
dist/demo.css.map vendored
View File

File diff suppressed because one or more lines are too long

4
package.json
View File

@ -46,7 +46,7 @@
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0"
},
"dependencies": {
"bee-button": "^1.0.6",
"bee-button": "^2.0.2",
"bee-datepicker": "latest",
"bee-dnd": "^1.0.2",
"bee-dropdown": "1.0.3",
@ -76,7 +76,7 @@
"devDependencies": {
"babel-jest": "^22.0.4",
"bee-animate": "latest",
"bee-checkbox": "^1.1.1",
"bee-checkbox": "^2.0.1",
"bee-form": "1.1.10",
"bee-input-group": "latest",
"bee-layout": "latest",

47
src/Table.scss
View File

@ -5,11 +5,13 @@
$text-color: #666;
$font-size-base: 12px;
$line-height: 1.5;
$table-border-color: $border-color-base;
$table-head-background-color: #f7f7f7;
// 主题定制border：
$table-border-color: unquote("rgb(#{$table-border-color-base})");
// $table-head-background-color: #f7f7f7;
// $table-head-text-color: #666;
$vertical-padding: 12px;
$horizontal-padding: 8px;
$table-border-color: #e9e9e9;
// $table-border-color: #e9e9e9;
$table-hover-color: #E7F2FC;
$table-move-in-color: $bg-color-base;
@ -54,21 +56,39 @@ $checkbox-height:16px;
td {
border-bottom: 1px solid $table-border-color;
a{
color: $brand-primary;
&:hover{
color: $brand-primary-hover;
}
&:active{
color: $brand-primary-active;
}
}
}
tr {
// transition: all 0.3s ease;
&:hover {
background: $table-hover-color;
background: $hover-bg-color-base;
td {
.uf-eye{
visibility: visible !important;
}
}
}
tr a{
color: $brand-primary;
&:hover{
color: $brand-primary-hover;
}
&:active{
color: $brand-primary-active;
}
}
}
tr.tr-row-hover {
background: $table-hover-color;
background: $hover-bg-color-base;
}
th,
@ -91,7 +111,7 @@ $checkbox-height:16px;
}
}
&-row-hover {
background: rgb(227, 242, 253);
background: $hover-bg-color-base;
}
&-scroll {
@ -99,24 +119,25 @@ $checkbox-height:16px;
}
&-bordered {
table {
border: 1px solid #e9e9e9;
border: 1px solid $table-border-color;
box-sizing: border-box;
table-layout: fixed;
// width:auto;
}
th {
border-bottom: 1px solid #e9e9e9;
border-bottom: 1px solid $table-border-color;
box-sizing: border-box;
}
th,
td {
border-right: 1px solid #e9e9e9;
border-right: 1px solid $table-border-color;
box-sizing: border-box;
}
}
&-header {
overflow: hidden;
background: $table-head-background-color;
color: $table-head-text-color;
}
&.fixed-height td {
@ -211,6 +232,11 @@ $checkbox-height:16px;
content: "+";
}
}
&-row{
&.selected{
background: $hover-bg-color-base;
}
}
tr.u-table-expanded-row {
background: #f7f7f7;
&:hover {
@ -312,6 +338,7 @@ $checkbox-height:16px;
}
th{
background: $table-head-background-color;
color: $table-head-text-color;
background-clip:padding-box;
//禁止选中文字
-moz-user-select: -moz-none;
@ -383,7 +410,7 @@ $checkbox-height:16px;
cursor: move;
}
.th-drag:hover{
background: rgb(227,242,253);
background: $hover-bg-color-base;
}
//为了区分是拖拽宽度还是交换列，先注释上面了
// .th-drag:hover{