udpate

packages/qjkankan-editor/.env.testprod

@@ -7,4 +7,4 @@ VUE_APP_PROXY_URL_ROOT='https://test.4dkankan.com'
 VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
 VUE_APP_ORIGIN=
 VUE_APP_URL_FILL=/qjkankan
-VUE_APP_DEBBUG_FLAG=0425-02
+VUE_APP_DEBBUG_FLAG=0425-05

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

@@ -1054,7 +1054,8 @@ export default {
 </style>
 
 <style lang="less">
-.material-list.dark {
+
+.material-list,.material-list.dark {
   .crumbs {
     // display: none;
     ul > li {

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

@@ -4,7 +4,7 @@
     <ul class="t-header" :class="{ 'bottom-line': showLine }">
       <!-- 复选框 -->
       <div
-        :class="{ show: selection && !isAllSelected }"
+        v-show="selection && !isAllSelected"
         class="checkbox inactive"
         @click="onClickSelectAll"
       ></div>
@@ -47,8 +47,7 @@
       >
         <!-- 复选框 -->
         <div
-          
-          :class="{ show: selection && !selectedIdList.some((id) => id === lineData.id) }"
+          v-show="selection && !selectedIdList.some((id) => id === lineData.id)"
           class="checkbox inactive"
           @click="selectItem(lineData, i)"
         />
@@ -240,10 +239,6 @@ export default {
     height: 16px;
     cursor: pointer;
     user-select: none;
-    visibility: hidden;
-    &.show{
-      visibility: visible;
-    }
   }
   .inactive {
     border-radius: 2px;
@@ -296,11 +291,12 @@ export default {
           > div {
             top: 46px;
             &::before {
+ 
               border: 7px solid transparent;
               border-bottom: 7px solid #fff;
               bottom: initial;
               top: -14px;
-
+            
               // transform: rotate(180deg);
             }
           }

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

@@ -602,7 +602,7 @@
     "move_folder": "移动",
     "move_folder_to": "移动到",
     "no_folder_need_create": "暂无文件夹，请先创建文件夹",
-    "rename_folder_placeholder": "请输入",
+    "rename_folder_placeholder": "请输入文件夹名，限15字",
     "video_size": "Support MP4 files: ≤ 200MB",
     "video_limit": "The file is too large.Support MP4 files: ≤ 200MB",
     "video_fail": "Format error. Support MP4 files: ≤ 200MB",

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

@@ -602,7 +602,7 @@
     "move_folder": "移动",
     "move_folder_to": "移动到",
     "no_folder_need_create": "暂无文件夹，请先创建文件夹",
-    "rename_folder_placeholder": "请输入",
+    "rename_folder_placeholder": "请输入文件夹名，限15字",
     "video_size": "请上传200MB以内、mp4格式的视频",
     "video_limit": "过大，请上传200MB以内、mp4格式的视频",
     "video_fail": "格式错误，请上传200MB以内、mp4格式的视频",

packages/qjkankan-editor/src/utils/other.js

@@ -231,14 +231,14 @@ export function preOrderTraversalSearch(root, checkNode, targetNodePath) {
 }
 export function nodeIdList2nodeInfoListByNodeTree(nodeIdList, nodeTree) {
   nodeIdList = nodeIdList.filter(i => i);
- if (nodeIdList.length === 0) {
+  if (nodeIdList.length === 0) {
     return null
   }
 
-  console.log('nodeIdList',nodeIdList)
-  console.log('nodeTree',nodeTree)
+  console.log('nodeIdList', nodeIdList)
+  console.log('nodeTree', nodeTree)
 
- let ret = [
+  let ret = [
     {
       id: nodeTree.id,
       name: nodeTree.name,
@@ -249,7 +249,7 @@ export function nodeIdList2nodeInfoListByNodeTree(nodeIdList, nodeTree) {
     const nextLevelRoot = nodeTree.children.find((item) => {
       return item.id === nodeIdList[1]
     })
-    console.log('nextLevelRoot',nextLevelRoot)
+    console.log('nextLevelRoot', nextLevelRoot)
     // console.assert(nextLevelRoot, 'nodeIdList2nodeInfoListByNodeTree: invalid param 2!')
     ret = ret.concat(nodeIdList2nodeInfoListByNodeTree(nodeIdList.slice(1, nodeIdList.length), nextLevelRoot))
   }

packages/qjkankan-editor/src/views/material/folderMixinFactory.js

@@ -159,13 +159,21 @@ export default function (materialType) {
           }
         })
       },
+      filterAncestors(ancestors) {
+        if (ancestors && ancestors.length > 0) {
+          const array = ancestors.split(',').map(item => item);
+          return array.join(',')
+        } else {
+          return ''
+        }
+      },
       async onSubmitMoveFolder(targetFolderId) {
         // const ancestors = this.folderPath.map((item) => {
         //   return item.id
         // }).join(',')
         const target = this.findFolderTreeById(this.folderTree, targetFolderId);
-        let targetAncestors = target ? target.ancestors + ',' + target.id : '1'
-        console.log('targetAncestors', targetAncestors);
+        let targetAncestors = target && target.ancestors && target.ancestors.length > 0 ? this.filterAncestors(target.ancestors) + ',' + target.id : '1'
+        console.log('filter-targetAncestors', targetAncestors);
         const res = await moveToFolder(this.selectedList, targetFolderId, targetAncestors);
         // console.log('res', res.code === 0);
         if (res) {
@@ -228,7 +236,7 @@ export default function (materialType) {
           this.folderTree = res.data
           const targetPathIdList = folder.ancestors.split(',').map((item) => {
             return Number(item)
-          })
+          }).filter(i => i)
           console.log('targetPathIdList', targetPathIdList);
           targetPathIdList.push(folder.id)
           this.folderPath = nodeIdList2nodeInfoListByNodeTree(targetPathIdList, this.folderTree)

packages/qjkankan-view/.env.testprod

@@ -6,4 +6,4 @@ VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
 VUE_APP_URL_FILL=/qjkankan
 # 接口请求地址
 VUE_APP_APIS_URL=https://test.4dkankan.com/
-VUE_APP_DEBBUG_FLAG=0425-01
+VUE_APP_DEBBUG_FLAG=0425-04

packages/qjkankan-view/src/components/assembly/Opening.vue

@@ -154,6 +154,7 @@ const videoShow = ref(false);
 
 const imgIndex = ref(1);
 const videoIndex = ref(1);
+const isToApp = ref(false);
 
 const currentScene = computed(() => store.getters["scene/currentScene"]);
 
@@ -320,14 +321,17 @@ watch(
 
 //跳转到app
 const toApp = () => {
-  imgShow.value = false;
-  videoShow.value = false;
-
-  useApp().then((app) => {
-    setTimeout(() => {
-      app.render();
-    }, 1000);
-  });
+  if (!unref(isToApp)) {
+    console.log("跳转到app");
+    imgShow.value = false;
+    videoShow.value = false;
+    isToApp.value;
+    useApp().then((app) => {
+      setTimeout(() => {
+        app.render();
+      }, 1000);
+    });
+  }
 };
 
 onMounted(() => {

packages/qjkankan-view/src/components/assembly/Tags/metas/fixaudio.vue

@@ -103,6 +103,7 @@ export default {
       var rate = e.offsetX / e.target.clientWidth;
       this.i_audio.volume = rate
       this.volumePosi = rate * 100
+      this.isMute =false
     },
 
     handleMute(){