fix: scrollY未定义
This commit is contained in:
parent
b08ee805bc
commit
00da5516d5
|
@ -6163,25 +6163,24 @@
|
||||||
var notificationStyle_copy = {};
|
var notificationStyle_copy = {};
|
||||||
var messageStyle_copy = {};
|
var messageStyle_copy = {};
|
||||||
var positionType = ['topRight', 'bottomRight', 'top', 'bottom', 'topLeft', 'bottomLeft', ''];
|
var positionType = ['topRight', 'bottomRight', 'top', 'bottom', 'topLeft', 'bottomLeft', ''];
|
||||||
|
var defaultStyle = {};
|
||||||
|
|
||||||
var positionObj = {
|
var positionObj = {
|
||||||
"top": {
|
"top": {
|
||||||
messageStyle: {
|
messageStyle: {},
|
||||||
transform: 'translateX( -50%)'
|
|
||||||
},
|
|
||||||
notificationStyle: {
|
notificationStyle: {
|
||||||
top: defaultTop,
|
top: defaultTop,
|
||||||
left: '50%'
|
left: '50%',
|
||||||
|
transform: 'translateX( -50%)'
|
||||||
},
|
},
|
||||||
transitionName: 'top'
|
transitionName: 'top'
|
||||||
},
|
},
|
||||||
"bottom": {
|
"bottom": {
|
||||||
messageStyle: {
|
messageStyle: {},
|
||||||
transform: 'translateX( -50%)'
|
|
||||||
},
|
|
||||||
notificationStyle: {
|
notificationStyle: {
|
||||||
bottom: defaultBottom,
|
bottom: defaultBottom,
|
||||||
left: '50%'
|
left: '50%',
|
||||||
|
transform: 'translateX( -50%)'
|
||||||
},
|
},
|
||||||
transitionName: 'bottom'
|
transitionName: 'bottom'
|
||||||
},
|
},
|
||||||
|
@ -6264,7 +6263,7 @@
|
||||||
var instanceObj = {
|
var instanceObj = {
|
||||||
clsPrefix: clsPrefix,
|
clsPrefix: clsPrefix,
|
||||||
transitionName: clsPrefix + '-' + positionObj[position].transitionName,
|
transitionName: clsPrefix + '-' + positionObj[position].transitionName,
|
||||||
style: style, // 覆盖原来的样式
|
style: _extends({}, style, defaultStyle), // 覆盖原来的样式
|
||||||
position: position
|
position: position
|
||||||
};
|
};
|
||||||
if (typeof keyboard === 'boolean') {
|
if (typeof keyboard === 'boolean') {
|
||||||
|
@ -6279,7 +6278,7 @@
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function notice(content, duration_arg, type, onClose, position, style, keyboard, onEscapeKeyUp, showIcon) {
|
function notice(content, duration_arg, type, onClose, position, style, keyboard, onEscapeKeyUp, showIcon, icon, props) {
|
||||||
if (positionType.findIndex(function (item) {
|
if (positionType.findIndex(function (item) {
|
||||||
return item === position;
|
return item === position;
|
||||||
}) < 0) {
|
}) < 0) {
|
||||||
|
@ -6305,8 +6304,9 @@
|
||||||
}[type];
|
}[type];
|
||||||
|
|
||||||
var positionStyle = JSON.stringify(messageStyle_copy) == "{}" ? positionObj[position].messageStyle : messageStyle_copy;
|
var positionStyle = JSON.stringify(messageStyle_copy) == "{}" ? positionObj[position].messageStyle : messageStyle_copy;
|
||||||
|
defaultStyle = _extends({}, positionStyle, style);
|
||||||
getMessageInstance(position, function (instance) {
|
getMessageInstance(position, function (instance) {
|
||||||
instance.notice({
|
instance.notice(_extends({}, props, {
|
||||||
key: key,
|
key: key,
|
||||||
duration: duration,
|
duration: duration,
|
||||||
color: type,
|
color: type,
|
||||||
|
@ -6317,7 +6317,7 @@
|
||||||
showIcon ? _react2["default"].createElement(
|
showIcon ? _react2["default"].createElement(
|
||||||
'div',
|
'div',
|
||||||
{ className: clsPrefix + '-notice-description-icon' },
|
{ className: clsPrefix + '-notice-description-icon' },
|
||||||
_react2["default"].createElement('i', { className: (0, _classnames2["default"])(iconType) })
|
icon ? _react2["default"].createElement('i', { className: (0, _classnames2["default"])('' + icon) }) : _react2["default"].createElement('i', { className: (0, _classnames2["default"])(iconType) })
|
||||||
) : null,
|
) : null,
|
||||||
_react2["default"].createElement(
|
_react2["default"].createElement(
|
||||||
'div',
|
'div',
|
||||||
|
@ -6326,7 +6326,7 @@
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
onClose: onClose
|
onClose: onClose
|
||||||
});
|
}));
|
||||||
}, keyboard, onEscapeKeyUp);
|
}, keyboard, onEscapeKeyUp);
|
||||||
return function () {
|
return function () {
|
||||||
var target = key++;
|
var target = key++;
|
||||||
|
@ -6350,8 +6350,9 @@
|
||||||
var onClose = obj.onClose || noop;
|
var onClose = obj.onClose || noop;
|
||||||
var position = obj.position || "top";
|
var position = obj.position || "top";
|
||||||
var style = obj.style || {};
|
var style = obj.style || {};
|
||||||
var showIcon = obj.showIcon || true;
|
var showIcon = obj.hasOwnProperty('showIcon') ? obj.showIcon : true;
|
||||||
return notice(content, duration, color, onClose, position, style, obj.keyboard, obj.onEscapeKeyUp, showIcon);
|
var icon = obj.hasOwnProperty('icon') ? obj.icon : false;
|
||||||
|
return notice(content, duration, color, onClose, position, style, obj.keyboard, obj.onEscapeKeyUp, showIcon, icon, obj);
|
||||||
},
|
},
|
||||||
config: function config(options) {
|
config: function config(options) {
|
||||||
if (options.top !== undefined) {
|
if (options.top !== undefined) {
|
||||||
|
@ -6378,6 +6379,16 @@
|
||||||
if (messageInstance) {
|
if (messageInstance) {
|
||||||
messageInstance.destroy();
|
messageInstance.destroy();
|
||||||
messageInstance = null;
|
messageInstance = null;
|
||||||
|
defaultDuration = 1.5;
|
||||||
|
newDuration = undefined;
|
||||||
|
defaultTop = 24;
|
||||||
|
defaultBottom = 48;
|
||||||
|
bottom = 90;
|
||||||
|
padding = 30;
|
||||||
|
width = 240;
|
||||||
|
notificationStyle_copy = null;
|
||||||
|
messageStyle_copy = null;
|
||||||
|
defaultStyle = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -7456,6 +7467,8 @@
|
||||||
value: true
|
value: 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 _react = __webpack_require__(1);
|
var _react = __webpack_require__(1);
|
||||||
|
|
||||||
var _react2 = _interopRequireDefault(_react);
|
var _react2 = _interopRequireDefault(_react);
|
||||||
|
@ -7478,6 +7491,8 @@
|
||||||
|
|
||||||
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
||||||
|
|
||||||
|
function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
|
||||||
|
|
||||||
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
||||||
|
|
||||||
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 _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; }
|
||||||
|
@ -7550,7 +7565,12 @@
|
||||||
style = _props.style,
|
style = _props.style,
|
||||||
children = _props.children,
|
children = _props.children,
|
||||||
color = _props.color,
|
color = _props.color,
|
||||||
title = _props.title;
|
title = _props.title,
|
||||||
|
content = _props.content,
|
||||||
|
onEnd = _props.onEnd,
|
||||||
|
onClose = _props.onClose,
|
||||||
|
duration = _props.duration,
|
||||||
|
others = _objectWithoutProperties(_props, ['closable', 'clsPrefix', 'className', 'style', 'children', 'color', 'title', 'content', 'onEnd', 'onClose', 'duration']);
|
||||||
|
|
||||||
var componentClass = clsPrefix + '-notice';
|
var componentClass = clsPrefix + '-notice';
|
||||||
var classes = (_classes = {}, _defineProperty(_classes, '' + componentClass, 1), _defineProperty(_classes, componentClass + '-closable', closable), _defineProperty(_classes, className, !!className), _classes);
|
var classes = (_classes = {}, _defineProperty(_classes, '' + componentClass, 1), _defineProperty(_classes, componentClass + '-closable', closable), _defineProperty(_classes, className, !!className), _classes);
|
||||||
|
@ -7559,7 +7579,7 @@
|
||||||
}
|
}
|
||||||
return _react2["default"].createElement(
|
return _react2["default"].createElement(
|
||||||
'div',
|
'div',
|
||||||
{ className: (0, _classnames2["default"])(classes), style: style, onClick: this.close },
|
_extends({ className: (0, _classnames2["default"])(classes), style: style, onClick: this.close }, others),
|
||||||
_react2["default"].createElement(
|
_react2["default"].createElement(
|
||||||
'div',
|
'div',
|
||||||
{ className: componentClass + '-content' },
|
{ className: componentClass + '-content' },
|
||||||
|
@ -7656,8 +7676,8 @@
|
||||||
type: _propTypes2["default"].string
|
type: _propTypes2["default"].string
|
||||||
|
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* badge 默认显示内容1
|
* badge 默认显示内容1
|
||||||
*/
|
*/
|
||||||
var defaultProps = {
|
var defaultProps = {
|
||||||
clsPrefix: 'uf'
|
clsPrefix: 'uf'
|
||||||
|
@ -7703,6 +7723,12 @@
|
||||||
|
|
||||||
var deselectCurrent = __webpack_require__(82);
|
var deselectCurrent = __webpack_require__(82);
|
||||||
|
|
||||||
|
var clipboardToIE11Formatting = {
|
||||||
|
"text/plain": "Text",
|
||||||
|
"text/html": "Url",
|
||||||
|
"default": "Text"
|
||||||
|
}
|
||||||
|
|
||||||
var defaultMessage = "Copy to clipboard: #{key}, Enter";
|
var defaultMessage = "Copy to clipboard: #{key}, Enter";
|
||||||
|
|
||||||
function format(message) {
|
function format(message) {
|
||||||
|
@ -7745,6 +7771,23 @@
|
||||||
mark.style.userSelect = "text";
|
mark.style.userSelect = "text";
|
||||||
mark.addEventListener("copy", function(e) {
|
mark.addEventListener("copy", function(e) {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
if (options.format) {
|
||||||
|
e.preventDefault();
|
||||||
|
if (typeof e.clipboardData === "undefined") { // IE 11
|
||||||
|
debug && console.warn("unable to use e.clipboardData");
|
||||||
|
debug && console.warn("trying IE specific stuff");
|
||||||
|
window.clipboardData.clearData();
|
||||||
|
var format = clipboardToIE11Formatting[options.format] || clipboardToIE11Formatting["default"]
|
||||||
|
window.clipboardData.setData(format, text);
|
||||||
|
} else { // all other browsers
|
||||||
|
e.clipboardData.clearData();
|
||||||
|
e.clipboardData.setData(options.format, text);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (options.onCopy) {
|
||||||
|
e.preventDefault();
|
||||||
|
options.onCopy(e.clipboardData);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
document.body.appendChild(mark);
|
document.body.appendChild(mark);
|
||||||
|
@ -7761,7 +7804,8 @@
|
||||||
debug && console.error("unable to copy using execCommand: ", err);
|
debug && console.error("unable to copy using execCommand: ", err);
|
||||||
debug && console.warn("trying IE specific stuff");
|
debug && console.warn("trying IE specific stuff");
|
||||||
try {
|
try {
|
||||||
window.clipboardData.setData("text", text);
|
window.clipboardData.setData(options.format || "text", text);
|
||||||
|
options.onCopy && options.onCopy(window.clipboardData);
|
||||||
success = true;
|
success = true;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
debug && console.error("unable to copy using clipboardData: ", err);
|
debug && console.error("unable to copy using clipboardData: ", err);
|
||||||
|
@ -11198,33 +11242,33 @@
|
||||||
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) : _defaults(subClass, 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) : _defaults(subClass, superClass); }
|
||||||
|
|
||||||
var propTypes = {
|
var propTypes = {
|
||||||
/**
|
/**
|
||||||
* @required
|
* @required
|
||||||
*/
|
*/
|
||||||
id: _propTypes2["default"].oneOfType([_propTypes2["default"].string, _propTypes2["default"].number]),
|
id: _propTypes2["default"].oneOfType([_propTypes2["default"].string, _propTypes2["default"].number]),
|
||||||
inverse: _propTypes2["default"].bool,
|
inverse: _propTypes2["default"].bool,
|
||||||
visible: _propTypes2["default"].bool,
|
visible: _propTypes2["default"].bool,
|
||||||
onVisibleChange: _propTypes2["default"].func,
|
onVisibleChange: _propTypes2["default"].func,
|
||||||
/**
|
/**
|
||||||
* 相对目标元素显示上下左右的位置
|
* 相对目标元素显示上下左右的位置
|
||||||
*/
|
*/
|
||||||
placement: _propTypes2["default"].oneOf(['top', 'right', 'bottom', 'left']),
|
placement: _propTypes2["default"].oneOf(['top', 'right', 'bottom', 'left', 'topLeft', 'topRight', 'bottomLeft', 'bottomRight', 'leftTop', 'leftBottom', 'rightTop', 'rightBottom']),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 绝对定位上边距.
|
* 绝对定位上边距.
|
||||||
*/
|
*/
|
||||||
positionTop: _propTypes2["default"].oneOfType([_propTypes2["default"].number, _propTypes2["default"].string]),
|
positionTop: _propTypes2["default"].oneOfType([_propTypes2["default"].number, _propTypes2["default"].string]),
|
||||||
/**
|
/**
|
||||||
* 绝对定位左边距
|
* 绝对定位左边距
|
||||||
*/
|
*/
|
||||||
positionLeft: _propTypes2["default"].oneOfType([_propTypes2["default"].number, _propTypes2["default"].string]),
|
positionLeft: _propTypes2["default"].oneOfType([_propTypes2["default"].number, _propTypes2["default"].string]),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 与目标Top的距离
|
* 与目标Top的距离
|
||||||
*/
|
*/
|
||||||
arrowOffsetTop: _propTypes2["default"].oneOfType([_propTypes2["default"].number, _propTypes2["default"].string]),
|
arrowOffsetTop: _propTypes2["default"].oneOfType([_propTypes2["default"].number, _propTypes2["default"].string]),
|
||||||
/**
|
/**
|
||||||
* 与目标Left的距离
|
* 与目标Left的距离
|
||||||
*/
|
*/
|
||||||
arrowOffsetLeft: _propTypes2["default"].oneOfType([_propTypes2["default"].number, _propTypes2["default"].string])
|
arrowOffsetLeft: _propTypes2["default"].oneOfType([_propTypes2["default"].number, _propTypes2["default"].string])
|
||||||
};
|
};
|
||||||
|
@ -11234,25 +11278,32 @@
|
||||||
clsPrefix: 'u-tooltip'
|
clsPrefix: 'u-tooltip'
|
||||||
};
|
};
|
||||||
function OverlayNode(props) {
|
function OverlayNode(props) {
|
||||||
var className = props.className,
|
var id = props.id,
|
||||||
|
className = props.className,
|
||||||
classNames = props.classNames,
|
classNames = props.classNames,
|
||||||
style = props.style,
|
style = props.style,
|
||||||
overlay = props.overlay,
|
overlay = props.overlay,
|
||||||
arrowOffsetTop = props.arrowOffsetTop,
|
overlayStyle = props.overlayStyle,
|
||||||
arrowOffsetLeft = props.arrowOffsetLeft;
|
otherProps = props.otherProps;
|
||||||
|
// style 包含用户传入的自定义样式,以及 bee-overlay 计算返回的样式。
|
||||||
|
// overlayStyle 是用户传入的自定义样式。
|
||||||
|
|
||||||
|
if (overlayStyle && overlayStyle.width) {
|
||||||
|
style.width = overlayStyle.width;
|
||||||
|
} else {
|
||||||
|
delete style.width;
|
||||||
|
}
|
||||||
return _react2["default"].createElement(
|
return _react2["default"].createElement(
|
||||||
'div',
|
'div',
|
||||||
{
|
_extends({
|
||||||
|
id: id,
|
||||||
|
role: 'tooltip',
|
||||||
className: (0, _classnames2["default"])(className, classNames),
|
className: (0, _classnames2["default"])(className, classNames),
|
||||||
onMouseEnter: props.onMouseEnter,
|
onMouseEnter: props.onMouseEnter,
|
||||||
onMouseLeave: props.onMouseLeave,
|
onMouseLeave: props.onMouseLeave,
|
||||||
style: style
|
style: style
|
||||||
},
|
}, otherProps),
|
||||||
overlay ? _react2["default"].createElement('div', { className: 'tooltip-arrow', style: {
|
overlay ? _react2["default"].createElement('div', { className: 'tooltip-arrow' }) : '',
|
||||||
top: arrowOffsetTop,
|
|
||||||
left: arrowOffsetLeft
|
|
||||||
} }) : '',
|
|
||||||
overlay ? _react2["default"].createElement(
|
overlay ? _react2["default"].createElement(
|
||||||
'div',
|
'div',
|
||||||
{ className: 'tooltip-inner' },
|
{ className: 'tooltip-inner' },
|
||||||
|
@ -11270,17 +11321,29 @@
|
||||||
var _this = _possibleConstructorReturn(this, _React$Component.call(this, props));
|
var _this = _possibleConstructorReturn(this, _React$Component.call(this, props));
|
||||||
|
|
||||||
_this.onMouseEnter = function () {
|
_this.onMouseEnter = function () {
|
||||||
|
var trigger = _this.props.trigger;
|
||||||
|
|
||||||
|
if (trigger === 'click') return;
|
||||||
_this.setState({
|
_this.setState({
|
||||||
isHoverShow: true
|
isHoverShow: true
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
_this.onMouseLeave = function () {
|
_this.onMouseLeave = function () {
|
||||||
|
var trigger = _this.props.trigger;
|
||||||
|
|
||||||
|
if (trigger === 'click') return;
|
||||||
_this.setState({
|
_this.setState({
|
||||||
isHoverShow: false
|
isHoverShow: false
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
_this.handleOnHide = function () {
|
||||||
|
var onHide = _this.props.onHide;
|
||||||
|
|
||||||
|
onHide && onHide(false);
|
||||||
|
};
|
||||||
|
|
||||||
var initState = {
|
var initState = {
|
||||||
isHoverShow: false
|
isHoverShow: false
|
||||||
};
|
};
|
||||||
|
@ -11306,13 +11369,13 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @desc 鼠标划入时候的事件
|
* @desc 鼠标划入时候的事件
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @desc 鼠标划出时候的事件
|
* @desc 鼠标划出时候的事件
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
@ -11322,8 +11385,7 @@
|
||||||
|
|
||||||
var _props2 = this.props,
|
var _props2 = this.props,
|
||||||
placement = _props2.placement,
|
placement = _props2.placement,
|
||||||
positionTop = _props2.positionTop,
|
id = _props2.id,
|
||||||
positionLeft = _props2.positionLeft,
|
|
||||||
arrowOffsetTop = _props2.arrowOffsetTop,
|
arrowOffsetTop = _props2.arrowOffsetTop,
|
||||||
arrowOffsetLeft = _props2.arrowOffsetLeft,
|
arrowOffsetLeft = _props2.arrowOffsetLeft,
|
||||||
className = _props2.className,
|
className = _props2.className,
|
||||||
|
@ -11332,15 +11394,18 @@
|
||||||
clsPrefix = _props2.clsPrefix,
|
clsPrefix = _props2.clsPrefix,
|
||||||
overlay = _props2.overlay,
|
overlay = _props2.overlay,
|
||||||
inverse = _props2.inverse,
|
inverse = _props2.inverse,
|
||||||
others = _objectWithoutProperties(_props2, ['placement', 'positionTop', 'positionLeft', 'arrowOffsetTop', 'arrowOffsetLeft', 'className', 'style', 'children', 'clsPrefix', 'overlay', 'inverse']);
|
trigger = _props2.trigger,
|
||||||
|
onVisibleChange = _props2.onVisibleChange,
|
||||||
|
onHide = _props2.onHide,
|
||||||
|
rootClose = _props2.rootClose,
|
||||||
|
visible = _props2.visible,
|
||||||
|
defaultOverlayShown = _props2.defaultOverlayShown,
|
||||||
|
positionTop = _props2.positionTop,
|
||||||
|
positionLeft = _props2.positionLeft,
|
||||||
|
others = _objectWithoutProperties(_props2, ['placement', 'id', 'arrowOffsetTop', 'arrowOffsetLeft', 'className', 'style', 'children', 'clsPrefix', 'overlay', 'inverse', 'trigger', 'onVisibleChange', 'onHide', 'rootClose', 'visible', 'defaultOverlayShown', 'positionTop', 'positionLeft']);
|
||||||
|
|
||||||
var classes = (_classes = {}, _defineProperty(_classes, placement, true), _defineProperty(_classes, 'inverse', inverse), _classes);
|
var classes = (_classes = {}, _defineProperty(_classes, placement, true), _defineProperty(_classes, 'inverse', inverse), _classes);
|
||||||
|
|
||||||
var outerStyle = _extends({
|
|
||||||
top: positionTop,
|
|
||||||
left: positionLeft
|
|
||||||
}, style);
|
|
||||||
|
|
||||||
var arrowStyle = {
|
var arrowStyle = {
|
||||||
top: arrowOffsetTop,
|
top: arrowOffsetTop,
|
||||||
left: arrowOffsetLeft
|
left: arrowOffsetLeft
|
||||||
|
@ -11349,26 +11414,53 @@
|
||||||
var classNames = (0, _classnames2["default"])(clsPrefix, classes);
|
var classNames = (0, _classnames2["default"])(clsPrefix, classes);
|
||||||
|
|
||||||
var overlayNode = _react2["default"].createElement(OverlayNode, {
|
var overlayNode = _react2["default"].createElement(OverlayNode, {
|
||||||
|
id: id,
|
||||||
className: className,
|
className: className,
|
||||||
classNames: classNames,
|
classNames: classNames,
|
||||||
overlay: overlay,
|
overlay: overlay,
|
||||||
onMouseEnter: this.onMouseEnter,
|
onMouseEnter: this.onMouseEnter,
|
||||||
onMouseLeave: this.onMouseLeave,
|
onMouseLeave: this.onMouseLeave,
|
||||||
style: true,
|
style: style,
|
||||||
arrowOffsetTop: true,
|
overlayStyle: style // 用户自定义样式
|
||||||
arrowOffsetLeft: true
|
, arrowOffsetTop: arrowOffsetTop,
|
||||||
|
arrowOffsetLeft: arrowOffsetLeft,
|
||||||
|
otherProps: others
|
||||||
});
|
});
|
||||||
return 'visible' in this.props ? _react2["default"].createElement(
|
return 'visible' in this.props ? _react2["default"].createElement(
|
||||||
_OverlayTrigger2["default"],
|
_OverlayTrigger2["default"],
|
||||||
_extends({ visible: this.state.visible, ref: function ref(_ref) {
|
_extends({}, others, {
|
||||||
|
visible: this.state.visible,
|
||||||
|
ref: function ref(_ref) {
|
||||||
return _this2.trigger = _ref;
|
return _this2.trigger = _ref;
|
||||||
}, shouldUpdatePosition: true, placement: placement }, others, { overlay: overlayNode }),
|
},
|
||||||
|
shouldUpdatePosition: true,
|
||||||
|
placement: placement,
|
||||||
|
overlay: overlayNode,
|
||||||
|
onHide: this.handleOnHide,
|
||||||
|
rootClose: rootClose,
|
||||||
|
defaultOverlayShown: defaultOverlayShown,
|
||||||
|
positionTop: positionTop,
|
||||||
|
positionLeft: positionLeft,
|
||||||
|
trigger: trigger
|
||||||
|
}),
|
||||||
children
|
children
|
||||||
) : _react2["default"].createElement(
|
) : _react2["default"].createElement(
|
||||||
_OverlayTrigger2["default"],
|
_OverlayTrigger2["default"],
|
||||||
_extends({ isHoverShow: this.state.isHoverShow, ref: function ref(_ref2) {
|
_extends({}, others, {
|
||||||
|
isHoverShow: this.state.isHoverShow,
|
||||||
|
ref: function ref(_ref2) {
|
||||||
return _this2.trigger = _ref2;
|
return _this2.trigger = _ref2;
|
||||||
}, shouldUpdatePosition: true, placement: placement }, others, { overlay: overlayNode }),
|
},
|
||||||
|
shouldUpdatePosition: true,
|
||||||
|
placement: placement,
|
||||||
|
overlay: overlayNode,
|
||||||
|
onHide: this.handleOnHide,
|
||||||
|
rootClose: rootClose,
|
||||||
|
defaultOverlayShown: defaultOverlayShown,
|
||||||
|
positionTop: positionTop,
|
||||||
|
positionLeft: positionLeft,
|
||||||
|
trigger: trigger
|
||||||
|
}),
|
||||||
children
|
children
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@ -13982,12 +14074,12 @@
|
||||||
'close': '关闭',
|
'close': '关闭',
|
||||||
|
|
||||||
'en-us': {
|
'en-us': {
|
||||||
'copy': 'copy',
|
'copy': 'Copy',
|
||||||
'cut': 'cut',
|
'cut': 'Cut',
|
||||||
'copyReady': 'copied',
|
'copyReady': 'Copied',
|
||||||
'cutReady': 'cut',
|
'cutReady': 'Cut',
|
||||||
'copyToClipboard': 'copy to clipboard',
|
'copyToClipboard': 'Copy to Clipboard',
|
||||||
'close': 'close'
|
'close': 'Close'
|
||||||
},
|
},
|
||||||
'zh-tw': {
|
'zh-tw': {
|
||||||
'copy': '複製',
|
'copy': '複製',
|
||||||
|
@ -33663,38 +33755,38 @@
|
||||||
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) : _defaults(subClass, 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) : _defaults(subClass, superClass); }
|
||||||
|
|
||||||
var propTypes = {
|
var propTypes = {
|
||||||
/**
|
/**
|
||||||
* @title 尺寸
|
* @title 尺寸
|
||||||
*/
|
*/
|
||||||
size: _propTypes2["default"].oneOf(['sm', 'md', 'xg', 'lg']),
|
size: _propTypes2["default"].oneOf(['sm', 'md', 'xg', 'lg']),
|
||||||
/**
|
/**
|
||||||
* @title 样式
|
* @title 样式
|
||||||
*/
|
*/
|
||||||
style: _propTypes2["default"].object,
|
style: _propTypes2["default"].object,
|
||||||
/**
|
/**
|
||||||
* @title 形状
|
* @title 形状
|
||||||
*/
|
*/
|
||||||
shape: _propTypes2["default"].oneOf(['block', 'round', 'border', 'squared', 'floating', 'pillRight', 'pillLeft', 'icon']),
|
shape: _propTypes2["default"].oneOf(['block', 'round', 'border', 'squared', 'floating', 'pillRight', 'pillLeft', 'icon']),
|
||||||
|
|
||||||
bordered: _propTypes2["default"].bool,
|
bordered: _propTypes2["default"].bool,
|
||||||
/**
|
/**
|
||||||
* @title 类型
|
* @title 类型
|
||||||
*/
|
*/
|
||||||
colors: _propTypes2["default"].oneOf(['primary', 'secondary', 'accent', 'success', 'info', 'warning', 'danger', 'dark', 'light', 'default']),
|
colors: _propTypes2["default"].oneOf(['primary', 'secondary', 'accent', 'success', 'info', 'warning', 'danger', 'dark', 'light', 'default']),
|
||||||
/**
|
/**
|
||||||
* @title 是否禁用
|
* @title 是否禁用
|
||||||
* @veIgnore
|
* @veIgnore
|
||||||
*/
|
*/
|
||||||
disabled: _propTypes2["default"].bool,
|
disabled: _propTypes2["default"].bool,
|
||||||
/**
|
/**
|
||||||
* @title 类名
|
* @title 类名
|
||||||
* @veIgnore
|
* @veIgnore
|
||||||
*/
|
*/
|
||||||
className: _propTypes2["default"].string,
|
className: _propTypes2["default"].string,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @title <button> 的 type
|
* @title <button> 的 type
|
||||||
* @veIgnore
|
* @veIgnore
|
||||||
*/
|
*/
|
||||||
htmlType: _propTypes2["default"].oneOf(['submit', 'button', 'reset']),
|
htmlType: _propTypes2["default"].oneOf(['submit', 'button', 'reset']),
|
||||||
isSubmit: _propTypes2["default"].bool //是否作为form的提交按钮
|
isSubmit: _propTypes2["default"].bool //是否作为form的提交按钮
|
||||||
|
@ -33898,6 +33990,7 @@
|
||||||
value: value
|
value: value
|
||||||
};
|
};
|
||||||
_this.input = {};
|
_this.input = {};
|
||||||
|
_this.clickClearBtn = false;
|
||||||
return _this;
|
return _this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33957,23 +34050,30 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
this.clearValue = function () {
|
this.clearValue = function () {
|
||||||
var onChange = _this2.props.onChange;
|
var _props = _this2.props,
|
||||||
|
onChange = _props.onChange,
|
||||||
|
showClose = _props.showClose;
|
||||||
|
|
||||||
_this2.setState({
|
_this2.setState({
|
||||||
showSearch: true,
|
showSearch: true,
|
||||||
value: ""
|
value: ""
|
||||||
});
|
});
|
||||||
|
if (_this2.e && _this2.e.target) _this2.e.target.value = "";
|
||||||
if (onChange) {
|
if (onChange) {
|
||||||
onChange("");
|
onChange("", _this2.e);
|
||||||
|
}
|
||||||
|
if (showClose) {
|
||||||
|
_this2.blurTime && clearTimeout(_this2.blurTime);
|
||||||
|
_this2.blurTime = null;
|
||||||
}
|
}
|
||||||
_this2.input.focus();
|
_this2.input.focus();
|
||||||
};
|
};
|
||||||
|
|
||||||
this.handleKeyDown = function (e) {
|
this.handleKeyDown = function (e) {
|
||||||
var _props = _this2.props,
|
var _props2 = _this2.props,
|
||||||
onSearch = _props.onSearch,
|
onSearch = _props2.onSearch,
|
||||||
type = _props.type,
|
type = _props2.type,
|
||||||
onKeyDown = _props.onKeyDown;
|
onKeyDown = _props2.onKeyDown;
|
||||||
|
|
||||||
if (e.keyCode === 13 && type === "search") {
|
if (e.keyCode === 13 && type === "search") {
|
||||||
if (onSearch) {
|
if (onSearch) {
|
||||||
|
@ -33991,11 +34091,19 @@
|
||||||
|
|
||||||
this.handleBlur = function (e) {
|
this.handleBlur = function (e) {
|
||||||
var value = _this2.state.value;
|
var value = _this2.state.value;
|
||||||
var onBlur = _this2.props.onBlur;
|
var _props3 = _this2.props,
|
||||||
|
onBlur = _props3.onBlur,
|
||||||
|
showClose = _props3.showClose;
|
||||||
|
|
||||||
|
var _e = _extends({}, e);
|
||||||
|
_this2.e = _e;
|
||||||
if (onBlur) {
|
if (onBlur) {
|
||||||
onBlur(value, e);
|
if (showClose && _this2.clickClearBtn) {
|
||||||
|
_this2.clickClearBtn = false;
|
||||||
|
onBlur(value, _e, true);
|
||||||
|
} else {
|
||||||
|
onBlur(value, _e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -34011,21 +34119,25 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.onClearBtnMouseDown = function () {
|
||||||
|
_this2.clickClearBtn = true;
|
||||||
|
};
|
||||||
|
|
||||||
this.renderInput = function () {
|
this.renderInput = function () {
|
||||||
var _props2 = _this2.props,
|
var _props4 = _this2.props,
|
||||||
Component = _props2.componentClass,
|
Component = _props4.componentClass,
|
||||||
type = _props2.type,
|
type = _props4.type,
|
||||||
className = _props2.className,
|
className = _props4.className,
|
||||||
size = _props2.size,
|
size = _props4.size,
|
||||||
clsPrefix = _props2.clsPrefix,
|
clsPrefix = _props4.clsPrefix,
|
||||||
onChange = _props2.onChange,
|
onChange = _props4.onChange,
|
||||||
onSearch = _props2.onSearch,
|
onSearch = _props4.onSearch,
|
||||||
onBlur = _props2.onBlur,
|
onBlur = _props4.onBlur,
|
||||||
showClose = _props2.showClose,
|
showClose = _props4.showClose,
|
||||||
focusSelect = _props2.focusSelect,
|
focusSelect = _props4.focusSelect,
|
||||||
prefix = _props2.prefix,
|
prefix = _props4.prefix,
|
||||||
suffix = _props2.suffix,
|
suffix = _props4.suffix,
|
||||||
others = _objectWithoutProperties(_props2, ['componentClass', 'type', 'className', 'size', 'clsPrefix', 'onChange', 'onSearch', 'onBlur', 'showClose', 'focusSelect', 'prefix', 'suffix']);
|
others = _objectWithoutProperties(_props4, ['componentClass', 'type', 'className', 'size', 'clsPrefix', 'onChange', 'onSearch', 'onBlur', 'showClose', 'focusSelect', 'prefix', 'suffix']);
|
||||||
// input[type="file"] 不应该有类名 .form-control.
|
// input[type="file"] 不应该有类名 .form-control.
|
||||||
|
|
||||||
|
|
||||||
|
@ -34063,10 +34175,10 @@
|
||||||
onFocus: _this2.handleFocus,
|
onFocus: _this2.handleFocus,
|
||||||
className: (0, _classnames2["default"])(classNames)
|
className: (0, _classnames2["default"])(classNames)
|
||||||
})),
|
})),
|
||||||
showClose ? _react2["default"].createElement(
|
showClose && value ? _react2["default"].createElement(
|
||||||
'div',
|
'div',
|
||||||
{ className: clsPrefix + '-suffix' },
|
{ className: clsPrefix + '-suffix has-close', onMouseDown: _this2.onClearBtnMouseDown, onClick: _this2.clearValue },
|
||||||
value ? _react2["default"].createElement(_beeIcon2["default"], { onClick: _this2.clearValue, type: 'uf-close-c' }) : ''
|
_react2["default"].createElement(_beeIcon2["default"], { type: 'uf-close-c' })
|
||||||
) : '',
|
) : '',
|
||||||
suffix ? _react2["default"].createElement(
|
suffix ? _react2["default"].createElement(
|
||||||
'span',
|
'span',
|
||||||
|
@ -34090,16 +34202,16 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
this.renderSearch = function () {
|
this.renderSearch = function () {
|
||||||
var _props3 = _this2.props,
|
var _props5 = _this2.props,
|
||||||
Component = _props3.componentClass,
|
Component = _props5.componentClass,
|
||||||
type = _props3.type,
|
type = _props5.type,
|
||||||
className = _props3.className,
|
className = _props5.className,
|
||||||
size = _props3.size,
|
size = _props5.size,
|
||||||
clsPrefix = _props3.clsPrefix,
|
clsPrefix = _props5.clsPrefix,
|
||||||
onChange = _props3.onChange,
|
onChange = _props5.onChange,
|
||||||
onSearch = _props3.onSearch,
|
onSearch = _props5.onSearch,
|
||||||
onBlur = _props3.onBlur,
|
onBlur = _props5.onBlur,
|
||||||
others = _objectWithoutProperties(_props3, ['componentClass', 'type', 'className', 'size', 'clsPrefix', 'onChange', 'onSearch', 'onBlur']);
|
others = _objectWithoutProperties(_props5, ['componentClass', 'type', 'className', 'size', 'clsPrefix', 'onChange', 'onSearch', 'onBlur']);
|
||||||
// input[type="file"] 不应该有类名 .form-control.
|
// input[type="file"] 不应该有类名 .form-control.
|
||||||
|
|
||||||
|
|
||||||
|
@ -36842,7 +36954,16 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
_this.handleScrollY = function () {
|
_this.handleScrollY = function () {
|
||||||
var rowHeight = _this.props.store.getState().rowHeight;
|
var store = _this.props.store;
|
||||||
|
|
||||||
|
var parentElement = _this.getParentElement(_this.scrollComponent);
|
||||||
|
if (!parentElement) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var scrollEl = parentElement;
|
||||||
|
var scrollY = scrollEl && scrollEl.clientHeight;
|
||||||
|
|
||||||
|
var rowHeight = store.getState().rowHeight;
|
||||||
//默认显示20条,rowsInView根据定高算的。在非固定高下,这个只是一个大概的值。
|
//默认显示20条,rowsInView根据定高算的。在非固定高下,这个只是一个大概的值。
|
||||||
_this.rowsInView = scrollY ? Math.floor(scrollY / rowHeight) : _config2['default'].defaultRowsInView;
|
_this.rowsInView = scrollY ? Math.floor(scrollY / rowHeight) : _config2['default'].defaultRowsInView;
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -194,12 +194,15 @@ export default class InfiniteScroll extends Component {
|
||||||
* @description 根据返回的scrollTop计算当前的索引。
|
* @description 根据返回的scrollTop计算当前的索引。
|
||||||
*/
|
*/
|
||||||
handleScrollY = () => {
|
handleScrollY = () => {
|
||||||
|
const { store } = this.props;
|
||||||
const parentElement = this.getParentElement(this.scrollComponent);
|
const parentElement = this.getParentElement(this.scrollComponent);
|
||||||
if (!parentElement) {
|
if (!parentElement) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let scrollEl = parentElement;
|
let scrollEl = parentElement;
|
||||||
let scrollY = scrollEl && scrollEl.clientHeight;
|
let scrollY = scrollEl && scrollEl.clientHeight;
|
||||||
|
|
||||||
|
let rowHeight = store.getState().rowHeight;
|
||||||
//默认显示20条,rowsInView根据定高算的。在非固定高下,这个只是一个大概的值。
|
//默认显示20条,rowsInView根据定高算的。在非固定高下,这个只是一个大概的值。
|
||||||
this.rowsInView = scrollY ? Math.floor(scrollY / rowHeight) : CONFIG.defaultRowsInView;
|
this.rowsInView = scrollY ? Math.floor(scrollY / rowHeight) : CONFIG.defaultRowsInView;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue