Merge branch 'master' of github.com:kuaifan/dootask into develop

# Conflicts: # app/Http/Controllers/Api/DialogController.php # electron/package.json # package.json # public/css/app.css # public/js/app.js # public/js/build/146.js # public/js/build/146.js.LICENSE.txt # public/js/build/178.js # public/js/build/178.js.LICENSE.txt # public/js/build/199.js # public/js/build/199.js.LICENSE.txt # public/js/build/309.js # public/js/build/328.js.LICENSE.txt # public/js/build/388.js # public/js/build/43.js # public/js/build/46.js.LICENSE.txt # public/js/build/857.js # public/js/build/857.js.LICENSE.txt # public/js/build/893.js
2022-01-25 16:11:23 +08:00
parent 778f6367f9 7f14a82053
commit 8f0b5dc049
1042 changed files with 7455 additions and 81206 deletions
--- a/app/Models/FileContent.php
+++ b/app/Models/FileContent.php
@@ -41,43 +41,57 @@ class FileContent extends AbstractModel
    use SoftDeletes;

    /**
-     * 获取格式内容
-     * @param $type
+     * 获取格式内容（或下载）
+     * @param File $file
     * @param $content
+     * @param $download
     * @return array|\Symfony\Component\HttpFoundation\BinaryFileResponse
     */
-    public static function formatContent($type, $content)
+    public static function formatContent($file, $content, $download = false)
    {
-        $content = Base::json2array($content);
-        if (in_array($type, ['word', 'excel', 'ppt'])) {
+        $name = $file->ext ? "{$file->name}.{$file->ext}" : null;
+        $content = Base::json2array($content ?: []);
+        if (in_array($file->type, ['word', 'excel', 'ppt'])) {
            if (empty($content)) {
-                return Response::download(resource_path('assets/statics/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $type)));
+                return Response::download(resource_path('assets/statics/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type)), $name);
            }
-            return Response::download(public_path($content['url']));
+            return Response::download(public_path($content['url']), $name);
        }
        if (empty($content)) {
-            $content = match ($type) {
+            $content = match ($file->type) {
                'document' => [
                    "type" => "md",
                    "content" => "",
                ],
-                'sheet' => [
-                    [
-                        "name" => "Sheet1",
-                        "config" => json_decode('{}'),
-                    ]
-                ],
                default => json_decode('{}'),
            };
+            if ($download) {
+                abort(403, "This file is empty.");
+            }
        } else {
            $content['preview'] = false;
-            if ($content['ext'] && !in_array($content['ext'], ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'])) {
-                $url = 'http://' . env('APP_IPPR') . '.3/' . $content['url'];
-                if (in_array($type, ['picture', 'image', 'tif', 'media'])) {
-                    $url = Base::fillUrl($content['url']);
+            if ($file->ext) {
+                $filePath = public_path($content['url']);
+                if (in_array($file->type, ['txt', 'code']) && $file->size < 2 * 1024 * 1024) {
+                    // 支持编辑，限制2M内的文件
+                    $content['content'] = file_get_contents($filePath);
+                } else {
+                    // 支持预览
+                    if (in_array($file->type, ['picture', 'image', 'tif', 'media'])) {
+                        $url = Base::fillUrl($content['url']);
+                    } else {
+                        $url = 'http://' . env('APP_IPPR') . '.3/' . $content['url'];
+                    }
+                    $content['url'] = base64_encode($url);
+                    $content['preview'] = true;
+                }
+            }
+            if ($download) {
+                if (isset($filePath)) {
+                    return Response::download($filePath, $name);
+                } else {
+                    abort(403, "This file not support download.");
                }
-                $content['url'] = base64_encode($url);
-                $content['preview'] = true;
            }
        }
        return Base::retSuccess('success', [ 'content' => $content ]);
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -694,6 +694,10 @@ class ProjectTask extends AbstractModel
                                $subTask->end_at = $this->end_at;
                                $isUp = true;
                            }
+                            if ($subTask->start_at && Carbon::parse($subTask->start_at)->gt($subTask->end_at)) {
+                                $subTask->start_at = $this->start_at;
+                                $isUp = true;
+                            }
                            if ($isUp) {
                                $updateMarking['is_update_subtask'] = true;
                                $subTask->addLog("同步修改{任务}时间");
@@ -862,6 +866,24 @@ class ProjectTask extends AbstractModel
        return $user->owner ? 2 : 1;
    }

+    /**
+     * 判断是否负责人（或者是主任务的负责人）
+     * @return bool
+     */
+    public function isOwner()
+    {
+        if ($this->owner) {
+            return true;
+        }
+        if ($this->parent_id > 0) {
+            $mainTask = self::allData()->find($this->parent_id);
+            if ($mainTask->owner) {
+                return true;
+            }
+        }
+        return false;
+    }
+
    /**
     * 是否有负责人
     * @return bool
@@ -1063,7 +1085,7 @@ class ProjectTask extends AbstractModel
     * 获取任务（会员有任务权限 或 会员存在项目内）
     * @param int $task_id
     * @param bool $archived true:仅限未归档, false:仅限已归档, null:不限制
-     * @param int|bool $mustOwner 0|false:不限制, 1|true:限制任务或项目负责人, 2:已有负责人才限制任务或项目负责人
+     * @param int|bool $mustOwner 0|false:不限制, 1|true:限制任务或项目负责人, 2:已有负责人才限制任务或项目负责人(子任务时如果是主任务负责人也可以)
     * @param array $with
     * @return self
     */
@@ -1096,7 +1118,7 @@ class ProjectTask extends AbstractModel
        if ($mustOwner === 2) {
            $mustOwner = $task->hasOwner() ? 1 : 0;
        }
-        if (($mustOwner === 1 || $mustOwner === true) && !$task->owner && !$project->owner) {
+        if (($mustOwner === 1 || $mustOwner === true) && !$task->isOwner() && !$project->owner) {
            throw new ApiException('仅限项目或任务负责人操作');
        }
        //