|
@@ -113,23 +113,17 @@ class EditableSpan extends Component{
|
|
|
}
|
|
|
|
|
|
moveEnd(obj) {
|
|
|
- obj.focus();
|
|
|
- if($.support.msie)
|
|
|
- {
|
|
|
- var range = document.selection.createRange();
|
|
|
- this.last = range;
|
|
|
- range.moveToElementText(obj);
|
|
|
- range.select();
|
|
|
- document.selection.empty(); //取消选中
|
|
|
+ if(window.getSelection){//ie11 10 9 ff safari
|
|
|
+ obj.focus(); //解决ff不获取焦点无法定位问题
|
|
|
+ var range = window.getSelection();//创建range
|
|
|
+ range.selectAllChildren(obj);//range 选择obj下所有子内容
|
|
|
+ range.collapseToEnd();//光标移至最后
|
|
|
}
|
|
|
- else
|
|
|
- {
|
|
|
- var range = document.createRange();
|
|
|
- range.selectNodeContents(obj);
|
|
|
- range.collapse(false);
|
|
|
- var sel = window.getSelection();
|
|
|
- sel.removeAllRanges();
|
|
|
- sel.addRange(range);
|
|
|
+ else if (document.selection) {//ie10 9 8 7 6 5
|
|
|
+ var range = document.selection.createRange();//创建选择对象
|
|
|
+ range.moveToElementText(obj);//range定位到obj
|
|
|
+ range.collapse(false);//光标移至最后
|
|
|
+ range.select();
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -159,16 +153,10 @@ class EditableSpan extends Component{
|
|
|
let innerVal = target.innerText;
|
|
|
if(ev.keyCode==8){
|
|
|
// 主诉现病史去重:删除最后一个字的时候移除该数据(将name、id和value替换成空)并移除id
|
|
|
- let pattern1 = new RegExp(/^\,|^\,|^\.|^\。|^\、|^\;|^\;|^\:|^\:/);
|
|
|
- if(pattern1.test(preVal)){//以标点开头的情况-现病史
|
|
|
- if(preVal.trim().length==2){
|
|
|
+ if(preVal.trim().length==1){
|
|
|
removeId && removeId({boxMark,i:index,text:""});
|
|
|
+ // this.moveEnd(obj[0]);
|
|
|
}
|
|
|
- }else{
|
|
|
- if(preVal.trim().length==1){
|
|
|
- removeId && removeId({boxMark,i:index,text:""});
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
if(innerVal !==preVal){return false}
|
|
|
let data = innerVal.trim();
|