shineout 1.8.0 → 1.8.4

package/lib/Table/SeperateTable.js

@@ -344,13 +344,17 @@ function (_PureComponent) {
 
 
       if (treeColumnsName && changedByExpand) {
+        // Blank space may appear after clicking the top or bottom collapse button
         if (fullHeight - this.lastScrollTop < (1 - this.lastScrollArgs[1]) * scrollHeight) {
-          this.tbody.style.marginTop = scrollHeight + "px";
-          (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", "-" + fullHeight + "px");
-          this.lastScrollTop = fullHeight;
+          if (fullHeight <= scrollHeight) {
+            index = 0;
+          } else {
+            this.tbody.style.marginTop = scrollHeight + "px";
+            (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", "-" + fullHeight + "px");
+            this.lastScrollTop = fullHeight;
+            return;
+          }
         }
-
-        return;
       }
 
       if (index === 0) {
@@ -631,7 +635,8 @@ function (_PureComponent) {
         rowHeight = _this$props7.rowHeight,
         columnResizable = _this$props7.columnResizable,
         innerScrollAttr = _this$props7.innerScrollAttr,
-        others = (0, _objectWithoutPropertiesLoose2.default)(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr"]);
+        bordered = _this$props7.bordered,
+        others = (0, _objectWithoutPropertiesLoose2.default)(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr", "bordered"]);
     var _this$state3 = this.state,
         colgroup = _this$state3.colgroup,
         scrollTop = _this$state3.scrollTop,
@@ -677,7 +682,7 @@ function (_PureComponent) {
         height: prevHeight
       }
     }), _react.default.createElement("table", {
-      className: (0, _styles.tableClass)(!colgroup && minWidthSup && 'init'),
+      className: (0, _styles.tableClass)(!colgroup && minWidthSup && 'init', bordered && 'table-bordered'),
       style: {
         width: width
       },
@@ -720,7 +725,8 @@ function (_PureComponent) {
       style: {
         width: width
       },
-      ref: this.bindThead
+      ref: this.bindThead,
+      className: (0, _styles.tableClass)('table-bordered')
     }, _react.default.createElement(_Colgroup.default, {
       colgroup: colgroup,
       columns: columns,

package/lib/Table/SimpleTable.js

@@ -166,7 +166,8 @@ function (_PureComponent) {
         data = _this$props2.data,
         onResize = _this$props2.onResize,
         columnResizable = _this$props2.columnResizable,
-        sticky = _this$props2.sticky;
+        sticky = _this$props2.sticky,
+        bordered = _this$props2.bordered;
     var _this$state = this.state,
         colgroup = _this$state.colgroup,
         scrollAble = _this$state.scrollAble;
@@ -174,7 +175,8 @@ function (_PureComponent) {
     var inner = _react.default.createElement("table", {
       style: {
         width: width
-      }
+      },
+      className: (0, _styles.tableClass)(bordered && 'table-bordered')
     }, _react.default.createElement(_Colgroup.default, {
       colgroup: colgroup,
       columns: columns,
@@ -214,7 +216,8 @@ function (_PureComponent) {
         width = _this$props3.width,
         fixed = _this$props3.fixed,
         columnResizable = _this$props3.columnResizable,
-        others = (0, _objectWithoutPropertiesLoose2.default)(_this$props3, ["columns", "width", "fixed", "columnResizable"]);
+        bordered = _this$props3.bordered,
+        others = (0, _objectWithoutPropertiesLoose2.default)(_this$props3, ["columns", "width", "fixed", "columnResizable", "bordered"]);
     var _this$state2 = this.state,
         colgroup = _this$state2.colgroup,
         resize = _this$state2.resize;
@@ -230,7 +233,7 @@ function (_PureComponent) {
       style: {
         width: width
       },
-      className: (0, _styles.tableClass)(!colgroup && minWidthSup && 'init')
+      className: (0, _styles.tableClass)(!colgroup && minWidthSup && 'init', bordered && 'table-bordered')
     }, _react.default.createElement(_Colgroup.default, {
       colgroup: colgroup,
       columns: columns,
@@ -250,11 +253,13 @@ function (_PureComponent) {
         columns = _this$props4.columns,
         width = _this$props4.width,
         children = _this$props4.children,
-        hideHeader = _this$props4.hideHeader;
+        hideHeader = _this$props4.hideHeader,
+        bordered = _this$props4.bordered;
     if (!columns || columns.length === 0) return _react.default.createElement("table", {
       style: {
         width: width
-      }
+      },
+      className: (0, _styles.tableClass)(bordered && 'table-bordered')
     }, children);
     return [hideHeader ? null : this.renderHeader(), this.renderBody(), children];
   };
@@ -273,7 +278,8 @@ SimpleTable.propTypes = {
   dataChangeResize: _propTypes.default.bool,
   columnResizable: _propTypes.default.bool,
   sticky: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.bool]),
-  hideHeader: _propTypes.default.bool
+  hideHeader: _propTypes.default.bool,
+  bordered: _propTypes.default.bool
 };
 SimpleTable.defaultProps = {
   data: undefined,

package/lib/Table/Table.js

@@ -163,7 +163,9 @@ function (_Component) {
       className: className,
       ref: this.bindTable,
       style: newStyle
-    }, events), _react.default.createElement(RenderTable, props), loading && _react.default.createElement("div", {
+    }, events), _react.default.createElement(RenderTable, (0, _extends2.default)({}, props, {
+      bordered: bordered
+    })), loading && _react.default.createElement("div", {
       className: (0, _styles.tableClass)('loading')
     }, typeof loading === 'boolean' ? _react.default.createElement(_Spin.default, {
       size: 40

package/lib/Table/resizable.js

@@ -79,7 +79,7 @@ var _default = function _default(Table) {
       var onColumnResize = this.props.onColumnResize;
       var changed = (0, _immer.default)(this.state, function (draft) {
         var column = draft.columns[index];
-        draft.delta += parseFloat(width - (column.width || 0));
+        draft.delta += parseFloat(width - (column.width || colgroup[index] || 0));
         colgroup[index] = width;
         draft.columns.forEach(function (col, i) {
           var w = colgroup[i];

package/lib/Table/styles/table.less

@@ -283,7 +283,7 @@
       }
     }
 
-    table {
+    .@{table-prefix}-table-bordered {
       > thead,
       > tbody,
       > tfoot {

package/lib/Textarea/index.d.ts

@@ -2,24 +2,24 @@ import * as React from 'react'
 import { StandardProps, RegularAttributes, FormItemStandardProps } from '../@types/common'
 
 export interface TextareaProps<Value> extends
-StandardProps, 
+StandardProps,
 FormItemStandardProps<Value>
   {
 
   /**
    * show border bottom
-   * 
+   *
    * 仅仅展示下边框
-   * 
+   *
    * default: false
    */
   underline?: boolean;
 
   /**
    * Whether the height changes automatically with the content
-   * 
+   *
    * 高度是否随内容自动变化
-   * 
+   *
    * default: false
    */
   autosize?: boolean;
@@ -27,76 +27,87 @@ FormItemStandardProps<Value>
 
   /**
    * User input triggers onChange and to check interval, unit: ms.
-   * 
+   *
    * 用户输入触发 onChange 和校验间隔时间，单位 毫秒。
-   * 
+   *
    * default: 400
    */
   delay?: number;
 
   /**
    * Infomation
-   * 
+   *
    * 提示信息
-   * 
+   *
    * default: -
    */
   info?: ((value: string) => string) | number;
 
   /**
    * The callback function for enter key
-   * 
+   *
    * 回车键回调函数
-   * 
-   * default: 
+   *
+   * default:
    */
   onEnterPress?: (value: Value) => void;
 
   /**
    * The position where the message pops up
-   * 
+   *
    * 信息弹出位置
-   * 
-   * default: 
+   *
+   * default:
    */
   popover?: RegularAttributes.Position;
 
   /**
    * The minimum row height. Same as native textarea rows property.
-   * 
+   *
    * 最小行高，同原生 textarea rows 属性
-   * 
+   *
    * default: 4
    */
   rows?: number;
 
   /**
    * the maxHeight of the textarea, scroll bars appear after more than
-   * 
+   *
    * 输入框的最大高度, 超过之后会出现滚动条
-   * 
+   *
    * default: -
    */
   maxHeight?: number | string;
 
   /**
    * When trim is true, blank characters are automatically deleted when lose focus。
-   * 
+   *
    * trim 为 true 时，失去焦点时会自动删除空白字符。
-   * 
+   *
    * default: false
    */
   trim?: boolean;
 
   /**
    * support resize
-   * 
+   *
    * 是否可以伸缩高度
-   * 
+   *
    * default: false
    */
   resize?: boolean;
 
+  /**
+   * disabled
+   *
+   * 禁用
+   *
+   * default: false
+   */
+  disabled?: boolean;
+
+
+
 }
 
 declare class Textarea<Value = any> extends React.Component<TextareaProps<Value>, {}> {}

package/lib/Tooltip/styles/tooltip.less

@@ -2,6 +2,8 @@
 @import '../../styles/themes/@{so-theme}.less';
 @tooltip-prefix: ~'@{so-prefix}-tooltip';
 
+@arrowOffset: (-@tooltip-arrow-width + 1px);
+
 .@{tooltip-prefix} {
   @keyframe-opacity: ~'@{tooltip-prefix}-kf-opacity';
   @keyframe-top: ~'@{tooltip-prefix}-kf-top';
@@ -98,7 +100,7 @@
     transform: translate(-50%, -100%);
 
     .@{tooltip-prefix}-arrow {
-      top: 100%;
+      bottom: @arrowOffset;
       left: 50%;
       border-top: @tooltip-arrow-width solid @tooltip-bg;
       border-right: @tooltip-arrow-width solid transparent;
@@ -117,7 +119,7 @@
 
     .@{tooltip-prefix}-arrow {
       top: 50%;
-      right: 100%;
+      left: @arrowOffset;
       border-top: @tooltip-arrow-width solid transparent;
       border-right: @tooltip-arrow-width solid @tooltip-bg;
       border-bottom: @tooltip-arrow-width solid transparent;
@@ -135,7 +137,7 @@
 
     .@{tooltip-prefix}-arrow {
       top: 50%;
-      left: 100%;
+      right: @arrowOffset;
       border-top: @tooltip-arrow-width solid transparent;
       border-bottom: @tooltip-arrow-width solid transparent;
       border-left: @tooltip-arrow-width solid @tooltip-bg;
@@ -152,12 +154,12 @@
     transform: translateX(-50%);
 
     .@{tooltip-prefix}-arrow {
-      top: 0;
+      top: @arrowOffset;
       left: 50%;
       border-right: @tooltip-arrow-width solid transparent;
       border-bottom: @tooltip-arrow-width solid @tooltip-bg;
       border-left: @tooltip-arrow-width solid transparent;
-      transform: translate(-50%, -100%);
+      transform: translate(-50%, 0);
     }
   }
 

package/lib/index.d.ts

@@ -2,7 +2,7 @@
 import './styles/normalize.less'
 import * as utils from './utils'
 
-export default { utils, version: '1.8.0' }
+export default { utils, version: '1.8.4' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/lib/index.js

@@ -222,6 +222,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '1.8.0'
+  version: '1.8.4'
 };
 exports.default = _default;

package/lib/styles/themes/base.less

@@ -539,7 +539,7 @@
 @tooltip-opacity:             .9;
 
 // Tooltip arrow width
-@tooltip-arrow-width:         5px;
+@tooltip-arrow-width:         6px;
 // Tooltip arrow color
 @tooltip-arrow-color:         @tooltip-bg;
 

package/lib/styles/themes/shineout.less

@@ -1,7 +1,7 @@
 @import './bootstrap.less';
 @import './cssvar.less';
 
-@font-family-sans-serif: -apple-system, system-ui, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
+@font-family-sans-serif:  -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Helvetica, PingFang SC, Hiragino KaKu Gothic Pro, Microsoft YaHei, Arial, sans-serif;
 
 @colors-primary-value: #197AFA;
 @colors-primary: var(--primary-color, @colors-primary-value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shineout",
-  "version": "1.8.0",
+  "version": "1.8.4",
   "description": "Shein 前端组件库",
   "main": "./lib/index.js",
   "module": "./es/index.js",