|
@@ -88,7 +88,7 @@ class Inspect extends React.Component {
|
|
|
let _impClose = $('#impClose')[0]; // 导入删除按钮
|
|
|
let _addClose = $('#addClose')[0]; // 添加删除按钮
|
|
|
let _closeTil = $('#delTit')[0]; // 弹窗标题
|
|
|
- if (searchOption) {
|
|
|
+ if (searchOption&&!this.isBar) {//onMousedown的目标为滚动条时,添加弹窗不关闭
|
|
|
if (searchOption != event.target && searchWrap != event.target && searchWrap != event.target.parentNode && !$.contains(searchOption, event.target)) { // Mark 1
|
|
|
if(this.state.show){
|
|
|
this.props.setHighter(48)
|
|
@@ -96,7 +96,7 @@ class Inspect extends React.Component {
|
|
|
this.setState({ show: false });
|
|
|
}
|
|
|
}
|
|
|
- if (inspectFill) {
|
|
|
+ if (inspectFill&&!this.isBar) {//onMousedown的目标为滚动条时,子项弹窗不关闭
|
|
|
if ($(event.target).attr('id') != "getSureTime"&&event.target.getAttribute('data-flg') != 'current' && inspectFill != event.target && !$.contains(inspectFill, event.target)) { // Mark 1
|
|
|
if(this.state.showFill){
|
|
|
this.props.setHighter(48)
|
|
@@ -105,7 +105,7 @@ class Inspect extends React.Component {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (_del) {
|
|
|
+ if (_del&&!this.isBar) {//onMousedown的目标为滚动条时,删除弹窗不关闭
|
|
|
if (!event.target.isEqualNode(_impClose) && !event.target.isEqualNode(_addClose) && !event.target.isEqualNode(_del) && event.target.parentNode != _del && !event.target.isEqualNode(_closeTil)) {
|
|
|
this.setState({
|
|
|
id: null,
|
|
@@ -114,6 +114,15 @@ class Inspect extends React.Component {
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
+ const that = this;
|
|
|
+ document.addEventListener('mousedown',function(e){
|
|
|
+ //onMousedown的目标为滚动条时,标签填写单不关闭
|
|
|
+ if(e.target.className=='scrollbar'){
|
|
|
+ that.isBar = true;
|
|
|
+ }else{
|
|
|
+ that.isBar = false;
|
|
|
+ }
|
|
|
+ });
|
|
|
// this.setState({ dateTime: getCurrentDate(1) })
|
|
|
}
|
|
|
componentWillReceiveProps(nextProps) {
|