Merge branch 'master' of http://192.168.4.246:3000/zhangs/surveyMaker

src/views/h5editor/overview.vue

@@ -76,15 +76,15 @@
     <div class="list custom-scrollbar" style="z-index: 2;" v-show="viewState === 1"
       :class="{ dragging: dragState === 1 }">
       <ul>
-        <li v-for="layer in layersNoBg">
-          <div class="layer" :class="{ active: editingLayer === layer}" @click="setEditingLayer($event, layer)"
+        <li v-for="(layer, index) in layersNoBg" :key="index">
+          <div class="layer" :class="{ active: editingLayer === layer}" @click="setEditingLayer(layer)"
             @mousedown="moveLayer">
             <span class="thumb" :style="{ backgroundImage: 'url(' + layer.imgSrc + ')' }"></span>{{ layer.type }}
           </div>
         </li>
       </ul>
-      <div v-for="layer in layersBg" class="layer" :class="{ active: editingLayer === layer}"
-        @click="setEditingLayer($event, layer)">
+      <div v-for="(layer, index) in layersBg" :key="index" class="layer" :class="{ active: editingLayer === layer}"
+        @click="setEditingLayer(layer)">
         <span class="thumb" :style="{ backgroundImage: 'url(' + layer.imgSrc + ')' }"></span>{{ layer.type }}
       </div>
     </div>
@@ -97,8 +97,8 @@
       <el-collapse-transition>
         <div v-show="showTopic">
           <div class="topic-group">
-            <el-checkbox v-model="item.isChecked" v-for="(item, index) in questionList" :label="item.name"
-              :key="item.name" @change="checked=>selectCheckbox(checked,item,index)" :disabled="isDisabled(index)">
+            <el-checkbox v-model="item.isChecked" v-for="(item, index) in questionList" :label="item.name" :key="index"
+              @change="checked=>selectCheckbox(checked,item,index)" :disabled="isDisabled(index)">
             </el-checkbox>
           </div>
         </div>
@@ -466,7 +466,9 @@ export default {
         "rgba(255,255,255,0)";
       this.$store.dispatch("setEditorPage", page);
     },
-    setEditingLayer(event, layer) {
+    setEditingLayer(layer) {
+      this.$store.state.editor.complexEditorElement = [];
+      this.$store.dispatch("setEditorElement", null);
       this.$store.dispatch("setEditorElement", layer);
     },
     updateLayersSort() {