shineout 2.0.4 → 2.0.5-beta.2

package/css/DatePicker/Container.js

@@ -372,8 +372,8 @@ function (_PureComponent) {
     }
 
     if (focus === true) {
-      this.firstRender = true; // this.props.onFocus()
-
+      // this.firstRender = true
+      // this.props.onFocus()
       this.bindClickAway();
     } else {
       this.props.onValueBlur();
@@ -621,7 +621,8 @@ function (_PureComponent) {
   _proto.renderPicker = function renderPicker() {
     var _this9 = this;
 
-    if (!this.firstRender) return undefined;
+    if (!this.firstRender && !this.focus) return undefined;
+    this.firstRender = true;
     var _this$props8 = this.props,
         range = _this$props8.range,
         type = _this$props8.type,

package/css/Table/SimpleTable.d.ts

@@ -16,6 +16,7 @@ declare class SimpleTable<DataItem, Value> extends PureComponent<SimpleTableProp
     header: HTMLDivElement;
     footer: HTMLDivElement;
     lastColGroup: number[];
+    cyclicCounter: number;
     constructor(props: SimpleTableProps<DataItem, Value>);
     componentDidMount(): void;
     componentDidUpdate(prevProps: SimpleTableProps<DataItem, Value>): void;

package/css/Table/SimpleTable.js

@@ -58,6 +58,7 @@ function (_PureComponent) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), "header", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), "footer", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), "lastColGroup", void 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), "cyclicCounter", void 0);
     _this.state = {
       colgroup: undefined,
       overHeight: false,
@@ -70,7 +71,10 @@ function (_PureComponent) {
     _this.bindFooter = _this.bindElement.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), 'footer');
     _this.handleScroll = _this.handleScroll.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleColgroup = _this.handleColgroup.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
-    _this.resetColGroup = _this.resetColGroup.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+    _this.resetColGroup = _this.resetColGroup.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this))); // 循环计数器。某些情况[*]下滚动条的出现会导致死循环问题，这里做一个计数器，超过一定次数就不再重置，认定最大 10 次为死循环
+    // [*] 横向滚动条的出现可能导致竖向滚动条从有到无。此时需要重新计算表头的宽度，否则会出现表头与表格内容不对齐的问题。纵向滚动条消失后，可能导致横向滚动条宽度足够，纵向滚动条再次出现，又导致横向滚动条消失，如此循环。
+
+    _this.cyclicCounter = 0;
     return _this;
   }
 
@@ -125,7 +129,17 @@ function (_PureComponent) {
   };
 
   _proto.scrollCheck = function scrollCheck() {
+    var _this2 = this;
+
     if (!this.body) return;
+
+    if (this.cyclicCounter > 10) {
+      this.setState({
+        overHeight: true
+      });
+      return;
+    }
+
     var overHeight = this.body.scrollHeight > this.body.clientHeight;
     var overWidth = this.body.scrollWidth > this.body.clientWidth;
     if (overWidth !== this.state.overWidth) this.setState({
@@ -134,6 +148,10 @@ function (_PureComponent) {
     if (overHeight !== this.state.overHeight) this.setState({
       overHeight: overHeight
     });
+    this.cyclicCounter += 1;
+    setTimeout(function () {
+      _this2.cyclicCounter = 0;
+    });
   };
 
   _proto.handleSortChange = function handleSortChange(finalOrder, sorter, index, cancelOrder, // 是否是自动触发

package/css/index.js

@@ -220,6 +220,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '2.0.4'
+  version: '2.0.5-beta.2'
 };
 exports.default = _default;