shineout 1.8.3 → 1.8.4

package/es/Button/Button.js

@@ -63,7 +63,7 @@ function (_PureComponent) {
       disabled: disabled
     }), this.props.className);
 
-    if (href) {
+    if (href && !disabled) {
       return React.createElement("a", _extends({
         href: href
       }, others, {

package/es/Menu/Item.js

@@ -35,7 +35,9 @@ function (_PureComponent) {
 
     var key = _this.getKey(props);
 
-    var _props$bindItem = props.bindItem(_this.id, _this.update.bind(_assertThisInitialized(_assertThisInitialized(_this))), _this.updateOpen.bind(_assertThisInitialized(_assertThisInitialized(_this))), _this.updateInPath.bind(_assertThisInitialized(_assertThisInitialized(_this)))),
+    var noop = function noop() {};
+
+    var _props$bindItem = props.bindItem(_this.id, noop, noop, noop),
         activeUpdate = _props$bindItem[0],
         openUpdate = _props$bindItem[1],
         inPathUpdate = _props$bindItem[2];
@@ -57,6 +59,12 @@ function (_PureComponent) {
 
   var _proto = Item.prototype;
 
+  _proto.componentDidMount = function componentDidMount() {
+    _PureComponent.prototype.componentDidMount.call(this);
+
+    this.props.bindItem(this.id, this.update.bind(this), this.updateOpen.bind(this), this.updateInPath.bind(this));
+  };
+
   _proto.componentWillUnmount = function componentWillUnmount() {
     _PureComponent.prototype.componentWillUnmount.call(this);
 

package/es/Table/SeperateTable.js

@@ -605,7 +605,8 @@ function (_PureComponent) {
         rowHeight = _this$props7.rowHeight,
         columnResizable = _this$props7.columnResizable,
         innerScrollAttr = _this$props7.innerScrollAttr,
-        others = _objectWithoutPropertiesLoose(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr"]);
+        bordered = _this$props7.bordered,
+        others = _objectWithoutPropertiesLoose(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr", "bordered"]);
 
     var _this$state3 = this.state,
         colgroup = _this$state3.colgroup,
@@ -652,7 +653,7 @@ function (_PureComponent) {
         height: prevHeight
       }
     }), React.createElement("table", {
-      className: tableClass(!colgroup && minWidthSup && 'init'),
+      className: tableClass(!colgroup && minWidthSup && 'init', bordered && 'table-bordered'),
       style: {
         width: width
       },
@@ -694,7 +695,8 @@ function (_PureComponent) {
       style: {
         width: width
       },
-      ref: this.bindThead
+      ref: this.bindThead,
+      className: tableClass('table-bordered')
     }, React.createElement(Colgroup, {
       colgroup: colgroup,
       columns: columns,

package/es/Table/SimpleTable.js

@@ -145,14 +145,16 @@ 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;
     var inner = React.createElement("table", {
       style: {
         width: width
-      }
+      },
+      className: tableClass(bordered && 'table-bordered')
     }, React.createElement(Colgroup, {
       colgroup: colgroup,
       columns: columns,
@@ -190,7 +192,8 @@ function (_PureComponent) {
         width = _this$props3.width,
         fixed = _this$props3.fixed,
         columnResizable = _this$props3.columnResizable,
-        others = _objectWithoutPropertiesLoose(_this$props3, ["columns", "width", "fixed", "columnResizable"]);
+        bordered = _this$props3.bordered,
+        others = _objectWithoutPropertiesLoose(_this$props3, ["columns", "width", "fixed", "columnResizable", "bordered"]);
 
     var _this$state2 = this.state,
         colgroup = _this$state2.colgroup,
@@ -207,7 +210,7 @@ function (_PureComponent) {
       style: {
         width: width
       },
-      className: tableClass(!colgroup && minWidthSup && 'init')
+      className: tableClass(!colgroup && minWidthSup && 'init', bordered && 'table-bordered')
     }, React.createElement(Colgroup, {
       colgroup: colgroup,
       columns: columns,
@@ -227,11 +230,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.createElement("table", {
       style: {
         width: width
-      }
+      },
+      className: tableClass(bordered && 'table-bordered')
     }, children);
     return [hideHeader ? null : this.renderHeader(), this.renderBody(), children];
   };
@@ -250,7 +255,8 @@ SimpleTable.propTypes = {
   dataChangeResize: PropTypes.bool,
   columnResizable: PropTypes.bool,
   sticky: PropTypes.oneOfType([PropTypes.object, PropTypes.bool]),
-  hideHeader: PropTypes.bool
+  hideHeader: PropTypes.bool,
+  bordered: PropTypes.bool
 };
 SimpleTable.defaultProps = {
   data: undefined,

package/es/Table/Table.js

@@ -135,7 +135,9 @@ function (_Component) {
       className: className,
       ref: this.bindTable,
       style: newStyle
-    }, events), React.createElement(RenderTable, props), loading && React.createElement("div", {
+    }, events), React.createElement(RenderTable, _extends({}, props, {
+      bordered: bordered
+    })), loading && React.createElement("div", {
       className: tableClass('loading')
     }, typeof loading === 'boolean' ? React.createElement(Spin, {
       size: 40

package/es/Table/styles/table.less

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

package/es/index.d.ts

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

package/es/index.js

@@ -3,7 +3,7 @@ import './styles/normalize.less';
 import * as utils from './utils';
 export default {
   utils: utils,
-  version: '1.8.3'
+  version: '1.8.4'
 };
 export { utils };
 export { setLocale } from './locale';

package/es/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/lib/Button/Button.js

@@ -83,7 +83,7 @@ function (_PureComponent) {
       disabled: disabled
     }), this.props.className);
 
-    if (href) {
+    if (href && !disabled) {
       return _react.default.createElement("a", (0, _extends2.default)({
         href: href
       }, others, {

package/lib/Menu/Item.js

@@ -57,7 +57,9 @@ function (_PureComponent) {
 
     var key = _this.getKey(props);
 
-    var _props$bindItem = props.bindItem(_this.id, _this.update.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this))), _this.updateOpen.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this))), _this.updateInPath.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)))),
+    var noop = function noop() {};
+
+    var _props$bindItem = props.bindItem(_this.id, noop, noop, noop),
         activeUpdate = _props$bindItem[0],
         openUpdate = _props$bindItem[1],
         inPathUpdate = _props$bindItem[2];
@@ -79,6 +81,12 @@ function (_PureComponent) {
 
   var _proto = Item.prototype;
 
+  _proto.componentDidMount = function componentDidMount() {
+    _PureComponent.prototype.componentDidMount.call(this);
+
+    this.props.bindItem(this.id, this.update.bind(this), this.updateOpen.bind(this), this.updateInPath.bind(this));
+  };
+
   _proto.componentWillUnmount = function componentWillUnmount() {
     _PureComponent.prototype.componentWillUnmount.call(this);
 

package/lib/Table/SeperateTable.js

@@ -635,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,
@@ -681,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
       },
@@ -724,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/styles/table.less

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

package/lib/index.d.ts

@@ -2,7 +2,7 @@
 import './styles/normalize.less'
 import * as utils from './utils'
 
-export default { utils, version: '1.8.3' }
+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.3'
+  version: '1.8.4'
 };
 exports.default = _default;

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.3",
+  "version": "1.8.4",
   "description": "Shein 前端组件库",
   "main": "./lib/index.js",
   "module": "./es/index.js",