From ba1c6c85435f39ce4cd68dcf4e9b42a3ac1b65a3 Mon Sep 17 00:00:00 2001
From: Jerry <731238433@qq.com>
Date: Tue, 1 Mar 2022 17:53:22 +0800
Subject: [PATCH 1/5] =?UTF-8?q?add=20=E8=BF=90=E8=A1=8C=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/task/schedule.vue | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/views/task/schedule.vue b/src/views/task/schedule.vue
index 3376746..996e28d 100644
--- a/src/views/task/schedule.vue
+++ b/src/views/task/schedule.vue
@@ -24,6 +24,7 @@
执行
日志
编辑
+ 编辑Shell
删除
@@ -37,7 +38,13 @@
-
+
+
+
+
+
+
+
@@ -111,6 +118,9 @@ export default {
}
},
data() {
+ const validateJobHandler = (rule, value, callback) => {
+ console.log(rule, value, callback);
+ }
return {
listLoading: false,
list: [],
@@ -122,13 +132,19 @@ export default {
dialogVisible: false,
dialogType: 'new',
- fromData: {},
+ fromData: {
+ runMode: 0
+ },
rules: {
cron: { required: true, message: '请输入Cron', trigger: 'blur' },
jobName: { required: true, message: '请输入任务名', trigger: 'blur' },
jobHandler: { required: true, message: '请输入jobHandler', trigger: 'blur' }
},
+ sourceFromData: {
+ runSource: '#!/bin/bash\necho "hello shell"\nexit 0'
+ },
+
// 日志浮窗
logDialogVisible: false,
logListQuery: {
@@ -164,7 +180,7 @@ export default {
}
},
handleEdit(row) {
- this.fromData = {}
+ this.fromData = { runMode: 0 }
if (row) {
this.fromData = JSON.parse(JSON.stringify(row))
this.dialogType = 'edit'
@@ -187,6 +203,14 @@ export default {
}
})
},
+ handleEditShell(row) {
+ this.sourceFromData = {
+ runSource: '#!/bin/bash\necho "hello shell"\nexit 0'
+ }
+ if (row) {
+ this.fromData = JSON.parse(JSON.stringify(row))
+ }
+ },
del(row) {
this.$confirm('确定要删除该任务吗？', '提示', {
confirmButtonText: '确定',
From b91e3f1f5274c30d7a09ccbdc4fbb41c30d97aa4 Mon Sep 17 00:00:00 2001
From: Jerry <731238433@qq.com>
Date: Thu, 17 Mar 2022 19:12:11 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84shell=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 1 +
src/views/task/schedule.vue | 44 ++++++++++++++++++++++++++++++++-----
yarn.lock | 18 +++++++++++++++
3 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 721a21c..60e7929 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
"nprogress": "0.2.0",
"path-to-regexp": "2.4.0",
"vue": "2.6.10",
+ "vue-codemirror": "^4.0.6",
"vue-router": "3.0.6",
"vuex": "3.1.0"
},
diff --git a/src/views/task/schedule.vue b/src/views/task/schedule.vue
index 996e28d..4a3af54 100644
--- a/src/views/task/schedule.vue
+++ b/src/views/task/schedule.vue
@@ -99,15 +99,32 @@
+
+
+
+
+
+