Revert interval select

xkloveme · Aug 25, 2023 · 7c307f0 · 7c307f0
1 parent bd322be
commit 7c307f0
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 265 deletions.
diff --git a/src/aliapi/dirfilelist.ts b/src/aliapi/dirfilelist.ts
@@ -677,6 +677,7 @@ export default class AliDirFileList {
     for (let i = 0, maxi = file_idList.length; i < maxi; i++) {
       list.set(file_idList[i], { dirID: file_idList[i], size: 0 })
       if (i > 0) postData = postData + ','
+      let id = file_idList[i].includes('root') ? 'root' : file_idList[i]
       const data2 = {
         body: {
           drive_id: drive_id,
@@ -686,7 +687,7 @@ export default class AliDirFileList {
           order_by: 'size DESC'
         },
         headers: { 'Content-Type': 'application/json' },
-        id: file_idList[i],
+        id: id,
         method: 'POST',
         url: '/file/search'
       }

diff --git a/src/aliapi/dirlist.ts b/src/aliapi/dirlist.ts
@@ -264,6 +264,13 @@ export default class AliDirList {
       for (let i = 0, maxi = dirList.length; i < maxi; i++) {
         if (i > 0) postData = postData + ','
         const query = 'type="folder" and ' + dirList[i].dirID
+        let id = dirList[i].dirID
+          .replaceAll('"', '')
+          .replaceAll(' ', '')
+          .replaceAll('-', '')
+          .replaceAll(':', '')
+          .replaceAll(',', '')
+        if (id.includes('root')) id = 'root'
         const data2 = {
           body: {
             drive_id: drive_id,
@@ -273,7 +280,7 @@ export default class AliDirList {
             fields: 'thumbnail'
           },
           headers: { 'Content-Type': 'application/json' },
-          id: dirList[i].dirID.replaceAll('"', '').replaceAll(' ', '').replaceAll('-', '').replaceAll(':', '').replaceAll(',', ''),
+          id: id,
           method: 'POST',
           url: '/file/search'
         }

diff --git a/src/down/DownDowned.vue b/src/down/DownDowned.vue
@@ -22,12 +22,6 @@ const appStore = useAppStore()
 const winStore = useWinStore()
 const downedStore = useDownedStore()
 
-const rangIsSelecting = ref(false)
-const rangSelectID = ref('')
-const rangSelectStart = ref('')
-const rangSelectEnd = ref('')
-const rangSelectFiles = ref<{ [k: string]: any }>({})
-
 const keyboardStore = useKeyboardStore()
 keyboardStore.$subscribe((_m: any, state: KeyboardState) => {
   if (appStore.appTab != 'down' || appStore.GetAppTabMenu != 'DownedRight') return
@@ -71,22 +65,6 @@ const handleRightClick = (e: { event: MouseEvent; node: any }) => {
   if (!downedStore.ListSelected.has(key)) downedStore.mMouseSelect(key, false, false)
   onShowRightMenu('downedrightmenu', e.event.clientX, e.event.clientY)
 }
-const onSelectRangStart = () => {
-  onHideRightMenuScroll()
-  rangIsSelecting.value = !rangIsSelecting.value
-  rangSelectID.value = ''
-  rangSelectStart.value = ''
-  rangSelectEnd.value = ''
-  rangSelectFiles.value = {}
-  downedStore.mRefreshListDataShow(false)
-}
-
-const onSelectCancel = () => {
-  onHideRightMenuScroll()
-  downedStore.ListSelected.clear()
-  downedStore.ListFocusKey = ''
-  downedStore.mRefreshListDataShow(false)
-}
 </script>
 
 <template>
@@ -135,28 +113,7 @@ const onSelectCancel = () => {
         </a-button>
       </AntdTooltip>
     </div>
-    <div class='selectInfo'>{{ downedStore.ListDataSelectCountInfo }}</div>
-    <div style='margin: 0 2px'>
-      <AntdTooltip placement='rightTop'>
-        <a-button shape='square' type='text' tabindex='-1' class='qujian'
-                  :status="rangIsSelecting ? 'danger' : 'normal'" title='Ctrl+Q' @click='onSelectRangStart'>
-          {{ rangIsSelecting ? '取消选择' : '区间选择' }}
-        </a-button>
-        <template #title>
-          <div>
-            第1步: 点击 区间选择 这个按钮
-            <br />
-            第2步: 鼠标点击一个文件
-            <br />
-            第3步: 移动鼠标点击另外一个文件
-          </div>
-        </template>
-      </AntdTooltip>
-      <a-button shape='square' v-if='!rangIsSelecting && downedStore.ListSelected.size > 0' type='text' tabindex='-1' class='qujian'
-                status='normal' @click='onSelectCancel'>
-        取消已选
-      </a-button>
-    </div>
+    <div class="selectInfo" style="min-width: 266px">{{ downedStore.ListDataSelectCountInfo }}</div>
   </div>
   <div class="toppanlist" @keydown.space.prevent="() => true">
     <a-list

diff --git a/src/down/DownDowning.vue b/src/down/DownDowning.vue
@@ -21,12 +21,6 @@ const appStore = useAppStore()
 const winStore = useWinStore()
 const downingStore = useDowningStore()
 
-const rangIsSelecting = ref(false)
-const rangSelectID = ref('')
-const rangSelectStart = ref('')
-const rangSelectEnd = ref('')
-const rangSelectFiles = ref<{ [k: string]: any }>({})
-
 const keyboardStore = useKeyboardStore()
 keyboardStore.$subscribe((_m: any, state: KeyboardState) => {
   if (appStore.appTab != 'down' || appStore.GetAppTabMenu != 'DowningRight') return
@@ -74,22 +68,6 @@ const handleRightClick = (e: { event: MouseEvent; node: any }) => {
   if (!downingStore.ListSelected.has(key)) downingStore.mMouseSelect(key, false, false)
   onShowRightMenu('downingrightmenu', e.event.clientX, e.event.clientY)
 }
-const onSelectRangStart = () => {
-  onHideRightMenuScroll()
-  rangIsSelecting.value = !rangIsSelecting.value
-  rangSelectID.value = ''
-  rangSelectStart.value = ''
-  rangSelectEnd.value = ''
-  rangSelectFiles.value = {}
-  downingStore.mRefreshListDataShow(false)
-}
-
-const onSelectCancel = () => {
-  onHideRightMenuScroll()
-  downingStore.ListSelected.clear()
-  downingStore.ListFocusKey = ''
-  downingStore.mRefreshListDataShow(false)
-}
 </script>
 
 <template>
@@ -159,28 +137,7 @@ const onSelectCancel = () => {
         </a-button>
       </AntdTooltip>
     </div>
-    <div class='selectInfo'>{{ downingStore.ListDataSelectCountInfo }}</div>
-    <div style='margin: 0 2px'>
-      <AntdTooltip placement='rightTop'>
-        <a-button shape='square' type='text' tabindex='-1' class='qujian'
-                  :status="rangIsSelecting ? 'danger' : 'normal'" title='Ctrl+Q' @click='onSelectRangStart'>
-          {{ rangIsSelecting ? '取消选择' : '区间选择' }}
-        </a-button>
-        <template #title>
-          <div>
-            第1步: 点击 区间选择 这个按钮
-            <br />
-            第2步: 鼠标点击一个文件
-            <br />
-            第3步: 移动鼠标点击另外一个文件
-          </div>
-        </template>
-      </AntdTooltip>
-      <a-button shape='square' v-if='!rangIsSelecting && downingStore.ListSelected.size > 0' type='text' tabindex='-1' class='qujian'
-                status='normal' @click='onSelectCancel'>
-        取消已选
-      </a-button>
-    </div>
+    <div class='selectInfo' style='min-width: 266px'>{{ downingStore.ListDataSelectCountInfo }}</div>
   </div>
   <div class='toppanlist' @keydown.space.prevent='() => true'>
     <a-list

diff --git a/src/down/DownUploaded.vue b/src/down/DownUploaded.vue
@@ -29,12 +29,6 @@ const appStore = useAppStore()
 const winStore = useWinStore()
 const uploadedStore = useUploadedStore()
 
-const rangIsSelecting = ref(false)
-const rangSelectID = ref('')
-const rangSelectStart = ref('')
-const rangSelectEnd = ref('')
-const rangSelectFiles = ref<{ [k: string]: any }>({})
-
 const keyboardStore = useKeyboardStore()
 keyboardStore.$subscribe((_m: any, state: KeyboardState) => {
   if (appStore.appTab != 'down' || appStore.GetAppTabMenu != 'UploadedRight') return
@@ -129,22 +123,6 @@ const onSelectFile = (item: IStateUploadTask | undefined, cmd: string) => {
     }
   }
 }
-const onSelectRangStart = () => {
-  onHideRightMenuScroll()
-  rangIsSelecting.value = !rangIsSelecting.value
-  rangSelectID.value = ''
-  rangSelectStart.value = ''
-  rangSelectEnd.value = ''
-  rangSelectFiles.value = {}
-  uploadedStore.mRefreshListDataShow(false)
-}
-
-const onSelectCancel = () => {
-  onHideRightMenuScroll()
-  uploadedStore.ListSelected.clear()
-  uploadedStore.ListFocusKey = 0
-  uploadedStore.mRefreshListDataShow(false)
-}
 </script>
 
 <template>
@@ -195,27 +173,6 @@ const onSelectCancel = () => {
       </AntdTooltip>
     </div>
     <div class="selectInfo">{{ uploadedStore.ListDataSelectCountInfo }}</div>
-    <div style='margin: 0 2px'>
-      <AntdTooltip placement='rightTop'>
-        <a-button shape='square' type='text' tabindex='-1' class='qujian'
-                  :status="rangIsSelecting ? 'danger' : 'normal'" title='Ctrl+Q' @click='onSelectRangStart'>
-          {{ rangIsSelecting ? '取消选择' : '区间选择' }}
-        </a-button>
-        <template #title>
-          <div>
-            第1步: 点击 区间选择 这个按钮
-            <br />
-            第2步: 鼠标点击一个文件
-            <br />
-            第3步: 移动鼠标点击另外一个文件
-          </div>
-        </template>
-      </AntdTooltip>
-      <a-button shape='square' v-if='!rangIsSelecting && uploadedStore.ListSelected.size > 0' type='text' tabindex='-1' class='qujian'
-                status='normal' @click='onSelectCancel'>
-        取消已选
-      </a-button>
-    </div>
 
     <div style="flex-grow: 1"></div>
 

diff --git a/src/down/DownUploading.vue b/src/down/DownUploading.vue
@@ -20,12 +20,6 @@ const appStore = useAppStore()
 const winStore = useWinStore()
 const uploadingStore = useUploadingStore()
 
-const rangIsSelecting = ref(false)
-const rangSelectID = ref('')
-const rangSelectStart = ref('')
-const rangSelectEnd = ref('')
-const rangSelectFiles = ref<{ [k: string]: any }>({})
-
 const menuShowDir = ref(false)
 const menuShowTask = ref(false)
 uploadingStore.$subscribe((_m: any, state: any) => {
@@ -60,23 +54,6 @@ const handleRightClick = (e: { event: MouseEvent; node: any }) => {
   if (!uploadingStore.ListSelected.has(key)) uploadingStore.mMouseSelect(key, false, false)
   onShowRightMenu('rightuploadingmenu', e.event.clientX, e.event.clientY)
 }
-
-const onSelectRangStart = () => {
-  onHideRightMenuScroll()
-  rangIsSelecting.value = !rangIsSelecting.value
-  rangSelectID.value = ''
-  rangSelectStart.value = ''
-  rangSelectEnd.value = ''
-  rangSelectFiles.value = {}
-  uploadingStore.mRefreshListDataShow(false)
-}
-
-const onSelectCancel = () => {
-  onHideRightMenuScroll()
-  uploadingStore.ListSelected.clear()
-  uploadingStore.ListFocusKey = 0
-  uploadingStore.mRefreshListDataShow(false)
-}
 </script>
 
 <template>
@@ -130,27 +107,6 @@ const onSelectCancel = () => {
       </AntdTooltip>
     </div>
     <div class="selectInfo">{{ uploadingStore.ListDataSelectCountInfo }}</div>
-    <div style='margin: 0 2px'>
-      <AntdTooltip placement='rightTop'>
-        <a-button shape='square' type='text' tabindex='-1' class='qujian'
-                  :status="rangIsSelecting ? 'danger' : 'normal'" title='Ctrl+Q' @click='onSelectRangStart'>
-          {{ rangIsSelecting ? '取消选择' : '区间选择' }}
-        </a-button>
-        <template #title>
-          <div>
-            第1步: 点击 区间选择 这个按钮
-            <br />
-            第2步: 鼠标点击一个文件
-            <br />
-            第3步: 移动鼠标点击另外一个文件
-          </div>
-        </template>
-      </AntdTooltip>
-      <a-button shape='square' v-if='!rangIsSelecting && uploadingStore.ListSelected.size > 0' type='text' tabindex='-1' class='qujian'
-                status='normal' @click='onSelectCancel'>
-        取消已选
-      </a-button>
-    </div>
 
     <div style="flex-grow: 1"></div>
     <div class="cell tiquma">瞬时速度</div>

diff --git a/src/down/m3u8/M3u8Downloaded.vue b/src/down/m3u8/M3u8Downloaded.vue
@@ -14,12 +14,6 @@ const appStore = useAppStore()
 const winStore = useWinStore()
 const downedStore = useM3u8DownloadedStore()
 
-const rangIsSelecting = ref(false)
-const rangSelectID = ref('')
-const rangSelectStart = ref('')
-const rangSelectEnd = ref('')
-const rangSelectFiles = ref<{ [k: string]: any }>({})
-
 const keyboardStore = useKeyboardStore()
 keyboardStore.$subscribe((_m: any, state: KeyboardState) => {
   if (appStore.appTab != 'down' || appStore.GetAppTabMenu != 'DownedRight') return
@@ -63,22 +57,6 @@ const handleRightClick = (e: { event: MouseEvent; node: any }) => {
   if (!downedStore.ListSelected.has(key)) downedStore.mMouseSelect(key, false, false)
   onShowRightMenu('downedrightmenu', e.event.clientX, e.event.clientY)
 }
-const onSelectRangStart = () => {
-  onHideRightMenuScroll()
-  rangIsSelecting.value = !rangIsSelecting.value
-  rangSelectID.value = ''
-  rangSelectStart.value = ''
-  rangSelectEnd.value = ''
-  rangSelectFiles.value = {}
-  downedStore.mRefreshListDataShow(false)
-}
-
-const onSelectCancel = () => {
-  onHideRightMenuScroll()
-  downedStore.ListSelected.clear()
-  downedStore.ListFocusKey = ''
-  downedStore.mRefreshListDataShow(false)
-}
 </script>
 
 <template>
@@ -127,28 +105,7 @@ const onSelectCancel = () => {
         </a-button>
       </AntdTooltip>
     </div>
-    <div class="selectInfo">{{ downedStore.ListDataSelectCountInfo }}</div>
-    <div style='margin: 0 2px'>
-      <AntdTooltip placement='rightTop'>
-        <a-button shape='square' type='text' tabindex='-1' class='qujian'
-                  :status="rangIsSelecting ? 'danger' : 'normal'" title='Ctrl+Q' @click='onSelectRangStart'>
-          {{ rangIsSelecting ? '取消选择' : '区间选择' }}
-        </a-button>
-        <template #title>
-          <div>
-            第1步: 点击 区间选择 这个按钮
-            <br />
-            第2步: 鼠标点击一个文件
-            <br />
-            第3步: 移动鼠标点击另外一个文件
-          </div>
-        </template>
-      </AntdTooltip>
-      <a-button shape='square' v-if='!rangIsSelecting && downedStore.ListSelected.size > 0' type='text' tabindex='-1' class='qujian'
-                status='normal' @click='onSelectCancel'>
-        取消已选
-      </a-button>
-    </div>
+    <div class="selectInfo" style="min-width: 266px">{{ downedStore.ListDataSelectCountInfo }}</div>
   </div>
   <div class="toppanlist" @keydown.space.prevent="() => true">
     <a-list