publish 1.6.11

CHANGELOG.md

@@ -1,3 +1,8 @@
+<a name="1.6.11"></a>
+## [1.6.11](https://github.com/tinper-bee/bee-table/compare/v1.6.9...v1.6.11) (2018-12-06)
+
+
+
 <a name="1.6.9"></a>
 ## [1.6.9](https://github.com/tinper-bee/bee-table/compare/v1.6.8...v1.6.9) (2018-12-05)
 
@@ -139,7 +144,7 @@
 
 
 <a name="1.5.1"></a>
-## [1.5.1](https://github.com/tinper-bee/bee-table/compare/v1.5.0...v1.5.1) (2018-11-19)
+## [1.5.1](https://github.com/tinper-bee/bee-table/compare/v1.5.0...v1.5.1) (2018-11-18)
 
 
 

build/FilterDropDown.js

@@ -63,21 +63,19 @@ var FilterDropDown = function (_Component) {
                 filterDropdownType = _this$props.filterDropdownType;
 
             if (onSelectDropdown) {
-                if (dataText != "") {
+                if (filterDropdownType == 'string') {
-                    if (filterDropdownType == 'string') {
+                    _this.setState({
-                        _this.setState({
+                        selectValue: [item.key]
-                            selectValue: [item.key]
+                    }, function () {
-                        }, function () {
+                        onSelectDropdown(item);
-                            onSelectDropdown(item);
+                    });
-                        });
+                }
-                    }
+                if (filterDropdownType == 'number') {
-                    if (filterDropdownType == 'number') {
+                    _this.setState({
-                        _this.setState({
+                        selectNumberValue: [item.key]
-                            selectNumberValue: [item.key]
+                    }, function () {
-                        }, function () {
+                        onSelectDropdown(item);
-                            onSelectDropdown(item);
+                    });
-                        });
-                    }
                 }
             }
         };
@@ -87,8 +85,8 @@ var FilterDropDown = function (_Component) {
 
             if (onClickClear) {
                 _this.setState({
-                    selectValue: [],
+                    // selectValue: [],
-                    selectNumberValue: []
+                    // selectNumberValue: []
                 }, function () {
                     onClickClear();
                 });

build/Table.js

@@ -914,10 +914,15 @@ var Table = function (_Component) {
         )
       );
     }
-
+    var leftFixedWidth = this.columnManager.getLeftColumnsWidth();
+    var rightFixedWidth = this.columnManager.getRightColumnsWidth();
+    var parStyle = {};
+    if (!fixed) {
+      parStyle = { 'marginLeft': leftFixedWidth, 'marginRight': rightFixedWidth };
+    }
     return _react2["default"].createElement(
-      'span',
+      'div',
-      null,
+      { style: parStyle },
       headTable,
       BodyTable
     );
@@ -1124,7 +1129,7 @@ var Table = function (_Component) {
         { className: clsPrefix + '-content' },
         _react2["default"].createElement(
           'div',
-          { className: isTableScroll ? clsPrefix + '-scroll' : '', style: { 'marginLeft': leftFixedWidth } },
+          { className: isTableScroll ? clsPrefix + '-scroll' : '' },
           this.getTable({ columns: this.columnManager.groupedColumns() }),
           this.getEmptyText(),
           this.getFooter()

build/TableHeader.js

@@ -583,7 +583,8 @@ var TableHeader = function (_Component) {
             delete da.drgHover;
             var fixedStyle = "";
             var canDotDrag = "";
-            if (!fixed && (da.fixed || rows[0][columIndex].fixed)) {
+            //主表格下、固定列或者是过滤行中含有固定列时添加该属性
+            if (!fixed && (da.fixed || filterable && index == rows.length - 1 && rows[0][columIndex].fixed)) {
               fixedStyle = clsPrefix + "-row-fixed-columns-in-body";
             }
 
@@ -607,8 +608,8 @@ var TableHeader = function (_Component) {
             if (!da.fixed) {
               return _react2["default"].createElement(
                 "th",
-                { key: 'table-header-th-' + da.dataindex, className: thClassName, "data-th-fixed": da.fixed,
+                _extends({}, da, { key: 'table-header-th-' + da.dataindex, className: thClassName, "data-th-fixed": da.fixed,
-                  "data-line-key": da.key, "data-line-index": columIndex, "data-th-width": da.width },
+                  "data-line-key": da.key, "data-line-index": columIndex, "data-th-width": da.width }),
                 da.children,
                 dragborder ? _react2["default"].createElement(
                   "div",

package.json

@@ -1,6 +1,6 @@
 {
  "name": "bee-table",
- "version": "1.6.10-beta.1",
+ "version": "1.6.11",
  "description": "Table ui component for react",
  "keywords": [
   "react",