publish 1.6.7
This commit is contained in:
parent
7d74213895
commit
d6dcbad699
|
@ -144,17 +144,29 @@ var TableHeader = function (_Component) {
|
||||||
if (!_this.props.draggable) return;
|
if (!_this.props.draggable) return;
|
||||||
event.target.setAttribute('draggable', true); //添加交换列效果
|
event.target.setAttribute('draggable', true); //添加交换列效果
|
||||||
_this.drag.option = 'dragAble';
|
_this.drag.option = 'dragAble';
|
||||||
|
_this.currentDome = event.target;
|
||||||
|
|
||||||
|
_this.thEventListen([{ key: 'mouseup', fun: _this.dragAbleMouseUp }], '', true); //th
|
||||||
_this.removeDragBorderEvent(); //清理掉拖拽列宽的事件
|
_this.removeDragBorderEvent(); //清理掉拖拽列宽的事件
|
||||||
_this.addDragAbleEvent(); //添加拖拽交换列的事件
|
_this.addDragAbleEvent(); //添加拖拽交换列的事件
|
||||||
};
|
};
|
||||||
|
|
||||||
|
_this.dragAbleMouseUp = function (e) {
|
||||||
|
_this.currentDome.setAttribute('draggable', false); //添加交换列效果
|
||||||
|
_this.removeDragAbleEvent();
|
||||||
|
_this.thEventListen([{ key: 'mouseup', fun: _this.dragAbleMouseUp }], 'remove', true); //th
|
||||||
|
//拖拽交换列事件
|
||||||
|
_this.thEventListen([{ key: 'mousedown', fun: _this.dragAbleMouseDown }], 'remove', true); //表示把事件添加到th元素上
|
||||||
|
_this.initEvent();
|
||||||
|
};
|
||||||
|
|
||||||
_this.onDragStart = function (e) {
|
_this.onDragStart = function (e) {
|
||||||
var event = _utils.Event.getEvent(e);
|
var event = _utils.Event.getEvent(e);
|
||||||
if (!_this.props.draggable) return;
|
if (!_this.props.draggable) return;
|
||||||
if (_this.drag.option === 'border') {
|
if (_this.drag.option === 'border') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// console.log('-------onDragStart----------',event.target);
|
console.log(_this.drag.option + ' -------onDragStart----------', event.target);
|
||||||
var th = _this.getThDome(event.target);
|
var th = _this.getThDome(event.target);
|
||||||
if (!th) return;
|
if (!th) return;
|
||||||
var currentIndex = parseInt(th.getAttribute("data-line-index"));
|
var currentIndex = parseInt(th.getAttribute("data-line-index"));
|
||||||
|
@ -175,9 +187,10 @@ var TableHeader = function (_Component) {
|
||||||
if (_this.drag.option === 'border') {
|
if (_this.drag.option === 'border') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
_this.currentDome.setAttribute('draggable', false); //添加交换列效果
|
||||||
var data = _this.getCurrentEventData(e);
|
var data = _this.getCurrentEventData(e);
|
||||||
if (!data) return;
|
if (!data) return;
|
||||||
// console.log('-------onDrop----------',event.target);
|
console.log(_this.drag.option + ' -------onDrop----------', event.target);
|
||||||
if (!_this.currentObj || _this.currentObj.key == data.key) return;
|
if (!_this.currentObj || _this.currentObj.key == data.key) return;
|
||||||
if (!_this.props.onDrop) return;
|
if (!_this.props.onDrop) return;
|
||||||
_this.props.onDrop(event, { dragSource: _this.currentObj, dragTarg: data });
|
_this.props.onDrop(event, { dragSource: _this.currentObj, dragTarg: data });
|
||||||
|
@ -336,9 +349,9 @@ var TableHeader = function (_Component) {
|
||||||
var _event = events[i];
|
var _event = events[i];
|
||||||
var _dataSource = eventSource ? element : colLine;
|
var _dataSource = eventSource ? element : colLine;
|
||||||
if (type === "remove") {
|
if (type === "remove") {
|
||||||
_dataSource.removeEventListener(_event.key, _event.fun);
|
_utils.EventUtil.removeHandler(_dataSource, _event.key, _event.fun);
|
||||||
} else {
|
} else {
|
||||||
_dataSource.addEventListener(_event.key, _event.fun);
|
_utils.EventUtil.addHandler(_dataSource, _event.key, _event.fun);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -349,9 +362,9 @@ var TableHeader = function (_Component) {
|
||||||
for (var i = 0; i < events.length; i++) {
|
for (var i = 0; i < events.length; i++) {
|
||||||
var _event = events[i];
|
var _event = events[i];
|
||||||
if (type == "remove") {
|
if (type == "remove") {
|
||||||
document.removeEventListener(_event.key, _event.fun);
|
_utils.EventUtil.removeHandler(document.body, _event.key, _event.fun);
|
||||||
} else {
|
} else {
|
||||||
document.addEventListener(_event.key, _event.fun);
|
_utils.EventUtil.addHandler(document.body, _event.key, _event.fun);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -381,7 +394,7 @@ var TableHeader = function (_Component) {
|
||||||
}
|
}
|
||||||
if (!this.props.draggable) return;
|
if (!this.props.draggable) return;
|
||||||
//拖拽交换列事件
|
//拖拽交换列事件
|
||||||
this.thEventListen([{ key: 'mousedown', fun: this.dragAbleMouseDown }], '', true); //表示把事件添加到竖线
|
this.thEventListen([{ key: 'mousedown', fun: this.dragAbleMouseDown }], '', true); //表示把事件添加到th元素上
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -437,7 +450,7 @@ var TableHeader = function (_Component) {
|
||||||
this.drag = {
|
this.drag = {
|
||||||
option: ""
|
option: ""
|
||||||
};
|
};
|
||||||
if (!this.props.draggable) {
|
if (this.props.draggable) {
|
||||||
this.removeDragAbleEvent();
|
this.removeDragAbleEvent();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -592,7 +605,7 @@ var TableHeader = function (_Component) {
|
||||||
if (!da.fixed) {
|
if (!da.fixed) {
|
||||||
return _react2["default"].createElement(
|
return _react2["default"].createElement(
|
||||||
"th",
|
"th",
|
||||||
{ key: da.dataindex, className: thClassName, "data-th-fixed": da.fixed,
|
{ key: 'table-header-th-' + da.dataindex, className: thClassName, "data-th-fixed": da.fixed,
|
||||||
"data-line-key": da.key, "data-line-index": columIndex, "data-th-width": da.width },
|
"data-line-key": da.key, "data-line-index": columIndex, "data-th-width": da.width },
|
||||||
da.children,
|
da.children,
|
||||||
dragborder ? _react2["default"].createElement(
|
dragborder ? _react2["default"].createElement(
|
||||||
|
|
|
@ -97,6 +97,7 @@ function multiSelect(Table, Checkbox) {
|
||||||
|
|
||||||
NewMultiSelect.prototype.setChecked = function setChecked(data) {
|
NewMultiSelect.prototype.setChecked = function setChecked(data) {
|
||||||
if (!this.isArray(data)) return false;
|
if (!this.isArray(data)) return false;
|
||||||
|
if (data.length == 0) return false;
|
||||||
var count = 0;
|
var count = 0;
|
||||||
data.forEach(function (da) {
|
data.forEach(function (da) {
|
||||||
if (da._checked) {
|
if (da._checked) {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
Object.defineProperty(exports, "__esModule", {
|
Object.defineProperty(exports, "__esModule", {
|
||||||
value: true
|
value: true
|
||||||
});
|
});
|
||||||
exports.Event = exports.tryParseInt = undefined;
|
exports.Event = exports.EventUtil = exports.tryParseInt = undefined;
|
||||||
|
|
||||||
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; };
|
||||||
|
|
||||||
|
@ -244,6 +244,29 @@ function stopPropagation(event) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//用事件冒泡方式,如果想兼容事件捕获只需要添加个bool参数
|
||||||
|
var EventUtil = exports.EventUtil = {
|
||||||
|
addHandler: function addHandler(element, type, handler) {
|
||||||
|
if (element.addEventListener) {
|
||||||
|
element.addEventListener(type, handler, false);
|
||||||
|
} else if (element.attachEvent) {
|
||||||
|
element.attachEvent('on' + type, handler);
|
||||||
|
} else {
|
||||||
|
element['on' + type] = handler;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
removeHandler: function removeHandler(element, type, handler) {
|
||||||
|
if (element.removeEventListener) {
|
||||||
|
element.removeEventListener(type, handler, false);
|
||||||
|
} else if (element.detachEvent) {
|
||||||
|
element.detachEvent('on' + type, handler);
|
||||||
|
} else {
|
||||||
|
element['on' + type] = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
var Event = exports.Event = {
|
var Event = exports.Event = {
|
||||||
addHandler: addHandler,
|
addHandler: addHandler,
|
||||||
removeHandler: removeHandler,
|
removeHandler: removeHandler,
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -7237,7 +7237,7 @@
|
||||||
duration: _propTypes2["default"].number,
|
duration: _propTypes2["default"].number,
|
||||||
onClose: _propTypes2["default"].func,
|
onClose: _propTypes2["default"].func,
|
||||||
children: _propTypes2["default"].any,
|
children: _propTypes2["default"].any,
|
||||||
color: _propTypes2["default"].oneOf(['light']),
|
color: _propTypes2["default"].oneOf(['info', 'success', 'danger', 'warning', 'light', 'dark', 'news', 'infolight', 'successlight', 'dangerlight', 'warninglight']),
|
||||||
title: _propTypes2["default"].any
|
title: _propTypes2["default"].any
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -7336,7 +7336,7 @@
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|
||||||
Notice.PropTypes = _propTypes2["default"];
|
Notice.propTypes = propTypes;
|
||||||
Notice.defaultProps = defaultProps;
|
Notice.defaultProps = defaultProps;
|
||||||
|
|
||||||
exports["default"] = Notice;
|
exports["default"] = Notice;
|
||||||
|
@ -10936,8 +10936,8 @@
|
||||||
Table.prototype.getHeader = function getHeader(columns, fixed) {
|
Table.prototype.getHeader = function getHeader(columns, fixed) {
|
||||||
var _props = this.props,
|
var _props = this.props,
|
||||||
filterDelay = _props.filterDelay,
|
filterDelay = _props.filterDelay,
|
||||||
onFilterRowsDropChange = _props.onFilterRowsDropChange,
|
onFilterChange = _props.onFilterChange,
|
||||||
onFilterRowsChange = _props.onFilterRowsChange,
|
onFilterClear = _props.onFilterClear,
|
||||||
filterable = _props.filterable,
|
filterable = _props.filterable,
|
||||||
showHeader = _props.showHeader,
|
showHeader = _props.showHeader,
|
||||||
expandIconAsCell = _props.expandIconAsCell,
|
expandIconAsCell = _props.expandIconAsCell,
|
||||||
|
@ -10989,8 +10989,8 @@
|
||||||
rowStyle: trStyle,
|
rowStyle: trStyle,
|
||||||
fixed: fixed,
|
fixed: fixed,
|
||||||
filterable: filterable,
|
filterable: filterable,
|
||||||
onFilterRowsChange: onFilterRowsChange,
|
onFilterChange: onFilterChange,
|
||||||
onFilterRowsDropChange: onFilterRowsDropChange,
|
onFilterClear: onFilterClear,
|
||||||
filterDelay: filterDelay,
|
filterDelay: filterDelay,
|
||||||
afterDragColWidth: afterDragColWidth,
|
afterDragColWidth: afterDragColWidth,
|
||||||
contentDomWidth: this.contentDomWidth,
|
contentDomWidth: this.contentDomWidth,
|
||||||
|
@ -12707,17 +12707,29 @@
|
||||||
if (!_this.props.draggable) return;
|
if (!_this.props.draggable) return;
|
||||||
event.target.setAttribute('draggable', true); //添加交换列效果
|
event.target.setAttribute('draggable', true); //添加交换列效果
|
||||||
_this.drag.option = 'dragAble';
|
_this.drag.option = 'dragAble';
|
||||||
|
_this.currentDome = event.target;
|
||||||
|
|
||||||
|
_this.thEventListen([{ key: 'mouseup', fun: _this.dragAbleMouseUp }], '', true); //th
|
||||||
_this.removeDragBorderEvent(); //清理掉拖拽列宽的事件
|
_this.removeDragBorderEvent(); //清理掉拖拽列宽的事件
|
||||||
_this.addDragAbleEvent(); //添加拖拽交换列的事件
|
_this.addDragAbleEvent(); //添加拖拽交换列的事件
|
||||||
};
|
};
|
||||||
|
|
||||||
|
_this.dragAbleMouseUp = function (e) {
|
||||||
|
_this.currentDome.setAttribute('draggable', false); //添加交换列效果
|
||||||
|
_this.removeDragAbleEvent();
|
||||||
|
_this.thEventListen([{ key: 'mouseup', fun: _this.dragAbleMouseUp }], 'remove', true); //th
|
||||||
|
//拖拽交换列事件
|
||||||
|
_this.thEventListen([{ key: 'mousedown', fun: _this.dragAbleMouseDown }], 'remove', true); //表示把事件添加到th元素上
|
||||||
|
_this.initEvent();
|
||||||
|
};
|
||||||
|
|
||||||
_this.onDragStart = function (e) {
|
_this.onDragStart = function (e) {
|
||||||
var event = _utils.Event.getEvent(e);
|
var event = _utils.Event.getEvent(e);
|
||||||
if (!_this.props.draggable) return;
|
if (!_this.props.draggable) return;
|
||||||
if (_this.drag.option === 'border') {
|
if (_this.drag.option === 'border') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// console.log('-------onDragStart----------',event.target);
|
console.log(_this.drag.option + ' -------onDragStart----------', event.target);
|
||||||
var th = _this.getThDome(event.target);
|
var th = _this.getThDome(event.target);
|
||||||
if (!th) return;
|
if (!th) return;
|
||||||
var currentIndex = parseInt(th.getAttribute("data-line-index"));
|
var currentIndex = parseInt(th.getAttribute("data-line-index"));
|
||||||
|
@ -12738,9 +12750,10 @@
|
||||||
if (_this.drag.option === 'border') {
|
if (_this.drag.option === 'border') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
_this.currentDome.setAttribute('draggable', false); //添加交换列效果
|
||||||
var data = _this.getCurrentEventData(e);
|
var data = _this.getCurrentEventData(e);
|
||||||
if (!data) return;
|
if (!data) return;
|
||||||
// console.log('-------onDrop----------',event.target);
|
console.log(_this.drag.option + ' -------onDrop----------', event.target);
|
||||||
if (!_this.currentObj || _this.currentObj.key == data.key) return;
|
if (!_this.currentObj || _this.currentObj.key == data.key) return;
|
||||||
if (!_this.props.onDrop) return;
|
if (!_this.props.onDrop) return;
|
||||||
_this.props.onDrop(event, { dragSource: _this.currentObj, dragTarg: data });
|
_this.props.onDrop(event, { dragSource: _this.currentObj, dragTarg: data });
|
||||||
|
@ -12899,9 +12912,9 @@
|
||||||
var _event = events[i];
|
var _event = events[i];
|
||||||
var _dataSource = eventSource ? element : colLine;
|
var _dataSource = eventSource ? element : colLine;
|
||||||
if (type === "remove") {
|
if (type === "remove") {
|
||||||
_dataSource.removeEventListener(_event.key, _event.fun);
|
_utils.EventUtil.removeHandler(_dataSource, _event.key, _event.fun);
|
||||||
} else {
|
} else {
|
||||||
_dataSource.addEventListener(_event.key, _event.fun);
|
_utils.EventUtil.addHandler(_dataSource, _event.key, _event.fun);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -12912,9 +12925,9 @@
|
||||||
for (var i = 0; i < events.length; i++) {
|
for (var i = 0; i < events.length; i++) {
|
||||||
var _event = events[i];
|
var _event = events[i];
|
||||||
if (type == "remove") {
|
if (type == "remove") {
|
||||||
document.removeEventListener(_event.key, _event.fun);
|
_utils.EventUtil.removeHandler(document.body, _event.key, _event.fun);
|
||||||
} else {
|
} else {
|
||||||
document.addEventListener(_event.key, _event.fun);
|
_utils.EventUtil.addHandler(document.body, _event.key, _event.fun);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -12944,7 +12957,7 @@
|
||||||
}
|
}
|
||||||
if (!this.props.draggable) return;
|
if (!this.props.draggable) return;
|
||||||
//拖拽交换列事件
|
//拖拽交换列事件
|
||||||
this.thEventListen([{ key: 'mousedown', fun: this.dragAbleMouseDown }], '', true); //表示把事件添加到竖线
|
this.thEventListen([{ key: 'mousedown', fun: this.dragAbleMouseDown }], '', true); //表示把事件添加到th元素上
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -13000,7 +13013,7 @@
|
||||||
this.drag = {
|
this.drag = {
|
||||||
option: ""
|
option: ""
|
||||||
};
|
};
|
||||||
if (!this.props.draggable) {
|
if (this.props.draggable) {
|
||||||
this.removeDragAbleEvent();
|
this.removeDragAbleEvent();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -13155,7 +13168,7 @@
|
||||||
if (!da.fixed) {
|
if (!da.fixed) {
|
||||||
return _react2["default"].createElement(
|
return _react2["default"].createElement(
|
||||||
"th",
|
"th",
|
||||||
{ key: Math.random() + new Date().getTime(), className: thClassName, "data-th-fixed": da.fixed,
|
{ key: 'table-header-th-' + da.dataindex, className: thClassName, "data-th-fixed": da.fixed,
|
||||||
"data-line-key": da.key, "data-line-index": columIndex, "data-th-width": da.width },
|
"data-line-key": da.key, "data-line-index": columIndex, "data-th-width": da.width },
|
||||||
da.children,
|
da.children,
|
||||||
dragborder ? _react2["default"].createElement(
|
dragborder ? _react2["default"].createElement(
|
||||||
|
@ -13342,7 +13355,7 @@
|
||||||
Object.defineProperty(exports, "__esModule", {
|
Object.defineProperty(exports, "__esModule", {
|
||||||
value: true
|
value: true
|
||||||
});
|
});
|
||||||
exports.Event = exports.tryParseInt = undefined;
|
exports.Event = exports.EventUtil = exports.tryParseInt = undefined;
|
||||||
|
|
||||||
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; };
|
||||||
|
|
||||||
|
@ -13583,6 +13596,29 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//用事件冒泡方式,如果想兼容事件捕获只需要添加个bool参数
|
||||||
|
var EventUtil = exports.EventUtil = {
|
||||||
|
addHandler: function addHandler(element, type, handler) {
|
||||||
|
if (element.addEventListener) {
|
||||||
|
element.addEventListener(type, handler, false);
|
||||||
|
} else if (element.attachEvent) {
|
||||||
|
element.attachEvent('on' + type, handler);
|
||||||
|
} else {
|
||||||
|
element['on' + type] = handler;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
removeHandler: function removeHandler(element, type, handler) {
|
||||||
|
if (element.removeEventListener) {
|
||||||
|
element.removeEventListener(type, handler, false);
|
||||||
|
} else if (element.detachEvent) {
|
||||||
|
element.detachEvent('on' + type, handler);
|
||||||
|
} else {
|
||||||
|
element['on' + type] = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
var Event = exports.Event = {
|
var Event = exports.Event = {
|
||||||
addHandler: addHandler,
|
addHandler: addHandler,
|
||||||
removeHandler: removeHandler,
|
removeHandler: removeHandler,
|
||||||
|
@ -21657,15 +21693,15 @@
|
||||||
InputNumber.prototype.ComponentWillMount = function ComponentWillMount() {};
|
InputNumber.prototype.ComponentWillMount = function ComponentWillMount() {};
|
||||||
|
|
||||||
InputNumber.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
|
InputNumber.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
|
||||||
// if(!nextProps.hasOwnProperty('precision')){//如果没有 precision
|
if (!nextProps.hasOwnProperty('precision')) {
|
||||||
var data = judgeValue(nextProps);
|
var data = judgeValue(nextProps);
|
||||||
this.setState({
|
this.setState({
|
||||||
value: data.value,
|
value: data.value,
|
||||||
minusDisabled: data.minusDisabled,
|
minusDisabled: data.minusDisabled,
|
||||||
plusDisabled: data.plusDisabled
|
plusDisabled: data.plusDisabled
|
||||||
});
|
});
|
||||||
this.tempStorage = data.value;
|
this.tempStorage = data.value;
|
||||||
// }
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
InputNumber.prototype.ComponentWillUnMount = function ComponentWillUnMount() {
|
InputNumber.prototype.ComponentWillUnMount = function ComponentWillUnMount() {
|
||||||
|
@ -53625,6 +53661,7 @@
|
||||||
|
|
||||||
NewMultiSelect.prototype.setChecked = function setChecked(data) {
|
NewMultiSelect.prototype.setChecked = function setChecked(data) {
|
||||||
if (!this.isArray(data)) return false;
|
if (!this.isArray(data)) return false;
|
||||||
|
if (data.length == 0) return false;
|
||||||
var count = 0;
|
var count = 0;
|
||||||
data.forEach(function (da) {
|
data.forEach(function (da) {
|
||||||
if (da._checked) {
|
if (da._checked) {
|
||||||
|
@ -53671,21 +53708,31 @@
|
||||||
if (checkedAll) {
|
if (checkedAll) {
|
||||||
check = false;
|
check = false;
|
||||||
} else {
|
} else {
|
||||||
if (indeterminate) {
|
// if(indeterminate){
|
||||||
check = true;
|
// check = true;
|
||||||
} else {
|
// }else{
|
||||||
check = true;
|
// check = true;
|
||||||
}
|
// }
|
||||||
|
check = true;
|
||||||
}
|
}
|
||||||
var selectList = [];
|
var selectList = [];
|
||||||
|
|
||||||
data.forEach(function (item) {
|
data.forEach(function (item) {
|
||||||
item._checked = check;
|
if (!item._disabled) {
|
||||||
|
item._checked = check;
|
||||||
|
}
|
||||||
|
|
||||||
if (item._checked) {
|
if (item._checked) {
|
||||||
selectList.push(item);
|
selectList.push(item);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
if (selectList.length > 0) {
|
||||||
|
indeterminate = true;
|
||||||
|
} else {
|
||||||
|
indeterminate = false;
|
||||||
|
}
|
||||||
_this2.setState({
|
_this2.setState({
|
||||||
indeterminate: false,
|
indeterminate: indeterminate,
|
||||||
checkedAll: check
|
checkedAll: check
|
||||||
});
|
});
|
||||||
_this2.props.getSelectedDataFunc(selectList);
|
_this2.props.getSelectedDataFunc(selectList);
|
||||||
|
@ -53718,11 +53765,22 @@
|
||||||
indeterminate = _state2.indeterminate;
|
indeterminate = _state2.indeterminate;
|
||||||
|
|
||||||
var checkAttr = { checked: checkedAll ? true : false };
|
var checkAttr = { checked: checkedAll ? true : false };
|
||||||
|
var data = _this2.props.data;
|
||||||
|
var dataLength = data.length;
|
||||||
|
var disabledCount = 0;
|
||||||
indeterminate ? checkAttr.indeterminate = true : "";
|
indeterminate ? checkAttr.indeterminate = true : "";
|
||||||
|
//设置表头Checkbox是否可以点击
|
||||||
|
data.forEach(function (item, index, arr) {
|
||||||
|
if (item._disabled) {
|
||||||
|
disabledCount++;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
var _defaultColumns = [{
|
var _defaultColumns = [{
|
||||||
title: _react2['default'].createElement(Checkbox, _extends({
|
title: _react2['default'].createElement(Checkbox, _extends({
|
||||||
className: 'table-checkbox'
|
className: 'table-checkbox'
|
||||||
}, checkAttr, {
|
}, checkAttr, {
|
||||||
|
disabled: disabledCount == dataLength ? true : false,
|
||||||
onChange: _this2.onAllCheckChange
|
onChange: _this2.onAllCheckChange
|
||||||
})),
|
})),
|
||||||
key: "checkbox",
|
key: "checkbox",
|
||||||
|
@ -59448,18 +59506,18 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Popconfirm.prototype.handleClose = function handleClose() {
|
Popconfirm.prototype.handleClose = function handleClose(e) {
|
||||||
var onClose = this.props.onClose;
|
var onClose = this.props.onClose;
|
||||||
|
|
||||||
this.hide();
|
this.hide();
|
||||||
onClose && onClose();
|
onClose && onClose(e);
|
||||||
};
|
};
|
||||||
|
|
||||||
Popconfirm.prototype.handleCancel = function handleCancel() {
|
Popconfirm.prototype.handleCancel = function handleCancel(e) {
|
||||||
var onCancel = this.props.onCancel;
|
var onCancel = this.props.onCancel;
|
||||||
|
|
||||||
this.hide();
|
this.hide();
|
||||||
onCancel && onCancel();
|
onCancel && onCancel(e);
|
||||||
};
|
};
|
||||||
|
|
||||||
Popconfirm.prototype.handleHide = function handleHide() {
|
Popconfirm.prototype.handleHide = function handleHide() {
|
||||||
|
@ -59495,7 +59553,8 @@
|
||||||
content = _props.content,
|
content = _props.content,
|
||||||
children = _props.children,
|
children = _props.children,
|
||||||
onClick = _props.onClick,
|
onClick = _props.onClick,
|
||||||
props = _objectWithoutProperties(_props, ['content', 'children', 'onClick']);
|
stopbubble = _props.stopbubble,
|
||||||
|
props = _objectWithoutProperties(_props, ['content', 'children', 'onClick', 'stopbubble']);
|
||||||
|
|
||||||
delete props.defaultOverlayShown;
|
delete props.defaultOverlayShown;
|
||||||
|
|
||||||
|
@ -59512,6 +59571,7 @@
|
||||||
_extends({}, confirmProps, {
|
_extends({}, confirmProps, {
|
||||||
onClose: this.handleClose,
|
onClose: this.handleClose,
|
||||||
onCancel: this.handleCancel,
|
onCancel: this.handleCancel,
|
||||||
|
stopbubble: stopbubble,
|
||||||
placement: props.placement }),
|
placement: props.placement }),
|
||||||
content
|
content
|
||||||
);
|
);
|
||||||
|
@ -59626,6 +59686,11 @@
|
||||||
*/
|
*/
|
||||||
arrowOffsetLeft: _propTypes2["default"].oneOfType([_propTypes2["default"].number, _propTypes2["default"].string]),
|
arrowOffsetLeft: _propTypes2["default"].oneOfType([_propTypes2["default"].number, _propTypes2["default"].string]),
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 阻止冒泡
|
||||||
|
*/
|
||||||
|
stopbubble: _propTypes2["default"].number,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Title content
|
* Title content
|
||||||
*/
|
*/
|
||||||
|
@ -59636,6 +59701,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
var defaultProps = {
|
var defaultProps = {
|
||||||
|
stopbubble: 0,
|
||||||
placement: 'right',
|
placement: 'right',
|
||||||
clsPrefix: 'u-popconfirm',
|
clsPrefix: 'u-popconfirm',
|
||||||
locale: {}
|
locale: {}
|
||||||
|
@ -59647,7 +59713,27 @@
|
||||||
function Confirm(props) {
|
function Confirm(props) {
|
||||||
_classCallCheck(this, Confirm);
|
_classCallCheck(this, Confirm);
|
||||||
|
|
||||||
return _possibleConstructorReturn(this, _React$Component.call(this, props));
|
var _this = _possibleConstructorReturn(this, _React$Component.call(this, props));
|
||||||
|
|
||||||
|
_this.cancel = function (e) {
|
||||||
|
var _this$props = _this.props,
|
||||||
|
stopbubble = _this$props.stopbubble,
|
||||||
|
onCancel = _this$props.onCancel;
|
||||||
|
|
||||||
|
stopbubble && e.stopPropagation();
|
||||||
|
onCancel(e);
|
||||||
|
};
|
||||||
|
|
||||||
|
_this.close = function (e) {
|
||||||
|
var _this$props2 = _this.props,
|
||||||
|
stopbubble = _this$props2.stopbubble,
|
||||||
|
onClose = _this$props2.onClose;
|
||||||
|
|
||||||
|
stopbubble && e.stopPropagation();
|
||||||
|
onClose(e);
|
||||||
|
};
|
||||||
|
|
||||||
|
return _this;
|
||||||
}
|
}
|
||||||
|
|
||||||
Confirm.prototype.render = function render() {
|
Confirm.prototype.render = function render() {
|
||||||
|
@ -59669,7 +59755,8 @@
|
||||||
onClose = _props.onClose,
|
onClose = _props.onClose,
|
||||||
color = _props.color,
|
color = _props.color,
|
||||||
onCancel = _props.onCancel,
|
onCancel = _props.onCancel,
|
||||||
props = _objectWithoutProperties(_props, ['placement', 'positionTop', 'positionLeft', 'arrowOffsetTop', 'arrowOffsetLeft', 'clsPrefix', 'trigger', 'title', 'className', 'style', 'children', 'locale', 'onClose', 'color', 'onCancel']);
|
stopbubble = _props.stopbubble,
|
||||||
|
props = _objectWithoutProperties(_props, ['placement', 'positionTop', 'positionLeft', 'arrowOffsetTop', 'arrowOffsetLeft', 'clsPrefix', 'trigger', 'title', 'className', 'style', 'children', 'locale', 'onClose', 'color', 'onCancel', 'stopbubble']);
|
||||||
|
|
||||||
var local = (0, _tool.getComponentLocale)(this.props, this.context, 'Popconfirm', function () {
|
var local = (0, _tool.getComponentLocale)(this.props, this.context, 'Popconfirm', function () {
|
||||||
return _i18n2["default"];
|
return _i18n2["default"];
|
||||||
|
@ -59695,7 +59782,10 @@
|
||||||
_extends({}, props, {
|
_extends({}, props, {
|
||||||
role: 'tooltip',
|
role: 'tooltip',
|
||||||
className: (0, _classnames2["default"])(className, classes),
|
className: (0, _classnames2["default"])(className, classes),
|
||||||
style: outerStyle
|
style: outerStyle,
|
||||||
|
onClick: function onClick(e) {
|
||||||
|
return stopbubble && e.stopPropagation();
|
||||||
|
}
|
||||||
}),
|
}),
|
||||||
_react2["default"].createElement('div', { className: 'arrow', style: arrowStyle }),
|
_react2["default"].createElement('div', { className: 'arrow', style: arrowStyle }),
|
||||||
_react2["default"].createElement(
|
_react2["default"].createElement(
|
||||||
|
@ -59708,13 +59798,13 @@
|
||||||
{ className: (0, _classnames2["default"])(clsPrefix + '-confirm') },
|
{ className: (0, _classnames2["default"])(clsPrefix + '-confirm') },
|
||||||
_react2["default"].createElement(
|
_react2["default"].createElement(
|
||||||
_beeButton2["default"],
|
_beeButton2["default"],
|
||||||
{ onClick: onCancel, size: 'sm', style: { minWidth: 50 },
|
{ onClick: this.cancel, size: 'sm', style: { minWidth: 50 },
|
||||||
shape: 'border' },
|
shape: 'border' },
|
||||||
local['cancel']
|
local['cancel']
|
||||||
),
|
),
|
||||||
_react2["default"].createElement(
|
_react2["default"].createElement(
|
||||||
_beeButton2["default"],
|
_beeButton2["default"],
|
||||||
{ onClick: onClose, size: 'sm', style: { minWidth: 50 }, colors: 'primary' },
|
{ onClick: this.close, size: 'sm', style: { minWidth: 50 }, colors: 'primary' },
|
||||||
local['ok']
|
local['ok']
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -61023,35 +61113,11 @@
|
||||||
columns[index] = dragSourceColum;
|
columns[index] = dragSourceColum;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// let titles = [];
|
|
||||||
// columns.forEach(da=>{
|
|
||||||
// for(let attr of da){
|
|
||||||
|
|
||||||
// }
|
|
||||||
// if(typeof da.title != "string"){
|
|
||||||
// titles.push(da.title);
|
|
||||||
// delete da.title;
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// let newColumns = null;
|
|
||||||
// if(titles.length != 0){
|
|
||||||
// newColumns = JSON.parse(JSON.stringify(columns));
|
|
||||||
// for (let index = 0; index < newColumns.length; index++) {
|
|
||||||
// newColumns[index].title = titles[index];
|
|
||||||
// }
|
|
||||||
// console.log("----columns----",newColumns);
|
|
||||||
// }else{
|
|
||||||
// newColumns = JSON.parse(JSON.stringify(columns));
|
|
||||||
// }
|
|
||||||
// this.setState({
|
|
||||||
// columns:newColumns
|
|
||||||
// });
|
|
||||||
|
|
||||||
_this.setState({
|
_this.setState({
|
||||||
columns: cloneDeep(columns)
|
columns: cloneDeep(columns)
|
||||||
});
|
});
|
||||||
if (_this.props.dragDrop) {
|
if (_this.props.onDrop) {
|
||||||
_this.props.dragDrop(event, data, newColumns);
|
_this.props.onDrop(event, data, columns);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -63990,6 +64056,7 @@
|
||||||
|
|
||||||
NewMultiSelect.prototype.setChecked = function setChecked(data) {
|
NewMultiSelect.prototype.setChecked = function setChecked(data) {
|
||||||
if (!this.isArray(data)) return false;
|
if (!this.isArray(data)) return false;
|
||||||
|
if (data.length == 0) return false;
|
||||||
var count = 0;
|
var count = 0;
|
||||||
data.forEach(function (da) {
|
data.forEach(function (da) {
|
||||||
if (da._checked) {
|
if (da._checked) {
|
||||||
|
@ -64036,21 +64103,31 @@
|
||||||
if (checkedAll) {
|
if (checkedAll) {
|
||||||
check = false;
|
check = false;
|
||||||
} else {
|
} else {
|
||||||
if (indeterminate) {
|
// if(indeterminate){
|
||||||
check = true;
|
// check = true;
|
||||||
} else {
|
// }else{
|
||||||
check = true;
|
// check = true;
|
||||||
}
|
// }
|
||||||
|
check = true;
|
||||||
}
|
}
|
||||||
var selectList = [];
|
var selectList = [];
|
||||||
|
|
||||||
data.forEach(function (item) {
|
data.forEach(function (item) {
|
||||||
item._checked = check;
|
if (!item._disabled) {
|
||||||
|
item._checked = check;
|
||||||
|
}
|
||||||
|
|
||||||
if (item._checked) {
|
if (item._checked) {
|
||||||
selectList.push(item);
|
selectList.push(item);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
if (selectList.length > 0) {
|
||||||
|
indeterminate = true;
|
||||||
|
} else {
|
||||||
|
indeterminate = false;
|
||||||
|
}
|
||||||
_this2.setState({
|
_this2.setState({
|
||||||
indeterminate: false,
|
indeterminate: indeterminate,
|
||||||
checkedAll: check
|
checkedAll: check
|
||||||
});
|
});
|
||||||
_this2.props.getSelectedDataFunc(selectList);
|
_this2.props.getSelectedDataFunc(selectList);
|
||||||
|
@ -64083,11 +64160,22 @@
|
||||||
indeterminate = _state2.indeterminate;
|
indeterminate = _state2.indeterminate;
|
||||||
|
|
||||||
var checkAttr = { checked: checkedAll ? true : false };
|
var checkAttr = { checked: checkedAll ? true : false };
|
||||||
|
var data = _this2.props.data;
|
||||||
|
var dataLength = data.length;
|
||||||
|
var disabledCount = 0;
|
||||||
indeterminate ? checkAttr.indeterminate = true : "";
|
indeterminate ? checkAttr.indeterminate = true : "";
|
||||||
|
//设置表头Checkbox是否可以点击
|
||||||
|
data.forEach(function (item, index, arr) {
|
||||||
|
if (item._disabled) {
|
||||||
|
disabledCount++;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
var _defaultColumns = [{
|
var _defaultColumns = [{
|
||||||
title: _react2['default'].createElement(Checkbox, _extends({
|
title: _react2['default'].createElement(Checkbox, _extends({
|
||||||
className: 'table-checkbox'
|
className: 'table-checkbox'
|
||||||
}, checkAttr, {
|
}, checkAttr, {
|
||||||
|
disabled: disabledCount == dataLength ? true : false,
|
||||||
onChange: _this2.onAllCheckChange
|
onChange: _this2.onAllCheckChange
|
||||||
})),
|
})),
|
||||||
key: "checkbox",
|
key: "checkbox",
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "bee-table",
|
"name": "bee-table",
|
||||||
"version": "1.6.6",
|
"version": "1.6.7",
|
||||||
"description": "Table ui component for react",
|
"description": "Table ui component for react",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"react",
|
"react",
|
||||||
|
|
Loading…
Reference in New Issue