From d39b13851db82f77761e01a2c34f9e02a5c8b44c Mon Sep 17 00:00:00 2001 From: 3y Date: Fri, 25 Mar 2022 22:51:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=85=A5=20=E9=92=89=E9=92=89?= =?UTF-8?q?=E7=BE=A4=20=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/crud-edit.json | 62 ++++++++++++++++++++++++++++----------- pages/crud-list.json | 6 ++-- pages/crud-new.json | 70 ++++++++++++++++++++++++++++++++++---------- pages/crud-view.json | 43 +++++++++++++++++++++++++-- 4 files changed, 143 insertions(+), 38 deletions(-) diff --git a/pages/crud-edit.json b/pages/crud-edit.json index 48e102d..205acf0 100644 --- a/pages/crud-edit.json +++ b/pages/crud-edit.json @@ -59,6 +59,10 @@ { "label": "企业微信userId", "value": "60" + }, + { + "label": "钉钉userId", + "value": "70" } ], "required": true @@ -85,40 +89,41 @@ }, { "type": "radios", - "label": "消息模板类型", - "name": "templateType", + "label": "屏蔽类型", + "name": "shieldType", "options": [ { - "label": "定时", + "label": "夜间不屏蔽", "value": "10" }, { - "label": "实时", + "label": "夜间屏蔽", "value": "20" + }, + { + "label": "夜间屏蔽(次日早上9点发送)", + "value": "30" } ], "required": true }, { "type": "radios", - "label": "屏蔽类型", - "name": "shieldType", + "label": "消息模板类型", + "name": "templateType", "options": [ { - "label": "夜间不屏蔽", + "label": "定时", "value": "10" }, { - "label": "夜间屏蔽", + "label": "实时", "value": "20" - }, - { - "label": "夜间屏蔽(次日早上9点发送)", - "value": "30" } ], "required": true }, + { "type": "input-text", "label": "cron表达式", @@ -183,6 +188,10 @@ { "label": "企业微信", "value": "70" + }, + { + "label": "钉钉群机器人", + "value": "80" } ], "required": true @@ -284,7 +293,26 @@ "size": "lg" }, { - "name": "wechatType", + "type": "select", + "label": "钉钉群机器人", + "name": "sendAccount", + "options": [ + { + "label": "austin", + "value": "10" + }, + { + "label": "athena", + "value": "20" + } + ], + "visibleOn": "this.sendChannel == 80", + "clearValueOnHidden": false, + "required": true, + "size": "lg" + }, + { + "name": "sendType", "label": "发送类型", "type": "radios", "options": [ @@ -329,17 +357,17 @@ "value": "100" } ], - "visibleOn": "this.sendChannel == 70", + "visibleOn": "this.sendChannel == 70 ||this.sendChannel == 80 ", "clearValueOnHidden": false, "required": true, "size": "lg" }, { "type": "input-text", - "label": "企业微信内容", + "label": "钉钉发送内容", "name": "content", "required": true, - "visibleOn": "this.sendChannel == 70 && this.wechatType == 10", + "visibleOn": "this.sendChannel == 80 && this.sendType == 10", "size": "lg", "clearValueOnHidden": false, "placeholder": "可用占位符{$content}" @@ -369,7 +397,7 @@ "sendAccount": "${sendAccount}", "cronCrowdPath": "${cronCrowdPath}", "shieldType": "${shieldType}", - "msgContent": "{\"content\":\"${content}\",\"url\":\"${url}\",\"title\":\"${title}\",\"wechatType\":\"${wechatType}\"}", + "msgContent": "{\"content\":\"${content}\",\"url\":\"${url}\",\"title\":\"${title}\",\"sendType\":\"${sendType}\"}", "id": "${id}", "flowId": "${flowId}", "msgStatus": "${msgStatus}", diff --git a/pages/crud-list.json b/pages/crud-list.json index 36171bf..41797bf 100644 --- a/pages/crud-list.json +++ b/pages/crud-list.json @@ -60,7 +60,8 @@ "40": "邮箱", "50": "服务号", "60": "小程序", - "70": "企业微信" + "70": "企业微信应用消息", + "80": "钉钉群机器人" } }, { @@ -96,7 +97,8 @@ "30": "手机号", "40": "openId", "50": "邮箱地址", - "60": "企业微信userId" + "60": "企业微信userId", + "70": "钉钉userId" } }, { diff --git a/pages/crud-new.json b/pages/crud-new.json index 03a34d4..317b7a8 100644 --- a/pages/crud-new.json +++ b/pages/crud-new.json @@ -59,6 +59,10 @@ { "label": "企业微信userId", "value": "60" + }, + { + "label": "钉钉userId", + "value": "70" } ], "required": true @@ -85,40 +89,41 @@ }, { "type": "radios", - "label": "消息模板类型", - "name": "templateType", + "label": "屏蔽类型", + "name": "shieldType", "options": [ { - "label": "定时", + "label": "夜间不屏蔽", "value": "10" }, { - "label": "实时", + "label": "夜间屏蔽", "value": "20" + }, + { + "label": "夜间屏蔽(次日早上9点发送)", + "value": "30" } ], "required": true }, { "type": "radios", - "label": "屏蔽类型", - "name": "shieldType", + "label": "消息模板类型", + "name": "templateType", "options": [ { - "label": "夜间不屏蔽", + "label": "定时", "value": "10" }, { - "label": "夜间屏蔽", + "label": "实时", "value": "20" - }, - { - "label": "夜间屏蔽(次日早上9点发送)", - "value": "30" } ], "required": true }, + { "type": "input-text", "label": "cron表达式", @@ -199,6 +204,10 @@ { "label": "企业微信", "value": "70" + }, + { + "label": "钉钉群机器人", + "value": "80" } ], "required": true @@ -301,7 +310,26 @@ "size": "lg" }, { - "name": "wechatType", + "type": "select", + "label": "钉钉群机器人", + "name": "sendAccount", + "options": [ + { + "label": "austin", + "value": "10" + }, + { + "label": "athena", + "value": "20" + } + ], + "visibleOn": "this.sendChannel == 80", + "clearValueOnHidden": false, + "required": true, + "size": "lg" + }, + { + "name": "sendType", "label": "发送类型", "type": "radios", "options": [ @@ -346,7 +374,7 @@ "value": "100" } ], - "visibleOn": "this.sendChannel == 70", + "visibleOn": "this.sendChannel == 70 ||this.sendChannel == 80 ", "clearValueOnHidden": false, "required": true, "size": "lg" @@ -356,7 +384,17 @@ "label": "企业微信内容", "name": "content", "required": true, - "visibleOn": "this.sendChannel == 70 && this.wechatType == 10", + "visibleOn": "this.sendChannel == 70 && this.sendType == 10", + "size": "lg", + "clearValueOnHidden": false, + "placeholder": "可用占位符{$content}" + }, + { + "type": "input-text", + "label": "钉钉发送内容", + "name": "content", + "required": true, + "visibleOn": "this.sendChannel == 80 && this.sendType == 10", "size": "lg", "clearValueOnHidden": false, "placeholder": "可用占位符{$content}" @@ -386,7 +424,7 @@ "sendAccount": "${sendAccount}", "cronCrowdPath": "${cronCrowdPath}", "shieldType": "${shieldType}", - "msgContent": "{\"content\":\"${content}\",\"url\":\"${url}\",\"title\":\"${title}\",\"wechatType\":\"${wechatType}\"}" + "msgContent": "{\"content\":\"${content}\",\"url\":\"${url}\",\"title\":\"${title}\",\"sendType\":\"${sendType}\"}" } } } diff --git a/pages/crud-view.json b/pages/crud-view.json index d2cd5fb..d4542b4 100644 --- a/pages/crud-view.json +++ b/pages/crud-view.json @@ -53,6 +53,10 @@ { "label": "企业微信userId", "value": "60" + }, + { + "label": "钉钉userId", + "value": "70" } ], "required": true @@ -177,6 +181,10 @@ { "label": "企业微信", "value": "70" + }, + { + "label": "钉钉userId", + "value": "80" } ], "required": true @@ -278,7 +286,26 @@ "size": "lg" }, { - "name": "wechatType", + "type": "select", + "label": "钉钉群机器人", + "name": "sendAccount", + "options": [ + { + "label": "austin", + "value": "10" + }, + { + "label": "athena", + "value": "20" + } + ], + "visibleOn": "this.sendChannel == 80", + "clearValueOnHidden": false, + "required": true, + "size": "lg" + }, + { + "name": "sendType", "label": "发送类型", "type": "radios", "options": [ @@ -323,7 +350,7 @@ "value": "100" } ], - "visibleOn": "this.sendChannel == 70", + "visibleOn": "this.sendChannel == 70 ||this.sendChannel == 80 ", "clearValueOnHidden": false, "required": true, "size": "lg" @@ -333,7 +360,17 @@ "label": "企业微信内容", "name": "content", "required": true, - "visibleOn": "this.sendChannel == 70 && this.wechatType == 10", + "visibleOn": "this.sendChannel == 70 && this.sendType == 10", + "size": "lg", + "clearValueOnHidden": false, + "placeholder": "可用占位符{$content}" + }, + { + "type": "input-text", + "label": "钉钉发送内容", + "name": "content", + "required": true, + "visibleOn": "this.sendChannel == 80 && this.sendType == 10", "size": "lg", "clearValueOnHidden": false, "placeholder": "可用占位符{$content}"