fix :bug

packages/qjkankan-editor/src/components/dragTree/index.vue

@@ -35,7 +35,7 @@
               <!-- 拖拽图标 -->
               <i ref="drag-group" class="drag-icon iconfont icon-editor_folder_off folder_collapsed"></i>
               <i v-if="data.type == 'group' && expandedNodes.includes(data.id)" class="iconfont icon-editor_folder_on folder_expanded"></i>
-              <span v-if="reNameId != data.id"> {{ data.name }}</span>
+              <span v-if="reNameId != data.id"> {{ fixTitle(data.name) }}</span>
               <input
                 ref="reNameInput"
                 v-model.trim="data.name"
@@ -261,7 +261,19 @@ export default {
   },
   methods: {
     ossImagePreviewUrlSuffix,
-
+    fixTitle(name) {
+      if (name == "默认二级分组") {
+        name = this.$i18n.t("navigation.default_group_two");
+      } else if (name == "一级分组") {
+        name = this.$i18n.t("navigation.group_one");
+      } else if (name == "二级分组") {
+        name = this.$i18n.t("navigation.group_two");
+      } else {
+        // eslint-disable-next-line no-self-assign
+        name = name;
+      }
+      return name;
+    },
     handleNodeExpand(data, node, instance) {
       console.log("节点展开", data);
       // 当节点展开时，将其id添加到数组中
@@ -449,8 +461,6 @@ export default {
         }
         changeListLength++;
       }
-      console.error(newScenes);
-      console.error(this.sceneList);
 
       let allSuccess = true;
       newScenes.forEach((item, i) => {
@@ -716,7 +726,7 @@ export default {
 
             break;
           case "del":
-            if (groupList.length == 1 && !panoList.length && groupList[0].children.length) {
+            if (groupList.length == 1 && !panoList.length && groupList[0].children.length && groupList[0].name == "默认二级分组") {
               //当只有一个二级目录，二级目录有场景
               item.children = groupList[0].children;
             }

packages/qjkankan-editor/src/framework/EditorHead.vue

@@ -371,30 +371,45 @@ export default {
         let fodderId = [];
         switch (item.hotspotType) {
           case "image":
-            fodderId = item.image.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
-            item.fodderId = fodderId;
-            // fodderId = item.content.image.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
-            // item.fodderId = fodderId;
+            try {
+              fodderId = item.image.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
+              item.fodderId = fodderId;
+            } catch (e) {
+              fodderId = item.content.image.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
+              item.fodderId = fodderId;
+            }
             break;
           case "audio":
-          item.fodderId = [item.audio.id].map((i) => i);
-            // item.fodderId = [item.content.audio.id].map((i) => i);
+            try {
+              item.fodderId = [item.audio.id].map((i) => i);
+            } catch (e) {
+              item.fodderId = [item.content.audio.id].map((i) => i);
+            }
+
             break;
           case "imageText":
-            fodderId = item.imageTextInfo.imageList.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
-            item.imageTextInfo.audio.id && fodderId.push(item.imageTextInfo.audio.id);
-            item.fodderId = fodderId;
-            // fodderId = item.content.imageTextInfo.imageList.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
-            // item.imageTextInfo.audio.id && fodderId.push(item.content.imageTextInfo.audio.id);
-            // item.fodderId = fodderId;
+            try {
+              fodderId = item.imageTextInfo.imageList.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
+              item.imageTextInfo.audio.id && fodderId.push(item.imageTextInfo.audio.id);
+              item.fodderId = fodderId;
+            } catch (e) {
+              fodderId = item.content.imageTextInfo.imageList.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
+              item.content.imageTextInfo.audio.id && fodderId.push(item.content.imageTextInfo.audio.id);
+              item.fodderId = fodderId;
+            }
+
             break;
           case "video":
-          item.fodderId = [item.video.id];
+            item.fodderId = [item.video.id];
             // item.fodderId = [item.content.video.id];
             break;
           case "scene":
-            item.fodderId = [item.scene.fodderId].map((i) => i);
-            // item.fodderId = [item.content.scene.fodderId].map((i) => i);
+            try {
+              item.fodderId = [item.scene.fodderId].map((i) => i);
+            } catch (e) {
+              item.fodderId = [item.content.scene.fodderId].map((i) => i);
+            }
+
             break;
           default:
             // target.fodderId = [];

packages/qjkankan-editor/src/framework/play/pano/components/new-list.vue

@@ -18,9 +18,7 @@
           > -->
           <div
             class="swiper-slide scene-slide"
-            v-tooltip="
-              item.type == '4dkk' ? $i18n.t('navigation.scene_edit_tips') : ''
-            "
+            v-tooltip="item.type == '4dkk' ? $i18n.t('navigation.scene_edit_tips') : ''"
             :class="{
               active: currentScene.id == item.id || (currentScene.sid && currentScene.sid == item.sid),
               disabled: isLockV4Scene,
@@ -221,6 +219,8 @@ export default {
         name = this.$i18n.t("navigation.default_group_two");
       } else if (name == "一级分组") {
         name = this.$i18n.t("navigation.group_one");
+      } else if (name == "二级分组") {
+        name = this.$i18n.t("navigation.group_two");
       } else {
         // eslint-disable-next-line no-self-assign
         name = name;

packages/qjkankan-view/src/components/UIGather/list.vue

@@ -233,6 +233,8 @@ const fixTitle = (name) => {
     name = t("navigation.default_group_two");
   } else if (name == "一级分组") {
     name = t("navigation.group_one");
+  } else if (name == "二级分组") {
+    name = t("navigation.group_two");
   } else {
     name = name;
   }
@@ -320,7 +322,7 @@ const initSceneSwiper = () => {
   });
 };
 const tabCurrentScene = (data, index) => {
-  if(data.type == '4dkk') {
+  if (data.type == "4dkk") {
     store.commit("functions/setShowScenesList", false);
   }
   store.commit("scene/setCurrentScene", data);