publish 1.2.6

README.md

@@ -187,17 +187,7 @@ import multiSelect from "bee-table/build/lib/multiSelect.js"
 | 参数     | 说明         | 类型       | 默认值  |
 | ------ | ---------- | -------- | ---- |
 | draggable | 当前表格可拖拽 | boolean | false |
-
-
-### 拖拽变更宽度
-
-目前支持此功能只支持普通表格【注：不支持tree结构的表头、不支持和表头拖拽交互列一起使用】[示例](https://github.com/tinper-bee/bee-table/tree/master/demo/demolist/Demo23.js)
-
-| 参数     | 说明         | 类型       | 默认值  |
-| ------ | ---------- | -------- | ---- |
-| dragborder | 当前表格可拖拽改变宽度 | boolean | false |
-
-
+ 
 
 
 ## rendertype

build/lib/dragColumn.js

@@ -78,8 +78,9 @@ function dragColumn(Table) {
         onDragOver: this.onDragOver,
         onDrop: this.onDrop,
         onDragEnter: this.onDragEnter,
-        draggable: draggable,
-        dragborder: dragborder,
+        draggable: draggable
+        // dragborder={dragborder}
+        , dragborder: false,
         dragborderKey: key
       }));
     };

build/lib/filterColumn.js

@@ -33,7 +33,6 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 /**
  * 参数: 过滤表头
  * @param {*} Table
- * @param {*} Checkbox
  * @param {*} Popover
  * @param {*} Icon
  */
@@ -69,7 +68,7 @@ function filterColumn(Table, Popover) {
 
     FilterColumn.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
       this.setState({
-        showPopover: false
+        showModal: false
       });
     };
 
@@ -133,24 +132,13 @@ function filterColumn(Table, Popover) {
   }, _initialiseProps = function _initialiseProps() {
     var _this2 = this;
 
-    this.getShowModal = function (event) {
-      var showModal = _this2.state.showModal;
-
-      if (showModal) {
-        _this2.setState({
-          showModal: false
-        });
-      }
-    };
-
     this.checkedColumItemClick = function (da) {
       da.checked = da.checked ? false : true;
       da.disable = da.checked ? true : false;
       _this2.setState(_extends({}, _this2.state));
     };
 
-    this.openCloumList = function (ev) {
-      var oEvent = ev || event;
+    this.openCloumList = function () {
       _this2.setState({
         showModal: true
       });

demo/TableDemo.scss

@@ -22,6 +22,10 @@
 }
 
 .demo25{
-  width: 500px;
+  width: 700px;
   height: 100%;
+
+  .u-table-filter-column-filter-icon{
+    right: 15px;
+  }
 }

demo/demolist/Demo25.js

@@ -192,16 +192,30 @@ const dataList = [
       confirmState_name:"aaaa",
       closeState_name:"vnnnnn",
       d:"操作",
-      key: "2"
+      key: "1"
   }, 
+  { 
+    index: 2, 
+    orderCode:"222", 
+    supplierName: "22xxx",
+    type_name: "1223",
+    purchasing:'内行2', 
+    purchasingGroup:"3223",
+    voucherDate:"222kk",
+    approvalState_name:"22vvvv",
+    confirmState_name:"2aaaa",
+    closeState_name:"2vnnnnn",
+    d:"2操作",
+    key: "2"
+}, 
 ]
 
-// const FilterColumnTable = filterColumn(Table, Popover);
-// const MultiSelectTable = multiSelect(Table, Checkbox);
+// const DragColumnTable = filterColumn(Table, Popover);
+// const DragColumnTable = multiSelect(Table, Checkbox);
 // let ComplexTable = multiSelect(Table, Checkbox);
 
 // const DragColumnTable = multiSelect(Table, Checkbox);
-const DragColumnTable = dragColumn(filterColumn(multiSelect(Table, Checkbox), Popover)); 
+const DragColumnTable = filterColumn(multiSelect(Table, Checkbox), Popover); 
 // const DragColumnTable = dragColumn(filterColumn(Table, Popover));
 
 const defaultProps25 = {
@@ -234,9 +248,9 @@ class Demo25 extends Component {
     data={dataList} 
     getSelectedDataFunc={this.getSelectedDataFunc}
     bordered
-    dragborder={true}
-    scroll={{x:this.getCloumnsScroll(columns)}}
+    // dragborder={true} 
     multiSelect={{type: "checkbox"}}
+    scroll={{x:this.getCloumnsScroll(columns), y: 150}}
     /></div>
   }
 }

dist/demo.css

@@ -9692,7 +9692,9 @@ li.rc-time-picker-panel-select-option-disabled:hover {
   background: #e3f2fd; }
 
 .demo25 {
-  width: 500px;
+  width: 700px;
   height: 100%; }
+  .demo25 .u-table-filter-column-filter-icon {
+    right: 15px; }
 
 /*# sourceMappingURL=demo.css.map */

package.json

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

src/lib/dragColumn.js

@@ -106,7 +106,8 @@ export default function dragColumn(Table) {
               onDrop={this.onDrop}
               onDragEnter={this.onDragEnter}
               draggable={draggable}
-              dragborder={dragborder}
+              // dragborder={dragborder}
+              dragborder={false}
               dragborderKey={key}
           />)
     }

src/lib/filterColumn.js

@@ -4,7 +4,6 @@ import Icon from "bee-icon";
 /**
  * 参数: 过滤表头
  * @param {*} Table
- * @param {*} Checkbox
  * @param {*} Popover
  * @param {*} Icon
  */
@@ -37,7 +36,7 @@ export default function filterColumn(Table,Popover) {
         showModal:false
       })
     }
-    
+
     checkedColumItemClick = (da)=>{
       da.checked = da.checked?false:true;
       da.disable  = da.checked?true:false;