shineout 1.10.4 → 1.10.7

package/dist/shineout.js

@@ -28593,6 +28593,7 @@ function (_PureComponent) {
   }, {
     key: "handleClose",
     value: function handleClose(e) {
+      e.stopPropagation();
       var _this$props5 = this.props,
           maskCloseAble = _this$props5.maskCloseAble,
           onClose = _this$props5.onClose;
@@ -28629,7 +28630,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 149,
+              lineNumber: 150,
               columnNumber: 14
             }
           }, title)
@@ -28645,7 +28646,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 156,
+            lineNumber: 157,
             columnNumber: 7
           }
         }, icon &&
@@ -28655,7 +28656,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 157,
+            lineNumber: 158,
             columnNumber: 18
           }
         }, icon), title)
@@ -28684,7 +28685,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 171,
+            lineNumber: 172,
             columnNumber: 44
           }
         }, children)
@@ -28698,7 +28699,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 176,
+            lineNumber: 177,
             columnNumber: 7
           }
         }, icon &&
@@ -28708,7 +28709,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 177,
+            lineNumber: 178,
             columnNumber: 18
           }
         }, icon), this.renderTitle(),
@@ -28717,7 +28718,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 179,
+            lineNumber: 180,
             columnNumber: 9
           }
         }, children))
@@ -28752,7 +28753,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 204,
+            lineNumber: 205,
             columnNumber: 7
           }
         },
@@ -28764,7 +28765,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 205,
+            lineNumber: 206,
             columnNumber: 9
           }
         },
@@ -28778,7 +28779,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 206,
+            lineNumber: 207,
             columnNumber: 11
           }
         }),
@@ -28793,7 +28794,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 214,
+            lineNumber: 215,
             columnNumber: 13
           }
         }, showClose &&
@@ -28804,7 +28805,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 223,
+            lineNumber: 224,
             columnNumber: 17
           }
         }, _icons__WEBPACK_IMPORTED_MODULE_10__["default"].Close), this.renderTitle(true), this.renderContent(), footer &&
@@ -28815,7 +28816,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 230,
+            lineNumber: 231,
             columnNumber: 17
           }
         }, footer)))))
@@ -37855,7 +37856,12 @@ function (_PureComponent) {
       //   this.closeByResult = true
       //   this.optionsHold = false
       // }
-      if (el.getAttribute('data-id') === id) return true;
+      if (el.getAttribute('data-id') === id) return true; // in label
+
+      if (el.tagName === 'LABEL' && el.htmlFor && el.contains(this.element) && el.contains(document.getElementById(el.htmlFor))) {
+        return true;
+      }
+
       if (!el.parentElement) return false;
       return this.isDescendent(el.parentElement, id);
     }
@@ -38248,7 +38254,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 405,
+            lineNumber: 414,
             columnNumber: 46
           }
         }, header)
@@ -38289,7 +38295,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 439,
+            lineNumber: 448,
             columnNumber: 7
           }
         }))
@@ -38339,7 +38345,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 486,
+            lineNumber: 495,
             columnNumber: 7
           }
         }))
@@ -38392,7 +38398,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 549,
+            lineNumber: 558,
             columnNumber: 7
           }
         },
@@ -38429,7 +38435,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 560,
+            lineNumber: 569,
             columnNumber: 9
           }
         }), this.renderOptions())
@@ -44902,7 +44908,12 @@ function (_PureComponent) {
         var target = e.target;
         this.resizingTh = Object(_utils_dom_element__WEBPACK_IMPORTED_MODULE_13__["getParent"])(target, 'th');
         this.resizingTable = Object(_utils_dom_element__WEBPACK_IMPORTED_MODULE_13__["getParent"])(target, 'table');
-        this.resizingIndex = [].indexOf.call(Object(_utils_dom_element__WEBPACK_IMPORTED_MODULE_13__["getParent"])(target, 'tr').children, this.resizingTh);
+        var thList = Object(_utils_dom_element__WEBPACK_IMPORTED_MODULE_13__["getParent"])(target, 'tr').children;
+        var indexInTr = [].indexOf.call(thList, this.resizingTh);
+        this.resizingIndex = [].slice.call(thList, 0, indexInTr).reduce(function (total, th) {
+          var count = Number(th.getAttribute('colspan')) || 1;
+          return total + count;
+        }, 0);
         this.resizingCol = this.resizingTable.querySelectorAll('col')[this.resizingIndex];
         this.resizingTable.classList.add(Object(_styles__WEBPACK_IMPORTED_MODULE_10__["tableClass"])('resizing'));
         this.resizingTh.classList.add(Object(_styles__WEBPACK_IMPORTED_MODULE_10__["tableClass"])('resizing-item'));
@@ -44958,7 +44969,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 125,
+          lineNumber: 130,
           columnNumber: 9
         }
       }) : null;
@@ -44973,7 +44984,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 129,
+            lineNumber: 134,
             columnNumber: 9
           }
         },
@@ -44983,7 +44994,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 137,
+            lineNumber: 142,
             columnNumber: 11
           }
         },
@@ -44992,7 +45003,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 138,
+            lineNumber: 143,
             columnNumber: 13
           }
         }, typeof col.title === 'function' ? col.title(data) : col.title), col.sorter &&
@@ -45004,7 +45015,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 140,
+            lineNumber: 145,
             columnNumber: 15
           }
         })), resize)));
@@ -45021,7 +45032,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 152,
+            lineNumber: 157,
             columnNumber: 9
           }
         }, showSelectAll &&
@@ -45034,7 +45045,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 154,
+            lineNumber: 159,
             columnNumber: 13
           }
         })));
@@ -45054,7 +45065,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 168,
+          lineNumber: 173,
           columnNumber: 7
         }
       }, col.name, resize));
@@ -45118,7 +45129,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 217,
+            lineNumber: 222,
             columnNumber: 7
           }
         }, trs.map(function (tr, i) {
@@ -45129,7 +45140,7 @@ function (_PureComponent) {
               __self: _this5,
               __source: {
                 fileName: _jsxFileName,
-                lineNumber: 219,
+                lineNumber: 224,
                 columnNumber: 11
               }
             }, tr)
@@ -54080,7 +54091,7 @@ function (_PureComponent) {
     value: function handleRemove(data) {
       var datum = this.props.datum;
       datum.set(datum.getKey(data), 0);
-      this.handleChange();
+      this.handleChange(data, datum.getKey(data));
     }
   }, {
     key: "handleChange",
@@ -60046,7 +60057,7 @@ function _createSuper2(Derived) {
             popover = _this$props.popover,
             popoverProps = _this$props.popoverProps;
         var classList = ['input-tip'];
-        var position = popover || Object(_config__WEBPACK_IMPORTED_MODULE_17__["isRTL"])() ? 'bottom-right' : 'bottom-left';
+        var position = popover || (Object(_config__WEBPACK_IMPORTED_MODULE_17__["isRTL"])() ? 'bottom-right' : 'bottom-left');
         var styles;
 
         if (popoverProps.style && popoverProps.style.width) {
@@ -61288,7 +61299,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   utils: _utils__WEBPACK_IMPORTED_MODULE_0__,
-  version: '1.10.4'
+  version: '1.10.7'
 });