From 7add28ebd98e9fac584c0c131f6c0dd07d73a55b Mon Sep 17 00:00:00 2001
From: xx <xx@123.com>
Date: Sat, 21 Dec 2024 14:42:34 +0800
Subject: [PATCH 1/6] feat: improve dingtalk webhook mention add mention
 specify

---
 server/notification-providers/dingding.js | 24 ++++++++++++++++++-----
 src/components/notifications/DingDing.vue | 10 ++++++++++
 src/lang/en.json                          |  4 ++++
 src/lang/zh-CN.json                       |  4 ++++
 src/lang/zh-HK.json                       |  8 +++++++-
 src/lang/zh-TW.json                       |  4 ++++
 6 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/server/notification-providers/dingding.js b/server/notification-providers/dingding.js
index c66f270a7..795018700 100644
--- a/server/notification-providers/dingding.js
+++ b/server/notification-providers/dingding.js
@@ -11,17 +11,26 @@ class DingDing extends NotificationProvider {
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         const okMsg = "Sent Successfully.";
-
+        const  mentionAll = notification.mentioning === "everyone"
+        const mobileList = notification.mentioning === "specify-mobiles" ?  notification.mobileList.split(",") : []
+        const userList = notification.mentioning === "specify-users" ?  notification.userList.split(",") : []
+        const mentionStr = [...mobileList || [], ...userList || [] ].map(item => `@${item}`).join(" ")
+        console.log('mobileList: ',mobileList)
+        console.log('userList: ',userList)
+        console.log('mentionStr: ',mentionStr)
         try {
             if (heartbeatJSON != null) {
+                notification.mobileList
                 let params = {
                     msgtype: "markdown",
                     markdown: {
                         title: `[${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]}`,
-                        text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
+                        text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}${'\n\n'+mentionStr}`,
                     },
-                    "at": {
-                        "isAtAll": notification.mentioning === "everyone"
+                    at: {
+                        isAtAll: mentionAll,
+                        atUserIds: userList,
+                        atMobiles: mobileList
                     }
                 };
                 if (await this.sendToDingDing(notification, params)) {
@@ -31,7 +40,12 @@ class DingDing extends NotificationProvider {
                 let params = {
                     msgtype: "text",
                     text: {
-                        content: msg
+                        content: `${msg}${'\n'+mentionStr}`
+                    },
+                    at: {
+                        isAtAll: mentionAll,
+                        atUserIds: userList,
+                        atMobiles: mobileList
                     }
                 };
                 if (await this.sendToDingDing(notification, params)) {
diff --git a/src/components/notifications/DingDing.vue b/src/components/notifications/DingDing.vue
index 710677fd7..3ed974d6e 100644
--- a/src/components/notifications/DingDing.vue
+++ b/src/components/notifications/DingDing.vue
@@ -19,8 +19,18 @@
         <select id="mentioning" v-model="$parent.notification.mentioning" class="form-select" required>
             <option value="nobody">{{ $t("Don't mention people") }}</option>
             <option value="everyone">{{ $t("Mention group", { group: "@everyone" }) }}</option>
+            <option value="specify-mobiles">{{ $t("Mention Mobile List") }}</option>
+            <option value="specify-users">{{ $t("Mention User List") }}</option>
         </select>
     </div>
+    <div class="mb-3" v-if="$parent.notification.mentioning === 'specify-mobiles'">
+        <label for="mobileList" class="form-label">{{ $t("Dingtalk Mobile List") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="mobileList" v-model="$parent.notification.mobileList" type="list" class="form-control" required>
+    </div>
+    <div class="mb-3" v-if="$parent.notification.mentioning === 'specify-users'">
+        <label for="userList" class="form-label">{{ $t("Dingtalk User List") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="userList" v-model="$parent.notification.userList" type="list" class="form-control" required>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/src/lang/en.json b/src/lang/en.json
index e215f1031..641dae02e 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -687,6 +687,10 @@
     "Mentioning": "Mentioning",
     "Don't mention people": "Don't mention people",
     "Mention group": "Mention {group}",
+    "Mention Mobile List": "Mention mobile list",
+    "Mention User List": "Mention user ID List",
+    "Dingtalk Mobile List": "Mobile List (use comma separator)",
+    "Dingtalk User List": "User List (use comma separator)",
     "Device Token": "Device Token",
     "Platform": "Platform",
     "Huawei": "Huawei",
diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index ac9ebbeca..2a70bc6b1 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -949,6 +949,10 @@
     "Mentioning": "是否提及成员",
     "Don't mention people": "不提及任何人",
     "Mention group": "提及 {group}",
+    "Mention Mobile List": "提及指定手机号列表",
+    "Mention User List": "提及指定用户ID列表",
+    "Dingtalk Mobile List": "手机号列表(使用逗号分隔多个手机号)",
+    "Dingtalk User List": "用户ID列表(使用逗号分隔多个用户ID)",
     "senderSevenIO": "发信人号码或名称",
     "wayToGetSevenIOApiKey": "访问 app.seven.io > 开发人员 > api 密钥 > 绿色添加按钮下的仪表板",
     "receiverInfoSevenIO": "如果接收号码不在德国，您必须在号码前面添加国家代码（例如，对于来自美国的国家代码 1，请使用 117612121212 而不是 017612121212）",
diff --git a/src/lang/zh-HK.json b/src/lang/zh-HK.json
index 570ca3a20..3cc9b6c53 100644
--- a/src/lang/zh-HK.json
+++ b/src/lang/zh-HK.json
@@ -760,5 +760,11 @@
     "locally configured mail transfer agent": "本機設定的郵件傳輸代理",
     "now": "現在",
     "time ago": "{0} 之前",
-    "ignoreTLSErrorGeneral": "忽略連接中的TLS/SSL錯誤"
+    "ignoreTLSErrorGeneral": "忽略連接中的TLS/SSL錯誤",
+    "Don't mention people": "不提及任何人",
+    "Mention group": "提及 {group}",
+    "Mention Mobile List": "提及指定手機號",
+    "Mention User List": "提及指定用戶ID",
+    "Dingtalk Mobile List": "手機號列表(使用逗號分割多个手機號)",
+    "Dingtalk User List": "用戶ID列表(使用逗號分割多個用戶ID)"
 }
diff --git a/src/lang/zh-TW.json b/src/lang/zh-TW.json
index 9f38eb73a..e3317b19b 100644
--- a/src/lang/zh-TW.json
+++ b/src/lang/zh-TW.json
@@ -956,6 +956,10 @@
     "wayToGetDiscordThreadId": "取得主題 / 論壇文章 ID 與取得頻道 ID 類似。詳細了解如何取得 ID {0}",
     "Don't mention people": "不要提及他人",
     "Mention group": "提及 {group}",
+    "Mention Mobile List": "提及指定手機號",
+    "Mention User List": "提及指定用戶ID",
+    "Dingtalk Mobile List": "手機號列表(使用逗號分割多个手機號)",
+    "Dingtalk User List": "用戶ID列表(使用逗號分割多個用戶ID)",
     "smspartnerSenderNameInfo": "必須介於 3..=11 個字元之間",
     "cacheBusterParam": "新增 {0} 參數",
     "cacheBusterParamDescription": "隨機生成參數以跳過快取。",

From b0910138f33cf56de47afe663b6a85502a2d5d5e Mon Sep 17 00:00:00 2001
From: xx <xx@123.com>
Date: Sat, 21 Dec 2024 14:56:15 +0800
Subject: [PATCH 2/6] format: format code

---
 server/notification-providers/dingding.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/server/notification-providers/dingding.js b/server/notification-providers/dingding.js
index 795018700..01cd26355 100644
--- a/server/notification-providers/dingding.js
+++ b/server/notification-providers/dingding.js
@@ -11,13 +11,10 @@ class DingDing extends NotificationProvider {
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         const okMsg = "Sent Successfully.";
-        const  mentionAll = notification.mentioning === "everyone"
-        const mobileList = notification.mentioning === "specify-mobiles" ?  notification.mobileList.split(",") : []
-        const userList = notification.mentioning === "specify-users" ?  notification.userList.split(",") : []
-        const mentionStr = [...mobileList || [], ...userList || [] ].map(item => `@${item}`).join(" ")
-        console.log('mobileList: ',mobileList)
-        console.log('userList: ',userList)
-        console.log('mentionStr: ',mentionStr)
+        const mentionAll = notification.mentioning === "everyone"
+        const mobileList = notification.mentioning === "specify-mobiles" ? notification.mobileList.split(",") : []
+        const userList = notification.mentioning === "specify-users" ? notification.userList.split(",") : []
+        const mentionStr = [...mobileList || [], ...userList || []].map(item => `@${item}`).join(" ")
         try {
             if (heartbeatJSON != null) {
                 notification.mobileList
@@ -25,7 +22,7 @@ class DingDing extends NotificationProvider {
                     msgtype: "markdown",
                     markdown: {
                         title: `[${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]}`,
-                        text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}${'\n\n'+mentionStr}`,
+                        text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}${'\n\n' + mentionStr}`,
                     },
                     at: {
                         isAtAll: mentionAll,
@@ -40,7 +37,7 @@ class DingDing extends NotificationProvider {
                 let params = {
                     msgtype: "text",
                     text: {
-                        content: `${msg}${'\n'+mentionStr}`
+                        content: `${msg}${'\n' + mentionStr}`
                     },
                     at: {
                         isAtAll: mentionAll,

From b84b79b021eb3ba806e83559e1d33bd719c1b12f Mon Sep 17 00:00:00 2001
From: xx <xx@123.com>
Date: Sat, 21 Dec 2024 15:11:59 +0800
Subject: [PATCH 3/6] lint: fix style

---
 server/notification-providers/dingding.js | 13 ++++++-------
 src/components/notifications/DingDing.vue |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/server/notification-providers/dingding.js b/server/notification-providers/dingding.js
index 01cd26355..79b0605a6 100644
--- a/server/notification-providers/dingding.js
+++ b/server/notification-providers/dingding.js
@@ -11,18 +11,17 @@ class DingDing extends NotificationProvider {
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         const okMsg = "Sent Successfully.";
-        const mentionAll = notification.mentioning === "everyone"
-        const mobileList = notification.mentioning === "specify-mobiles" ? notification.mobileList.split(",") : []
-        const userList = notification.mentioning === "specify-users" ? notification.userList.split(",") : []
-        const mentionStr = [...mobileList || [], ...userList || []].map(item => `@${item}`).join(" ")
+        const mentionAll = notification.mentioning === "everyone";
+        const mobileList = notification.mentioning === "specify-mobiles" ? notification.mobileList.split(",") : [];
+        const userList = notification.mentioning === "specify-users" ? notification.userList.split(",") : [];
+        const mentionStr = [ ...mobileList || [], ...userList || [] ].map(item => `@${item}`).join(" ");
         try {
             if (heartbeatJSON != null) {
-                notification.mobileList
                 let params = {
                     msgtype: "markdown",
                     markdown: {
                         title: `[${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]}`,
-                        text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}${'\n\n' + mentionStr}`,
+                        text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}${"\n\n" + mentionStr}`,
                     },
                     at: {
                         isAtAll: mentionAll,
@@ -37,7 +36,7 @@ class DingDing extends NotificationProvider {
                 let params = {
                     msgtype: "text",
                     text: {
-                        content: `${msg}${'\n' + mentionStr}`
+                        content: `${msg}${"\n" + mentionStr}`
                     },
                     at: {
                         isAtAll: mentionAll,
diff --git a/src/components/notifications/DingDing.vue b/src/components/notifications/DingDing.vue
index 3ed974d6e..f6012818b 100644
--- a/src/components/notifications/DingDing.vue
+++ b/src/components/notifications/DingDing.vue
@@ -23,11 +23,11 @@
             <option value="specify-users">{{ $t("Mention User List") }}</option>
         </select>
     </div>
-    <div class="mb-3" v-if="$parent.notification.mentioning === 'specify-mobiles'">
+    <div v-if="$parent.notification.mentioning === 'specify-mobiles'" class="mb-3">
         <label for="mobileList" class="form-label">{{ $t("Dingtalk Mobile List") }}<span style="color: red;"><sup>*</sup></span></label>
         <input id="mobileList" v-model="$parent.notification.mobileList" type="list" class="form-control" required>
     </div>
-    <div class="mb-3" v-if="$parent.notification.mentioning === 'specify-users'">
+    <div v-if="$parent.notification.mentioning === 'specify-users'" class="mb-3">
         <label for="userList" class="form-label">{{ $t("Dingtalk User List") }}<span style="color: red;"><sup>*</sup></span></label>
         <input id="userList" v-model="$parent.notification.userList" type="list" class="form-control" required>
     </div>

From b023a81d7bcdf44cc0c21871573d9581ee2b0280 Mon Sep 17 00:00:00 2001
From: xx <xx@123.com>
Date: Sat, 21 Dec 2024 15:30:06 +0800
Subject: [PATCH 4/6] fix: checks

---
 src/lang/zh-CN.json | 4 ----
 src/lang/zh-HK.json | 8 +-------
 src/lang/zh-TW.json | 4 ----
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index 2a70bc6b1..ac9ebbeca 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -949,10 +949,6 @@
     "Mentioning": "是否提及成员",
     "Don't mention people": "不提及任何人",
     "Mention group": "提及 {group}",
-    "Mention Mobile List": "提及指定手机号列表",
-    "Mention User List": "提及指定用户ID列表",
-    "Dingtalk Mobile List": "手机号列表(使用逗号分隔多个手机号)",
-    "Dingtalk User List": "用户ID列表(使用逗号分隔多个用户ID)",
     "senderSevenIO": "发信人号码或名称",
     "wayToGetSevenIOApiKey": "访问 app.seven.io > 开发人员 > api 密钥 > 绿色添加按钮下的仪表板",
     "receiverInfoSevenIO": "如果接收号码不在德国，您必须在号码前面添加国家代码（例如，对于来自美国的国家代码 1，请使用 117612121212 而不是 017612121212）",
diff --git a/src/lang/zh-HK.json b/src/lang/zh-HK.json
index 3cc9b6c53..570ca3a20 100644
--- a/src/lang/zh-HK.json
+++ b/src/lang/zh-HK.json
@@ -760,11 +760,5 @@
     "locally configured mail transfer agent": "本機設定的郵件傳輸代理",
     "now": "現在",
     "time ago": "{0} 之前",
-    "ignoreTLSErrorGeneral": "忽略連接中的TLS/SSL錯誤",
-    "Don't mention people": "不提及任何人",
-    "Mention group": "提及 {group}",
-    "Mention Mobile List": "提及指定手機號",
-    "Mention User List": "提及指定用戶ID",
-    "Dingtalk Mobile List": "手機號列表(使用逗號分割多个手機號)",
-    "Dingtalk User List": "用戶ID列表(使用逗號分割多個用戶ID)"
+    "ignoreTLSErrorGeneral": "忽略連接中的TLS/SSL錯誤"
 }
diff --git a/src/lang/zh-TW.json b/src/lang/zh-TW.json
index e3317b19b..9f38eb73a 100644
--- a/src/lang/zh-TW.json
+++ b/src/lang/zh-TW.json
@@ -956,10 +956,6 @@
     "wayToGetDiscordThreadId": "取得主題 / 論壇文章 ID 與取得頻道 ID 類似。詳細了解如何取得 ID {0}",
     "Don't mention people": "不要提及他人",
     "Mention group": "提及 {group}",
-    "Mention Mobile List": "提及指定手機號",
-    "Mention User List": "提及指定用戶ID",
-    "Dingtalk Mobile List": "手機號列表(使用逗號分割多个手機號)",
-    "Dingtalk User List": "用戶ID列表(使用逗號分割多個用戶ID)",
     "smspartnerSenderNameInfo": "必須介於 3..=11 個字元之間",
     "cacheBusterParam": "新增 {0} 參數",
     "cacheBusterParamDescription": "隨機生成參數以跳過快取。",

From da62c3d50afed5225b7ce40d422eb4f6b2309b98 Mon Sep 17 00:00:00 2001
From: xx <xx@123.com>
Date: Mon, 23 Dec 2024 17:39:07 +0800
Subject: [PATCH 5/6] fix: change input to vue-multiselect 1. change input 2.
 verify input

---
 server/notification-providers/dingding.js |  4 +-
 src/components/notifications/DingDing.vue | 92 ++++++++++++++++++++++-
 src/lang/en.json                          | 10 ++-
 3 files changed, 98 insertions(+), 8 deletions(-)

diff --git a/server/notification-providers/dingding.js b/server/notification-providers/dingding.js
index 79b0605a6..39f8b1711 100644
--- a/server/notification-providers/dingding.js
+++ b/server/notification-providers/dingding.js
@@ -12,8 +12,8 @@ class DingDing extends NotificationProvider {
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         const okMsg = "Sent Successfully.";
         const mentionAll = notification.mentioning === "everyone";
-        const mobileList = notification.mentioning === "specify-mobiles" ? notification.mobileList.split(",") : [];
-        const userList = notification.mentioning === "specify-users" ? notification.userList.split(",") : [];
+        const mobileList = notification.mentioning === "specify-mobiles" ? notification.mobileList : [];
+        const userList = notification.mentioning === "specify-users" ? notification.userList : [];
         const mentionStr = [ ...mobileList || [], ...userList || [] ].map(item => `@${item}`).join(" ");
         try {
             if (heartbeatJSON != null) {
diff --git a/src/components/notifications/DingDing.vue b/src/components/notifications/DingDing.vue
index f6012818b..d5227bb39 100644
--- a/src/components/notifications/DingDing.vue
+++ b/src/components/notifications/DingDing.vue
@@ -25,23 +25,109 @@
     </div>
     <div v-if="$parent.notification.mentioning === 'specify-mobiles'" class="mb-3">
         <label for="mobileList" class="form-label">{{ $t("Dingtalk Mobile List") }}<span style="color: red;"><sup>*</sup></span></label>
-        <input id="mobileList" v-model="$parent.notification.mobileList" type="list" class="form-control" required>
+        <VueMultiselect
+            id="mobileList-select"
+            v-model="$parent.notification.mobileList"
+            :required="$parent.notification.mentioning === 'specify-mobiles'"
+            :placeholder="$t('Enter a list of mobile')"
+            :multiple="true"
+            :options="mobileOpts"
+            :max-height="500"
+            :taggable="true"
+            :show-no-options="false"
+            :close-on-select="false"
+            :clear-on-select="false"
+            :preserve-search="false"
+            :preselect-first="false"
+            @remove="removeMobile"
+            @tag="addMobile"
+        ></VueMultiselect>
     </div>
     <div v-if="$parent.notification.mentioning === 'specify-users'" class="mb-3">
         <label for="userList" class="form-label">{{ $t("Dingtalk User List") }}<span style="color: red;"><sup>*</sup></span></label>
-        <input id="userList" v-model="$parent.notification.userList" type="list" class="form-control" required>
+        <VueMultiselect
+            id="userList-select"
+            v-model="$parent.notification.userList"
+            :required="$parent.notification.mentioning === 'specify-users'"
+            :placeholder="$t('Enter a list of userId')"
+            :multiple="true"
+            :options="userIdOpts"
+            :max-height="500"
+            :taggable="true"
+            :show-no-options="false"
+            :close-on-select="false"
+            :clear-on-select="true"
+            :preserve-search="false"
+            :preselect-first="false"
+            @remove="removeUser"
+            @tag="addUser"
+        ></VueMultiselect>
     </div>
 </template>
 
 <script lang="ts">
 import HiddenInput from "../HiddenInput.vue";
+import VueMultiselect from "vue-multiselect";
 
 export default {
-    components: { HiddenInput },
+    components: {
+        HiddenInput,
+        VueMultiselect
+    },
+    data() {
+        return {
+            mobileOpts: [],
+            userIdOpts: [],
+        };
+    },
+
     mounted() {
         if (typeof this.$parent.notification.mentioning === "undefined") {
             this.$parent.notification.mentioning = "nobody";
         }
+        if (typeof this.$parent.notification.mobileList === "undefined") {
+            this.$parent.notification.mobileList = [];
+        } else {
+            this.mobileOpts = this.$parent.notification.mobileList;
+        }
+
+        if (typeof this.$parent.notification.userList === "undefined") {
+            this.$parent.notification.userList = [];
+        } else {
+            this.mobileOpts = this.$parent.notification.mobileList;
+        }
+    },
+    methods: {
+        addMobile(mobile) {
+            const trimmedMobile = mobile.trim();
+            const chinaMobileRegex = /^1[3-9]\d{9}$/;
+            if (!chinaMobileRegex.test(trimmedMobile)) {
+                this.$root.toastError(this.$t("Invalid mobile", { "mobile": trimmedMobile }));
+                return;
+            }
+            this.mobileOpts.push(mobile);
+        },
+        removeMobile(mobile) {
+            const idx = this.mobileOpts.indexOf(mobile);
+            if (idx > -1) {
+                this.mobileOpts.splice(idx, 1);
+            }
+        },
+        addUser(userId) {
+            const trimmedUserId = userId.trim();
+            const userIdRegex = /^[a-zA-Z0-9]+$/;
+            if (!userIdRegex.test(trimmedUserId)) {
+                this.$root.toastError(this.$t("Invalid userId", { "userId": trimmedUserId }));
+                return;
+            }
+            this.userIdOpts.push(trimmedUserId);
+        },
+        removeUser(userId) {
+            const idx = this.userIdOpts.indexOf(userId);
+            if (idx > -1) {
+                this.userIdOpts.splice(idx, 1);
+            }
+        },
     }
 };
 </script>
diff --git a/src/lang/en.json b/src/lang/en.json
index 641dae02e..3a80e37c7 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -688,9 +688,13 @@
     "Don't mention people": "Don't mention people",
     "Mention group": "Mention {group}",
     "Mention Mobile List": "Mention mobile list",
-    "Mention User List": "Mention user ID List",
-    "Dingtalk Mobile List": "Mobile List (use comma separator)",
-    "Dingtalk User List": "User List (use comma separator)",
+    "Mention User List": "Mention user id list",
+    "Dingtalk Mobile List": "Mobile list",
+    "Dingtalk User List": "User ID list",
+    "Enter a list of userId": "Enter a list of userId",
+    "Enter a list of mobile": "Enter a list of mobile",
+    "Invalid mobile": "Invalid mobile [{mobile}]",
+    "Invalid userId": "Invalid userId [{userId}]",
     "Device Token": "Device Token",
     "Platform": "Platform",
     "Huawei": "Huawei",

From 25adf97b2babc62b8029203976cd7e6b24db7b29 Mon Sep 17 00:00:00 2001
From: xx <xx@123.com>
Date: Tue, 24 Dec 2024 09:54:33 +0800
Subject: [PATCH 6/6] fix: trim str, clear choise when change option

---
 server/notification-providers/dingding.js |  7 ++++---
 src/components/notifications/DingDing.vue | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/server/notification-providers/dingding.js b/server/notification-providers/dingding.js
index 39f8b1711..cfacd45ed 100644
--- a/server/notification-providers/dingding.js
+++ b/server/notification-providers/dingding.js
@@ -14,14 +14,15 @@ class DingDing extends NotificationProvider {
         const mentionAll = notification.mentioning === "everyone";
         const mobileList = notification.mentioning === "specify-mobiles" ? notification.mobileList : [];
         const userList = notification.mentioning === "specify-users" ? notification.userList : [];
-        const mentionStr = [ ...mobileList || [], ...userList || [] ].map(item => `@${item}`).join(" ");
+        const finalList = [ ...mobileList || [], ...userList || [] ];
+        const mentionStr = finalList.length > 0 ? "\n" : "" + finalList.map(item => `@${item}`).join(" ");
         try {
             if (heartbeatJSON != null) {
                 let params = {
                     msgtype: "markdown",
                     markdown: {
                         title: `[${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]}`,
-                        text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}${"\n\n" + mentionStr}`,
+                        text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}${mentionStr}`,
                     },
                     at: {
                         isAtAll: mentionAll,
@@ -36,7 +37,7 @@ class DingDing extends NotificationProvider {
                 let params = {
                     msgtype: "text",
                     text: {
-                        content: `${msg}${"\n" + mentionStr}`
+                        content: `${msg}${mentionStr}`
                     },
                     at: {
                         isAtAll: mentionAll,
diff --git a/src/components/notifications/DingDing.vue b/src/components/notifications/DingDing.vue
index d5227bb39..a5fd3c82b 100644
--- a/src/components/notifications/DingDing.vue
+++ b/src/components/notifications/DingDing.vue
@@ -16,7 +16,7 @@
     </div>
     <div class="mb-3">
         <label for="mentioning" class="form-label">{{ $t("Mentioning") }}<span style="color: red;"><sup>*</sup></span></label>
-        <select id="mentioning" v-model="$parent.notification.mentioning" class="form-select" required>
+        <select id="mentioning" v-model="$parent.notification.mentioning" class="form-select" required @change="onMentioningChange">
             <option value="nobody">{{ $t("Don't mention people") }}</option>
             <option value="everyone">{{ $t("Mention group", { group: "@everyone" }) }}</option>
             <option value="specify-mobiles">{{ $t("Mention Mobile List") }}</option>
@@ -94,10 +94,20 @@ export default {
         if (typeof this.$parent.notification.userList === "undefined") {
             this.$parent.notification.userList = [];
         } else {
-            this.mobileOpts = this.$parent.notification.mobileList;
+            this.userIdOpts = this.$parent.notification.userList;
         }
     },
     methods: {
+        onMentioningChange(e) {
+            if (e.target.value === "specify-mobiles") {
+                this.$parent.notification.userList = [];
+            } else if (e.target.value === "specify-users") {
+                this.$parent.notification.mobileList = [];
+            } else {
+                this.$parent.notification.userList = [];
+                this.$parent.notification.mobileList = [];
+            }
+        },
         addMobile(mobile) {
             const trimmedMobile = mobile.trim();
             const chinaMobileRegex = /^1[3-9]\d{9}$/;