forgetest5
/
bee-table6
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

This commit is contained in:
yangchch6 2019-05-22 18:24:33 +08:00
parent 503ad33ada f287618102
commit e87ac8a9aa
17 changed files with 101 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,3 +1,8 @@
<a name="2.0.23"></a>
## [2.0.23](https://github.com/tinper-bee/bee-table/compare/v2.0.22...v2.0.23) (2019-05-22)
<a name="2.0.22"></a>
## [2.0.22](https://github.com/tinper-bee/bee-table/compare/v2.0.21...v2.0.22) (2019-05-22)

3
build/Table.css
View File

@ -273,7 +273,8 @@
.u-table-fixed-header .u-table-fixed-left .u-table-body-inner {
padding-right: 0px; }
.u-table-fixed-header .u-table-body-inner {
height: 100%; }
height: 100%;
overflow: scroll; }
.u-table-fixed-header .u-table-scroll .u-table-header {
overflow-x: scroll;
padding-bottom: 20px;

6
build/Table.js
View File

@ -392,7 +392,7 @@ var Table = function (_Component) {
}
// 是否传入 scroll中的y属性，如果传入判断是否是整数，如果是则进行比较 。bodyTable 的clientHeight进行判断
this.isShowScrollY();
// this.isShowScrollY();
};
Table.prototype.componentWillUnmount = function componentWillUnmount() {
@ -1021,7 +1021,7 @@ var Table = function (_Component) {
if (this.domWidthDiff <= 0) {
headStyle.marginBottom = scrollbarWidth + 'px';
// bodyStyle.marginBottom = `-${scrollbarWidth}px`;
bodyStyle.marginBottom = '-' + scrollbarWidth + 'px';
} else {
innerBodyStyle.overflowX = 'auto';
}
@ -1038,7 +1038,7 @@ var Table = function (_Component) {
headStyle.overflow = 'hidden';
innerBodyStyle.overflowX = 'auto'; //兼容expand场景、子表格含有固定列的场景
} else {
// bodyStyle.marginBottom = `-${scrollbarWidth}px`;
bodyStyle.marginBottom = '-' + scrollbarWidth + 'px';
}
} else {
// 没有数据时，表头滚动条隐藏问题

2
build/lib/multiSelect.js
View File

@ -105,7 +105,7 @@ function multiSelect(Table, Checkbox) {
}
});
if (data.length == count + disabledCount) {
if (data.length == count + disabledCount && count > 0) {
return "all";
}
return count == 0 ? false : "indeter";

3
dist/demo.css vendored
View File

@ -259,7 +259,8 @@
.u-table-fixed-header .u-table-fixed-left .u-table-body-inner {
padding-right: 0px; }
.u-table-fixed-header .u-table-body-inner {
height: 100%; }
height: 100%;
overflow: scroll; }
.u-table-fixed-header .u-table-scroll .u-table-header {
overflow-x: scroll;
padding-bottom: 20px;

2
dist/demo.css.map vendored
View File

File diff suppressed because one or more lines are too long

9
dist/demo.js vendored
View File

@ -34244,7 +34244,7 @@
}
// 是否传入 scroll中的y属性，如果传入判断是否是整数，如果是则进行比较 。bodyTable 的clientHeight进行判断
this.isShowScrollY();
// this.isShowScrollY();
};
Table.prototype.componentWillUnmount = function componentWillUnmount() {
@ -34583,7 +34583,6 @@
* 行拖拽结束时触发
* @param currentKey 当前拖拽目标的key
* @param targetKey 拖拽结束时，目标位置的key
* @param dragEvent 拖拽动作的事件对象
*/
@ -34874,7 +34873,7 @@
if (this.domWidthDiff <= 0) {
headStyle.marginBottom = scrollbarWidth + 'px';
// bodyStyle.marginBottom = `-${scrollbarWidth}px`;
bodyStyle.marginBottom = '-' + scrollbarWidth + 'px';
} else {
innerBodyStyle.overflowX = 'auto';
}
@ -34891,7 +34890,7 @@
headStyle.overflow = 'hidden';
innerBodyStyle.overflowX = 'auto'; //兼容expand场景、子表格含有固定列的场景
} else {
// bodyStyle.marginBottom = `-${scrollbarWidth}px`;
bodyStyle.marginBottom = '-' + scrollbarWidth + 'px';
}
} else {
// 没有数据时，表头滚动条隐藏问题
@ -250917,7 +250916,7 @@
}
});
if (data.length == count + disabledCount) {
if (data.length == count + disabledCount && count > 0) {
return "all";
}
return count == 0 ? false : "indeter";

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "bee-table",
"version": "2.0.22",
"version": "2.0.23",
"description": "Table ui component for react",
"keywords": [
"react",

6
src/Table.js
View File

@ -232,7 +232,7 @@ class Table extends Component {
}
// 是否传入 scroll中的y属性，如果传入判断是否是整数，如果是则进行比较 。bodyTable 的clientHeight进行判断
this.isShowScrollY();
// this.isShowScrollY();
}
componentWillUnmount() {
@ -874,7 +874,7 @@ class Table extends Component {
if(this.domWidthDiff <= 0){
headStyle.marginBottom = `${scrollbarWidth}px`;
// bodyStyle.marginBottom = `-${scrollbarWidth}px`;
bodyStyle.marginBottom = `-${scrollbarWidth}px`;
}else{
innerBodyStyle.overflowX = 'auto';
}
@ -891,7 +891,7 @@ class Table extends Component {
headStyle.overflow = 'hidden';
innerBodyStyle.overflowX = 'auto'; //兼容expand场景、子表格含有固定列的场景
}else{
// bodyStyle.marginBottom = `-${scrollbarWidth}px`;
bodyStyle.marginBottom = `-${scrollbarWidth}px`;
}
}else{

2
src/Table.scss
View File

@ -212,7 +212,7 @@ $icon-color:#505F79;
&-fixed-header &-body-inner {
height: 100%;
// overflow: scroll;
overflow: scroll;
}

2
src/lib/multiSelect.js
View File

@ -75,7 +75,7 @@ export default function multiSelect(Table, Checkbox) {
}
})
if(data.length == count + disabledCount){
if(data.length == count + disabledCount && count>0){
return "all";
}
return count == 0?false:"indeter";