From 942f20e07898f54d3447776b89fa4269557be95d Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Tue, 24 Aug 2021 16:36:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=98=9F=E5=88=97=E5=8F=AF=E4=BB=A5=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AA=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/admins/recipients/tasks/delete.go | 26 +++++++++++++++++++
 .../default/admins/recipients/tasks/init.go   |  1 +
 .../admins/recipients/tasks/index.css         |  9 +++++++
 .../admins/recipients/tasks/index.css.map     |  1 +
 .../admins/recipients/tasks/index.html        |  2 ++
 .../@default/admins/recipients/tasks/index.js | 16 ++++++++++++
 .../admins/recipients/tasks/index.less        |  9 +++++++
 7 files changed, 64 insertions(+)
 create mode 100644 internal/web/actions/default/admins/recipients/tasks/delete.go
 create mode 100644 web/views/@default/admins/recipients/tasks/index.css
 create mode 100644 web/views/@default/admins/recipients/tasks/index.css.map
 create mode 100644 web/views/@default/admins/recipients/tasks/index.js
 create mode 100644 web/views/@default/admins/recipients/tasks/index.less

diff --git a/internal/web/actions/default/admins/recipients/tasks/delete.go b/internal/web/actions/default/admins/recipients/tasks/delete.go
new file mode 100644
index 00000000..ca3d6752
--- /dev/null
+++ b/internal/web/actions/default/admins/recipients/tasks/delete.go
@@ -0,0 +1,26 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package tasks
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type DeleteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteAction) RunPost(params struct {
+	TaskId int64
+}) {
+	defer this.CreateLogInfo("删除消息发送任务 %d", params.TaskId)
+
+	_, err := this.RPC().MessageTaskRPC().DeleteMessageTask(this.AdminContext(), &pb.DeleteMessageTaskRequest{MessageTaskId: params.TaskId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}
diff --git a/internal/web/actions/default/admins/recipients/tasks/init.go b/internal/web/actions/default/admins/recipients/tasks/init.go
index 90fde3e2..2a8f7499 100644
--- a/internal/web/actions/default/admins/recipients/tasks/init.go
+++ b/internal/web/actions/default/admins/recipients/tasks/init.go
@@ -15,6 +15,7 @@ func init() {
 			Prefix("/admins/recipients/tasks").
 			Get("", new(IndexAction)).
 			Post("/taskInfo", new(TaskInfoAction)).
+			Post("/delete", new(DeleteAction)).
 			EndAll()
 	})
 }
diff --git a/web/views/@default/admins/recipients/tasks/index.css b/web/views/@default/admins/recipients/tasks/index.css
new file mode 100644
index 00000000..38e2fff3
--- /dev/null
+++ b/web/views/@default/admins/recipients/tasks/index.css
@@ -0,0 +1,9 @@
+td {
+  position: relative;
+}
+td a.op {
+  position: absolute;
+  right: 1em;
+  top: 0.5em;
+}
+/*# sourceMappingURL=index.css.map */
\ No newline at end of file
diff --git a/web/views/@default/admins/recipients/tasks/index.css.map b/web/views/@default/admins/recipients/tasks/index.css.map
new file mode 100644
index 00000000..fe294f96
--- /dev/null
+++ b/web/views/@default/admins/recipients/tasks/index.css.map
@@ -0,0 +1 @@
+{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;EACC,kBAAA;;AAGD,EAAG,EAAC;EACH,kBAAA;EACA,UAAA;EACA,UAAA","file":"index.css"}
\ No newline at end of file
diff --git a/web/views/@default/admins/recipients/tasks/index.html b/web/views/@default/admins/recipients/tasks/index.html
index c7bd1f39..35a6c01b 100644
--- a/web/views/@default/admins/recipients/tasks/index.html
+++ b/web/views/@default/admins/recipients/tasks/index.html
@@ -17,6 +17,8 @@
             <td>
                 {{task.user}} <span class="disabled">&nbsp; | &nbsp;</span> <span v-if="task.instance != null">媒介：{{task.instance.name}}<link-icon :href="'/admins/recipients/instances/instance?instanceId=' + task.instance.id"></link-icon></span>
                 <span class="disabled">&nbsp; | &nbsp;</span> 时间：{{task.createdTime}}
+
+                <a href="" title="删除" class="op" @click.prevent="deleteTask(task.id)"><i class="icon remove small"></i></a>
             </td>
         </tr>
         <tr v-if="task.subject.length > 0">
diff --git a/web/views/@default/admins/recipients/tasks/index.js b/web/views/@default/admins/recipients/tasks/index.js
new file mode 100644
index 00000000..e0ae639a
--- /dev/null
+++ b/web/views/@default/admins/recipients/tasks/index.js
@@ -0,0 +1,16 @@
+Tea.context(function () {
+	this.deleteTask = function (taskId) {
+		let that = this
+		teaweb.confirm("确定要删除这个发送任务吗？", function () {
+			that.$post(".delete")
+				.params({
+					taskId: taskId
+				})
+				.success(function () {
+					teaweb.successToast("删除成功", null, function () {
+						teaweb.reload()
+					})
+				})
+		})
+	}
+})
\ No newline at end of file
diff --git a/web/views/@default/admins/recipients/tasks/index.less b/web/views/@default/admins/recipients/tasks/index.less
new file mode 100644
index 00000000..dea18e03
--- /dev/null
+++ b/web/views/@default/admins/recipients/tasks/index.less
@@ -0,0 +1,9 @@
+td {
+	position: relative;
+}
+
+td a.op {
+	position: absolute;
+	right: 1em;
+	top: 0.5em;
+}
\ No newline at end of file