gemercheung hace 2 años
padre
commit
d3e7b0bf60

+ 9 - 3
packages/qjkankan-editor/src/api/index.js

@@ -700,7 +700,13 @@ export function moveToFolder(list, targetId, ancestors) {
     }).join(','),
     parentId: targetId,
   }
-  return http.postJson(`${URL_FILL}/manage/dir/move`, param)
+  return http.postJson(`${URL_FILL}/manage/dir/move`, param).then((res) => {
+    if (res.code === 0) {
+      return Promise.resolve(res)
+    } else {
+      return Promise.resolve(false)
+    }
+  })
 }
 
 export async function delFolder(id) {
@@ -708,7 +714,7 @@ export async function delFolder(id) {
     if (res.code === 0) {
       return Promise.resolve(res)
     } else {
-      return Promise.reject(false)
+      return Promise.resolve(false)
     }
   })
   // return http.postJson(`${URL_FILL}/manage/dir/remove/${id}`, ok, no)
@@ -746,7 +752,7 @@ export function getWorksList(data, ok, no) {
  */
 export function saveWorks(data, ok, no) {
   !data.id && (data.id = number())
- 
+
   // return http.postJson(`http://192.168.0.152:8001/qjkankan/manage/work/edit`, data, ok, no)
   return http.postJson(`${URL_FILL}/manage/work/edit`, data, ok, no)
 }

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

@@ -11,8 +11,8 @@
         {{ $i18n.t("gather.audio") }}
       </div>
     </div>
-    <div class="second-line">
-      <template v-if="!searchKey">
+    <div class="second-line" :class="{ disabled: searchKey }">
+      <template>
         <div class="btn">
           <button
             @mouseover.stop="showList = true"
@@ -627,7 +627,16 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.second-line {
+  &.disabled {
+    button {
+      opacity: 0.5;
+      pointer-events: none;
+    }
+  }
+}
+</style>
 <style lang="less" scoped>
 @import "../style.less";
 </style>

+ 7 - 4
packages/qjkankan-editor/src/views/material/folderMixinFactory.js

@@ -148,7 +148,7 @@ export default function (materialType) {
           type: materialType,
         }).then((res) => {
           this.folderTree = res.data
-          console.log('onClickMoveFolder->>', res.data,this.folderTree);
+          console.log('onClickMoveFolder->>', res.data, this.folderTree);
           if (this.folderTree.children.length === 0) {
             this.$confirm({
               title: this.$i18n.t('gather.move_folder_to'),
@@ -159,21 +159,24 @@ export default function (materialType) {
           }
         })
       },
-      onSubmitMoveFolder(targetFolderId) {
+      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);
-        moveToFolder(this.selectedList, targetFolderId, targetAncestors).then(() => {
+        const res = await moveToFolder(this.selectedList, targetFolderId, targetAncestors);
+        // console.log('res', res.code === 0);
+        if (res) {
           this.$msg.success(this.$i18n.t('gather.success'))
           this.$nextTick(() => {
             this.isShowMoveFolder = false;
             this.selectedList = []
             this.refreshListDebounced()
           });
-        })
+        } 
+
       },
 
       findFolderTreeById(folderTree, id) {