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

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -358,7 +358,12 @@
                 this.$refs.newFeature.setReadOnly(false)
               } catch (ex) {}
               try {
-                this.$refs.newFeature2.canEditChange(true)
+                if (this.$refs.newFeature2) {
+                  this.$refs.newFeature2.canEditChange(true);
+                }
+                if (this.$refs.UpgradedVersion) {
+                  this.$refs.UpgradedVersion.canEditChange(true);
+                }
               } catch (ex) {}
               //解锁表单重复提交
               this.$emit("unlockFormCommit", true);

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

@@ -31,10 +31,13 @@
           try {
             var range = sel.getRangeAt(0);
             var textNode = range.startContainer;
+            var textNodeName = textNode.nodeName;
             console.log("textNode", textNode.nodeName);
-            range.setStart(textNode, offset);
-            sel.removeAllRanges();
-            sel.addRange(range);
+            if (textNodeName == "#text") {
+              range.setStart(textNode, offset);
+              sel.removeAllRanges();
+              sel.addRange(range);
+            }
           } catch (err) {
             console.log(err);
           }