shineout 1.8.1 → 1.8.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/css/AnimationList/AbsoluteList.js +1 -1
  2. package/css/Button/Button.js +1 -1
  3. package/css/Form/Field.js +11 -6
  4. package/css/Menu/Item.js +9 -1
  5. package/css/Modal/events.js +6 -3
  6. package/css/Scroll/Scroll.js +31 -11
  7. package/css/Select/Input.js +16 -3
  8. package/css/Table/SeperateTable.js +14 -8
  9. package/css/Table/SimpleTable.js +13 -7
  10. package/css/Table/Table.js +3 -1
  11. package/css/Table/resizable.js +1 -1
  12. package/css/Table/styles/table.css +8 -8
  13. package/css/Tooltip/styles/tooltip.css +31 -31
  14. package/css/index.d.ts +1 -1
  15. package/css/index.js +1 -1
  16. package/dist/shineout.js +138 -72
  17. package/dist/shineout.js.map +1 -1
  18. package/dist/shineout.min.js +1 -1
  19. package/dist/theme.antd.css +1 -1
  20. package/dist/theme.antd2.css +1 -1
  21. package/dist/theme.default.css +1 -1
  22. package/dist/theme.shineout.css +1 -1
  23. package/es/AnimationList/AbsoluteList.js +1 -1
  24. package/es/Button/Button.js +1 -1
  25. package/es/Form/Field.js +11 -6
  26. package/es/Menu/Item.js +9 -1
  27. package/es/Modal/events.js +6 -3
  28. package/es/Scroll/Scroll.js +31 -11
  29. package/es/Select/Input.js +16 -3
  30. package/es/Table/SeperateTable.js +14 -8
  31. package/es/Table/SimpleTable.js +13 -7
  32. package/es/Table/Table.js +3 -1
  33. package/es/Table/resizable.js +1 -1
  34. package/es/Table/styles/table.less +1 -1
  35. package/es/Tooltip/styles/tooltip.less +7 -5
  36. package/es/index.d.ts +1 -1
  37. package/es/index.js +1 -1
  38. package/es/styles/themes/base.less +1 -1
  39. package/es/styles/themes/shineout.less +1 -1
  40. package/lib/AnimationList/AbsoluteList.js +1 -1
  41. package/lib/Button/Button.js +1 -1
  42. package/lib/Form/Field.js +11 -6
  43. package/lib/Menu/Item.js +9 -1
  44. package/lib/Modal/events.js +6 -3
  45. package/lib/Scroll/Scroll.js +31 -11
  46. package/lib/Select/Input.js +16 -3
  47. package/lib/Table/SeperateTable.js +14 -8
  48. package/lib/Table/SimpleTable.js +13 -7
  49. package/lib/Table/Table.js +3 -1
  50. package/lib/Table/resizable.js +1 -1
  51. package/lib/Table/styles/table.less +1 -1
  52. package/lib/Tooltip/styles/tooltip.less +7 -5
  53. package/lib/index.d.ts +1 -1
  54. package/lib/index.js +1 -1
  55. package/lib/styles/themes/base.less +1 -1
  56. package/lib/styles/themes/shineout.less +1 -1
  57. package/package.json +1 -1
package/dist/shineout.js CHANGED
@@ -4538,8 +4538,8 @@ var dropdownPosition = ['bottom-left', 'bottom-right', 'top-left', 'top-right'];
4538
4538
  value: function componentDidUpdate(prevProps) {
4539
4539
  var _this2 = this;
4540
4540
 
4541
- if (Object(_utils_shallowEqual__WEBPACK_IMPORTED_MODULE_12__["default"])(prevProps.value, this.props.value)) return;
4542
4541
  if (!this.props.focus) this.ajustdoc = false;
4542
+ if (Object(_utils_shallowEqual__WEBPACK_IMPORTED_MODULE_12__["default"])(prevProps.value, this.props.value)) return;
4543
4543
  setTimeout(function () {
4544
4544
  _this2.forceUpdate();
4545
4545
  });
@@ -5654,7 +5654,7 @@ function (_PureComponent) {
5654
5654
  disabled: disabled
5655
5655
  }), this.props.className);
5656
5656
 
5657
- if (href) {
5657
+ if (href && !disabled) {
5658
5658
  return (
5659
5659
  /*#__PURE__*/
5660
5660
  react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("a", Object.assign({
@@ -19878,17 +19878,22 @@ function (_Component) {
19878
19878
  });
19879
19879
  }
19880
19880
 
19881
+ var cloneProps = {
19882
+ value: value,
19883
+ error: error,
19884
+ onChange: this.handleChange
19885
+ };
19886
+
19887
+ if (disabled !== undefined) {
19888
+ cloneProps.disabled = disabled;
19889
+ }
19890
+
19881
19891
  if (
19882
19892
  /*#__PURE__*/
19883
19893
  Object(react__WEBPACK_IMPORTED_MODULE_6__["isValidElement"])(children)) {
19884
19894
  return (
19885
19895
  /*#__PURE__*/
19886
- Object(react__WEBPACK_IMPORTED_MODULE_6__["cloneElement"])(children, {
19887
- value: value,
19888
- error: error,
19889
- onChange: this.handleChange,
19890
- disabled: disabled
19891
- })
19896
+ Object(react__WEBPACK_IMPORTED_MODULE_6__["cloneElement"])(children, cloneProps)
19892
19897
  );
19893
19898
  }
19894
19899
 
@@ -25890,7 +25895,9 @@ function (_PureComponent) {
25890
25895
 
25891
25896
  var key = _this.getKey(props);
25892
25897
 
25893
- var _props$bindItem = props.bindItem(_this.id, _this.update.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this)), _this.updateOpen.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this)), _this.updateInPath.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this))),
25898
+ var noop = function noop() {};
25899
+
25900
+ var _props$bindItem = props.bindItem(_this.id, noop, noop, noop),
25894
25901
  _props$bindItem2 = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_0__["default"])(_props$bindItem, 3),
25895
25902
  activeUpdate = _props$bindItem2[0],
25896
25903
  openUpdate = _props$bindItem2[1],
@@ -25912,6 +25919,13 @@ function (_PureComponent) {
25912
25919
  }
25913
25920
 
25914
25921
  Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_createClass__WEBPACK_IMPORTED_MODULE_2__["default"])(Item, [{
25922
+ key: "componentDidMount",
25923
+ value: function componentDidMount() {
25924
+ Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_get__WEBPACK_IMPORTED_MODULE_4__["default"])(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_getPrototypeOf__WEBPACK_IMPORTED_MODULE_7__["default"])(Item.prototype), "componentDidMount", this).call(this);
25925
+
25926
+ this.props.bindItem(this.id, this.update.bind(this), this.updateOpen.bind(this), this.updateInPath.bind(this));
25927
+ }
25928
+ }, {
25915
25929
  key: "componentWillUnmount",
25916
25930
  value: function componentWillUnmount() {
25917
25931
  Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_get__WEBPACK_IMPORTED_MODULE_4__["default"])(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_getPrototypeOf__WEBPACK_IMPORTED_MODULE_7__["default"])(Item.prototype), "componentWillUnmount", this).call(this);
@@ -26101,7 +26115,7 @@ function (_PureComponent) {
26101
26115
  __self: this,
26102
26116
  __source: {
26103
26117
  fileName: _jsxFileName,
26104
- lineNumber: 182,
26118
+ lineNumber: 184,
26105
26119
  columnNumber: 9
26106
26120
  }
26107
26121
  }),
@@ -26114,7 +26128,7 @@ function (_PureComponent) {
26114
26128
  __self: this,
26115
26129
  __source: {
26116
26130
  fileName: _jsxFileName,
26117
- lineNumber: 183,
26131
+ lineNumber: 185,
26118
26132
  columnNumber: 11
26119
26133
  }
26120
26134
  }), item)
@@ -26127,7 +26141,7 @@ function (_PureComponent) {
26127
26141
  __self: this,
26128
26142
  __source: {
26129
26143
  fileName: _jsxFileName,
26130
- lineNumber: 190,
26144
+ lineNumber: 192,
26131
26145
  columnNumber: 7
26132
26146
  }
26133
26147
  }), item,
@@ -26140,7 +26154,7 @@ function (_PureComponent) {
26140
26154
  __self: this,
26141
26155
  __source: {
26142
26156
  fileName: _jsxFileName,
26143
- lineNumber: 192,
26157
+ lineNumber: 194,
26144
26158
  columnNumber: 9
26145
26159
  }
26146
26160
  }))
@@ -26200,7 +26214,7 @@ function (_PureComponent) {
26200
26214
  __self: this,
26201
26215
  __source: {
26202
26216
  fileName: _jsxFileName,
26203
- lineNumber: 250,
26217
+ lineNumber: 252,
26204
26218
  columnNumber: 7
26205
26219
  }
26206
26220
  }), this.renderItem(hasChilds, style), hasChilds &&
@@ -26226,7 +26240,7 @@ function (_PureComponent) {
26226
26240
  __self: this,
26227
26241
  __source: {
26228
26242
  fileName: _jsxFileName,
26229
- lineNumber: 253,
26243
+ lineNumber: 255,
26230
26244
  columnNumber: 11
26231
26245
  }
26232
26246
  }))
@@ -28471,10 +28485,13 @@ function open(props, isPortal) {
28471
28485
  div.style.display = 'block';
28472
28486
  var parsed = parseInt(zIndex, 10);
28473
28487
  if (!Number.isNaN(parsed)) div.style.zIndex = parsed;
28474
- var scrollWidth = window.innerWidth - _utils_dom_document__WEBPACK_IMPORTED_MODULE_17__["docSize"].width;
28475
28488
  var doc = document.body.parentNode;
28476
- doc.style.overflow = 'hidden';
28477
- doc.style.paddingRight = "".concat(scrollWidth, "px");
28489
+
28490
+ if (!doc.style.paddingRight) {
28491
+ var scrollWidth = window.innerWidth - _utils_dom_document__WEBPACK_IMPORTED_MODULE_17__["docSize"].width;
28492
+ doc.style.overflow = 'hidden';
28493
+ doc.style.paddingRight = "".concat(scrollWidth, "px");
28494
+ }
28478
28495
 
28479
28496
  var handleClose = function handleClose() {
28480
28497
  if (onClose) onClose();
@@ -33410,6 +33427,7 @@ function (_PureComponent) {
33410
33427
  _this.handleTouchStart = _this.handleTouchStart.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this));
33411
33428
  _this.handleTouchMove = _this.handleTouchMove.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this));
33412
33429
  _this.setStartPoint = _this.setStartPoint.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this));
33430
+ _this.handleInnerScroll = _this.handleInnerScroll.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this));
33413
33431
  return _this;
33414
33432
  }
33415
33433
 
@@ -33428,6 +33446,7 @@ function (_PureComponent) {
33428
33446
  this.wheelElement.addEventListener('touchmove', this.handleTouchMove, {
33429
33447
  passive: false
33430
33448
  });
33449
+ this.inner.addEventListener('scroll', this.handleInnerScroll);
33431
33450
  }
33432
33451
  }, {
33433
33452
  key: "componentDidUpdate",
@@ -33446,6 +33465,7 @@ function (_PureComponent) {
33446
33465
  this.wheelElement.removeEventListener('wheel', this.handleWheel);
33447
33466
  this.wheelElement.removeEventListener('touchstart', this.handleTouchStart);
33448
33467
  this.wheelElement.removeEventListener('touchmove', this.handleTouchMove);
33468
+ this.inner.removeEventListener('scroll', this.handleInnerScroll);
33449
33469
  }
33450
33470
  }, {
33451
33471
  key: "getWheelRect",
@@ -33639,23 +33659,41 @@ function (_PureComponent) {
33639
33659
 
33640
33660
  this.setStartPoint(position);
33641
33661
  this.boundleScroll();
33642
- }
33662
+ } // inner scroll
33663
+
33643
33664
  }, {
33644
- key: "render",
33645
- value: function render() {
33665
+ key: "handleInnerScroll",
33666
+ value: function handleInnerScroll(e) {
33667
+ var target = e.target;
33646
33668
  var _this$props6 = this.props,
33647
- children = _this$props6.children,
33648
- scrollWidth = _this$props6.scrollWidth,
33649
- scrollHeight = _this$props6.scrollHeight,
33650
33669
  left = _this$props6.left,
33651
- top = _this$props6.top,
33652
- scrollX = _this$props6.scrollX,
33653
- scrollY = _this$props6.scrollY,
33654
- style = _this$props6.style;
33670
+ scrollWidth = _this$props6.scrollWidth;
33655
33671
 
33656
33672
  var _this$getWheelRect2 = this.getWheelRect(),
33657
- width = _this$getWheelRect2.width,
33658
- height = _this$getWheelRect2.height;
33673
+ width = _this$getWheelRect2.width;
33674
+
33675
+ if (target.scrollLeft) {
33676
+ this.handleScroll(left + target.scrollLeft / (scrollWidth - width), this.props.top, undefined, 0);
33677
+ target.scrollLeft = 0;
33678
+ target.scrollTop = 0;
33679
+ }
33680
+ }
33681
+ }, {
33682
+ key: "render",
33683
+ value: function render() {
33684
+ var _this$props7 = this.props,
33685
+ children = _this$props7.children,
33686
+ scrollWidth = _this$props7.scrollWidth,
33687
+ scrollHeight = _this$props7.scrollHeight,
33688
+ left = _this$props7.left,
33689
+ top = _this$props7.top,
33690
+ scrollX = _this$props7.scrollX,
33691
+ scrollY = _this$props7.scrollY,
33692
+ style = _this$props7.style;
33693
+
33694
+ var _this$getWheelRect3 = this.getWheelRect(),
33695
+ width = _this$getWheelRect3.width,
33696
+ height = _this$getWheelRect3.height;
33659
33697
 
33660
33698
  var rtl = Object(_config__WEBPACK_IMPORTED_MODULE_17__["isRTL"])();
33661
33699
  var className = classnames__WEBPACK_IMPORTED_MODULE_10___default()(Object(_styles__WEBPACK_IMPORTED_MODULE_15__["scrollClass"])('_', scrollX && 'show-x', scrollY && 'show-y', rtl && 'rtl'), this.props.className);
@@ -33671,7 +33709,7 @@ function (_PureComponent) {
33671
33709
  __self: this,
33672
33710
  __source: {
33673
33711
  fileName: _jsxFileName,
33674
- lineNumber: 234,
33712
+ lineNumber: 249,
33675
33713
  columnNumber: 7
33676
33714
  }
33677
33715
  },
@@ -33684,7 +33722,7 @@ function (_PureComponent) {
33684
33722
  __self: this,
33685
33723
  __source: {
33686
33724
  fileName: _jsxFileName,
33687
- lineNumber: 235,
33725
+ lineNumber: 250,
33688
33726
  columnNumber: 9
33689
33727
  }
33690
33728
  }),
@@ -33694,7 +33732,7 @@ function (_PureComponent) {
33694
33732
  __self: this,
33695
33733
  __source: {
33696
33734
  fileName: _jsxFileName,
33697
- lineNumber: 236,
33735
+ lineNumber: 251,
33698
33736
  columnNumber: 9
33699
33737
  }
33700
33738
  }),
@@ -33705,7 +33743,7 @@ function (_PureComponent) {
33705
33743
  __self: this,
33706
33744
  __source: {
33707
33745
  fileName: _jsxFileName,
33708
- lineNumber: 237,
33746
+ lineNumber: 252,
33709
33747
  columnNumber: 9
33710
33748
  }
33711
33749
  },
@@ -33719,7 +33757,7 @@ function (_PureComponent) {
33719
33757
  __self: this,
33720
33758
  __source: {
33721
33759
  fileName: _jsxFileName,
33722
- lineNumber: 238,
33760
+ lineNumber: 253,
33723
33761
  columnNumber: 11
33724
33762
  }
33725
33763
  }, children)), scrollY &&
@@ -33734,7 +33772,7 @@ function (_PureComponent) {
33734
33772
  __self: this,
33735
33773
  __source: {
33736
33774
  fileName: _jsxFileName,
33737
- lineNumber: 241,
33775
+ lineNumber: 256,
33738
33776
  columnNumber: 11
33739
33777
  }
33740
33778
  }), scrollX &&
@@ -33748,7 +33786,7 @@ function (_PureComponent) {
33748
33786
  __self: this,
33749
33787
  __source: {
33750
33788
  fileName: _jsxFileName,
33751
- lineNumber: 251,
33789
+ lineNumber: 266,
33752
33790
  columnNumber: 11
33753
33791
  }
33754
33792
  }))
@@ -34832,7 +34870,9 @@ function (_Component) {
34832
34870
  _this.handleBlur = _this.handleBlur.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this));
34833
34871
  _this.geHandleMax = _this.geHandleMax.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this));
34834
34872
  _this.handlePaste = _this.handlePaste.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this));
34835
- _this.focusInput = _this.focusInput.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this)); // for mutiple select
34873
+ _this.focusInput = _this.focusInput.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this));
34874
+ _this.handleCompositionStart = _this.handleCompositionStart.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this));
34875
+ _this.handleCompositionEnd = _this.handleCompositionEnd.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this)); // for mutiple select
34836
34876
 
34837
34877
  _this.props.setInputReset(_this.reset.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this))); // set focus func to Select
34838
34878
 
@@ -34889,7 +34929,7 @@ function (_Component) {
34889
34929
  value: function geHandleMax(e) {
34890
34930
  var maxLength = this.props.maxLength;
34891
34931
 
34892
- if (!maxLength) {
34932
+ if (!maxLength || this.composition) {
34893
34933
  return true;
34894
34934
  }
34895
34935
 
@@ -35015,6 +35055,17 @@ function (_Component) {
35015
35055
  if (text === txt) return;
35016
35056
  this.props.onInputBlur(text);
35017
35057
  }
35058
+ }, {
35059
+ key: "handleCompositionStart",
35060
+ value: function handleCompositionStart() {
35061
+ this.composition = true;
35062
+ }
35063
+ }, {
35064
+ key: "handleCompositionEnd",
35065
+ value: function handleCompositionEnd(e) {
35066
+ this.composition = false;
35067
+ this.handleInput(e);
35068
+ }
35018
35069
  }, {
35019
35070
  key: "render",
35020
35071
  value: function render() {
@@ -35031,7 +35082,9 @@ function (_Component) {
35031
35082
  contentEditable: focus || this.state.editable,
35032
35083
  onFocus: handleFocus,
35033
35084
  onBlur: this.handleBlur,
35034
- title: !focus && Object(_utils_is__WEBPACK_IMPORTED_MODULE_12__["isString"])(value) ? value : null
35085
+ title: !focus && Object(_utils_is__WEBPACK_IMPORTED_MODULE_12__["isString"])(value) ? value : null,
35086
+ onCompositionStart: this.handleCompositionStart,
35087
+ onCompositionEnd: this.handleCompositionEnd
35035
35088
  };
35036
35089
 
35037
35090
  if (
@@ -35056,7 +35109,7 @@ function (_Component) {
35056
35109
  __self: this,
35057
35110
  __source: {
35058
35111
  fileName: _jsxFileName,
35059
- lineNumber: 192,
35112
+ lineNumber: 205,
35060
35113
  columnNumber: 12
35061
35114
  }
35062
35115
  }))
@@ -41567,13 +41620,17 @@ function (_PureComponent) {
41567
41620
 
41568
41621
 
41569
41622
  if (treeColumnsName && changedByExpand) {
41623
+ // Blank space may appear after clicking the top or bottom collapse button
41570
41624
  if (fullHeight - this.lastScrollTop < (1 - this.lastScrollArgs[1]) * scrollHeight) {
41571
- this.tbody.style.marginTop = "".concat(scrollHeight, "px");
41572
- Object(_utils_dom_translate__WEBPACK_IMPORTED_MODULE_15__["setTranslate"])(this.tbody, "-".concat(offsetLeft, "px"), "-".concat(fullHeight, "px"));
41573
- this.lastScrollTop = fullHeight;
41625
+ if (fullHeight <= scrollHeight) {
41626
+ index = 0;
41627
+ } else {
41628
+ this.tbody.style.marginTop = "".concat(scrollHeight, "px");
41629
+ Object(_utils_dom_translate__WEBPACK_IMPORTED_MODULE_15__["setTranslate"])(this.tbody, "-".concat(offsetLeft, "px"), "-".concat(fullHeight, "px"));
41630
+ this.lastScrollTop = fullHeight;
41631
+ return;
41632
+ }
41574
41633
  }
41575
-
41576
- return;
41577
41634
  }
41578
41635
 
41579
41636
  if (index === 0) {
@@ -41857,7 +41914,8 @@ function (_PureComponent) {
41857
41914
  rowHeight = _this$props7.rowHeight,
41858
41915
  columnResizable = _this$props7.columnResizable,
41859
41916
  innerScrollAttr = _this$props7.innerScrollAttr,
41860
- others = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_1__["default"])(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr"]);
41917
+ bordered = _this$props7.bordered,
41918
+ others = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_1__["default"])(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr", "bordered"]);
41861
41919
 
41862
41920
  var _this$state3 = this.state,
41863
41921
  colgroup = _this$state3.colgroup,
@@ -41879,7 +41937,7 @@ function (_PureComponent) {
41879
41937
  __self: this,
41880
41938
  __source: {
41881
41939
  fileName: _jsxFileName,
41882
- lineNumber: 493,
41940
+ lineNumber: 499,
41883
41941
  columnNumber: 14
41884
41942
  }
41885
41943
  })
@@ -41908,7 +41966,7 @@ function (_PureComponent) {
41908
41966
  __self: this,
41909
41967
  __source: {
41910
41968
  fileName: _jsxFileName,
41911
- lineNumber: 506,
41969
+ lineNumber: 512,
41912
41970
  columnNumber: 7
41913
41971
  }
41914
41972
  },
@@ -41922,7 +41980,7 @@ function (_PureComponent) {
41922
41980
  __self: this,
41923
41981
  __source: {
41924
41982
  fileName: _jsxFileName,
41925
- lineNumber: 516,
41983
+ lineNumber: 522,
41926
41984
  columnNumber: 9
41927
41985
  }
41928
41986
  },
@@ -41934,13 +41992,13 @@ function (_PureComponent) {
41934
41992
  __self: this,
41935
41993
  __source: {
41936
41994
  fileName: _jsxFileName,
41937
- lineNumber: 517,
41995
+ lineNumber: 523,
41938
41996
  columnNumber: 11
41939
41997
  }
41940
41998
  }),
41941
41999
  /*#__PURE__*/
41942
42000
  react__WEBPACK_IMPORTED_MODULE_10___default.a.createElement("table", {
41943
- className: Object(_styles__WEBPACK_IMPORTED_MODULE_19__["tableClass"])(!colgroup && minWidthSup && 'init'),
42001
+ className: Object(_styles__WEBPACK_IMPORTED_MODULE_19__["tableClass"])(!colgroup && minWidthSup && 'init', bordered && 'table-bordered'),
41944
42002
  style: {
41945
42003
  width: width
41946
42004
  },
@@ -41948,7 +42006,7 @@ function (_PureComponent) {
41948
42006
  __self: this,
41949
42007
  __source: {
41950
42008
  fileName: _jsxFileName,
41951
- lineNumber: 518,
42009
+ lineNumber: 524,
41952
42010
  columnNumber: 11
41953
42011
  }
41954
42012
  },
@@ -41960,7 +42018,7 @@ function (_PureComponent) {
41960
42018
  __self: this,
41961
42019
  __source: {
41962
42020
  fileName: _jsxFileName,
41963
- lineNumber: 519,
42021
+ lineNumber: 529,
41964
42022
  columnNumber: 13
41965
42023
  }
41966
42024
  }),
@@ -41982,7 +42040,7 @@ function (_PureComponent) {
41982
42040
  __self: this,
41983
42041
  __source: {
41984
42042
  fileName: _jsxFileName,
41985
- lineNumber: 520,
42043
+ lineNumber: 530,
41986
42044
  columnNumber: 13
41987
42045
  }
41988
42046
  })))))
@@ -42007,7 +42065,7 @@ function (_PureComponent) {
42007
42065
  __self: this,
42008
42066
  __source: {
42009
42067
  fileName: _jsxFileName,
42010
- lineNumber: 547,
42068
+ lineNumber: 557,
42011
42069
  columnNumber: 7
42012
42070
  }
42013
42071
  },
@@ -42017,10 +42075,11 @@ function (_PureComponent) {
42017
42075
  width: width
42018
42076
  },
42019
42077
  ref: this.bindThead,
42078
+ className: Object(_styles__WEBPACK_IMPORTED_MODULE_19__["tableClass"])('table-bordered'),
42020
42079
  __self: this,
42021
42080
  __source: {
42022
42081
  fileName: _jsxFileName,
42023
- lineNumber: 548,
42082
+ lineNumber: 558,
42024
42083
  columnNumber: 9
42025
42084
  }
42026
42085
  },
@@ -42032,7 +42091,7 @@ function (_PureComponent) {
42032
42091
  __self: this,
42033
42092
  __source: {
42034
42093
  fileName: _jsxFileName,
42035
- lineNumber: 549,
42094
+ lineNumber: 559,
42036
42095
  columnNumber: 11
42037
42096
  }
42038
42097
  }),
@@ -42044,7 +42103,7 @@ function (_PureComponent) {
42044
42103
  __self: this,
42045
42104
  __source: {
42046
42105
  fileName: _jsxFileName,
42047
- lineNumber: 550,
42106
+ lineNumber: 560,
42048
42107
  columnNumber: 11
42049
42108
  }
42050
42109
  }))));
@@ -42060,7 +42119,7 @@ function (_PureComponent) {
42060
42119
  __self: this,
42061
42120
  __source: {
42062
42121
  fileName: _jsxFileName,
42063
- lineNumber: 558,
42122
+ lineNumber: 568,
42064
42123
  columnNumber: 9
42065
42124
  }
42066
42125
  }), header)
@@ -42102,7 +42161,7 @@ function (_PureComponent) {
42102
42161
  __self: this,
42103
42162
  __source: {
42104
42163
  fileName: _jsxFileName,
42105
- lineNumber: 588,
42164
+ lineNumber: 598,
42106
42165
  columnNumber: 7
42107
42166
  }
42108
42167
  }, this.renderBody(floatClass))];
@@ -42360,7 +42419,8 @@ function (_PureComponent) {
42360
42419
  data = _this$props2.data,
42361
42420
  onResize = _this$props2.onResize,
42362
42421
  columnResizable = _this$props2.columnResizable,
42363
- sticky = _this$props2.sticky;
42422
+ sticky = _this$props2.sticky,
42423
+ bordered = _this$props2.bordered;
42364
42424
  var _this$state = this.state,
42365
42425
  colgroup = _this$state.colgroup,
42366
42426
  scrollAble = _this$state.scrollAble;
@@ -42370,6 +42430,7 @@ function (_PureComponent) {
42370
42430
  style: {
42371
42431
  width: width
42372
42432
  },
42433
+ className: Object(_styles__WEBPACK_IMPORTED_MODULE_10__["tableClass"])(bordered && 'table-bordered'),
42373
42434
  __self: this,
42374
42435
  __source: {
42375
42436
  fileName: _jsxFileName,
@@ -42447,7 +42508,8 @@ function (_PureComponent) {
42447
42508
  width = _this$props3.width,
42448
42509
  fixed = _this$props3.fixed,
42449
42510
  columnResizable = _this$props3.columnResizable,
42450
- others = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_0__["default"])(_this$props3, ["columns", "width", "fixed", "columnResizable"]);
42511
+ bordered = _this$props3.bordered,
42512
+ others = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_0__["default"])(_this$props3, ["columns", "width", "fixed", "columnResizable", "bordered"]);
42451
42513
 
42452
42514
  var _this$state2 = this.state,
42453
42515
  colgroup = _this$state2.colgroup,
@@ -42474,7 +42536,7 @@ function (_PureComponent) {
42474
42536
  style: {
42475
42537
  width: width
42476
42538
  },
42477
- className: Object(_styles__WEBPACK_IMPORTED_MODULE_10__["tableClass"])(!colgroup && minWidthSup && 'init'),
42539
+ className: Object(_styles__WEBPACK_IMPORTED_MODULE_10__["tableClass"])(!colgroup && minWidthSup && 'init', bordered && 'table-bordered'),
42478
42540
  __self: this,
42479
42541
  __source: {
42480
42542
  fileName: _jsxFileName,
@@ -42490,7 +42552,7 @@ function (_PureComponent) {
42490
42552
  __self: this,
42491
42553
  __source: {
42492
42554
  fileName: _jsxFileName,
42493
- lineNumber: 139,
42555
+ lineNumber: 142,
42494
42556
  columnNumber: 11
42495
42557
  }
42496
42558
  }),
@@ -42506,7 +42568,7 @@ function (_PureComponent) {
42506
42568
  __self: this,
42507
42569
  __source: {
42508
42570
  fileName: _jsxFileName,
42509
- lineNumber: 140,
42571
+ lineNumber: 143,
42510
42572
  columnNumber: 11
42511
42573
  }
42512
42574
  }))))
@@ -42519,18 +42581,20 @@ function (_PureComponent) {
42519
42581
  columns = _this$props4.columns,
42520
42582
  width = _this$props4.width,
42521
42583
  children = _this$props4.children,
42522
- hideHeader = _this$props4.hideHeader;
42584
+ hideHeader = _this$props4.hideHeader,
42585
+ bordered = _this$props4.bordered;
42523
42586
  if (!columns || columns.length === 0) return (
42524
42587
  /*#__PURE__*/
42525
42588
  react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("table", {
42526
42589
  style: {
42527
42590
  width: width
42528
42591
  },
42592
+ className: Object(_styles__WEBPACK_IMPORTED_MODULE_10__["tableClass"])(bordered && 'table-bordered'),
42529
42593
  __self: this,
42530
42594
  __source: {
42531
42595
  fileName: _jsxFileName,
42532
- lineNumber: 156,
42533
- columnNumber: 50
42596
+ lineNumber: 161,
42597
+ columnNumber: 9
42534
42598
  }
42535
42599
  }, children)
42536
42600
  );
@@ -42552,7 +42616,8 @@ SimpleTable.propTypes = {
42552
42616
  dataChangeResize: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool,
42553
42617
  columnResizable: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool,
42554
42618
  sticky: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.oneOfType([prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.object, prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool]),
42555
- hideHeader: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool
42619
+ hideHeader: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool,
42620
+ bordered: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool
42556
42621
  };
42557
42622
  SimpleTable.defaultProps = {
42558
42623
  data: undefined,
@@ -42993,6 +43058,7 @@ function (_Component) {
42993
43058
  }),
42994
43059
  /*#__PURE__*/
42995
43060
  react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(RenderTable, Object.assign({}, props, {
43061
+ bordered: bordered,
42996
43062
  __self: this,
42997
43063
  __source: {
42998
43064
  fileName: _jsxFileName,
@@ -45835,7 +45901,7 @@ function _createSuper2(Derived) {
45835
45901
  var onColumnResize = this.props.onColumnResize;
45836
45902
  var changed = Object(immer__WEBPACK_IMPORTED_MODULE_8__["default"])(this.state, function (draft) {
45837
45903
  var column = draft.columns[index];
45838
- draft.delta += parseFloat(width - (column.width || 0));
45904
+ draft.delta += parseFloat(width - (column.width || colgroup[index] || 0));
45839
45905
  colgroup[index] = width;
45840
45906
  draft.columns.forEach(function (col, i) {
45841
45907
  var w = colgroup[i];
@@ -60251,7 +60317,7 @@ __webpack_require__.r(__webpack_exports__);
60251
60317
 
60252
60318
  /* harmony default export */ __webpack_exports__["default"] = ({
60253
60319
  utils: _utils__WEBPACK_IMPORTED_MODULE_0__,
60254
- version: '1.8.1'
60320
+ version: '1.8.5'
60255
60321
  });
60256
60322
 
60257
60323