From 7a4d27da69e9afaad5dc4b11441a3e8726e785a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com>
Date: Fri, 18 Feb 2022 16:14:54 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E3=80=90=E6=96=87=E4=BB=B6=E3=80=91?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E9=80=89=E6=8B=A9=E5=89=AA=E5=88=87=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=B8=8E=E5=8F=B3=E9=94=AE=E5=89=AA=E5=88=87=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E5=90=88=E6=8B=BC=EF=BC=9B=E6=96=B9=E6=A0=BC=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=EF=BC=8C=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA=E5=A4=9A=E9=80=89=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage/file.vue | 53 +++++++++++------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
index a2a5b1b3..9cf61d53 100644
--- a/resources/assets/js/pages/manage/file.vue
+++ b/resources/assets/js/pages/manage/file.vue
@@ -31,12 +31,6 @@
                         <span v-if="item.share && item.permission == 0" class="readonly">{{$L('只读')}}</span>
                     </li>
                 </ul>
-                <Button v-if="shearFile" :disabled="shearFile.pid == pid" size="small" type="primary" @click="shearTo">
-                    <div class="file-shear">
-                        <span>{{$L('粘贴')}}</span>
-                        "<em>{{shearFile.name}}</em>"
-                    </div>
-                </Button>
                 <Button v-if="shearFiles.length > 0" :disabled="shearFiles[0].pid == pid" size="small" type="primary" @click="batchShearTo">
                     <div class="file-shear">
                         <span>{{$L('粘贴')}}</span>
@@ -96,7 +90,7 @@
                             <div class="file-menu" @click.stop="handleRightClick($event, item)">
                                 <Icon type="ios-more" />
                             </div>
-                            <div class="file-check" @click.stop :class="fileChecked[item.id] ?'file-checked' : ''">
+                            <div class="file-check" v-if="showMultipleChoice" @click.stop :class="fileChecked[item.id] ?'file-checked' : ''">
                                 <Checkbox v-model="fileChecked[item.id]" @on-change="onFileCheckClick(item)"/>
                             </div>
                             <div :class="`no-dark-mode-before file-icon ${item.type}`">
@@ -160,6 +154,7 @@
                             <DropdownItem @click.native="handleContextClick('rename')" divided>{{$L('重命名')}}</DropdownItem>
                             <DropdownItem @click.native="handleContextClick('copy')" :disabled="contextMenuItem.type == 'folder'">{{$L('复制')}}</DropdownItem>
                             <DropdownItem @click.native="handleContextClick('shear')" :disabled="contextMenuItem.userid != userId">{{$L('剪切')}}</DropdownItem>
+                            <DropdownItem v-if="!tableMode" @click.native="handleContextClick('multipleChoice')" divided>{{showMultipleChoice?$L('取消多选'):$L('多选')}}</DropdownItem>
                             <template v-if="contextMenuItem.userid == userId">
                                 <DropdownItem @click.native="handleContextClick('share')" divided>{{$L('共享')}}</DropdownItem>
                                 <DropdownItem @click.native="handleContextClick('link')" :disabled="contextMenuItem.type == 'folder'">{{$L('链接')}}</DropdownItem>
@@ -461,6 +456,7 @@ export default {
             selectFile: [],
             fileChecked: [],
             shearFiles: [],
+            showMultipleChoice: false
         }
     },
 
@@ -928,7 +924,27 @@ export default {
                     break;
 
                 case 'shear':
-                    this.shearId = item.id;
+                    this.showMultipleChoice = true;
+                    this.fileChecked[item.id] = true;
+                    this.onFileCheckClick(item);
+                    for (const item of this.selectFile) {
+                        let selected = false;
+                        for (const shearFile of this.shearFiles) {
+                            if ( shearFile.id === item.id ) {
+                                selected = true;
+                                break;
+                            }
+                        }
+                        if (!selected)
+                            this.shearFiles.push(item);
+                    }
+                    break;
+
+                case 'multipleChoice':
+                    this.showMultipleChoice = !this.showMultipleChoice;
+                    if(this.showMultipleChoice === false){
+                        this.clearSelect();
+                    }
                     break;
 
                 case 'batchShear':
@@ -1063,25 +1079,6 @@ export default {
             this.$refs.linkInput.focus({cursor:'all'});
         },
 
-        shearTo() {
-            if (!this.shearFile) {
-                return;
-            }
-            this.$store.dispatch("call", {
-                url: 'file/move',
-                data: {
-                    id: this.shearFile.id,
-                    pid: this.pid,
-                },
-            }).then(({data, msg}) => {
-                $A.messageSuccess(msg);
-                this.shearId = 0;
-                this.$store.dispatch("saveFile", data);
-            }).catch(({msg}) => {
-                $A.modalError(msg);
-            });
-        },
-
         autoBlur(id) {
             this.$nextTick(() => {
                 if (this.$refs['input_' + id]) {
@@ -1361,6 +1358,7 @@ export default {
                         this.$Modal.remove();
                         this.selectFile = [];
                         this.fileChecked = [];
+                        this.showMultipleChoice = false;
                         $A.messageSuccess("已提交至后台处理，请稍后再回来查看结果吧");
                     }).catch(({msg}) => {
                         $A.modalError(msg, 301);
@@ -1417,6 +1415,7 @@ export default {
             this.shearFiles = [];
             this.selectFile = [];
             this.fileChecked = [];
+            this.showMultipleChoice = false;
             if ( this.tableMode ) // 如果是表格模式，则将表格取消全选
                 this.$refs.fileListTable.selectAll(false);
         },