fix: 栏目被删除的时候，已归档任务不受影响

app/Http/Controllers/Api/DialogController.php

@@ -868,8 +868,8 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {post} api/dialog/msg/sendfiles          19. 群发文件上传
+     * @api {post} api/dialog/msg/sendfiles          18. 群发文件上传
-     * @api {post} api/dialog/msg/sendfiles          19. 群发文件上传
+     * @api {post} api/dialog/msg/sendfiles          18. 群发文件上传
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0

app/Http/Controllers/Api/ProjectController.php

@@ -856,7 +856,47 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/lists          18. 任务列表
+     * @api {get} api/project/column/one          18. 获取任务列详细
+     *
+     * @apiDescription 需要token身份（限：项目负责人）
+     * @apiVersion 1.0.0
+     * @apiGroup project
+     * @apiName column__one
+     *
+     * @apiParam {Number} column_id        列表ID
+     * @apiParam {String} [deleted]        是否读取已删除
+     * - all：所有
+     * - yes：已删除
+     * - no：未删除（默认）
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function column__one()
+    {
+        User::auth();
+        // 
+        $column_id = intval(Request::input('column_id'));
+        $deleted = Request::input('deleted', 'no');
+        // 
+        $builder = ProjectColumn::whereId($column_id);
+        if ($deleted == 'all') {
+            $builder->withTrashed();
+        } elseif ($deleted == 'yes') {
+            $builder->onlyTrashed();
+        }
+        $column = $builder->first();
+        if (empty($column)) {
+            return Base::retError('列表不存在');
+        }
+        // 
+        return Base::retSuccess('success', $column);
+    }
+    
+
+    /**
+     * @api {get} api/project/task/lists          19. 任务列表
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1048,7 +1088,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/easylists          19. 任务列表-简单的
+     * @api {get} api/project/task/easylists          20. 任务列表-简单的
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1104,7 +1144,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/export          20. 导出任务（限管理员）
+     * @api {get} api/project/task/export          21. 导出任务（限管理员）
      *
      * @apiDescription 导出指定范围任务（已完成、未完成、已归档），返回下载地址，需要token身份
      * @apiVersion 1.0.0
@@ -1307,7 +1347,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/exportoverdue          21. 导出超期任务（限管理员）
+     * @api {get} api/project/task/exportoverdue          22. 导出超期任务（限管理员）
      *
      * @apiDescription 导出指定范围任务（已完成、未完成、已归档），返回下载地址，需要token身份
      * @apiVersion 1.0.0
@@ -1416,7 +1456,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/down          22. 下载导出的任务
+     * @api {get} api/project/task/down          23. 下载导出的任务
      *
      * @apiVersion 1.0.0
      * @apiGroup project
@@ -1442,7 +1482,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/one          23. 获取单个任务信息
+     * @api {get} api/project/task/one          24. 获取单个任务信息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1486,7 +1526,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/content          24. 获取任务详细描述
+     * @api {get} api/project/task/content          25. 获取任务详细描述
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1514,7 +1554,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/files          25. 获取任务文件列表
+     * @api {get} api/project/task/files          26. 获取任务文件列表
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1539,7 +1579,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/filedelete          26. 删除任务文件
+     * @api {get} api/project/task/filedelete          27. 删除任务文件
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1572,7 +1612,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/filedetail          27. 获取任务文件详情
+     * @api {get} api/project/task/filedetail          28. 获取任务文件详情
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1616,7 +1656,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/filedown          28. 下载任务文件
+     * @api {get} api/project/task/filedown          29. 下载任务文件
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1663,7 +1703,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {post} api/project/task/add          29. 添加任务
+     * @api {post} api/project/task/add          30. 添加任务
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1747,7 +1787,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/addsub          30. 添加子任务
+     * @api {get} api/project/task/addsub          31. 添加子任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1792,7 +1832,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {post} api/project/task/update          31. 修改任务、子任务
+     * @api {post} api/project/task/update          32. 修改任务、子任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1891,7 +1931,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/dialog          32. 创建/获取聊天室
+     * @api {get} api/project/task/dialog          33. 创建/获取聊天室
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -1940,7 +1980,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/archived          33. 归档任务
+     * @api {get} api/project/task/archived          34. 归档任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -1982,7 +2022,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/remove          34. 删除任务
+     * @api {get} api/project/task/remove          35. 删除任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -2016,7 +2056,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/resetfromlog          35. 根据日志重置任务
+     * @api {get} api/project/task/resetfromlog          36. 根据日志重置任务
      *
      * @apiDescription 需要token身份（限：项目、任务负责人）
      * @apiVersion 1.0.0
@@ -2075,7 +2115,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/task/flow          36. 任务工作流信息
+     * @api {get} api/project/task/flow          37. 任务工作流信息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2157,7 +2197,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/flow/list          37. 工作流列表
+     * @api {get} api/project/flow/list          38. 工作流列表
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2183,7 +2223,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {post} api/project/flow/save          38. 保存工作流
+     * @api {post} api/project/flow/save          39. 保存工作流
      *
      * @apiDescription 需要token身份（限：项目负责人）
      * @apiVersion 1.0.0
@@ -2217,7 +2257,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/flow/delete          39. 删除工作流
+     * @api {get} api/project/flow/delete          40. 删除工作流
      *
      * @apiDescription 需要token身份（限：项目负责人）
      * @apiVersion 1.0.0
@@ -2249,7 +2289,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/log/lists          40. 获取项目、任务日志
+     * @api {get} api/project/log/lists          41. 获取项目、任务日志
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -2302,7 +2342,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @api {get} api/project/top          41. 项目置顶
+     * @api {get} api/project/top          42. 项目置顶
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0

app/Models/ProjectColumn.php

@@ -68,8 +68,10 @@ class ProjectColumn extends AbstractModel
         AbstractModel::transaction(function () use ($pushMsg) {
             $tasks = ProjectTask::whereColumnId($this->id)->get();
             foreach ($tasks as $task) {
+                if(!$task->archived_at){
                     $task->deleteTask($pushMsg);
                 }
+            }
             $this->delete();
             $this->addLog("删除列表：" . $this->name);
         });
@@ -119,7 +121,7 @@ class ProjectColumn extends AbstractModel
             $userid = $this->project->relationUserids();
         }
         $params = [
-            'ignoreFd' => Request::header('fd'),
+            'ignoreFd' => $action == 'recovery' ? 0 : Request::header('fd'),
             'userid' => $userid,
             'msg' => [
                 'type' => 'projectColumn',

app/Models/ProjectTask.php

@@ -1289,6 +1289,13 @@ class ProjectTask extends AbstractModel
         }
         AbstractModel::transaction(function () use ($isAuto, $archived_at) {
             if ($archived_at === null) {
+                // 还原任务栏
+                if (!$this->projectColumn) {
+                    $this->projectColumn()->restore();
+                    if($projectColumn = $this->projectColumn()->first()){
+                        $projectColumn->pushMsg('recovery', $projectColumn);
+                    }
+                }
                 // 取消归档
                 $this->archived_at = null;
                 $this->archived_userid = User::userid();

language/original-api.txt

@@ -472,3 +472,7 @@ Api接口文档
 
 文件
 未完成
+请选择下载的文件或文件夹
+一次最多只能下载100个文件或文件夹
+创建压缩文件失败
+文件总大小已超过1GB,请分批下载

language/original-web.txt

@@ -1381,3 +1381,5 @@ APP推送
 模型
 
 未设置时间
+检测到所属的任务列表已被删除，该操作将会还原任务列表，你确定要还原归档吗？
+压缩下载

language/translate.json

@@ -18104,5 +18104,82 @@
         "de": "Wir haben keinen zeitplan festgelegt",
         "fr": "Temps non défini",
         "id": "Waktu tidak diatur"
+    },
+    {
+        "key": "检测到所属的任务列表已被删除，该操作将会还原任务列表，你确定要还原归档吗",
+        "zh": "",
+        "zh-CHT": "檢測到所屬的任務列表已被刪除，該操作將會還原任務列表，你確定要還原歸檔嗎",
+        "en": "Detected that the task list has been deleted. This action will restore the task list. Are you sure you want to restore the archive",
+        "ko": "작업 목록이 삭제되었습니다.이 작업은 작업 목록을 복원합니다. 압축 파일을 복원하시겠습니까",
+        "ja": "タスクリストが削除されたことが検出されたら、タスクリストに戻します。",
+        "de": "Erkennt man, dass eine liste gelöscht wurde? Diese aktion beendet die liste der aufgaben. Möchten sie wirklich ihre dateien wiederherstellen",
+        "fr": "Il a été détecté que la liste des tâches affiliées a été supprimée. Cette action va restaurer la liste des tâches. Êtes-vous sûr de vouloir restaurer l’archive? *",
+        "id": "Senarai misi yang telah terdeteksi telah dihapus operasi akan mengembalikan senarai tugas. Apakah anda yakin ingin mengembalikan berkas"
+    },
+    {
+        "key": "检测到所属的任务列表已被删除，该操作将会还原任务列表，你确定要还原归档吗？",
+        "zh": "",
+        "zh-CHT": "檢測到所屬的任務列表已被刪除，該操作將會還原任務列表，你確定要還原歸檔嗎？",
+        "en": "Detected that the task list has been deleted. This action will restore the task list. Are you sure you want to restore the archive?",
+        "ko": "작업 목록이 삭제되었습니다.이 작업은 작업 목록을 복원합니다. 압축 파일을 복원하시겠습니까?",
+        "ja": "タスクリストが削除されたことを検知したら、タスクリストに戻します。ファイリングを元に戻しますか?",
+        "de": "Erkennt man, dass eine liste gelöscht wurde? Diese aktion beendet die liste der aufgaben. Möchten sie wirklich ihre dateien wiederherstellen?",
+        "fr": "Il a été détecté que la liste des tâches affiliées a été supprimée. Cette action va restaurer la liste des tâches. Êtes-vous sûr de vouloir restaurer l’archive?",
+        "id": "Senarai misi yang telah terdeteksi telah dihapus operasi akan mengembalikan senarai tugas. Apakah anda yakin ingin mengembalikan berkas?"
+    },
+    {
+        "key": "请选择下载的文件或文件夹",
+        "zh": "",
+        "zh-CHT": "請選擇下載的文件或文件夾",
+        "en": "Please select the file or folder to download",
+        "ko": "다운로드할 파일이나 폴더를 선택하십시오",
+        "ja": "ダウンロードするファイルまたはフォルダを選択します。",
+        "de": "Bitte wählen sie die datei Oder den ordner zum download",
+        "fr": "Veuillez sélectionner un fichier ou un dossier à télécharger",
+        "id": "Silakan pilih berkas atau folder yang anda unduh"
+    },
+    {
+        "key": "一次最多只能下载100个文件或文件夹",
+        "zh": "",
+        "zh-CHT": "一次最多隻能下載100個文件或文件夾",
+        "en": "You can download a maximum of 100 files or folders at a time",
+        "ko": "한 번에 최대 100개의 파일이나 폴더만 다운로드할 수 있다",
+        "ja": "一度にダウンロードできるファイルやフォルダは100個までです",
+        "de": "Sie können zur gleichen zeit höchstens 100 dateien Oder ordner heruntergeladen werden",
+        "fr": "Vous ne pouvez télécharger que 100 fichiers ou dossiers à la fois",
+        "id": "Hanya 100 file atau folder yang bisa diunduh sekaligus"
+    },
+    {
+        "key": "创建压缩文件失败",
+        "zh": "",
+        "zh-CHT": "創建壓縮文件失敗",
+        "en": "Failed to create the compressed file. Procedure",
+        "ko": "압축 파일을 만들 수 없습니다",
+        "ja": "圧縮ファイルの作成に失敗します",
+        "de": "Das erstellen einer komprimierten datei ist fehlgeschlagen",
+        "fr": "Échec de la création d’un fichier compressé",
+        "id": "Gagal membuat berkas kompresi"
+    },
+    {
+        "key": "文件总大小已超过1GB,请分批下载",
+        "zh": "",
+        "zh-CHT": "文件總大小已超過1GB,請分批下載",
+        "en": "The total size of the file exceeds 1GB. Please download it in batches",
+        "ko": "전체 파일 크기가 1gb를 초과했습니다. 차례로 다운로드하십시오",
+        "ja": "ファイルの総サイズはすでに1GBを超えて、いくつかに分けてダウンロードします",
+        "de": "Die datei insgesamt betrug mehr als 1 gigabyte, und bitte download sie in einzelnen gruppen",
+        "fr": "La taille totale du fichier a dépassé 1 go, veuillez le télécharger par lots",
+        "id": "Ukuran total file telah melebihi 1GB, silahkan download secara terpisah"
+    },
+    {
+        "key": "压缩下载",
+        "zh": "",
+        "zh-CHT": "壓縮下載",
+        "en": "Compressed download",
+        "ko": "압축 다운로드",
+        "ja": "圧縮ダウンロードです",
+        "de": "Download komprimieren.",
+        "fr": "Compresser et télécharger",
+        "id": "Download terkompresi"
     }
 ]

public/language/api/zh.json

@@ -1 +1 @@
-["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
+["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]

public/language/web/zh.js

@@ -1 +1 @@
-if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
+if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]

resources/assets/js/pages/manage/components/TaskArchived.vue

@@ -163,12 +163,14 @@ export default {
                             }, this.$L('查看')),
                             h('Poptip', {
                                 props: {
-                                    title: this.$L('你确定要还原归档吗？'),
+                                    title: params.row.__restorePoptipTitle,
                                     confirm: true,
                                     transfer: true,
                                     placement: 'left',
                                     okText: this.$L('确定'),
                                     cancelText: this.$L('取消'),
+                                    value: params.row.__restorePoptipShow,
+                                    width: 220,
                                 },
                                 style: {
                                     marginLeft: '6px',
@@ -179,9 +181,46 @@ export default {
                                 on: {
                                     'on-ok': () => {
                                         this.recovery(params.row);
+                                    },
+                                    'on-popper-hide': () => {
+                                        params.row.__restorePoptipLoadIng = false;
+                                        params.row.__restorePoptipTitle = this.$L('你确定要还原归档吗？');
+                                        params.row.__restorePoptipShow = false;
+                                    },
+                                },
+                            },  [h('span', {
+                                    on: {
+                                        'click': (e) => {
+                                            e.stopPropagation();
+                                            params.row.__restorePoptipLoadIng = true
+                                            this.$store.dispatch("call", {
+                                                url: 'project/column/one',
+                                                data: {
+                                                    column_id:  params.row.column_id,
+                                                    deleted: 'all'
+                                                },
+                                            }).then(({ data }) => {
+                                                if(data.deleted_at){
+                                                    params.row.__restorePoptipTitle = this.$L('检测到所属的任务列表已被删除，该操作将会还原任务列表，你确定要还原归档吗？');
+                                                }
+                                                params.row.__restorePoptipShow = true;
+                                            }).catch(() => {
+                                                // this.noText = '数据加载失败';
+                                            }).finally(_ => {
+                                                params.row.__restorePoptipLoadIng = false
+                                            })
                                         }
                                     },
-                            }, this.$L('还原')),
+                                }, 
+                                [ 
+                                    params.row.__restorePoptipLoadIng ? h('Loading', {
+                                        style: {
+                                            width: '26px',
+                                            height: '15px',
+                                        },
+                                    }) : this.$L('还原') 
+                                ])
+                            ]),
                             h('Poptip', {
                                 props: {
                                     title: this.$L('你确定要删除任务吗？'),
@@ -268,7 +307,12 @@ export default {
             }).then(({data}) => {
                 this.page = data.current_page;
                 this.total = data.total;
-                this.list = data.data;
+                this.list = data.data.map(h=>{
+                    h.__restorePoptipLoadIng = false;
+                    h.__restorePoptipTitle = this.$L('你确定要还原归档吗？');
+                    h.__restorePoptipShow = false;
+                    return h;
+                });
                 this.noText = '没有相关的数据';
             }).catch(() => {
                 this.noText = '数据加载失败';

resources/assets/js/store/actions.js

@@ -3322,6 +3322,7 @@ export default {
                                 switch (action) {
                                     case 'add':
                                     case 'update':
+                                    case 'recovery':
                                         dispatch("saveColumn", data)
                                         break;
                                     case 'delete':