管理中心-我的素材-搜索功能相关 前置修改 瞎jb改

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

@@ -1087,7 +1087,7 @@ export default {
         this.scene3DList = []
         this.requestMore3DData()
       }
-    }, 700, false),
+    }, 500, false),
     onFileInputChange(e) {
       switch (this.currentMaterialType) {
         case 'pano':

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

@@ -741,7 +741,7 @@ export default {
         this.scene3DList = []
         this.requestMore3DData()
       }
-    }, 700, false),
+    }, 500, false),
     onFileInputChange(e) {
       switch (this.currentMaterialType) {
         case 'pano':

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

@@ -278,7 +278,7 @@ export default {
         display: inline-block;
         margin-right: 20px;
         flex-grow: 1;
-        span {
+        .textItem {
           color: #323233;
           // word-break: keep-all;
           // white-space: nowrap;

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

@@ -1,45 +1,48 @@
 <template>
   <div class="panorama con">
     <div class="top">
-      <crumbs :list="folderPath" @click-path="onClickPath" />
+      <crumbs v-if="!lastestUsedSearchKey" :list="folderPath" @click-path="onClickPath" />
+      <div v-if="lastestUsedSearchKey" class="">{{$i18n.t("gather.audio")}}</div>
     </div>
     <div class="second-line">
-      <div class="btn">
+      <template v-if="!lastestUsedSearchKey">
+        <div class="btn">
+          <button
+            @mouseover.stop="showList = true"
+            @click="onUploadFile"
+            class="ui-button submit"
+          >
+            <span>{{upload_material}}</span>
+            <i class="iconfont icon-material_prompt hover-tips hover-tips-upload-icon">
+              <div>
+                <div class="remark">{{audio_size}}</div>
+              </div>
+            </i>
+            <upload
+              ref="uploadFile"
+              :failString="audio_fail"
+              :limitFailStr="audio_limit"
+              accept-type="audio/mp3"
+              media-type="audio"
+              :limit="20"
+              @file-change="onFileChange"
+            ></upload>
+          </button>
+        </div>
         <button
-          @mouseover.stop="showList = true"
-          @click="onUploadFile"
           class="ui-button submit"
+          @click="isShowNewFolder = true"
         >
-          <span>{{upload_material}}</span>
-          <i class="iconfont icon-material_prompt hover-tips hover-tips-upload-icon">
-            <div>
-              <div class="remark">{{audio_size}}</div>
-            </div>
-          </i>
-          <upload
-            ref="uploadFile"
-            :failString="audio_fail"
-            :limitFailStr="audio_limit"
-            accept-type="audio/mp3"
-            media-type="audio"
-            :limit="20"
-            @file-change="onFileChange"
-          ></upload>
+          {{$i18n.t(`gather.new_folder`)}}
         </button>
-      </div>
-      <button
-        class="ui-button submit"
-        @click="isShowNewFolder = true"
-      >
-        {{$i18n.t(`gather.new_folder`)}}
-      </button>
-      <button
-        class="ui-button cancel"
-        :class="{disable: selectedList.length === 0}"
-        @click="onClickMoveFolder"
-      >
-        {{$i18n.t(`gather.move_folder`)}}
-      </button>
+        <button
+          class="ui-button cancel"
+          :class="{disable: selectedList.length === 0}"
+          @click="onClickMoveFolder"
+        >
+          {{$i18n.t(`gather.move_folder`)}}
+        </button>
+      </template>
       <div class="filter">
         <div :class="{active: isFilterFocus}" @focusin="onFilterFocus" @focusout="onFilterBlur">
           <i class="iconfont icon-works_search search" ></i>
@@ -63,7 +66,7 @@
         :canRequestMoreData="hasMoreData && !isRequestingMoreData"
         :header="tabHeader"
         :showLine="true"
-        :selection="true"
+        :selection="lastestUsedSearchKey ? false : true"
         :data="list"
         class="table-list"
         ref="table-list"
@@ -124,7 +127,13 @@
           </span>
         </div>
       </tableList>
-      <UploadTaskList class="upload-task-list" fileType="AUDIO" :taskList="uploadListForUI" :targetFolderId="currentFolderId" @cancel-task="onCancelTask"></UploadTaskList>
+      <UploadTaskList
+        class="upload-task-list"
+        fileType="AUDIO"
+        :taskList="uploadListForUI"
+        :targetFolderId="lastestUsedSearchKey ? -1 : currentFolderId"
+        @cancel-task="onCancelTask"
+      />
       <div class="total-number" v-if="list.length !== 0 || hasMoreData">{{had_load}}</div>
       <div class="nodata" v-if="list.length == 0 && !hasMoreData && lastestUsedSearchKey">
         <img :src="$noresult" alt="" />
@@ -273,7 +282,7 @@ export default {
       this.isRequestingMoreData = false
       this.hasMoreData = true
       this.$refs['table-list'].requestMoreData()
-    }, 700, true),
+    }, 500, false),
     stopAllAudio() {
       Array.from($("audio")).forEach((item) => {
         if (!item.paused) {

packages/qjkankan-editor/src/views/material/components/uploadList1.1.0.vue

@@ -123,7 +123,7 @@ export default {
     },
     taskListForShow() {
       return this.taskList.filter((item) => {
-        return item.parentFolderId === this.targetFolderId
+        return item.parentFolderId === this.targetFolderId || this.targetFolderId === -1
       })
     }
   },

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

@@ -32,42 +32,33 @@ export default function(materialType) {
             id: 1,
           },
         ],
-        folderListInPath: [],
       }
     },
     computed: {
       currentFolderId() {
         return this.folderPath[this.folderPath.length - 1].id
+      },
+      folderListInPath() {
+        if (this.list) {
+          return this.list.filter((item) => {
+            return item.type === 'dir'
+          })
+        } else {
+          return []
+        }
       }
     },
     mounted() {
-      this.getAllFolderInPath()
     },
     watch: {
       folderPath: {
         handler: function () {
           this.refreshListDebounced()
-          this.getAllFolderInPath()
         },
         deep: true,
-      }
+      },
     },
     methods: {
-      getAllFolderInPath() {
-        getMaterialList(
-          {
-            dirId: this.currentFolderId,
-            type: materialType,
-          },
-          (res) => {
-            this.folderListInPath = res.data.list.filter((item) => {
-              return item.type === 'dir'
-            })
-          },
-          () => {
-          }
-        )
-      },
       validateNewFolderName(name) {
         const isUnique = (this.folderListInPath.findIndex((item) => {
           return item.name === name
@@ -195,6 +186,7 @@ export default function(materialType) {
         }
       },
       onClickPath(idx) {
+        this.searchKey = ''
         this.folderPath = this.folderPath.slice(0, idx + 1)
         this.selectedList = []
       },
@@ -203,6 +195,7 @@ export default function(materialType) {
           name: folder.name,
           id: folder.id,
         })
+        this.searchKey = ''
         this.selectedList = []
       },
     }

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

@@ -1,45 +1,48 @@
 <template>
   <div class="panorama con">
     <div class="top">
-      <crumbs :list="folderPath" @click-path="onClickPath" />
+      <crumbs v-if="!lastestUsedSearchKey" :list="folderPath" @click-path="onClickPath" />
+      <div v-if="lastestUsedSearchKey" class="">{{$i18n.t("gather.image")}}</div>
     </div>
     <div class="second-line">
-      <div class="btn">
+      <template v-if="!lastestUsedSearchKey">
+        <div class="btn">
+          <button
+            @mouseover.stop="showList = true"
+            @click="onUploadFile"
+            class="ui-button submit"
+          >
+            <span>{{upload_material}}</span>
+            <i class="iconfont icon-material_prompt hover-tips hover-tips-upload-icon">
+              <div>
+                <div class="remark">{{img_size}}</div>
+              </div>
+            </i>
+            <upload
+              ref="uploadFile"
+              :failString="img_fail"
+              :limitFailStr="img_limit"
+              accept-type="image/png,image/jpeg"
+              media-type="image"
+              :limit="10"
+              @file-change="onFileChange"
+            ></upload>
+          </button>
+        </div>
         <button
-          @mouseover.stop="showList = true"
-          @click="onUploadFile"
           class="ui-button submit"
+          @click="isShowNewFolder = true"
         >
-          <span>{{upload_material}}</span>
-          <i class="iconfont icon-material_prompt hover-tips hover-tips-upload-icon">
-            <div>
-              <div class="remark">{{img_size}}</div>
-            </div>
-          </i>
-          <upload
-            ref="uploadFile"
-            :failString="img_fail"
-            :limitFailStr="img_limit"
-            accept-type="image/png,image/jpeg"
-            media-type="image"
-            :limit="10"
-            @file-change="onFileChange"
-          ></upload>
+          {{$i18n.t(`gather.new_folder`)}}
         </button>
-      </div>
-      <button
-        class="ui-button submit"
-        @click="isShowNewFolder = true"
-      >
-        {{$i18n.t(`gather.new_folder`)}}
-      </button>
-      <button
-        class="ui-button cancel"
-        :class="{disable: selectedList.length === 0}"
-        @click="onClickMoveFolder"
-      >
-        {{$i18n.t(`gather.move_folder`)}}
-      </button>
+        <button
+          class="ui-button cancel"
+          :class="{disable: selectedList.length === 0}"
+          @click="onClickMoveFolder"
+        >
+          {{$i18n.t(`gather.move_folder`)}}
+        </button>
+      </template>
       <div class="filter">
         <div :class="{active: isFilterFocus}" @focusin="onFilterFocus" @focusout="onFilterBlur">
           <i class="iconfont icon-works_search search" ></i>
@@ -63,7 +66,7 @@
         :canRequestMoreData="hasMoreData && !isRequestingMoreData"
         :header="tabHeader"
         :showLine="true"
-        :selection="true"
+        :selection="lastestUsedSearchKey ? false : true"
         :data="list"
         class="table-list"
         ref="table-list"
@@ -118,7 +121,13 @@
           </span>
         </div>
       </tableList>
-      <UploadTaskList class="upload-task-list" fileType="IMAGE" :taskList="uploadListForUI" :targetFolderId="currentFolderId" @cancel-task="onCancelTask"></UploadTaskList>
+      <UploadTaskList
+        class="upload-task-list"
+        fileType="IMAGE"
+        :taskList="uploadListForUI"
+        :targetFolderId="lastestUsedSearchKey ? -1 : currentFolderId"
+        @cancel-task="onCancelTask"
+      />
       <div class="total-number" v-if="list.length !== 0 || hasMoreData">{{had_load}}</div>
       <div class="nodata" v-if="list.length == 0 && !hasMoreData && lastestUsedSearchKey">
         <img :src="$noresult" alt="" />
@@ -274,7 +283,7 @@ export default {
       this.isRequestingMoreData = false
       this.hasMoreData = true
       this.$refs['table-list'].requestMoreData()
-    }, 700, true),
+    }, 500, false),
     handleRename(newName) {
       editMaterial(
         {

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

@@ -1,34 +1,37 @@
 <template>
   <div class="panorama con">
     <div class="top">
-      <crumbs :list="folderPath" @click-path="onClickPath" />
+      <crumbs v-if="!lastestUsedSearchKey" :list="folderPath" @click-path="onClickPath" />
+      <div v-if="lastestUsedSearchKey" class="">{{$i18n.t("gather.pano")}}</div>
     </div>
     <div class="second-line">
-      <div class="btn">
-        <button @mouseover.stop="showList = true" @click="onUploadFile" class="ui-button submit">
-          <span>{{ upload_material }}</span>
-          <i class="iconfont icon-material_prompt hover-tips hover-tips-upload-icon">
-            <div>
-              <div class="remark">{{ pano_size }}</div>
-            </div>
-          </i>
-          <upload ref="uploadFile" :failString="pano_fail" :limitFailStr="pano_limit" accept-type=".jpg"
-            media-type="image" :limit="120" @file-change="onFileChange"></upload>
+      <template v-if="!lastestUsedSearchKey">
+        <div class="btn">
+          <button @mouseover.stop="showList = true" @click="onUploadFile" class="ui-button submit">
+            <span>{{ upload_material }}</span>
+            <i class="iconfont icon-material_prompt hover-tips hover-tips-upload-icon">
+              <div>
+                <div class="remark">{{ pano_size }}</div>
+              </div>
+            </i>
+            <upload ref="uploadFile" :failString="pano_fail" :limitFailStr="pano_limit" accept-type=".jpg"
+              media-type="image" :limit="120" @file-change="onFileChange"></upload>
+          </button>
+        </div>
+        <button
+          class="ui-button submit"
+          @click="isShowNewFolder = true"
+        >
+          {{$i18n.t(`gather.new_folder`)}}
         </button>
-      </div>
-      <button
-        class="ui-button submit"
-        @click="isShowNewFolder = true"
-      >
-        {{$i18n.t(`gather.new_folder`)}}
-      </button>
-      <button
-        class="ui-button cancel"
-        :class="{disable: selectedList.length === 0}"
-        @click="onClickMoveFolder"
-      >
-        {{$i18n.t(`gather.move_folder`)}}
-      </button>
+        <button
+          class="ui-button cancel"
+          :class="{disable: selectedList.length === 0}"
+          @click="onClickMoveFolder"
+        >
+          {{$i18n.t(`gather.move_folder`)}}
+        </button>
+      </template>
       <div class="filter">
         <div :class="{ active: isFilterFocus }" @focusin="onFilterFocus" @focusout="onFilterBlur">
           <i class="iconfont icon-works_search search"></i>
@@ -48,7 +51,7 @@
         :canRequestMoreData="hasMoreData && !isRequestingMoreData"
         :header="tabHeader"
         :showLine="true"
-        :selection="true"
+        :selection="lastestUsedSearchKey ? false : true"
         :data="list"
         class="table-list"
         ref="table-list"
@@ -131,8 +134,13 @@
           </span>
         </div>
       </tableList>
-      <UploadTaskList class="upload-task-list" fileType="IMAGE" :taskList="uploadListForUI" :targetFolderId="currentFolderId" @cancel-task="onCancelTask">
-      </UploadTaskList>
+      <UploadTaskList
+        class="upload-task-list"
+        fileType="IMAGE"
+        :taskList="uploadListForUI"
+        :targetFolderId="lastestUsedSearchKey ? -1 : currentFolderId"
+        @cancel-task="onCancelTask"
+      />
       <div class="total-number" v-if="list.length !== 0 || hasMoreData">{{ had_load }}</div>
       <div class="nodata" v-if="list.length == 0 && !hasMoreData && lastestUsedSearchKey">
         <img :src="$noresult" alt="" />
@@ -319,7 +327,7 @@ export default {
       this.isRequestingMoreData = false
       this.hasMoreData = true
       this.$refs['table-list'].requestMoreData()
-    }, 700, true),
+    }, 500, false),
     clearinter() {
       this.interval && clearInterval(this.interval);
       this.interval = null;

packages/qjkankan-editor/src/views/material/style.less

@@ -4,6 +4,12 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+    > div {
+      font-size: 18px;
+      font-weight: bold;
+      color: #333333;
+      line-height: 28px;
+    }
   }
 
   .ui-button{

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

@@ -1,45 +1,48 @@
 <template>
   <div class="panorama con">
     <div class="top">
-      <crumbs :list="folderPath" @click-path="onClickPath" />
+      <crumbs v-if="!lastestUsedSearchKey" :list="folderPath" @click-path="onClickPath" />
+      <div v-if="lastestUsedSearchKey" class="">{{$i18n.t("gather.video")}}</div>
     </div>
     <div class="second-line">
-      <div class="btn">
+      <template v-if="!lastestUsedSearchKey">
+        <div class="btn">
+          <button
+            @mouseover.stop="showList = true"
+            @click="onUploadFile"
+            class="ui-button submit"
+          >
+            <span>{{upload_material}}</span>
+            <i class="iconfont icon-material_prompt hover-tips hover-tips-upload-icon">
+              <div>
+                <div class="remark">{{video_size}}</div>
+              </div>
+            </i>
+            <upload
+              ref="uploadFile"
+              :failString="video_limit"
+              :limitFailStr="video_fail"
+              accept-type="video/mp4"
+              media-type="video"
+              :limit="200"
+              @file-change="onFileChange"
+            ></upload>
+          </button>
+        </div>
         <button
-          @mouseover.stop="showList = true"
-          @click="onUploadFile"
           class="ui-button submit"
+          @click="isShowNewFolder = true"
         >
-          <span>{{upload_material}}</span>
-          <i class="iconfont icon-material_prompt hover-tips hover-tips-upload-icon">
-            <div>
-              <div class="remark">{{video_size}}</div>
-            </div>
-          </i>
-          <upload
-            ref="uploadFile"
-            :failString="video_limit"
-            :limitFailStr="video_fail"
-            accept-type="video/mp4"
-            media-type="video"
-            :limit="200"
-            @file-change="onFileChange"
-          ></upload>
+          {{$i18n.t(`gather.new_folder`)}}
         </button>
-      </div>
-      <button
-        class="ui-button submit"
-        @click="isShowNewFolder = true"
-      >
-        {{$i18n.t(`gather.new_folder`)}}
-      </button>
-      <button
-        class="ui-button cancel"
-        :class="{disable: selectedList.length === 0}"
-        @click="onClickMoveFolder"
-      >
-        {{$i18n.t(`gather.move_folder`)}}
-      </button>
+        <button
+          class="ui-button cancel"
+          :class="{disable: selectedList.length === 0}"
+          @click="onClickMoveFolder"
+        >
+          {{$i18n.t(`gather.move_folder`)}}
+        </button>
+      </template>
       <div class="filter">
           <div :class="{active: isFilterFocus}" @focusin="onFilterFocus" @focusout="onFilterBlur">
             <i class="iconfont icon-works_search search"></i>
@@ -63,7 +66,7 @@
         :canRequestMoreData="hasMoreData && !isRequestingMoreData"
         :header="tabHeader"
         :showLine="true"
-        :selection="true"
+        :selection="lastestUsedSearchKey ? false : true"
         :data="list"
         class="table-list"
         ref="table-list"
@@ -124,7 +127,13 @@
           </span>
         </div>
       </tableList>
-      <UploadTaskList class="upload-task-list" fileType="VIDEO" :taskList="uploadListForUI" :targetFolderId="currentFolderId" @cancel-task="onCancelTask"></UploadTaskList>
+      <UploadTaskList
+        class="upload-task-list"
+        fileType="VIDEO"
+        :taskList="uploadListForUI"
+        :targetFolderId="lastestUsedSearchKey ? -1 : currentFolderId"
+        @cancel-task="onCancelTask"
+      />
       <div class="total-number" v-if="list.length !== 0 || hasMoreData">{{had_load}}</div>
       <div class="nodata" v-if="list.length == 0 && !hasMoreData && lastestUsedSearchKey">
         <img :src="$noresult" alt="" />
@@ -284,7 +293,7 @@ export default {
       this.isRequestingMoreData = false
       this.hasMoreData = true
       this.$refs['table-list'].requestMoreData()
-    }, 700, true),
+    }, 500, false),
     handleRename(newName) {
       editMaterial(
         {

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

@@ -183,7 +183,7 @@ export default {
       this.isRequestingMoreData = false
       this.hasMoreData = true
       this.requestMoreData()
-    }, 700, false),
+    }, 500, false),
     openShare(data) {
       console.log(data);
       getPanoInfo(data.id, (data) => {