Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/newTravelmanager/TravelGroupControl/TravelTemp/VEditDiv.vue

@@ -5,7 +5,7 @@
 </template>
 <script>
   export default {
-    props: ["value", "canEdit","textLength"],
+    props: ["value", "canEdit", "textLength"],
     data() {
       return {
         innerText: this.value,
@@ -21,26 +21,22 @@
     },
     methods: {
       changeText: function () {
-        let sel = window.getSelection()
-        let offset = sel.anchorOffset
-        if(this.$el.innerText.length>this.textLength){
-          this.$el.innerText = this.$el.innerText.slice(0,3)
+        let sel = window.getSelection();
+        let offset = sel.anchorOffset;
+        if (this.$el.innerText.length > this.textLength) {
+          this.$el.innerText = this.$el.innerText.slice(0, 3);
+        }
+        if (this.textLength) {
+          this.$el.innerText = this.$el.innerText.slice(0, this.textLength);
         }
-        if(this.textLength) this.$el.innerText = this.$el.innerText.slice(0,this.textLength)
         this.$emit("input", this.$el.innerText);
-        // setTimeout(() => {
-        //   var range = sel.getRangeAt(0);
-        //   if (range) {
-        //     var textNode = range.startContainer;
-        //     if (textNode) {
-        //       range.setStart(textNode, offset)
-        //     }
-        //     if (sel) {
-        //       sel.removeAllRanges()
-        //       sel.addRange(range)
-        //     }
-        //   }
-        // }, 0)
+        setTimeout(() => {
+          var range = sel.getRangeAt(0);
+          var textNode = range.startContainer;
+          range.setStart(textNode, offset);
+          sel.removeAllRanges();
+          sel.addRange(range);
+        }, 0);
       }
     }
   };