tree空格快捷键引起浏览器默认滚动

This commit is contained in:
wanghaoo 2018-12-25 18:04:47 +08:00
parent 097ff9e77e
commit 35f13d00a0
4 changed files with 16 additions and 11 deletions

10
dist/demo.js vendored
View File

@ -6980,13 +6980,13 @@
this.goDown(currentPos, currentIndex, e, treeNode);
} else if (e.keyCode == _tinperBeeCore.KeyCode.UP) {
this.goUp(currentPos, currentIndex, e, treeNode);
} else if (e.keyCode == _tinperBeeCore.KeyCode.LEFT) {
} else if (e.keyCode == _tinperBeeCore.KeyCode.LEFT && !treeNode.props.isLeaf) {
// 收起树节点
this.onExpand(treeNode, 'left');
} else if (e.keyCode == _tinperBeeCore.KeyCode.RIGHT && !treeNode.props.isLeaf) {
// 展开树节点
this.onExpand(treeNode, 'right');
} else if (e.keyCode == _tinperBeeCore.KeyCode.SPACE && props.checkable && !treeNode.props.isLeaf) {
} else if (e.keyCode == _tinperBeeCore.KeyCode.SPACE && props.checkable) {
// 如果是多选tree则进行选中或者反选该节点
this.onCheck(treeNode);
}
@ -7694,6 +7694,8 @@
var _propTypes2 = _interopRequireDefault(_propTypes);
var _tinperBeeCore = __webpack_require__(26);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
function _defaults(obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }
@ -7860,7 +7862,9 @@
TreeNode.prototype.onKeyDown = function onKeyDown(e) {
this.props.root.onKeyDown(e, this);
// e.preventDefault();
if (e.keyCode !== _tinperBeeCore.KeyCode.TAB) {
e.preventDefault();
}
};
TreeNode.prototype.renderSwitcher = function renderSwitcher(props, expandedState) {

2
dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -480,8 +480,7 @@ onExpand(treeNode,keyType) {
}
// all keyboard events callbacks run from here at first
onKeyDown(e,treeNode) {
// event.preventDefault()
// console.log('-----'+e.keyCode);
const props = this.props;
const currentPos = treeNode.props.pos;
const currentIndex = currentPos.substr(currentPos.lastIndexOf('-')+1);
@ -490,14 +489,13 @@ onExpand(treeNode,keyType) {
this.goDown(currentPos,currentIndex,e,treeNode);
}else if(e.keyCode == KeyCode.UP){
this.goUp(currentPos,currentIndex,e,treeNode);
}else if(e.keyCode == KeyCode.LEFT){
}else if(e.keyCode == KeyCode.LEFT && !treeNode.props.isLeaf){
// 收起树节点
this.onExpand(treeNode,'left');
}else if (e.keyCode == KeyCode.RIGHT && !treeNode.props.isLeaf){
// 展开树节点
this.onExpand(treeNode,'right');
}else if (e.keyCode == KeyCode.SPACE && props.checkable && !treeNode.props.isLeaf){
}else if (e.keyCode == KeyCode.SPACE && props.checkable){
// 如果是多选tree则进行选中或者反选该节点
this.onCheck(treeNode);
}

View File

@ -6,7 +6,7 @@ import {
browser
} from './util';
import PropTypes from 'prop-types';
import { KeyCode } from 'tinper-bee-core';
const browserUa = typeof window !== 'undefined' ? browser(window.navigator) : '';
const ieOrEdge = /.*(IE|Edge).+/.test(browserUa);
// const uaArray = browserUa.split(' ');
@ -168,7 +168,10 @@ class TreeNode extends React.Component {
// keyboard event support
onKeyDown(e) {
this.props.root.onKeyDown(e,this);
// e.preventDefault();
if(e.keyCode !== KeyCode.TAB){
e.preventDefault();
}
}
renderSwitcher(props, expandedState) {