update

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

@@ -1,21 +1,21 @@
-import { http,getToken } from '../utils/request'
+import { http, getToken } from '../utils/request'
 import config from '../config'
 import { $waiting } from "@/components/shared/loading";
 import { postOrderTraversal } from "@/utils/other.js";
 import { i18n } from "@/lang"
 
-const number = function() {
-    return config.projectNum
+const number = function () {
+  return config.projectNum
 }
 
-const scene = function() {
-    return config.sceneNum
+const scene = function () {
+  return config.sceneNum
 }
 
 
 
-const CLIENT_CODE =  config.client_code
-const URL_FILL =  config.urlFill
+const CLIENT_CODE = config.client_code
+const URL_FILL = config.urlFill
 
 
 let ossUrl = config.CDN
@@ -36,7 +36,7 @@ export function getUserInfo(ok, no) {
  * @param {*} no 
  */
 export function getPanoInfo(data, ok, no) {
-  return http.get(`${ossUrl}/720yun_fd_manage/${data||number()}/someData.json?_=${Math.random()}`, {}, ok, no)
+  return http.get(`${ossUrl}/720yun_fd_manage/${data || number()}/someData.json?_=${Math.random()}`, {}, ok, no)
 }
 
 
@@ -46,8 +46,8 @@ export function getPanoInfo(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function getSceneInfomation(data, ok, no) {
-    return http.get(`/api/scene/getInfo?num=${data.id}&_=${Math.random()}`, {}, ok, no)
+export function getSceneInfomation(data, ok, no) {
+  return http.get(`/api/scene/getInfo?num=${data.id}&_=${Math.random()}`, {}, ok, no)
 }
 
 /**
@@ -56,8 +56,8 @@ export function getPanoInfo(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function getTabList(data, ok, no) {
-    return http.get(`${URL_FILL}/manage/catalog/getCatalog/${number()}`, data, ok, no)
+export function getTabList(data, ok, no) {
+  return http.get(`${URL_FILL}/manage/catalog/getCatalog/${number()}`, data, ok, no)
 }
 
 
@@ -68,8 +68,8 @@ export function getPanoInfo(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function getTabSceneList(data, ok, no) {
-    return http.get(`${URL_FILL}/manage/catalog/getScene/${data.catalogId}`, {}, ok, no)
+export function getTabSceneList(data, ok, no) {
+  return http.get(`${URL_FILL}/manage/catalog/getScene/${data.catalogId}`, {}, ok, no)
 }
 
 /**
@@ -78,9 +78,9 @@ export function getPanoInfo(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function editTabName(data, ok, no) {
-    data.workId = number()
-    return http.postJson(`${URL_FILL}/manage/catalog/save`, data, ok, no)
+export function editTabName(data, ok, no) {
+  data.workId = number()
+  return http.postJson(`${URL_FILL}/manage/catalog/save`, data, ok, no)
 }
 
 
@@ -90,9 +90,9 @@ export function getPanoInfo(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function savePanoToWorks(data, ok, no) {
-    data.workId = number()
-    return http.postJson(`${URL_FILL}/manage/scene/saves`, data, ok, no)
+export function savePanoToWorks(data, ok, no) {
+  data.workId = number()
+  return http.postJson(`${URL_FILL}/manage/scene/saves`, data, ok, no)
 }
 
 
@@ -102,8 +102,8 @@ export function getPanoInfo(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function delTab(data, ok, no) {
-    return http.get(`${URL_FILL}/manage/catalog/remove/${data}`, {}, ok, no)
+export function delTab(data, ok, no) {
+  return http.get(`${URL_FILL}/manage/catalog/remove/${data}`, {}, ok, no)
 }
 
 /**
@@ -112,8 +112,8 @@ export function getPanoInfo(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function delPano(data, ok, no) {
-    return http.get(`${URL_FILL}/manage/scene/remove/${data}`, {}, ok, no)
+export function delPano(data, ok, no) {
+  return http.get(`${URL_FILL}/manage/scene/remove/${data}`, {}, ok, no)
 }
 
 
@@ -136,7 +136,7 @@ export function get3DSceneList(data, ok) {
             name: i18n.t('gather.siweikankan'),
             sceneName: i18n.t('gather.siweikankan'),
             id: 'kankan',
-            type: 'dir', 
+            type: 'dir',
           },
           {
             name: i18n.t('gather.siweikanjian'),
@@ -188,7 +188,7 @@ export function get3DSceneList(data, ok) {
  * 获取三维场景列表（使用关键词搜索功能，分别搜索看看和看见，两个结果合并后返回）
  */
 
- export function searchInAll3DScenes(data, ok) {
+export function searchInAll3DScenes(data, ok) {
   const {
     searchKey,
   } = data
@@ -246,8 +246,8 @@ export function get3DSceneList(data, ok) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function getIndex(data, ok, no) {
-    return http.get(`${URL_FILL}/manage/scene/getIndex/${number()}`, data, ok, no)
+export function getIndex(data, ok, no) {
+  return http.get(`${URL_FILL}/manage/scene/getIndex/${number()}`, data, ok, no)
 }
 
 
@@ -257,8 +257,8 @@ export function get3DSceneList(data, ok) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function saveIndexInfo(data, ok, no) {
-    return http.post(`${URL_FILL}/manage/scene/setIndex/${data.id}/${number()}`, '', ok, no)
+export function saveIndexInfo(data, ok, no) {
+  return http.post(`${URL_FILL}/manage/scene/setIndex/${data.id}/${number()}`, '', ok, no)
 }
 
 
@@ -269,8 +269,8 @@ export function get3DSceneList(data, ok) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function uploadCover(data, ok, no) {
-    return http.uploadBlobFile(`${URL_FILL}/manage/work/upload`, data, ok, no)
+export function uploadCover(data, ok, no) {
+  return http.uploadBlobFile(`${URL_FILL}/manage/work/upload`, data, ok, no)
 }
 
 
@@ -282,8 +282,8 @@ export function get3DSceneList(data, ok) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function savePosition(data, ok, no) {
-    return http.postJson(`${URL_FILL}/manage/scene/editXml`, data, ok, no)
+export function savePosition(data, ok, no) {
+  return http.postJson(`${URL_FILL}/manage/scene/editXml`, data, ok, no)
 }
 
 
@@ -293,8 +293,8 @@ export function get3DSceneList(data, ok) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function editPanoName(data, ok, no) {
-    return http.postJson(`${URL_FILL}/manage/scene/edit`, data, ok, no)
+export function editPanoName(data, ok, no) {
+  return http.postJson(`${URL_FILL}/manage/scene/edit`, data, ok, no)
 }
 
 
@@ -304,8 +304,8 @@ export function get3DSceneList(data, ok) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function editCatalogName(data, ok, no) {
-    return http.postJson(`${URL_FILL}/manage/catalog/edit`, data, ok, no)
+export function editCatalogName(data, ok, no) {
+  return http.postJson(`${URL_FILL}/manage/catalog/edit`, data, ok, no)
 }
 
 
@@ -318,7 +318,7 @@ export function get3DSceneList(data, ok) {
  * @param {*} no 
  */
 export function saveInitScreen(data, ok, no) {
-    return http.post(`${URL_FILL}/manage/scene/saveIndex`, data, ok, no)
+  return http.post(`${URL_FILL}/manage/scene/saveIndex`, data, ok, no)
 }
 
 /**
@@ -327,8 +327,8 @@ export function saveInitScreen(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function saveSomeData(data, ok, no) {
-    return http.postJson(`${URL_FILL}/manage/scene/editSomeData`, data, ok, no)
+export function saveSomeData(data, ok, no) {
+  return http.postJson(`${URL_FILL}/manage/scene/editSomeData`, data, ok, no)
 }
 
 
@@ -338,8 +338,8 @@ export function saveInitScreen(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function saveUseHots(data, ok, no) {
-    return http.postJson(`${URL_FILL}/manage/scene/save/useHots`, data, ok, no)
+export function saveUseHots(data, ok, no) {
+  return http.postJson(`${URL_FILL}/manage/scene/save/useHots`, data, ok, no)
 }
 
 
@@ -350,8 +350,8 @@ export function saveInitScreen(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function deleteIndexInfo(data, ok, no) {
-    return http.get(`${URL_FILL}/manage/scene/removeIndex/${number()}`, data, ok, no)
+export function deleteIndexInfo(data, ok, no) {
+  return http.get(`${URL_FILL}/manage/scene/removeIndex/${number()}`, data, ok, no)
 }
 
 
@@ -363,8 +363,8 @@ export function saveInitScreen(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function getSceneInfo(data, ok, no) {
-    return http.get(`${URL_FILL}/manage/scene/detail/${scene()}`, {}, ok, no)
+export function getSceneInfo(data, ok, no) {
+  return http.get(`${URL_FILL}/manage/scene/detail/${scene()}`, {}, ok, no)
 }
 
 
@@ -374,8 +374,8 @@ export function saveInitScreen(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function getWebTabList(data, ok, no) {
-    return http.get(`${URL_FILL}/web/common/getCatalog/${number()}`, data, ok, no)
+export function getWebTabList(data, ok, no) {
+  return http.get(`${URL_FILL}/web/common/getCatalog/${number()}`, data, ok, no)
 }
 
 /**
@@ -384,13 +384,13 @@ export function saveInitScreen(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function checkWork(data, ok, no) {
-     let visit = ''
-    if (window.location.pathname.indexOf('showMobile.html')>-1 || window.location.pathname.indexOf('show.html')>-1) {
-        visit = 1111
-    }
+export function checkWork(data, ok, no) {
+  let visit = ''
+  if (window.location.pathname.indexOf('showMobile.html') > -1 || window.location.pathname.indexOf('show.html') > -1) {
+    visit = 1111
+  }
 
-    return http.get(`${URL_FILL}/web/common/checkWork/${number()}${visit?('?visit='+visit):''}`, data, ok, no)
+  return http.get(`${URL_FILL}/web/common/checkWork/${number()}${visit ? ('?visit=' + visit) : ''}`, data, ok, no)
 }
 
 
@@ -400,8 +400,8 @@ export function saveInitScreen(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function getWebTabSceneList(data, ok, no) {
-    return http.get(`${URL_FILL}/web/common/getScene/${data.catalogId}`, {}, ok, no)
+export function getWebTabSceneList(data, ok, no) {
+  return http.get(`${URL_FILL}/web/common/getScene/${data.catalogId}`, {}, ok, no)
 }
 
 
@@ -410,11 +410,11 @@ export function saveInitScreen(data, ok, no) {
  * 检测登陆状态
  */
 export function checkLogin() {
-    if (window.location.pathname.indexOf('material.html')>-1) {
-        return http.get(`${URL_FILL}/web/common/checkToken/?_=${Math.random()}`)
-    }else{
-        return http.get(`${URL_FILL}/manage/work/checkToken/${number()}`)
-    }
+  if (window.location.pathname.indexOf('material.html') > -1) {
+    return http.get(`${URL_FILL}/web/common/checkToken/?_=${Math.random()}`)
+  } else {
+    return http.get(`${URL_FILL}/manage/work/checkToken/${number()}`)
+  }
 }
 
 
@@ -424,8 +424,8 @@ export function checkLogin() {
 /**
  * 检测素材状态
  */
- export function checkMStatus(data, ok, no) {
-    return http.get(`${URL_FILL}/manage/fodder/checkStatus/${data.ids.join(',')}`, {islongpolling:data.islongpolling}, ok, no)
+export function checkMStatus(data, ok, no) {
+  return http.get(`${URL_FILL}/manage/fodder/checkStatus/${data.ids.join(',')}`, { islongpolling: data.islongpolling }, ok, no)
 }
 
 
@@ -437,8 +437,8 @@ export function checkLogin() {
  * @param {*} ok 
  * @param {*} no 
  */
- export function getWebWorksInfo(data, ok, no) {
-    return http.get(`${URL_FILL}/web/common/detail/${number()}`, {}, ok, no)
+export function getWebWorksInfo(data, ok, no) {
+  return http.get(`${URL_FILL}/web/common/detail/${number()}`, {}, ok, no)
 }
 
 
@@ -449,9 +449,9 @@ export function checkLogin() {
  * @param {*} ok 
  * @param {*} no 
  */
- export function checkPassword(data, ok, no) {
-    data.workId = number()
-    return http.postJson(`${URL_FILL}/web/common/checkPwd`, data, ok, no)
+export function checkPassword(data, ok, no) {
+  data.workId = number()
+  return http.postJson(`${URL_FILL}/web/common/checkPwd`, data, ok, no)
 }
 
 
@@ -462,8 +462,8 @@ export function checkLogin() {
  * @param {*} ok 
  * @param {*} no 
  */
- export function getWebIndex(data, ok, no) {
-    return http.get(`${URL_FILL}/web/common/getIndex/${number()}`, {}, ok, no)
+export function getWebIndex(data, ok, no) {
+  return http.get(`${URL_FILL}/web/common/getIndex/${number()}`, {}, ok, no)
 }
 
 
@@ -474,8 +474,8 @@ export function checkLogin() {
  * @param {*} ok 
  * @param {*} no 
  */
- export function getAllVrList(data, ok, no) {
-    return http.get(`${URL_FILL}/manage/scene/findByWork/${number()}`, data, ok, no)
+export function getAllVrList(data, ok, no) {
+  return http.get(`${URL_FILL}/manage/scene/findByWork/${number()}`, data, ok, no)
 }
 
 
@@ -489,8 +489,8 @@ export function checkLogin() {
  * @param {*} no 
  */
 export function savePanoInfo(data, ok, no) {
-    data.houseId = number()
-    return http.postJson('/fcb/pano/scene/house/edit', data, ok, no)
+  data.houseId = number()
+  return http.postJson('/fcb/pano/scene/house/edit', data, ok, no)
 }
 
 
@@ -503,7 +503,7 @@ export function savePanoInfo(data, ok, no) {
  * @param {*} no 
  */
 export function getAuthCode(data, ok, no) {
-    return http.postJson(`/fcb/project/api/query/authCode`, data, ok, no)
+  return http.postJson(`/fcb/project/api/query/authCode`, data, ok, no)
 }
 
 
@@ -514,9 +514,9 @@ export function getAuthCode(data, ok, no) {
  * @param {*} no 
  */
 export function getHouseList(data, ok, no) {
-    data.token = getToken()
-    data.houseId = number()
-    return http.postJson(`/fcb/pano/scene/findVrModel`, data, ok, no)
+  data.token = getToken()
+  data.houseId = number()
+  return http.postJson(`/fcb/pano/scene/findVrModel`, data, ok, no)
 }
 
 
@@ -527,8 +527,8 @@ export function getHouseList(data, ok, no) {
  * @param {*} no 
  */
 export function getPanoList(data, ok, no) {
-    data.houseId = number()
-    return http.postJson('/fcb/pano/scene/list', data, ok, no)
+  data.houseId = number()
+  return http.postJson('/fcb/pano/scene/list', data, ok, no)
 }
 
 /**
@@ -538,8 +538,8 @@ export function getPanoList(data, ok, no) {
  * @param {*} no 
  */
 export function getSearchPanoList(data, ok, no) {
-    data.houseId = number()
-    return http.postJson('/fcb/pano/scene/searchUnion', data, ok, no)
+  data.houseId = number()
+  return http.postJson('/fcb/pano/scene/searchUnion', data, ok, no)
 }
 
 
@@ -552,8 +552,8 @@ export function getSearchPanoList(data, ok, no) {
  * @param {*} no 
  */
 export function getHouseDetail(data, ok, no) {
-    data.houseId = number()
-    return http.postJson(`/fcb/pano/scene/findRoom/${data.houseId}`, {}, ok, no)
+  data.houseId = number()
+  return http.postJson(`/fcb/pano/scene/findRoom/${data.houseId}`, {}, ok, no)
 }
 
 
@@ -564,7 +564,7 @@ export function getHouseDetail(data, ok, no) {
  * @param {*} no 
  */
 export function setListSort(data, ok, no) {
-    return http.postJson(`/fcb/pano/scene/setSort`, data, ok, no)
+  return http.postJson(`/fcb/pano/scene/setSort`, data, ok, no)
 }
 
 
@@ -579,29 +579,29 @@ export function setListSort(data, ok, no) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function getMaterialList(data, ok, no) {
-    
-    let url = `${URL_FILL}/manage/fodder/listAndDir`
-    // if (data.urlSelect) {
-    //     url = `${URL_FILL}/manage/fodder/select/${data.type}/${number()}`
-    // }
-    return http.postJson(url, data, (result)=>{
-        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 = '根目录'
-            }
-          }
+export function getMaterialList(data, ok, no) {
+
+  let url = `${URL_FILL}/manage/fodder/listAndDir`
+  // if (data.urlSelect) {
+  //     url = `${URL_FILL}/manage/fodder/select/${data.type}/${number()}`
+  // }
+  return http.postJson(url, data, (result) => {
+    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
         }
-        return ok(result)
-    }, (err) => {
-      return no(err)
-    })
+        if (item.dirName === '') {
+          item.dirName = '根目录'
+        }
+      }
+    }
+    return ok(result)
+  }, (err) => {
+    return no(err)
+  })
 }
 
 /**
@@ -703,8 +703,15 @@ export function moveToFolder(list, targetId, ancestors) {
   return http.postJson(`${URL_FILL}/manage/dir/move`, param)
 }
 
-export function delFolder(id) {
-  return http.postJson(`${URL_FILL}/manage/dir/remove/${id}`)
+export async function delFolder(id) {
+  return http.postJson(`${URL_FILL}/manage/dir/remove/${id}`).then((res) => {
+    if (res.code === 0) {
+      return Promise.resolve(res)
+    } else {
+      return Promise.reject(false)
+    }
+  })
+  // return http.postJson(`${URL_FILL}/manage/dir/remove/${id}`, ok, no)
 }
 
 /**
@@ -717,8 +724,8 @@ export function delFolder(id) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function addWorks(data, ok, no) {
-    return http.postJson(`${URL_FILL}/manage/work/add`, data, ok, no)
+export function addWorks(data, ok, no) {
+  return http.postJson(`${URL_FILL}/manage/work/add`, data, ok, no)
 }
 
 /**
@@ -727,8 +734,8 @@ export function delFolder(id) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function getWorksList(data, ok, no) {
-    return http.postJson(`${URL_FILL}/manage/work/list`, data, ok, no)
+export function getWorksList(data, ok, no) {
+  return http.postJson(`${URL_FILL}/manage/work/list`, data, ok, no)
 }
 
 /**
@@ -737,10 +744,10 @@ export function delFolder(id) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function saveWorks(data, ok, no) {
-    !data.id && (data.id = number())
+export function saveWorks(data, ok, no) {
+  !data.id && (data.id = number())
 
-    return http.postJson(`${URL_FILL}/manage/work/edit`, data, ok, no)
+  return http.postJson(`${URL_FILL}/manage/work/edit`, data, ok, no)
 }
 
 
@@ -750,8 +757,8 @@ export function delFolder(id) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function delWorks(data, ok, no) {
-    return http.postJson(`${URL_FILL}/manage/work/remove/${data}`, {}, ok, no)
+export function delWorks(data, ok, no) {
+  return http.postJson(`${URL_FILL}/manage/work/remove/${data}`, {}, ok, no)
 }
 
 
@@ -761,8 +768,8 @@ export function delFolder(id) {
  * @param {*} ok 
  * @param {*} no 
  */
- export function checkUserSize(data, ok, no) {
-    return http.get(`${URL_FILL}/manage/fodder/checkUserSize`, data, ok, no)
+export function checkUserSize(data, ok, no) {
+  return http.get(`${URL_FILL}/manage/fodder/checkUserSize`, data, ok, no)
 }
 /**
  * 上传附件

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

@@ -427,6 +427,7 @@ export default {
             }
           )
         })
+
       } else {
         this.$confirm({
           title: i18n.t("gather.delete_material"),

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

@@ -7,40 +7,59 @@
         :rootName="$i18n.t('gather.pano')"
         @click-path="onClickPath"
       />
-      <div v-if="lastestUsedSearchKey" class="">{{$i18n.t("gather.pano")}}</div>
+      <div v-if="lastestUsedSearchKey" class="">
+        {{ $i18n.t("gather.pano") }}
+      </div>
     </div>
     <div class="second-line">
       <template v-if="!searchKey">
         <div class="btn">
-          <button @mouseover.stop="showList = true" @click="onUploadFile" class="ui-button submit">
+          <button
+            @mouseover.stop="showList = true"
+            @click="onUploadFile"
+            class="ui-button submit"
+          >
             <span>{{ upload_material }}</span>
-            <i
-              class="iconfont icon-material_prompt"
-              v-tooltip="pano_size"
-            />
-            <upload ref="uploadFile" :failString="pano_fail" :limitFailStr="pano_limit" accept-type=".jpg"
-              media-type="image" :limit="120" @file-change="onFileChange"></upload>
+            <i class="iconfont icon-material_prompt" v-tooltip="pano_size" />
+            <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 class="ui-button submit" @click="isShowNewFolder = true">
+          {{ $i18n.t(`gather.new_folder`) }}
         </button>
         <button
           class="ui-button cancel"
-          :class="{disable: selectedList.length === 0}"
+          :class="{ disable: selectedList.length === 0 }"
           @click="onClickMoveFolder"
         >
-          {{$i18n.t(`gather.move_folder`)}}
+          {{ $i18n.t(`gather.move_folder`) }}
         </button>
       </template>
       <div class="filter">
-        <div :class="{ active: isFilterFocus }" @focusin="onFilterFocus" @focusout="onFilterBlur">
+        <div
+          :class="{ active: isFilterFocus }"
+          @focusin="onFilterFocus"
+          @focusout="onFilterBlur"
+        >
           <i class="iconfont icon-works_search search"></i>
-          <input type="text" v-model="searchKey" :placeholder="serch_material" />
-          <i v-if="searchKey" @click="searchKey = ''" class="iconfont icontoast_red del"></i>
+          <input
+            type="text"
+            v-model="searchKey"
+            :placeholder="serch_material"
+          />
+          <i
+            v-if="searchKey"
+            @click="searchKey = ''"
+            class="iconfont icontoast_red del"
+          ></i>
         </div>
       </div>
     </div>
@@ -65,7 +84,11 @@
           {{ headerItem.name && $i18n.t(`zh_key.${headerItem.name}`) }}
         </div>
         <!-- 内容各单元格 -->
-        <div slot-scope="{ itemData, lineData, headerItem }" slot="tableItem" style="width: 100%">
+        <div
+          slot-scope="{ itemData, lineData, headerItem }"
+          slot="tableItem"
+          style="width: 100%"
+        >
           <!-- 操作型单元格 -->
           <div class="handle" v-if="headerItem.canclick">
             <i
@@ -101,8 +124,7 @@
             class="img"
             @click="previewImage(lineData)"
           >
-            <img :src="itemData + $imgsuffix"
-              alt="" />
+            <img :src="itemData + $imgsuffix" alt="" />
           </div>
           <div
             v-else-if="headerItem.type == 'image' && lineData.type === 'dir'"
@@ -115,18 +137,10 @@
             />
           </div>
 
-
-
           <!-- 文字型单元格 -->
-          <div
-            v-else
-            class="textItem"
-          >
-          
-          
+          <div v-else class="textItem">
             <!-- 名称 -->
             <div v-if="headerItem.key === 'name'" class="name">
-              
               <!-- 不是搜索出来的 -->
               <div v-if="!lastestUsedSearchKey" class="not-search-res">
                 <!-- 文件夹名称 -->
@@ -143,22 +157,25 @@
                 </div>
               </div>
               <!-- end of 不是搜索出来的 -->
-              
+
               <!-- 搜索出来的 -->
               <div v-if="lastestUsedSearchKey" class="search-res">
                 <!-- 文件夹名称 -->
-                <div
-                  v-if="lineData.type === 'dir'"
-                  class="dirName"
-                >
-                  <div
-                    class="self-name"
-                    @click="onClickFolder(lineData)"
-                  >
+                <div v-if="lineData.type === 'dir'" class="dirName">
+                  <div class="self-name" @click="onClickFolder(lineData)">
                     {{ itemData || "-" }}
                   </div>
                   <div class="parent-name-wrap">
-                    {{$i18n.t('gather.dir')}} <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirId === 1 ? $i18n.t('gather.root_dir') : lineData.dirName}}</span>
+                    {{ $i18n.t("gather.dir") }}
+                    <span
+                      class="parent-name"
+                      @click="onClickParentFolder(lineData)"
+                      >{{
+                        lineData.dirId === 1
+                          ? $i18n.t("gather.root_dir")
+                          : lineData.dirName
+                      }}</span
+                    >
                   </div>
                 </div>
                 <!-- 素材名称 -->
@@ -167,28 +184,30 @@
                     {{ itemData || "-" }}
                   </div>
                   <div class="parent-name-wrap">
-                    {{$i18n.t('gather.dir')}} <span class="parent-name" @click="onClickParentFolder(lineData)">{{lineData.dirId === 1 ? $i18n.t('gather.root_dir') : lineData.dirName}}</span>
+                    {{ $i18n.t("gather.dir") }}
+                    <span
+                      class="parent-name"
+                      @click="onClickParentFolder(lineData)"
+                      >{{
+                        lineData.dirId === 1
+                          ? $i18n.t("gather.root_dir")
+                          : lineData.dirName
+                      }}</span
+                    >
                   </div>
                 </div>
               </div>
               <!-- end of 搜索出来的 -->
-              
             </div>
             <!-- end of 名称 -->
-            
-            
+
             <!-- 不是名称 -->
             <div v-else class="not-name">
               {{ itemData || "-" }}
             </div>
             <!-- end of 不是名称 -->
-
-            
           </div>
           <!-- end of 文字型单元格 -->
-
-
-
         </div>
       </tableList>
       <UploadTaskList
@@ -198,28 +217,38 @@
         :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">
+      <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="" />
         <span>{{ no_serch_result }}</span>
       </div>
-      <div class="nodata" v-if="list.length == 0 && !hasMoreData && !lastestUsedSearchKey">
+      <div
+        class="nodata"
+        v-if="list.length == 0 && !hasMoreData && !lastestUsedSearchKey"
+      >
         <img :src="config.empty" alt="" />
         <span>{{ no_material_result }}</span>
-        <button @click="$refs.uploadFile.click()" class="upload-btn-in-table">{{ upload_material }}</button>
+        <button @click="$refs.uploadFile.click()" class="upload-btn-in-table">
+          {{ upload_material }}
+        </button>
       </div>
     </div>
 
     <CreateFolder
       v-if="isShowNewFolder"
-      :validate=validateNewFolderName
+      :validate="validateNewFolderName"
       @close="isShowNewFolder = false"
       @submit="onSubmitNewFolder"
     />
     <RenameFolder
       v-if="isShowRenameFolder"
       :oldName="popupItem.name"
-      :validate=validateRenameFolderName
+      :validate="validateRenameFolderName"
       @close="isShowRenameFolder = false"
       @submit="onSubmitRenameFolder"
     />
@@ -231,15 +260,15 @@
       @submit="onSubmitMoveFolder"
     />
     <rename
-      v-if="showRename" 
+      v-if="showRename"
       :item="popupItem"
       @rename="handleRename"
-      @close="showRename = false" 
+      @close="showRename = false"
     />
     <preview
       ref="image-previewer"
-      :sceneCodeList="list.map(item => item.sceneCode)"
-      :imageTitleList="list.map(item => item.name)"
+      :sceneCodeList="list.map((item) => item.sceneCode)"
+      :imageTitleList="list.map((item) => item.name)"
       @click-delete="onClickDeleteInPreview"
     />
     <cover
@@ -262,9 +291,9 @@ import cover from "../popup/cover";
 import Upload from "@/components/shared/uploads/UploadMultiple";
 import { getImgWH, changeByteUnit } from "@/utils/file";
 import UploadTaskList from "../components/uploadList1.1.0.vue";
-import { debounce } from "@/utils/other.js"
-import { mapState } from 'vuex';
-import { i18n } from "@/lang"
+import { debounce } from "@/utils/other.js";
+import { mapState } from "vuex";
+import { i18n } from "@/lang";
 import folderMixinFactory from "../folderMixinFactory.js";
 
 import {
@@ -274,19 +303,16 @@ import {
   delMaterial,
   uploadCover,
   checkMStatus,
-  checkUserSize
+  checkUserSize,
 } from "@/api";
 
-
 const TYPE = "pano";
 const LONG_POLLING_INTERVAL = 5;
-const folderMixin = folderMixinFactory(TYPE)
+const folderMixin = folderMixinFactory(TYPE);
 
 export default {
-  mixins: [
-    folderMixin,
-  ],
-  name: 'Pano',
+  mixins: [folderMixin],
+  name: "Pano",
   components: {
     tableList,
     crumbs,
@@ -317,7 +343,7 @@ export default {
       tabHeader: data,
 
       // 因为searchKey的变化经过debounce、异步请求的延时，才会反映到数据列表的变化上，所以是否显示、显示哪种无数据提示，也要等到数据列表变化后，根据数据列表是否为空，以及引发本次变化的那个searchKey瞬时值来决定。本变量就是用来保存那个瞬时值。
-      lastestUsedSearchKey: '',
+      lastestUsedSearchKey: "",
       isFilterFocus: false,
       searchKey: "",
       list: [],
@@ -327,19 +353,18 @@ export default {
   },
   computed: {
     ...mapState({
-      uploadListForUI: 'uploadStatusListPano',
+      uploadListForUI: "uploadStatusListPano",
     }),
     needLongPolling() {
       return this.uploadListForUI.some((item) => {
-        return item.status === 'LOADING' && item.ifKnowProgress === false
-      })
+        return item.status === "LOADING" && item.ifKnowProgress === false;
+      });
     },
     had_load() {
-      return i18n.t("gather.had_load", { msg: this.list.length })
-    }
-  },
-  mounted() {
+      return i18n.t("gather.had_load", { msg: this.list.length });
+    },
   },
+  mounted() {},
   watch: {
     needLongPolling: {
       handler: function (newVal) {
@@ -356,7 +381,7 @@ export default {
     },
     searchKey: {
       handler: function () {
-        this.refreshListDebounced()
+        this.refreshListDebounced();
       },
       immediate: false,
     },
@@ -365,25 +390,29 @@ export default {
     onUploadFile() {
       checkUserSize({}, (data) => {
         //判断已用是否大于3G
-        if ((data.data / 1024 / 1024) > 3) {
+        if (data.data / 1024 / 1024 > 3) {
           this.$alert({ content: i18n.t("tips_code.FAILURE_3024") });
         } else {
-          this.$refs.uploadFile.click()
+          this.$refs.uploadFile.click();
         }
-      })
+      });
     },
     onFilterFocus() {
-      this.isFilterFocus = true
+      this.isFilterFocus = true;
     },
     onFilterBlur() {
-      this.isFilterFocus = false
+      this.isFilterFocus = false;
     },
-    refreshListDebounced: debounce(function () {
-      this.list = []
-      this.isRequestingMoreData = false
-      this.hasMoreData = true
-      this.$refs['table-list'].requestMoreData()
-    }, 500, false),
+    refreshListDebounced: debounce(
+      function () {
+        this.list = [];
+        this.isRequestingMoreData = false;
+        this.hasMoreData = true;
+        this.$refs["table-list"].requestMoreData();
+      },
+      500,
+      false
+    ),
     clearinter() {
       this.interval && clearInterval(this.interval);
       this.interval = null;
@@ -397,12 +426,12 @@ export default {
         () => {
           this.$msg.success(i18n.t("gather.edit_success"));
           const index = this.list.findIndex((eachItem) => {
-            return eachItem.id === this.popupItem.id
-          })
+            return eachItem.id === this.popupItem.id;
+          });
           if (index >= 0) {
-            this.list[index].name = newName
+            this.list[index].name = newName;
           } else {
-            console.error('在素材列表里没找到要重命名的那一项！');
+            console.error("在素材列表里没找到要重命名的那一项！");
           }
           this.showRename = false;
           this.popupItem = null;
@@ -426,11 +455,11 @@ export default {
               this.$msg.success(i18n.t("gather.setting_success"));
 
               const index = this.list.findIndex((eachItem) => {
-                return eachItem.id === this.popupItem.id
-              })
+                return eachItem.id === this.popupItem.id;
+              });
               if (index >= 0) {
-                this.isRequestingMoreData = true
-                const lastestUsedSearchKey = this.searchKey
+                this.isRequestingMoreData = true;
+                const lastestUsedSearchKey = this.searchKey;
                 getMaterialList(
                   {
                     dirId: this.currentFolderId,
@@ -443,21 +472,21 @@ export default {
                       i.fileSize = changeByteUnit(Number(i.fileSize));
                       return i;
                     });
-                    this.list.splice(index, 1, newData[0])
+                    this.list.splice(index, 1, newData[0]);
                     this.showCover = false;
                     this.popupItem = "";
-                    this.isRequestingMoreData = false
-                    this.lastestUsedSearchKey = lastestUsedSearchKey
+                    this.isRequestingMoreData = false;
+                    this.lastestUsedSearchKey = lastestUsedSearchKey;
                   },
                   () => {
-                    this.isRequestingMoreData = false
-                    this.lastestUsedSearchKey = lastestUsedSearchKey
+                    this.isRequestingMoreData = false;
+                    this.lastestUsedSearchKey = lastestUsedSearchKey;
                     this.showCover = false;
                     this.popupItem = "";
                   }
-                )
+                );
               } else {
-                console.error('在素材列表里没找到要编辑封面的那一项！');
+                console.error("在素材列表里没找到要编辑封面的那一项！");
                 this.showCover = false;
                 this.popupItem = "";
               }
@@ -467,7 +496,9 @@ export default {
       });
     },
     _checkMStatus() {
-      let needPollingTaskList = this.uploadListForUI.filter((item) => item.status === 'LOADING' && item.ifKnowProgress === false);
+      let needPollingTaskList = this.uploadListForUI.filter(
+        (item) => item.status === "LOADING" && item.ifKnowProgress === false
+      );
       if (needPollingTaskList.length > 0) {
         checkMStatus(
           {
@@ -476,15 +507,22 @@ export default {
           },
           (res) => {
             // 1切图中，2失败，3成功
-            res.data.forEach(eachRes => {
+            res.data.forEach((eachRes) => {
               if (eachRes.status === 2) {
-                const index = this.uploadListForUI.findIndex(eachTask => eachTask.backendId === eachRes.id)
-                index >= 0 && (this.uploadListForUI[index].status = 'FAIL')
-                index >= 0 && (this.uploadListForUI[index].statusText = this.$msg.success(i18n.t("gather.material_cutting_fail")))
+                const index = this.uploadListForUI.findIndex(
+                  (eachTask) => eachTask.backendId === eachRes.id
+                );
+                index >= 0 && (this.uploadListForUI[index].status = "FAIL");
+                index >= 0 &&
+                  (this.uploadListForUI[index].statusText = this.$msg.success(
+                    i18n.t("gather.material_cutting_fail")
+                  ));
               } else if (eachRes.status === 3) {
-                const index = this.uploadListForUI.findIndex(eachTask => eachTask.backendId === eachRes.id)
-                index >= 0 && (this.uploadListForUI.splice(index, 1))
-                index >= 0 && this.refreshListDebounced()
+                const index = this.uploadListForUI.findIndex(
+                  (eachTask) => eachTask.backendId === eachRes.id
+                );
+                index >= 0 && this.uploadListForUI.splice(index, 1);
+                index >= 0 && this.refreshListDebounced();
               }
             });
           }
@@ -492,54 +530,61 @@ export default {
       }
     },
     onClickRename(lineData) {
-      this.popupItem = lineData
-      if (lineData.type !== 'dir') {
-        this.showRename = true
+      this.popupItem = lineData;
+      if (lineData.type !== "dir") {
+        this.showRename = true;
       } else {
-        this.isShowRenameFolder = true
+        this.isShowRenameFolder = true;
       }
     },
     del(item) {
-      if (item.type === 'dir') {
-        this.delFolder(item.id, (lastestUsedSearchKey) => {
-          getMaterialList(
-            {
-              dirId: this.currentFolderId,
-              pageNum: this.list.length,
-              pageSize: 1,
-              searchKey: this.searchKey,
-              type: TYPE,
-            },
-            (data) => {
-              const index = this.list.findIndex((eachItem) => {
-                return eachItem.id === item.id
-              })
-              if (index >= 0) {
-                this.list.splice(index, 1)
-                const newData = data.data.list.map((i) => {
-                  i.fileSize = changeByteUnit(Number(i.fileSize));
-                  return i;
+      if (item.type === "dir") {
+        this.delFolder(
+          item.id,
+          (lastestUsedSearchKey) => {
+            debugger;
+            getMaterialList(
+              {
+                dirId: this.currentFolderId,
+                pageNum: this.list.length,
+                pageSize: 1,
+                searchKey: this.searchKey,
+                type: TYPE,
+              },
+              (data) => {
+                const index = this.list.findIndex((eachItem) => {
+                  return eachItem.id === item.id;
                 });
-                this.list = this.list.concat(newData)
-                if (this.list.length === data.data.total) {
-                  this.hasMoreData = false
-                }
-                if (this.list.length === 0) {
-                  this.$refs['image-previewer'].onClickClose()
+                if (index >= 0) {
+                  this.list.splice(index, 1);
+                  const newData = data.data.list.map((i) => {
+                    i.fileSize = changeByteUnit(Number(i.fileSize));
+                    return i;
+                  });
+                  this.list = this.list.concat(newData);
+                  if (this.list.length === data.data.total) {
+                    this.hasMoreData = false;
+                  }
+                  if (this.list.length === 0) {
+                    this.$refs["image-previewer"].onClickClose();
+                  }
+                } else {
+                  console.error("在素材列表里没找到要删除的那一项！");
                 }
-              } else {
-                console.error('在素材列表里没找到要删除的那一项！');
-              }
 
-              this.isRequestingMoreData = false
-              this.lastestUsedSearchKey = lastestUsedSearchKey
-            },
-            () => {
-              this.isRequestingMoreData = false
-              this.lastestUsedSearchKey = lastestUsedSearchKey
-            }
-          )
-        })
+                this.isRequestingMoreData = false;
+                this.lastestUsedSearchKey = lastestUsedSearchKey;
+              },
+              () => {
+                this.isRequestingMoreData = false;
+                this.lastestUsedSearchKey = lastestUsedSearchKey;
+              }
+            );
+          },
+          () => {
+            console.error("gemer");
+          }
+        );
       } else {
         this.$confirm({
           title: i18n.t("gather.delete_material"),
@@ -548,8 +593,8 @@ export default {
           ok: () => {
             delMaterial(item.id, () => {
               this.$msg.success(i18n.t("gather.delete_success"));
-              this.isRequestingMoreData = true
-              const lastestUsedSearchKey = this.searchKey
+              this.isRequestingMoreData = true;
+              const lastestUsedSearchKey = this.searchKey;
               getMaterialList(
                 {
                   dirId: this.currentFolderId,
@@ -560,33 +605,33 @@ export default {
                 },
                 (data) => {
                   const index = this.list.findIndex((eachItem) => {
-                    return eachItem.id === item.id
-                  })
+                    return eachItem.id === item.id;
+                  });
                   if (index >= 0) {
-                    this.list.splice(index, 1)
+                    this.list.splice(index, 1);
                     const newData = data.data.list.map((i) => {
                       i.fileSize = changeByteUnit(Number(i.fileSize));
                       return i;
                     });
-                    this.list = this.list.concat(newData)
+                    this.list = this.list.concat(newData);
                     if (this.list.length === data.data.total) {
-                      this.hasMoreData = false
+                      this.hasMoreData = false;
                     }
                     if (this.list.length === 0) {
-                      this.$refs['image-previewer'].onClickClose()
+                      this.$refs["image-previewer"].onClickClose();
                     }
                   } else {
-                    console.error('在素材列表里没找到要删除的那一项！');
+                    console.error("在素材列表里没找到要删除的那一项！");
                   }
 
-                  this.isRequestingMoreData = false
-                  this.lastestUsedSearchKey = lastestUsedSearchKey
+                  this.isRequestingMoreData = false;
+                  this.lastestUsedSearchKey = lastestUsedSearchKey;
                 },
                 () => {
-                  this.isRequestingMoreData = false
-                  this.lastestUsedSearchKey = lastestUsedSearchKey
+                  this.isRequestingMoreData = false;
+                  this.lastestUsedSearchKey = lastestUsedSearchKey;
                 }
-              )
+              );
             });
           },
         });
@@ -594,15 +639,13 @@ export default {
     },
     previewImage(targetItem) {
       const index = this.list.findIndex((eachItem) => {
-        return eachItem.id === targetItem.id
-      })
-      this.$refs['image-previewer'].show(index)
+        return eachItem.id === targetItem.id;
+      });
+      this.$refs["image-previewer"].show(index);
     },
     onFileChange(e) {
       e.files.forEach(async (eachFile, i) => {
-        if (
-          eachFile.type.indexOf("jpeg") <= -1
-        ) {
+        if (eachFile.type.indexOf("jpeg") <= -1) {
           setTimeout(() => {
             this.$msg({
               message: `“${eachFile.name}”${i18n.t("gather.pano_fail")}`,
@@ -612,7 +655,9 @@ export default {
           return;
         }
 
-        if (eachFile.name.substring(0, eachFile.name.lastIndexOf(".")).length > 50) {
+        if (
+          eachFile.name.substring(0, eachFile.name.lastIndexOf(".")).length > 50
+        ) {
           setTimeout(() => {
             this.$msg({
               message: `“${eachFile.name}”${i18n.t("gather.too_long_word")}`,
@@ -622,19 +667,19 @@ export default {
           return;
         }
 
-        let WHRate = null
+        let WHRate = null;
         try {
-          const { width, height } = await getImgWH(eachFile)
-          WHRate = width / height
+          const { width, height } = await getImgWH(eachFile);
+          WHRate = width / height;
         } catch (e) {
-          console.error('获取图像宽高失败：', e)
+          console.error("获取图像宽高失败：", e);
           setTimeout(() => {
             this.$msg({
               message: `“${eachFile.name}”${i18n.t("gather.pano_fail")}`,
               type: "warning",
             });
           }, i * 100);
-          return
+          return;
         }
         if (WHRate !== 2) {
           setTimeout(() => {
@@ -643,18 +688,18 @@ export default {
               type: "warning",
             });
           }, i * 100);
-          return
+          return;
         }
 
         let itemInUploadList = {
           title: eachFile.name,
           ifKnowProgress: true,
           progress: 0,
-          status: 'LOADING',
+          status: "LOADING",
           statusText: i18n.t("gather.uploading_material"),
           uid: `u_${this.$randomWord(true, 8, 8)}`,
           abortHandler: null,
-          backendId: '',
+          backendId: "",
           parentFolderId: this.currentFolderId,
         };
 
@@ -665,43 +710,47 @@ export default {
             tempId: itemInUploadList.uid,
             type: TYPE,
           },
-          (response) => { // 上传成功
-            itemInUploadList.statusText = i18n.t("gather.cutting")
-            itemInUploadList.ifKnowProgress = false
-            itemInUploadList.backendId = response.data.id
+          (response) => {
+            // 上传成功
+            itemInUploadList.statusText = i18n.t("gather.cutting");
+            itemInUploadList.ifKnowProgress = false;
+            itemInUploadList.backendId = response.data.id;
           },
           (err) => {
-            if (err.statusText === 'abort') { // 用户取消了上传任务。
+            if (err.statusText === "abort") {
+              // 用户取消了上传任务。
               const index = this.uploadListForUI.findIndex((eachItem) => {
-                return eachItem.uid === itemInUploadList.uid
-              })
-              this.uploadListForUI.splice(index, 1)
+                return eachItem.uid === itemInUploadList.uid;
+              });
+              this.uploadListForUI.splice(index, 1);
             } else {
-              itemInUploadList.status = 'FAIL'
-              itemInUploadList.statusText = i18n.t("gather.material_upload_fail")
+              itemInUploadList.status = "FAIL";
+              itemInUploadList.statusText = i18n.t(
+                "gather.material_upload_fail"
+              );
             }
           },
           (progress) => {
-            itemInUploadList.progress = progress
+            itemInUploadList.progress = progress;
           }
-        )
+        );
 
         this.uploadListForUI.push(itemInUploadList);
-      })
+      });
     },
     onCancelTask(uid) {
       const index = this.uploadListForUI.findIndex((eachItem) => {
-        return eachItem.uid === uid
-      })
-      if (this.uploadListForUI[index].status === 'LOADING') {
-        this.uploadListForUI[index].abortHandler.abort()
+        return eachItem.uid === uid;
+      });
+      if (this.uploadListForUI[index].status === "LOADING") {
+        this.uploadListForUI[index].abortHandler.abort();
       } else {
-        this.uploadListForUI.splice(index, 1)
+        this.uploadListForUI.splice(index, 1);
       }
     },
     getMoreMaterialItem(islongpolling = null) {
-      this.isRequestingMoreData = true
-      const lastestUsedSearchKey = this.searchKey
+      this.isRequestingMoreData = true;
+      const lastestUsedSearchKey = this.searchKey;
       getMaterialList(
         {
           dirId: this.currentFolderId,
@@ -709,38 +758,36 @@ export default {
           pageSize: config.PAGE_SIZE,
           searchKey: this.searchKey,
           type: TYPE,
-          islongpolling
+          islongpolling,
         },
         (data) => {
           const newData = data.data.list.map((i) => {
-            if (i.type !== 'dir') {
+            if (i.type !== "dir") {
               i.fileSize = changeByteUnit(Number(i.fileSize));
             }
             return i;
           });
-          this.list = this.list.concat(newData)
+          this.list = this.list.concat(newData);
           if (this.list.length === data.data.total) {
-            this.hasMoreData = false
+            this.hasMoreData = false;
           }
-          this.isRequestingMoreData = false
-          this.lastestUsedSearchKey = lastestUsedSearchKey
+          this.isRequestingMoreData = false;
+          this.lastestUsedSearchKey = lastestUsedSearchKey;
         },
         () => {
-          this.isRequestingMoreData = false
-          this.lastestUsedSearchKey = lastestUsedSearchKey
+          this.isRequestingMoreData = false;
+          this.lastestUsedSearchKey = lastestUsedSearchKey;
         }
       );
     },
     onClickDeleteInPreview(index) {
-      this.del(this.list[index])
+      this.del(this.list[index]);
     },
   },
 };
 </script>
 
-<style lang="less" scoped>
-
-</style>
+<style lang="less" scoped></style>
 <style lang="less" scoped>
 @import "../style.less";
-</style>
+</style>

packages/qjkankan-editor/src/views/material/popup/CreateFolder.vue

@@ -17,7 +17,7 @@
           type="text"
           maxlength="15"
           :placeholder="$i18n.t(`gather.new_folder_placeholder`)"
-          @input="emojistr" v-model.trim="key"
+          @input="emojistr" v-model="key"
         />
         <div v-if="!validateRes.isValid" class="invalid-tip">
           {{validateRes.tip}}
@@ -79,14 +79,14 @@ export default {
     this.$refs.input.focus()
   },
   methods: {
-    emojistr() {
+    emojistr() { 
       this.key = this.key.replace(/(\ud83c[\udf00-\udfff])|(\ud83d[\udc00-\ude4f])|(\ud83d[\ude80-\udeff])/g, function (char) {
         if (char.length === 2) {
           return ""
         } else {
-          return char;
+          return char
         }
-      });
+      }).replace(/\s+/g,'');
     },
     onClickConfirm() {
       if (!this.key.trim()) {
@@ -156,4 +156,8 @@ export default {
 
 <style lang="less" scoped>
 @import '../style.less';
-</style>
+</style>
+
+<!-- https://ossxiaoan.4dage.com/720yun_fd_manage/image/20230419_170916442.jpg?d=1681895356516 -->
+<!-- https://ossxiaoan.4dage.com/720yun_fd_manage/fd720_1ymO1oQ7l/preview.jpg?0.6912560855121661 -->
+<!-- https://ossxiaoan.4dage.com/720yun_fd_manage/fd720_dlq9lADG1/vtour/panos/fd720_dlq9lADG1.tiles/preview.jpg -->

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

@@ -1,6 +1,8 @@
 <template>
   <div class="passwordcon" v-if="show">
-    <img :src="metadata.icon" alt="" />
+    <!-- {{ currentScene }} -->
+    <img :src="currentScene.icon" alt="" />
+
     <ui-window
       @ok="onOk"
       :okText="$t('common.confirm')"
@@ -40,7 +42,7 @@ const show = ref(false);
 const password = ref("");
 const passwordkey = computed(() => store.getters["scene/password"]);
 const metadata = computed(() => store.getters["scene/metadata"]);
-
+const currentScene = computed(() => store.getters["scene/currentScene"]);
 const onOk = () => {
   let app = getApp();