update

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

@@ -42,7 +42,8 @@
         v-infinite-scroll="requestMoreData"
         :infinite-scroll-disabled="!hasMoreData || isRequestingMoreData"
       >
-        <!-- vuex中的上传中数据 -->
+
+
         <div v-for="(item, i) in uploadStatusList" :key="item.uid">
           <div
             class="table-body-row"
@@ -281,7 +282,7 @@
 
     <div class="btns">
       <button v-if="canUpload && !searchKey" class="ui-button upload-btn" @click="onClickUpload">
-        <span>{{ $i18n.t("gather.upload_material") }}</span>
+        <span>{{ $i18n.t("gather.upload_material") }}xxx</span>
         <i
           class="iconfont icon-material_prompt tool-tip-for-editor"
           v-tooltip="fileInputBtnTip"
@@ -687,7 +688,8 @@ export default {
           }
         )
 
-        this.uploadStatusList.unshift(itemInUploadList);
+        // this.uploadStatusList.unshift(itemInUploadList);
+        this.refreshMaterialList();
       })
     },
     onClickRow(e) {

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

@@ -287,6 +287,9 @@ export default {
       padding: 10px 16px 10px 16px;
       .showWhenHover {
         visibility: hidden;
+        overflow: auto;
+        // position: relative;
+        // z-index: 1;
       }
       &:hover {
         background: #f7f7f7;

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

@@ -136,6 +136,7 @@ export default {
       if (this.info.firstScene) {
         this.info.firstScene = this.info.scenes.find((item) => item.sceneCode == this.info.firstScene.sceneCode);
       }
+       // fodderId:[] 资源引用给后端
     },
 
     onSave() {

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

@@ -230,6 +230,7 @@ export function preOrderTraversalSearch(root, checkNode, targetNodePath) {
   return false
 }
 export function nodeIdList2nodeInfoListByNodeTree(nodeIdList, nodeTree) {
+  nodeIdList = nodeIdList.filter(i => i);
   console.assert(nodeIdList && nodeTree && nodeTree.id && nodeTree.name, 'nodeIdList2nodeInfoListByNodeTree: invalid param!')
   if (nodeIdList.length === 0) {
     return null
@@ -249,7 +250,7 @@ export function nodeIdList2nodeInfoListByNodeTree(nodeIdList, nodeTree) {
     // console.assert(nextLevelRoot, 'nodeIdList2nodeInfoListByNodeTree: invalid param 2!')
     ret = ret.concat(nodeIdList2nodeInfoListByNodeTree(nodeIdList.slice(1, nodeIdList.length), nextLevelRoot))
   }
-  console.log('nodeIdList2nodeInfoListByNodeTree',ret);
+  console.log('nodeIdList2nodeInfoListByNodeTree', ret);
   return ret
 }
 

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

@@ -164,8 +164,8 @@ export default function (materialType) {
         //   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.id : '1'
+        console.log('targetAncestors', targetAncestors);
         moveToFolder(this.selectedList, targetFolderId, targetAncestors).then(() => {
           this.$msg.success(this.$i18n.t('gather.success'))
           this.$nextTick(() => {
@@ -236,11 +236,14 @@ export default function (materialType) {
         getFolderTree({
           type: materialType,
         }).then((res) => {
+
           this.folderTree = res.data
+          console.log('clickedItem.type', clickedItem);
           if (clickedItem.type === 'dir') {
             const targetPathIdList = clickedItem.ancestors.split(',').map((item) => {
               return Number(item)
             })
+
             this.folderPath = nodeIdList2nodeInfoListByNodeTree(targetPathIdList, this.folderTree)
           } else {
             // 在folderTree里找到id等于clickedItem.dirId的那个文件夹，从而确定folderPath
@@ -252,8 +255,12 @@ export default function (materialType) {
                 return false
               }
             }, targetNodePath)
+
             this.folderPath = targetNodePath.map((item) => {
-              return item.id
+              return {
+                id: item.id,
+                name: item.name
+              }
             })
           }
           this.searchKey = ''

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

@@ -177,7 +177,7 @@ onMounted(() => {
       break;
     case props.coverData.coverSelect.toLowerCase().indexOf("img") > -1:
       showImgDaoji(() => {
-        closeImg();
+        props.coverData.coverImageInWay == 1 && closeImg();
       });
       break;
     default: