فهرست منبع

修改后不可输入

xuzhiheng 5 سال پیش
والد
کامیت
2a775e24eb

+ 5 - 2
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/keyWord.css

@@ -107,15 +107,18 @@
   display: none;
   margin-top: .16rem;
 }
-.keyWord .showKeyWord ul li .modify span {
+.keyWord .showKeyWord ul li .modify textarea {
   width: 100%;
-  display: block;
+  display: flex;
+  align-items: center;
+  resize: none;
   line-height: 0.5rem;
   padding: 0.2rem .3rem;
   background: #fff;
   outline: none;
   font-size: 0.3rem;
   color: #1d1d1d;
+  min-height: 0.94rem;
 }
 .keyWord .showKeyWord ul li .modify button {
   width: 50%;

+ 6 - 22
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js

@@ -66,7 +66,7 @@ $(function(){
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span contentEditable="true">${ keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWord}</textarea>
                             <button class="deleteKey">删除</button>
                             <button class="ascertainKey">确定</button>
                         </div>
@@ -86,13 +86,11 @@ $(function(){
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
-        let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
-        oSpan.focus();
-        setTimeout(() => {
-            keepLastIndex(oSpan)
-        }, 40);
+        let oSpan = e.target.parentNode.nextElementSibling.children[0];
+        let val = $(oSpan).val();
         $(this).parent().hide();
         $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+        $(oSpan).val('').focus().val(val);
         $(".addKeyWord").hide();
     })
 
@@ -108,7 +106,7 @@ $(function(){
     })
     // 编辑 确定
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
-        var keyWord = $(this).siblings('span').text();
+        var keyWord = $(this).siblings('textarea').val();
         var buyer = $(this).parent().prev().find('.key').text();
         keyWord = keyWord.replace(/\s/g,"");
         if (keyWord.length < 1) {
@@ -121,7 +119,7 @@ $(function(){
                 }
             });
             return
-        }else if($(this).parent().find("span").text().length > 50){
+        }else if($(this).parent().find("textarea").val().length > 50){
             // var s = $(this).parent().find("span").text().slice(0,49);
             // $(this).parent().find("span").text(s);
             weui.toast('采购单位不能超过50字', {
@@ -152,18 +150,4 @@ $(function(){
         history.back();
     })
 
-    function keepLastIndex(obj) {
-        if (window.getSelection) {//ie11 10 9 ff safari
-            obj.focus(); //解决ff不获取焦点无法定位问题
-            var range = window.getSelection();//创建range
-            range.selectAllChildren(obj);//range 选择obj下所有子内容
-            range.collapseToEnd();//光标移至最后
-        }
-        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();
-        }
-    }
 });

+ 22 - 40
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js

@@ -49,16 +49,14 @@ $(function(){
         }
     });
 
-    // $('.exclusion input.enterOne').on('input', function() {
-    //     var buttonDOM = $(this).siblings().find('button')[0]
-    //     if ($(this).val().length >= 1) {
-    //         buttonDOM.style.opacity = 1
-    //         buttonDOM.removeAttribute("disabled")
-    //     } else {
-    //         buttonDOM.style.opacity = .5
-    //         buttonDOM.setAttribute("disabled", true)
-    //     }
-    // })
+    $('textarea').each(function(i,dom){
+        // console.log(i,dom)
+        dom.style.height = dom.scrollHeight +'px';
+    });
+    $("textarea").on("input", function() {
+        this.style.height = 'auto';
+        this.style.height = this.scrollHeight + "px";
+    });
 
     // 添加 按钮的点击事件
     $('.addkeyWord .btn .save').on('click', function(){
@@ -88,7 +86,7 @@ $(function(){
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -121,7 +119,7 @@ $(function(){
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keys[i].keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -145,7 +143,7 @@ $(function(){
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keys[i].keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -173,7 +171,7 @@ $(function(){
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keys[i].keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -193,7 +191,7 @@ $(function(){
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keys[i].keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -233,12 +231,9 @@ $(function(){
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
-        let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
-        oSpan.focus()
-        setTimeout(() => {
-            keepLastIndex(oSpan)
-        }, 40)
-
+        let oSpan = e.target.parentNode.nextElementSibling.children[0];
+        let val = $(oSpan).val();
+        // alert(oSpan.documentElement.scrollTop)
         var keyWord = $(this).prev().children().find(".key").text();
         for(var i in keyWordArr){
             if(keyWordArr[i].keyWord === keyWord){
@@ -268,8 +263,9 @@ $(function(){
                 $(this).parent().next().find(".addExclusion").text(strs);
             }
         }
-        $(this).parent().hide()
+        $(this).parent().hide();
         $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+        $(oSpan).val('').focus().val(val);
         $(".addKeyWord").hide();
     });
 
@@ -302,10 +298,11 @@ $(function(){
     // 编辑确定
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
         var $this = $(this);
-        var keyWord = $(this).siblings('span').text();
+        // var keyWord = $(this).siblings('span').text();
+        var keyWord = $(this).siblings('textarea').val();
         var keyWords = $(this).parent().prev().find('.key').text();
         keyWord = keyWord.replace(/\s/g,"");
-        if ($(this).parent().find("span").html().length < 1) {
+        if ($(this).parent().find("textarea").val().length < 1) {
 
             weui.toast('关键词不能为空', {
                 duration: 2000,
@@ -315,7 +312,7 @@ $(function(){
                 }
             });
             return
-        }else if($(this).parent().find("span").text().length > 20){
+        }else if($(this).parent().find("textarea").val().length > 20){
             // var s = $(this).parent().find("span").text().slice(0,19);
             // $(this).parent().find("span").text(s);
             weui.toast('关键词不能超过20字', {
@@ -342,19 +339,4 @@ $(function(){
         return this.replace(/(^\s*)|(\s*$)/g, ' ');
     }
 
-    function keepLastIndex(obj) {
-        if (window.getSelection) {//ie11 10 9 ff safari
-            obj.focus(); //解决ff不获取焦点无法定位问题
-            var range = window.getSelection();//创建range
-            range.selectAllChildren(obj);//range 选择obj下所有子内容
-            range.collapseToEnd();//光标移至最后
-        }
-        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();
-        }
-    }
-
 })

+ 9 - 13
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html

@@ -53,9 +53,7 @@
         top: 85%;
         text-align: center;
     }
-    .ios-user-select{
-        -webket-user-select: text;
-    }
+
 </style>
 <body>
 <div class="app-layout-header">
@@ -152,7 +150,7 @@
                                         <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                     </div>
                                     <div class="modify">
-                                        <span class="ios-user-select" contentEditable="true">${ appendedArr[y] }</span>
+                                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ appendedArr[y] }</textarea>
                                         <button class="deleteKey">删除</button>
                                         <button class="ascertainKey">确定</button>
                                     </div>
@@ -187,7 +185,7 @@
                                 <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
                             <div class="modify">
-                                <span contentEditable="true">${ appendeds[m] }</span>
+                                <textarea  name=""  rows="1"  placeholder="" maxlength="">${ appendeds[m] }</textarea>
                                 <button class="deleteKey">删除</button>
                                 <button class="ascertainKey">确定</button>
                             </div>
@@ -301,7 +299,7 @@
                                     <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                 </div>
                                 <div class="modify">
-                                    <span contentEditable="true">${ appended }</span>
+                                    <textarea  name=""  rows="1"  placeholder="" maxlength="">${ appended }</textarea>
                                     <button class="deleteKey">删除</button>
                                     <button class="ascertainKey">确定</button>
                                 </div>
@@ -320,13 +318,11 @@
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
-                let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
-                oSpan.focus();
-                setTimeout(() => {
-                    keepLastIndex(oSpan)
-                }, 40);
+                let oSpan = e.target.parentNode.nextElementSibling.children[0];
+                let val = $(oSpan).val();
                 $(this).parent().hide();
                 $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+                $(oSpan).val('').focus().val(val);
                 $(".addKeyWord").hide();
             });
 
@@ -356,7 +352,7 @@
             });
             // 编辑 确定
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
-                var appended = $(this).siblings('span').text();
+                var appended = $(this).siblings('textarea').val();
                 var appendeds = $(this).parent().prev().find('.key').text();
                 appended = appended.replace(/\s/g,"");
                 if (appended.length < 1) {
@@ -369,7 +365,7 @@
                         }
                     });
                     return
-                }else if($(this).parent().find("span").text().length > 20){
+                }else if($(this).parent().find("textarea").val().length > 20){
                     // var s = $(this).parent().find("span").text().slice(0,19);
                     // $(this).parent().find("span").text(s);
                     weui.toast('附加词不能超过20字', {

+ 3 - 3
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html

@@ -9,7 +9,7 @@
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css">
-	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css">
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}22">
 	<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js"></script>
 	<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
@@ -89,7 +89,7 @@
 </div>
 <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js"></script>
 <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js"></script>
-<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/additionWord.js?v={{Msg "seo" "version"}}31"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/additionWord.js?v={{Msg "seo" "version"}}32"></script>
 <script>
 	$(window).bind("pageshow", function(event){
 		if(event.originalEvent.persisted){
@@ -114,7 +114,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ buyer[i] }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ buyer[i] }</textarea>
                             <button class="deleteKey">删除</button>
                             <button class="ascertainKey">确定</button>
                         </div>

+ 10 - 27
src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html

@@ -53,9 +53,7 @@
         top: 85%;
         text-align: center;
     }
-    .ios-user-select{
-        -webket-user-select: text;
-    }
+
 </style>
 <body>
 <div class="app-layout-header">
@@ -152,7 +150,7 @@
                                     <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                 </div>
                                 <div class="modify">
-                                    <span class="ios-user-select" contentEditable="true">${ excludeArr[y] }</span>
+                                    <textarea  name=""  rows="1"  placeholder="" maxlength="">${ excludeArr[y] }</textarea>
                                     <button class="deleteKey">删除</button>
                                     <button class="ascertainKey">确定</button>
                                 </div>
@@ -187,7 +185,7 @@
                                     <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                 </div>
                                 <div class="modify">
-                                    <span contentEditable="true">${ excludes[m] }</span>
+                                    <textarea  name=""  rows="1"  placeholder="" maxlength="">${ excludes[m] }</textarea>
                                     <button class="deleteKey">删除</button>
                                     <button class="ascertainKey">确定</button>
                                 </div>
@@ -302,7 +300,7 @@
                                         <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                     </div>
                                     <div class="modify">
-                                        <span contentEditable="true">${ exclude }</span>
+                                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ exclude }</textarea>
                                         <button class="deleteKey">删除</button>
                                         <button class="ascertainKey">确定</button>
                                     </div>
@@ -321,13 +319,11 @@
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
-                let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
-                oSpan.focus();
-                setTimeout(() => {
-                    keepLastIndex(oSpan)
-                }, 40);
+                let oSpan = e.target.parentNode.nextElementSibling.children[0];
+                let val = $(oSpan).val();
                 $(this).parent().hide();
                 $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+                $(oSpan).val('').focus().val(val);
                 $(".addKeyWord").hide();
             });
 
@@ -357,7 +353,7 @@
             })
             // 编辑 确定
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
-                var exclude = $(this).siblings('span').text();
+                var exclude = $(this).siblings('textarea').val();
                 var excludes = $(this).parent().prev().find('.key').text();
                 exclude = exclude.replace(/\s/g,"");
                 if (exclude.length < 1) {
@@ -370,7 +366,7 @@
                         }
                     });
                     return
-                }else if($(this).parent().find("span").text().length > 20){
+                }else if($(this).parent().find("textarea").val().length > 20){
                     // var s = $(this).parent().find("span").text().slice(0,19);
                     // $(this).parent().find("span").text(s);
                     weui.toast('排除词不能超过20字', {
@@ -414,20 +410,7 @@
             $('.addkeyWord .btn .close').on('click', function () {
                 window.history.back();
             });
-            function keepLastIndex(obj) {
-                if (window.getSelection) {//ie11 10 9 ff safari
-                    obj.focus(); //解决ff不获取焦点无法定位问题
-                    var range = window.getSelection();//创建range
-                    range.selectAllChildren(obj);//range 选择obj下所有子内容
-                    range.collapseToEnd();//光标移至最后
-                }
-                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();
-                }
-            }
+
         })
         $(".app-back").on("click", function () {
             history.back();

+ 6 - 6
src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}18">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}21">
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
@@ -139,7 +139,7 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}40"></script>
+    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}45"></script>
     <script>
         $(window).bind("pageshow", function(event){
             if(event.originalEvent.persisted){
@@ -171,7 +171,7 @@
                                 <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
                             <div class="modify">
-                                <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                                <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWordArr[i].keyWord}</textarea>
                                 <button class="addAdjunctWord">编辑 附加词</button>
                                 <button class="addExclusion">添加 排除词</button>
                                 <button class="deleteKey">删除</button>
@@ -195,7 +195,7 @@
                                 <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
                             <div class="modify">
-                                <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                                <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWordArr[i].keyWord}</textarea>
                                 <button class="addAdjunctWord">编辑 附加词</button>
                                 <button class="addExclusion">添加 排除词</button>
                                 <button class="deleteKey">删除</button>
@@ -223,7 +223,7 @@
                                 <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
                             <div class="modify">
-                                <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                                <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWordArr[i].keyWord}</textarea>
                                 <button class="addAdjunctWord">编辑 附加词</button>
                                 <button class="addExclusion">添加 排除词</button>
                                 <button class="deleteKey">删除</button>
@@ -243,7 +243,7 @@
                                 <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
                             <div class="modify">
-                                <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                                <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWordArr[i].keyWord}</textarea>
                                 <button class="addAdjunctWord">编辑 附加词</button>
                                 <button class="addExclusion">添加 排除词</button>
                                 <button class="deleteKey">删除</button>

+ 8 - 26
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html

@@ -56,9 +56,6 @@
 			text-align: center;
 			bottom: 10%;
 		}
-		.ios-user-select{
-			-webket-user-select: text;
-		}
 	</style>
 	<body>
 	<div class="app-layout-header">
@@ -111,7 +108,7 @@
 								<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
 							</div>
 							<div class="modify">
-								<span class="ios-user-select" contentEditable="true">${ winner[i] }</span>
+								<textarea  name=""  rows="1"  placeholder="" maxlength="">${ winner[i] }</textarea>
 								<button class="deleteKey">删除</button>
 								<button class="ascertainKey">确定</button>
 							</div>
@@ -187,7 +184,7 @@
 									<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
 								</div>
 								<div class="modify">
-									<span contentEditable="true">${ keyWord }</span>
+									<textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWord }</textarea>
 									<button class="deleteKey">删除</button>
 									<button class="ascertainKey">确定</button>
 								</div>
@@ -207,13 +204,11 @@
 
 			// 编辑
 			$(".showKeyWord").on('click', '.editKeyWord',function(e){
-				let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
-				oSpan.focus();
-				setTimeout(() => {
-					keepLastIndex(oSpan)
-				}, 40);
+				let oSpan = e.target.parentNode.nextElementSibling.children[0];
+				let val = $(oSpan).val();
 				$(this).parent().hide();
 				$(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+				$(oSpan).val('').focus().val(val);
 				$(".addKeyWord").hide();
 			});
 
@@ -229,7 +224,7 @@
 			});
 			// 编辑 确定
 			$('.showKeyWord').on('click', '.ascertainKey', function(e) {
-				var keyWord = $(this).siblings('span').text();
+				var keyWord = $(this).siblings('textarea').val();
 				var winner = $(this).parent().prev().find('.key').text();
 				keyWord = keyWord.replace(/\s/g,"");
 				if (keyWord.length < 1) {
@@ -242,7 +237,7 @@
 						}
 					});
 					return
-				}else if($(this).parent().find("span").text().length > 50){
+				}else if($(this).parent().find("textarea").val().length > 50){
 					// var s = $(this).parent().find("span").text().slice(0,49);
 					// $(this).parent().find("span").text(s);
 					weui.toast('中标单位不能超过50字', {
@@ -275,20 +270,7 @@
 			$(".app-back").on("click", function () {
 				history.back();
 			});
-			function keepLastIndex(obj) {
-				if (window.getSelection) {//ie11 10 9 ff safari
-					obj.focus(); //解决ff不获取焦点无法定位问题
-					var range = window.getSelection();//创建range
-					range.selectAllChildren(obj);//range 选择obj下所有子内容
-					range.collapseToEnd();//光标移至最后
-				}
-				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();
-				}
-			}
+
 		})
 
 	</script>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/login.html

@@ -285,7 +285,7 @@
 		}
 		function loginByWeixinCallBack222(){
 			//var wxSign = "D00THAAVRlVFXBkKUlRUQQMHBwFGWUNXSVZdQFRbHQtSVEcbUWhUdEQFEwsjTHliRFswBAcIXBFVZAVXPyZITElWQFlVF05NQVlUTQUGV1RMDkgPVRAHVVIBEU1cTBYdVV4TD1YNEl5VEVcBVABFWhILBBcHVgkEElkRWlxCBVQAABBbRExJVkZJQVBWVUAT";
-			var wxSign="D00THAAVRlVFXBkKUlRUQQQJBgZBWkleSVZdQFRbHQtSVEdWHhJERhEdGQpHThAFVQJMVkgNBxEDAwkHR18SXFQWUwUHDUBNXEwXHVYSCxdFV0BZVBVWUwEGRl9JWldGVAIIF1hNAwcCGhAKE1EVV0RZURVUBlcCFQ1AWwZFAFUCVBILSV0GRlcDUgIWTVxMEQ1CVRMPRRI=";
+			var wxSign="D00THAAVRlVFXBkKUlRUQQUABAdFXkZaSVZdQFRbHQtSVEdWHhJERhEdGQpHThAFUlASXEZaABELBgVTQFxHXwYXBVICVkdNXEwXHVYSCxdFWkZdXUMCBgkGTFpFX1VBAgEFDExXR0xJVkFZVltWVVJXVhYHVQACRVcRVwcRA1QIVEVfE1ZURwcFAQEXDBFWB1YeEkVMBApSVFUJ";
       		$.ajax({
 				url: "/jyapp/free/login",
 				type: "post",

+ 5 - 2
src/web/staticres/wx_dataExport/css/keyWord.css

@@ -103,15 +103,18 @@
   display: none;
   margin-top: .16rem;
 }
-.keyWord .showKeyWord ul li .modify span {
+.keyWord .showKeyWord ul li .modify textarea {
   width: 100%;
-  display: block;
+  display: flex;
+  align-items: center;
+  resize: none;
   line-height: 0.5rem;
   padding: 0.2rem .3rem;
   background: #fff;
   outline: none;
   font-size: 0.3rem;
   color: #1d1d1d;
+  min-height: 0.94rem;
 }
 .keyWord .showKeyWord ul li .modify button {
   width: 50%;

+ 6 - 21
src/web/staticres/wx_dataExport/js/additionWord.js

@@ -86,13 +86,11 @@ $(function(){
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
-        let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
-        oSpan.focus();
-        setTimeout(() => {
-            keepLastIndex(oSpan)
-        }, 40);
+        let oSpan = e.target.parentNode.nextElementSibling.children[0];
+        let val = $(oSpan).val();
         $(this).parent().hide();
         $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+        $(oSpan).val('').focus().val(val);
         $(".addKeyWord").hide();
     })
 
@@ -108,7 +106,7 @@ $(function(){
     })
     // 编辑 确定
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
-        var keyWord = $(this).siblings('span').text();
+        var keyWord = $(this).siblings('textarea').val();
         var buyer = $(this).parent().prev().find('.key').text();
         keyWord = keyWord.replace(/\s/g,"");
         if (keyWord.length < 1) {
@@ -121,7 +119,7 @@ $(function(){
                 }
             });
             return
-        }else if($(this).parent().find("span").text().length > 50){
+        }else if($(this).parent().find("textarea").val().length > 50){
             // var s = $(this).parent().find("span").text().slice(0,49);
             // $(this).parent().find("span").text(s);
             weui.toast('采购单位不能超过50字', {
@@ -151,18 +149,5 @@ $(function(){
     $(".close").on("click", function () {
         history.back();
     })
-    function keepLastIndex(obj) {
-        if (window.getSelection) {//ie11 10 9 ff safari
-            obj.focus(); //解决ff不获取焦点无法定位问题
-            var range = window.getSelection();//创建range
-            range.selectAllChildren(obj);//range 选择obj下所有子内容
-            range.collapseToEnd();//光标移至最后
-        }
-        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();
-        }
-    }
+
 });

+ 27 - 32
src/web/staticres/wx_dataExport/js/keyWord.js

@@ -23,11 +23,11 @@ $(function(){
         }
     }
     hasWords();
-    
+
     //添加按钮
     $(".addKeyWord i").on('click',function(){
         sessionStorage.removeItem("keyWord");
-        window.location.href="/front/wx_dataExport/keyWordInput";
+        window.location.href="/jyapp/front/dataExport/keyWordInput";
     });
 
     // 添加keyWords检查输入框内是否有文字,如果有才能点击添加按钮
@@ -48,14 +48,23 @@ $(function(){
             $(this).next().find(".exclude").prop("disabled", true);
         }
     });
-    
+
+    $('textarea').each(function(i,dom){
+        // console.log(i,dom)
+        dom.style.height = dom.scrollHeight +'px';
+    });
+    $("textarea").on("input", function() {
+        this.style.height = 'auto';
+        this.style.height = this.scrollHeight + "px";
+    });
+
     // 添加 按钮的点击事件
     $('.addkeyWord .btn .save').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val();
         keyWord = keyWord.replace(/\s/g,"");
         if (keyWord.length > 20) {
             // var s = keyWord.slice(0,19);
-            // $('.addkeyWord input.enterOne').val(s);
+            // $('.addkeyWord input.enterOne').val(s)
 
             weui.toast('关键词不能超过20字', {
                 duration: 2000,
@@ -77,7 +86,7 @@ $(function(){
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -110,7 +119,7 @@ $(function(){
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keys[i].keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -134,7 +143,7 @@ $(function(){
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keys[i].keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -162,7 +171,7 @@ $(function(){
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keys[i].keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -182,7 +191,7 @@ $(function(){
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keys[i].keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -222,11 +231,10 @@ $(function(){
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
-        let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
-        oSpan.focus();
-        setTimeout(() => {
-            keepLastIndex(oSpan)
-        }, 40);
+        let oSpan = e.target.parentNode.nextElementSibling.children[0];
+        let val = $(oSpan).val();
+
+        // alert(oSpan.documentElement.scrollTop)
         var keyWord = $(this).prev().children().find(".key").text();
         for(var i in keyWordArr){
             if(keyWordArr[i].keyWord === keyWord){
@@ -258,6 +266,7 @@ $(function(){
         }
         $(this).parent().hide();
         $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+        $(oSpan).val('').focus().val(val);
         $(".addKeyWord").hide();
     });
 
@@ -290,10 +299,11 @@ $(function(){
     // 编辑确定
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
         var $this = $(this);
-        var keyWord = $(this).siblings('span').text();
+        // var keyWord = $(this).siblings('span').text();
+        var keyWord = $(this).siblings('textarea').val();
         var keyWords = $(this).parent().prev().find('.key').text();
         keyWord = keyWord.replace(/\s/g,"");
-        if ($(this).parent().find("span").html().length < 1) {
+        if ($(this).parent().find("textarea").val().length < 1) {
 
             weui.toast('关键词不能为空', {
                 duration: 2000,
@@ -303,7 +313,7 @@ $(function(){
                 }
             });
             return
-        }else if($(this).parent().find("span").text().length > 20){
+        }else if($(this).parent().find("textarea").val().length > 20){
             // var s = $(this).parent().find("span").text().slice(0,19);
             // $(this).parent().find("span").text(s);
             weui.toast('关键词不能超过20字', {
@@ -330,19 +340,4 @@ $(function(){
         return this.replace(/(^\s*)|(\s*$)/g, ' ');
     }
 
-    function keepLastIndex(obj) {
-        if (window.getSelection) {//ie11 10 9 ff safari
-            obj.focus(); //解决ff不获取焦点无法定位问题
-            var range = window.getSelection();//创建range
-            range.selectAllChildren(obj);//range 选择obj下所有子内容
-            range.collapseToEnd();//光标移至最后
-        }
-        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();
-        }
-    }
-    
 })

+ 9 - 24
src/web/templates/weixin/dataExport/dataExport_appended.html

@@ -125,7 +125,7 @@
                                         <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                     </div>
                                     <div class="modify">
-                                        <span class="ios-user-select" contentEditable="true">${ appendedArr[y] }</span>
+                                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ appendedArr[y] }</textarea>
                                         <button class="deleteKey">删除</button>
                                         <button class="ascertainKey">确定</button>
                                     </div>
@@ -160,7 +160,7 @@
                                 <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
                             <div class="modify">
-                                <span contentEditable="true">${ appendeds[m] }</span>
+                                <textarea  name=""  rows="1"  placeholder="" maxlength="">${ appendeds[m] }</textarea>
                                 <button class="deleteKey">删除</button>
                                 <button class="ascertainKey">确定</button>
                             </div>
@@ -274,7 +274,7 @@
                                     <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                 </div>
                                 <div class="modify">
-                                    <span contentEditable="true">${ appended }</span>
+                                    <textarea  name=""  rows="1"  placeholder="" maxlength="">${ appended }</textarea>
                                     <button class="deleteKey">删除</button>
                                     <button class="ascertainKey">确定</button>
                                 </div>
@@ -293,13 +293,11 @@
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
-                let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
-                oSpan.focus();
-                setTimeout(() => {
-                    keepLastIndex(oSpan)
-                }, 40);
+                let oSpan = e.target.parentNode.nextElementSibling.children[0];
+                let val = $(oSpan).val();
                 $(this).parent().hide();
                 $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+                $(oSpan).val('').focus().val(val);
                 $(".addKeyWord").hide();
             });
 
@@ -329,7 +327,7 @@
             });
             // 编辑 确定
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
-                var appended = $(this).siblings('span').text();
+                var appended = $(this).siblings('textarea').val();
                 var appendeds = $(this).parent().prev().find('.key').text();
                 appended = appended.replace(/\s/g,"");
                 if (appended.length < 1) {
@@ -342,7 +340,7 @@
                         }
                     });
                     return
-                }else if($(this).parent().find("span").text().length > 20){
+                }else if($(this).parent().find("textarea").val().length > 20){
                     // var s = $(this).parent().find("span").text().slice(0,19);
                     // $(this).parent().find("span").text(s);
                     weui.toast('附加词不能超过20字', {
@@ -387,20 +385,7 @@
             $('.addkeyWord .btn .close').on('click', function () {
                 window.history.back();
             });
-            function keepLastIndex(obj) {
-                if (window.getSelection) {//ie11 10 9 ff safari
-                    obj.focus(); //解决ff不获取焦点无法定位问题
-                    var range = window.getSelection();//创建range
-                    range.selectAllChildren(obj);//range 选择obj下所有子内容
-                    range.collapseToEnd();//光标移至最后
-                }
-                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();
-                }
-            }
+
         })
 
     </script>

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_buyerEdit.html

@@ -86,7 +86,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ buyer[i] }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ buyer[i] }</textarea>
                             <button class="deleteKey">删除</button>
                             <button class="ascertainKey">确定</button>
                         </div>

+ 10 - 27
src/web/templates/weixin/dataExport/dataExport_exclude.html

@@ -28,9 +28,7 @@
         top: 85%;
         text-align: center;
     }
-    .ios-user-select{
-        -webket-user-select: text;
-    }
+
 </style>
 <body>
 
@@ -125,7 +123,7 @@
                                     <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                 </div>
                                 <div class="modify">
-                                    <span class="ios-user-select" contentEditable="true">${ excludeArr[y] }</span>
+                                    <textarea  name=""  rows="1"  placeholder="" maxlength="">${ excludeArr[y] }</textarea>
                                     <button class="deleteKey">删除</button>
                                     <button class="ascertainKey">确定</button>
                                 </div>
@@ -160,7 +158,7 @@
                                     <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                 </div>
                                 <div class="modify">
-                                    <span contentEditable="true">${ excludes[m] }</span>
+                                    <textarea  name=""  rows="1"  placeholder="" maxlength="">${ excludes[m] }</textarea>
                                     <button class="deleteKey">删除</button>
                                     <button class="ascertainKey">确定</button>
                                 </div>
@@ -273,7 +271,7 @@
                                         <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                     </div>
                                     <div class="modify">
-                                        <span contentEditable="true">${ exclude }</span>
+                                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ exclude }</textarea>
                                         <button class="deleteKey">删除</button>
                                         <button class="ascertainKey">确定</button>
                                     </div>
@@ -292,13 +290,11 @@
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
-                let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
-                oSpan.focus();
-                setTimeout(() => {
-                    keepLastIndex(oSpan)
-                }, 40);
+                let oSpan = e.target.parentNode.nextElementSibling.children[0];
+                let val = $(oSpan).val();
                 $(this).parent().hide();
                 $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+                $(oSpan).val('').focus().val(val);
                 $(".addKeyWord").hide();
             });
 
@@ -328,7 +324,7 @@
             })
             // 编辑 确定
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
-                var exclude = $(this).siblings('span').text();
+                var exclude = $(this).siblings('textarea').val();
                 var excludes = $(this).parent().prev().find('.key').text();
                 exclude = exclude.replace(/\s/g,"");
                 if (exclude.length < 1) {
@@ -341,7 +337,7 @@
                         }
                     });
                     return
-                }else if($(this).parent().find("span").text().length > 20){
+                }else if($(this).parent().find("textarea").val().length > 20){
                     // var s = $(this).parent().find("span").text().slice(0,19);
                     // $(this).parent().find("span").text(s);
                     weui.toast('排除词不能超过20字', {
@@ -385,20 +381,7 @@
             $('.addkeyWord .btn .close').on('click', function () {
                 window.history.back();
             });
-            function keepLastIndex(obj) {
-                if (window.getSelection) {//ie11 10 9 ff safari
-                    obj.focus(); //解决ff不获取焦点无法定位问题
-                    var range = window.getSelection();//创建range
-                    range.selectAllChildren(obj);//range 选择obj下所有子内容
-                    range.collapseToEnd();//光标移至最后
-                }
-                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();
-                }
-            }
+
         })
 
     </script>

+ 6 - 6
src/web/templates/weixin/dataExport/dataExport_keyWord.html

@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}123">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}124">
     <script src="/js/jquery.js"></script>
     {{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
@@ -112,7 +112,7 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}53"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}55"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         $(window).bind("pageshow", function(event){
@@ -145,7 +145,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWordArr[i].keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -169,7 +169,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWordArr[i].keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -197,7 +197,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWordArr[i].keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -217,7 +217,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWordArr[i].keyWord}</textarea>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>

+ 9 - 26
src/web/templates/weixin/dataExport/dataExport_winnerEdit.html

@@ -31,9 +31,7 @@
 		body{
 			background: rgba(245,244,249,1);
 		}
-		.ios-user-select{
-			-webket-user-select: text;
-		}
+
 	</style>
 	<body>
 	<div class="keyWord">
@@ -82,7 +80,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span class="ios-user-select" contentEditable="true">${ winner[i] }</span>
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ winner[i] }</textarea>
                             <button class="deleteKey">删除</button>
                             <button class="ascertainKey">确定</button>
                         </div>
@@ -158,7 +156,7 @@
 								<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
 							</div>
 							<div class="modify">
-								<span class="ios-user-select" contentEditable="true">${ keyWord }</span>
+								<textarea  name=""  rows="1"  placeholder="" maxlength="">${ keyWord }</textarea>
 								<button class="deleteKey">删除</button>
 								<button class="ascertainKey">确定</button>
 							</div>
@@ -178,13 +176,11 @@
 
 			// 编辑
 			$(".showKeyWord").on('click', '.editKeyWord',function(e){
-				let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
-				oSpan.focus();
-				setTimeout(() => {
-					keepLastIndex(oSpan)
-				}, 40);
+				let oSpan = e.target.parentNode.nextElementSibling.children[0];
+				let val = $(oSpan).val();
 				$(this).parent().hide();
 				$(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+				$(oSpan).val('').focus().val(val);
 				$(".addKeyWord").hide();
 			});
 
@@ -200,7 +196,7 @@
 			});
 			// 编辑 确定
 			$('.showKeyWord').on('click', '.ascertainKey', function(e) {
-				var keyWord = $(this).siblings('span').text();
+				var keyWord = $(this).siblings('textarea').val();
 				var winner = $(this).parent().prev().find('.key').text();
 				keyWord = keyWord.replace(/\s/g,"");
 				if (keyWord.length < 1) {
@@ -213,7 +209,7 @@
 						}
 					});
 					return
-				}else if($(this).parent().find("span").text().length > 50){
+				}else if($(this).parent().find("textarea").val().length > 50){
 					// var s = $(this).parent().find("span").text().slice(0,49);
 					// $(this).parent().find("span").text(s);
 					weui.toast('中标单位不能超过50字', {
@@ -243,20 +239,7 @@
 			$(".close").on('click', function () {
 				history.back();
 			});
-			function keepLastIndex(obj) {
-				if (window.getSelection) {//ie11 10 9 ff safari
-					obj.focus(); //解决ff不获取焦点无法定位问题
-					var range = window.getSelection();//创建range
-					range.selectAllChildren(obj);//range 选择obj下所有子内容
-					range.collapseToEnd();//光标移至最后
-				}
-				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();
-				}
-			}
+
 		})
 
 	</script>