From bdc14cc1c5a446e9d838830e79189053a58e8439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cjonyshi=E2=80=9D?= Date: Thu, 28 Feb 2019 15:18:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bee-transfer=20=E9=97=B4=E8=B7=9D=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scss/minxin-variables.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scss/minxin-variables.scss b/scss/minxin-variables.scss index 833a090..b0151d1 100644 --- a/scss/minxin-variables.scss +++ b/scss/minxin-variables.scss @@ -1493,4 +1493,7 @@ $tree-node-bg-color: $hover-bg-color-base !default; // bee-table $table-head-background-color: unquote("rgb(#{$table-header-background-color})") !default; -$table-head-text-color: unquote("rgb(#{$table-header-text-color})") !default; \ No newline at end of file +$table-head-text-color: unquote("rgb(#{$table-header-text-color})") !default; + +// bee-transfer +$transfer-border-gap-color:#d9d9d9; From 1aa5932d5d6d62796dfdd8edf993eaeb3e7bcec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cjonyshi=E2=80=9D?= Date: Thu, 28 Feb 2019 16:55:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=89=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=89=B9=E5=88=B6=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scss/minxin-variables.scss | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scss/minxin-variables.scss b/scss/minxin-variables.scss index b0151d1..aa7683d 100644 --- a/scss/minxin-variables.scss +++ b/scss/minxin-variables.scss @@ -206,7 +206,7 @@ $color-light: $gray-darker !default; //redius -$default-border-radius: 4px; +$default-border-radius: $border-radius; // hover时的背景色，包括select、dropdown、table、datepicker、tree、menu等组件 $hover-bg-color-base: unquote("rgb(#{$item-hover-bg-color-base})") !default; @@ -567,7 +567,7 @@ $timeline-danger-color: $color-danger; $alert-padding:10px; $alert-font-size:12px; -$alert-border-radius: 4px; +$alert-border-radius: $border-radius; $alert-text-padding-left: 15px; $alert-text-padding-right: 15px; $alert-close-font-size: 21px; @@ -700,6 +700,8 @@ $loading-duration: 360 * $loading-arc-time / ( strip-units($loading-arc-start-rot + (360deg - $loading-arc-size))); // datetimepicker +$timepicker-border-gap-color:#ccc; +$timepicker-font-size:14px; $date-bg-color: unquote("rgb(#{$primary-color})") !default; @@ -1236,7 +1238,6 @@ $message-font-size: 12px; $message-right: 30px; $message-width: 300px; $message-text-margin-right: 15px; -$default-border-radius: 4px; $message-padding: 0; $message-content-padding: 15px; $message-background: $gray-darkest; @@ -1497,3 +1498,6 @@ $table-head-text-color: unquote("rgb(#{$table-header-text-color})") !default; // bee-transfer $transfer-border-gap-color:#d9d9d9; + +// bee-transfer +$cascader-border-gap-color:#ccc; \ No newline at end of file From 29e760738fdd4c2f982ec39eaea6dfd1cd65cdc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cjonyshi=E2=80=9D?= Date: Thu, 28 Feb 2019 17:11:33 +0800 Subject: [PATCH 3/3] v 2.0.13 --- lib/Align.js | 6 +++++- lib/Event.js | 4 ++++ lib/addEventListener.js | 4 ++++ lib/all.js | 5 ++++- lib/componentOrElement.js | 6 +++++- lib/contains.js | 4 ++++ lib/createChainedFunction.js | 4 ++++ lib/cssAnimation.js | 6 +++++- lib/deprecated.js | 6 ++++-- lib/elementType.js | 6 +++++- lib/getContainerRenderMixin.js | 6 +++++- lib/isRequiredForA11y.js | 4 ++++ lib/keyCode.js | 4 ++++ lib/splitComponent.js | 4 ++++ lib/toArray.js | 5 ++++- lib/utils/createChainableTypeChecker.js | 4 ++++ 16 files changed, 69 insertions(+), 9 deletions(-) diff --git a/lib/Align.js b/lib/Align.js index 9d18c2b..984c506 100644 --- a/lib/Align.js +++ b/lib/Align.js @@ -28,7 +28,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } /** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ + //import isWindow from './isWindow'; diff --git a/lib/Event.js b/lib/Event.js index 06c007f..6c016d5 100644 --- a/lib/Event.js +++ b/lib/Event.js @@ -1,6 +1,10 @@ 'use strict'; exports.__esModule = true; +/** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ var EVENT_NAME_MAP = { transitionend: { transition: 'transitionend', diff --git a/lib/addEventListener.js b/lib/addEventListener.js index 706f795..f7575bd 100644 --- a/lib/addEventListener.js +++ b/lib/addEventListener.js @@ -13,6 +13,10 @@ var _reactDom2 = _interopRequireDefault(_reactDom); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +/** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ function addEventListenerWrap(target, eventType, cb) { /* eslint camelcase: 2 */ var callback = _reactDom2.default.unstable_batchedUpdates ? function run(e) { diff --git a/lib/all.js b/lib/all.js index 3c31fe7..fdd10b7 100644 --- a/lib/all.js +++ b/lib/all.js @@ -36,4 +36,7 @@ function all() { } return (0, _createChainableTypeChecker2.default)(allPropTypes); -} \ No newline at end of file +} /** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ \ No newline at end of file diff --git a/lib/componentOrElement.js b/lib/componentOrElement.js index f03b5c1..bee6c4d 100644 --- a/lib/componentOrElement.js +++ b/lib/componentOrElement.js @@ -2,7 +2,11 @@ exports.__esModule = true; -var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; +var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; /** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ + var _react = require('react'); diff --git a/lib/contains.js b/lib/contains.js index 73d59b6..3bb3790 100644 --- a/lib/contains.js +++ b/lib/contains.js @@ -2,6 +2,10 @@ exports.__esModule = true; exports.default = contains; +/** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ function contains(root, n) { var node = n; while (node) { diff --git a/lib/createChainedFunction.js b/lib/createChainedFunction.js index f71343f..e3992a6 100644 --- a/lib/createChainedFunction.js +++ b/lib/createChainedFunction.js @@ -1,6 +1,10 @@ 'use strict'; exports.__esModule = true; +/** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ function createChainedFunction() { for (var _len = arguments.length, funcs = Array(_len), _key = 0; _key < _len; _key++) { funcs[_key] = arguments[_key]; diff --git a/lib/cssAnimation.js b/lib/cssAnimation.js index ea54ec6..634e2ad 100644 --- a/lib/cssAnimation.js +++ b/lib/cssAnimation.js @@ -2,7 +2,11 @@ exports.__esModule = true; -var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; +var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; /** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ + var _Event = require('./Event'); diff --git a/lib/deprecated.js b/lib/deprecated.js index e2cbabc..879527c 100644 --- a/lib/deprecated.js +++ b/lib/deprecated.js @@ -9,8 +9,10 @@ var _warning2 = _interopRequireDefault(_warning); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var warned = {}; - +var warned = {}; /** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ function deprecated(validator, reason) { return function validate(props, propName, componentName, location, propFullName) { var componentNameSafe = componentName || '<>'; diff --git a/lib/elementType.js b/lib/elementType.js index e44cdeb..0d24440 100644 --- a/lib/elementType.js +++ b/lib/elementType.js @@ -2,7 +2,11 @@ exports.__esModule = true; -var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; +var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; /** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ + var _react = require('react'); diff --git a/lib/getContainerRenderMixin.js b/lib/getContainerRenderMixin.js index 91d8feb..1ce3139 100644 --- a/lib/getContainerRenderMixin.js +++ b/lib/getContainerRenderMixin.js @@ -2,7 +2,11 @@ exports.__esModule = true; -var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; +var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; /** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ + exports.default = getContainerRenderMixin; diff --git a/lib/isRequiredForA11y.js b/lib/isRequiredForA11y.js index 999082d..8a01251 100644 --- a/lib/isRequiredForA11y.js +++ b/lib/isRequiredForA11y.js @@ -2,6 +2,10 @@ exports.__esModule = true; exports.default = isRequiredForA11y; +/** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ function isRequiredForA11y(validator) { return function validate(props, propName, componentName, location, propFullName) { var componentNameSafe = componentName || '<>'; diff --git a/lib/keyCode.js b/lib/keyCode.js index d3f44f8..b76559d 100644 --- a/lib/keyCode.js +++ b/lib/keyCode.js @@ -1,3 +1,7 @@ +/** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ 'use strict'; /** diff --git a/lib/splitComponent.js b/lib/splitComponent.js index 4fbb0ea..0e4a9f7 100644 --- a/lib/splitComponent.js +++ b/lib/splitComponent.js @@ -2,6 +2,10 @@ exports.__esModule = true; exports.default = splitComponentProps; +/** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ function _objectEntries(obj) { var entries = []; var keys = Object.keys(obj); diff --git a/lib/toArray.js b/lib/toArray.js index 80dadfd..61a8ccc 100644 --- a/lib/toArray.js +++ b/lib/toArray.js @@ -15,4 +15,7 @@ function toArray(children) { ret.push(c); }); return ret; -} \ No newline at end of file +} /** + * This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ \ No newline at end of file diff --git a/lib/utils/createChainableTypeChecker.js b/lib/utils/createChainableTypeChecker.js index 626811a..e6947d7 100644 --- a/lib/utils/createChainableTypeChecker.js +++ b/lib/utils/createChainableTypeChecker.js @@ -13,6 +13,10 @@ exports.default = createChainableTypeChecker; // Mostly taken from ReactPropTypes. +/* This source code is quoted from rc-util. + * homepage: https://github.com/react-component/util + */ + function createChainableTypeChecker(validate) { function checkType(isRequired, props, propName, componentName, location, propFullName) { var componentNameSafe = componentName || '<>';