管理中心-我的素材-素材列表：“根目录”这个目录名的显示适配多语种；拿到素材列表数据后对其中旧版本时上传的数据补齐新版本新增字段。

packages/qjkankan-editor/src/api/index.js

@@ -478,6 +478,18 @@ export function setListSort(data, ok, no) {
     $waiting.show()
     return http.postJson(url, data, (result)=>{
         $waiting.hide()
+        console.log(result);
+        // 处理旧版本时上传的素材没有新版本新加入的字段的问题
+        if (result && result.code === 0 && result.data.list) {
+          for (const item of result.data.list) {
+            if (item.dirId === null) {
+              item.dirId = 1
+            }
+            if (item.dirName === '') {
+              item.dirName = '根目录'
+            }
+          }
+        }
         return ok(result)
     }, (err) => {
       $waiting.hide()

packages/qjkankan-editor/src/components/nestedFolder.vue

@@ -16,7 +16,7 @@
       <i class="iconfont icon-edit_input_arrow icon-expand" :class="isExpanded ? '' : 'collapsed'"></i>
       <img v-show="!isExpanded" class="folder collapsed" src="@/assets/images/icons/folder-blue-small-close.png" alt="" draggable="false">
       <img v-show="isExpanded" class="folder opened" src="@/assets/images/icons/folder-blue-small-open.png" alt="" draggable="false">
-      <span class="group-name">{{folderInfo.name}}</span>
+      <span class="group-name">{{folderInfo.id === 1 ? $i18n.t('gather.root_dir') : folderInfo.name}}</span>
     </div>
 
     <div class="group-content" v-if="isExpanded">

packages/qjkankan-editor/src/lang/_en.json

@@ -644,7 +644,9 @@
 
     "nothing_edit": "You haven't created any content yet",
     "at_least_one_scene": "At least one scene can be previewed. Please go to \"Scene Navigation\" to add",
-    "exitVr": "Exit VR"
+    "exitVr": "Exit VR",
+
+    "root_dir": "根目录"
   },
   "personal_center": {
     "personal_center": "Personal Center",

packages/qjkankan-editor/src/lang/_zh.json

@@ -648,7 +648,9 @@
 
     "nothing_edit": "您还未创建任何内容哦",
     "at_least_one_scene": "至少添加一个场景才可预览，请前往“场景导航”添加",
-    "exitVr": "退出VR模式"
+    "exitVr": "退出VR模式",
+
+    "root_dir": "根目录"
   },
   "personal_center": {
     "personal_center": "个人中心",
@@ -778,9 +780,6 @@
     "一级分组":"一级分组",
     "二级分组":"二级分组",
     "默认二级分组":"默认二级分组"
-
-
-
   },
   "navigation": {
     "scene_edit_tips": "请前往四维时代个人中心编辑场景",

packages/qjkankan-editor/src/views/material/audio/index.vue

@@ -159,7 +159,7 @@
                     {{ itemData || "-" }}
                   </div>
                   <div class="parent-name-wrap">
-                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirName}}</span>
+                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirId === 1 ? $i18n.t('gather.root_dir') : lineData.dirName}}</span>
                   </div>
                 </div>
                 <!-- 素材名称 -->
@@ -168,7 +168,7 @@
                     {{ itemData || "-" }}
                   </div>
                   <div class="parent-name-wrap">
-                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirName}}</span>
+                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirId === 1 ? $i18n.t('gather.root_dir') : lineData.dirName}}</span>
                   </div>
                 </div>
               </div>

packages/qjkankan-editor/src/views/material/image/index.vue

@@ -153,7 +153,7 @@
                     {{ itemData || "-" }}
                   </div>
                   <div class="parent-name-wrap">
-                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirName}}</span>
+                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirId === 1 ? $i18n.t('gather.root_dir') : lineData.dirName}}</span>
                   </div>
                 </div>
                 <!-- 素材名称 -->
@@ -162,7 +162,7 @@
                     {{ itemData || "-" }}
                   </div>
                   <div class="parent-name-wrap">
-                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirName}}</span>
+                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirId === 1 ? $i18n.t('gather.root_dir') : lineData.dirName}}</span>
                   </div>
                 </div>
               </div>

packages/qjkankan-editor/src/views/material/pano/index.vue

@@ -154,7 +154,7 @@
                     {{ itemData || "-" }}
                   </div>
                   <div class="parent-name-wrap">
-                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirName}}</span>
+                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirId === 1 ? $i18n.t('gather.root_dir') : lineData.dirName}}</span>
                   </div>
                 </div>
                 <!-- 素材名称 -->
@@ -163,7 +163,7 @@
                     {{ itemData || "-" }}
                   </div>
                   <div class="parent-name-wrap">
-                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirName}}</span>
+                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirId === 1 ? $i18n.t('gather.root_dir') : lineData.dirName}}</span>
                   </div>
                 </div>
               </div>

packages/qjkankan-editor/src/views/material/video/index.vue

@@ -159,7 +159,7 @@
                     {{ itemData || "-" }}
                   </div>
                   <div class="parent-name-wrap">
-                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirName}}</span>
+                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirId === 1 ? $i18n.t('gather.root_dir') : lineData.dirName}}</span>
                   </div>
                 </div>
                 <!-- 素材名称 -->
@@ -168,7 +168,7 @@
                     {{ itemData || "-" }}
                   </div>
                   <div class="parent-name-wrap">
-                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirName}}</span>
+                    目录 <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirId === 1 ? $i18n.t('gather.root_dir') : lineData.dirName}}</span>
                   </div>
                 </div>
               </div>