publish 1.6.8

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="1.6.8"></a>
+## [1.6.8](https://github.com/tinper-bee/bee-table/compare/v1.6.7...v1.6.8) (2018-12-05)
+
+
+
+<a name="1.6.7"></a>
+## [1.6.7](https://github.com/tinper-bee/bee-table/compare/v1.6.6...v1.6.7) (2018-12-04)
+
+
+
 <a name="1.6.6"></a>
 ## [1.6.6](https://github.com/tinper-bee/bee-table/compare/v1.6.5...v1.6.6) (2018-12-04)
 

build/FilterDropDown.js

@@ -59,15 +59,25 @@ var FilterDropDown = function (_Component) {
         _this.onSelectDropdown = function (item) {
             var _this$props = _this.props,
                 onSelectDropdown = _this$props.onSelectDropdown,
-                dataText = _this$props.dataText;
+                dataText = _this$props.dataText,
+                filterDropdownType = _this$props.filterDropdownType;
 
             if (onSelectDropdown) {
                 if (dataText != "") {
-                    _this.setState({
+                    if (filterDropdownType == 'string') {
-                        selectValue: [item.key]
+                        _this.setState({
-                    }, function () {
+                            selectValue: [item.key]
-                        onSelectDropdown(item);
+                        }, function () {
-                    });
+                            onSelectDropdown(item);
+                        });
+                    }
+                    if (filterDropdownType == 'number') {
+                        _this.setState({
+                            selectNumberValue: [item.key]
+                        }, function () {
+                            onSelectDropdown(item);
+                        });
+                    }
                 }
             }
         };
@@ -77,7 +87,8 @@ var FilterDropDown = function (_Component) {
 
             if (onClickClear) {
                 _this.setState({
-                    selectValue: []
+                    selectValue: [],
+                    selectNumberValue: []
                 }, function () {
                     onClickClear();
                 });
@@ -85,7 +96,9 @@ var FilterDropDown = function (_Component) {
         };
 
         _this.getMenu = function () {
-            var selectValue = _this.state.selectValue;
+            var _this$state = _this.state,
+                selectValue = _this$state.selectValue,
+                selectNumberValue = _this$state.selectNumberValue;
             var filterDropdownType = _this.props.filterDropdownType;
 
             var locale = (0, _tool.getComponentLocale)(_this.props, _this.context, 'Table', function () {
@@ -135,7 +148,7 @@ var FilterDropDown = function (_Component) {
                         _beeMenus2["default"],
                         {
                             onSelect: _this.onSelectDropdown,
-                            selectedKeys: selectValue
+                            selectedKeys: selectNumberValue
                         },
                         _react2["default"].createElement(
                             Item,
@@ -174,7 +187,8 @@ var FilterDropDown = function (_Component) {
         };
 
         _this.state = {
-            selectValue: [] //选择的条件的值
+            selectValue: ['LIKE'],
+            selectNumberValue: ['EQ']
         };
         return _this;
     }

build/FilterType.js

@@ -392,7 +392,11 @@ var FilterType = function (_Component) {
     FilterType.prototype.render = function render() {
         var rendertype = this.props.rendertype;
 
-        return this.renderControl(rendertype);
+        return _react2["default"].createElement(
+            'div',
+            { 'data-filter-type': 'filterContext' },
+            this.renderControl(rendertype)
+        );
     };
 
     return FilterType;

build/TableHeader.js

@@ -139,9 +139,11 @@ var TableHeader = function (_Component) {
     };
 
     _this.dragAbleMouseDown = function (e) {
-      _utils.Event.stopPropagation(e);
+      // Event.stopPropagation(e); 
       var event = _utils.Event.getEvent(e);
       if (!_this.props.draggable) return;
+      var th = _this.getThDome(event.target);
+      if (!th) return;
       event.target.setAttribute('draggable', true); //添加交换列效果
       _this.drag.option = 'dragAble';
       _this.currentDome = event.target;
@@ -166,7 +168,7 @@ var TableHeader = function (_Component) {
       if (_this.drag.option === 'border') {
         return;
       }
-      console.log(_this.drag.option + ' -------onDragStart----------', event.target);
+      // console.log(this.drag.option+' -------onDragStart----------',event.target);
       var th = _this.getThDome(event.target);
       if (!th) return;
       var currentIndex = parseInt(th.getAttribute("data-line-index"));
@@ -190,7 +192,7 @@ var TableHeader = function (_Component) {
       _this.currentDome.setAttribute('draggable', false); //添加交换列效果
       var data = _this.getCurrentEventData(e);
       if (!data) return;
-      console.log(_this.drag.option + ' -------onDrop----------', event.target);
+      // console.log(this.drag.option+' -------onDrop----------',event.target);
       if (!_this.currentObj || _this.currentObj.key == data.key) return;
       if (!_this.props.onDrop) return;
       _this.props.onDrop(event, { dragSource: _this.currentObj, dragTarg: data });
@@ -519,6 +521,7 @@ var TableHeader = function (_Component) {
 
   TableHeader.prototype.getThDome = function getThDome(element) {
     var _tagName = element.tagName.toLowerCase();
+    if (element.getAttribute('data-filter-type') === 'filterContext') return null;
     if (_tagName === 'i') return null;
     if (_tagName != 'th') {
       return this.getThDome(element.parentElement);

dist/demo.css

@@ -2421,9 +2421,6 @@ i.uf {
 /*
  * 选择时删除文本阴影，及设置默认选中颜色
  */
-::-moz-selection {
-  background: rgb(187,222,251);
-  text-shadow: none; }
 ::selection {
   background: rgb(187,222,251);
   text-shadow: none; }
@@ -5287,7 +5284,7 @@ a, .mdl-accordion, .mdl-button, .mdl-card, .mdl-checkbox, .mdl-dropdown-menu,
   .u-panel .u-panel-body {
     padding: 15px 15px;
     position: relative; }
-    .u-panel .u-panel-body .uf {
+    .u-panel .u-panel-body .u-panel-copy {
       position: absolute;
       right: 25px;
       top: 30px;
@@ -5297,7 +5294,7 @@ a, .mdl-accordion, .mdl-button, .mdl-card, .mdl-checkbox, .mdl-dropdown-menu,
       margin: 8px;
       border-radius: 4px;
       cursor: pointer; }
-      .u-panel .u-panel-body .uf:hover {
+      .u-panel .u-panel-body .u-panel-copy:hover {
         color: #a8a7a7; }
 
 .u-panel-default {
@@ -6673,7 +6670,8 @@ input.u-button[type="submit"] {
   border-radius: 0 500px 500px 0; }
 
 .u-pagination {
-  font-size: 14px; }
+  font-size: 14px;
+  position: relative; }
   .u-pagination-list {
     float: left;
     margin: 5px; }
@@ -6811,6 +6809,15 @@ input.u-button[type="submit"] {
     margin: 5px; }
     .u-pagination-total span {
       padding: 0 5px; }
+  .u-pagination.u-pagination-disabled .u-pagination-disabled-mask {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 46px;
+    background: rgba(255, 255, 255, 0.6);
+    z-index: 2;
+    cursor: not-allowed; }
 
 .pagination-state {
   float: left;
@@ -6917,15 +6924,29 @@ input.u-button[type="submit"] {
   margin: 0 5px;
   height: 18px;
   line-height: 18px;
-  font-size: 14px; }
+  font-size: 14px;
+  white-space: nowrap;
+  cursor: pointer;
+  outline: none;
+  position: relative;
+  line-height: 1;
+  vertical-align: middle; }
   .u-checkbox.disabled .u-checkbox-label {
     cursor: not-allowed;
     opacity: 0.5; }
   .u-checkbox input[type='checkbox'] {
-    display: none;
+    position: absolute;
-    cursor: pointer; }
+    z-index: 3;
+    cursor: pointer;
+    opacity: 0;
+    box-sizing: border-box;
+    padding: 0;
+    width: 100%;
+    height: 100%; }
   .u-checkbox input[disabled] {
     cursor: not-allowed; }
+  .u-checkbox input[type='checkbox']:focus + .u-checkbox-label:before {
+    border-color: #1e88e5; }
   .u-checkbox.is-checked .u-checkbox-label:before {
     box-shadow: inset 0 0 0 10px rgb(30,136,229);
     border-color: rgb(30,136,229); }
@@ -6977,22 +6998,37 @@ input.u-button[type="submit"] {
   box-shadow: inset 0 0 0 10px rgb(76,175,80);
   border-color: rgb(76,175,80); }
 
+.u-checkbox.u-checkbox-success input[type='checkbox']:focus + .u-checkbox-label:before {
+  border-color: rgb(76,175,80); }
+
 .u-checkbox.u-checkbox-warning.is-checked .u-checkbox-label:before {
   box-shadow: inset 0 0 0 10px rgb(255,152,0);
   border-color: rgb(255,152,0); }
 
+.u-checkbox.u-checkbox-warning input[type='checkbox']:focus + .u-checkbox-label:before {
+  border-color: rgb(255,152,0); }
+
 .u-checkbox.u-checkbox-danger.is-checked .u-checkbox-label:before {
   box-shadow: inset 0 0 0 10px rgb(244,67,54);
   border-color: rgb(244,67,54); }
 
+.u-checkbox.u-checkbox-danger input[type='checkbox']:focus + .u-checkbox-label:before {
+  border-color: rgb(244,67,54); }
+
 .u-checkbox.u-checkbox-dark.is-checked .u-checkbox-label:before {
   box-shadow: inset 0 0 0 10px rgb(97,97,97);
   border-color: rgb(97,97,97); }
 
+.u-checkbox.u-checkbox-dark input[type='checkbox']:focus + .u-checkbox-label:before {
+  border-color: rgb(97,97,97); }
+
 .u-checkbox.u-checkbox-info.is-checked .u-checkbox-label:before {
   box-shadow: inset 0 0 0 10px rgb(0,188,212);
   border-color: rgb(0,188,212); }
 
+.u-checkbox.u-checkbox-info input[type='checkbox']:focus + .u-checkbox-label:before {
+  border-color: rgb(0,188,212); }
+
 /* FormGroup */
 /*  Navlayout  */
 /* keyframes 定义 */
@@ -7530,7 +7566,8 @@ ul {
     zoom: 1;
     position: absolute;
     right: 4px;
-    padding: 0 0 0 8px; }
+    padding: 0 0 0 8px;
+    top: -3px; }
   .u-select-selection--multiple .u-select-selection-choice-remove:before {
     display: block;
     font-family: "uf"; }

package.json

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