From 3b38c8b408ef46256b5e79fe73b05457fe3a028c Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 21 Jan 2022 02:14:59 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=85=B1=E4=BA=AB=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E7=A7=BB=E5=8A=A8=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=BB=85=E9=99=90=E6=89=80=E6=9C=89=E8=80=85=E6=88=96=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E8=80=85=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/File.php                       | 10 +++++-----
 resources/assets/js/pages/manage/file.vue | 22 +++++++++++++++++++++-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/Models/File.php b/app/Models/File.php
index 24984d56..5cddb8f1 100644
--- a/app/Models/File.php
+++ b/app/Models/File.php
@@ -53,12 +53,12 @@ class File extends AbstractModel
     /**
      * 是否有访问权限
      * @param $userid
-     * @return int -1:没有权限，0:访问权限，1:读写权限，1000:所有者
+     * @return int -1:没有权限，0:访问权限，1:读写权限，1000:所有者或创建者
      */
     public function getPermission($userid)
     {
-        if ($userid == $this->userid) {
-            // ① 自己的文件夹
+        if ($userid == $this->userid || $userid == $this->created_id) {
+            // ① 自己的文件夹 或 自己创建的文件夹
             return 1000;
         }
         $row = $this->getShareInfo();
@@ -217,7 +217,7 @@ class File extends AbstractModel
     /**
      * 获取文件并检测权限
      * @param $id
-     * @param int $limit 要求权限: 0-访问权限、1-读写权限、1000-所有者
+     * @param int $limit 要求权限: 0-访问权限、1-读写权限、1000-所有者或创建者
      * @param $permission
      * @return File
      */
@@ -231,7 +231,7 @@ class File extends AbstractModel
         $permission = $file->getPermission(User::userid());
         if ($permission < $limit) {
             $msg = match ($limit) {
-                1000 => '仅限所有者操作',
+                1000 => '仅限所有者或创建者操作',
                 1 => '没有读写权限',
                 default => '没有访问权限',
             };
diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
index 64b4a11a..60c1a855 100644
--- a/resources/assets/js/pages/manage/file.vue
+++ b/resources/assets/js/pages/manage/file.vue
@@ -80,6 +80,12 @@
                                         <i class="taskfont">&#xe757;</i>
                                     </div>
                                 </template>
+                                <template v-else-if="isParentShare">
+                                    <UserAvatar :userid="item.created_id" class="share-avatar" :size="20">
+                                        <p v-if="item.created_id != item.userid"><strong>{{$L('成员创建于')}}: {{item.created_at}}</strong></p>
+                                        <p v-else>{{$L('所有者创建于')}}: {{item.created_at}}</p>
+                                    </UserAvatar>
+                                </template>
                             </div>
                             <div v-if="item._edit" class="file-input">
                                 <Input
@@ -487,7 +493,12 @@ export default {
                 }
             }
             return array;
-        }
+        },
+
+        isParentShare() {
+            const {navigator} = this;
+            return !!navigator.find(({share}) => share);
+        },
     },
 
     watch: {
@@ -620,6 +631,15 @@ export default {
                                         },
                                     }))
                                 }
+                            } else if (this.isParentShare) {
+                                iconArray.push(h('UserAvatar', {
+                                    props: {
+                                        userid: row.created_id,
+                                        size: 20
+                                    },
+                                }, [
+                                    row.created_id != row.userid ? h('p', [h('strong', this.$L('成员创建于') + ": " + row.created_at)]) : h('p', this.$L('所有者创建') + ": " + row.created_at)
+                                ]))
                             }
                             return h('div', {
                                 class: 'file-nbox'