fix: able to use default channel to send webhook message now

songquanpeng · May 10, 2023 · 34b9633 · 34b9633
1 parent 1d32544
commit 34b9633
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/web/src/components/WebhooksTable.js b/web/src/components/WebhooksTable.js
@@ -195,6 +195,14 @@ const WebhooksTable = () => {
             >
               状态
             </Table.HeaderCell>
+            <Table.HeaderCell
+              style={{ cursor: 'pointer' }}
+              onClick={() => {
+                sortWebhook('channel');
+              }}
+            >
+              通道
+            </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
               onClick={() => {
@@ -220,6 +228,11 @@ const WebhooksTable = () => {
                   <Table.Cell>{webhook.id}</Table.Cell>
                   <Table.Cell>{webhook.name}</Table.Cell>
                   <Table.Cell>{renderStatus(webhook.status)}</Table.Cell>
+                  <Table.Cell>
+                    <Label>
+                      {webhook.channel ? webhook.channel : '默认通道'}
+                    </Label>
+                  </Table.Cell>
                   <Table.Cell>
                     {renderTimestamp(webhook.created_time)}
                   </Table.Cell>

diff --git a/web/src/pages/Webhook/EditWebhook.js b/web/src/pages/Webhook/EditWebhook.js
@@ -24,7 +24,7 @@ const EditWebhook = () => {
       '  "content": "内容：$content",\n' +
       '  "url": "https://example.com/$title"\n' +
       '}',
-    channel: '',
+    channel: 'default',
   };
 
   const [inputs, setInputs] = useState(originInputs);
@@ -39,6 +39,9 @@ const EditWebhook = () => {
     let res = await API.get(`/api/webhook/${webhookId}`);
     const { success, message, data } = res.data;
     if (success) {
+      if (data.channel === '') {
+        data.channel = 'default';
+      }
       setInputs(data);
     } else {
       showError(message);
@@ -53,6 +56,12 @@ const EditWebhook = () => {
       }
       let channels = await loadUserChannels();
       if (channels) {
+        channels.unshift({
+          key: 'default',
+          text: '默认通道',
+          value: 'default',
+          description: '使用默认通道',
+        });
         setChannels(channels);
       }
     };
@@ -71,6 +80,9 @@ const EditWebhook = () => {
     }
     let res = undefined;
     let localInputs = { ...inputs };
+    if (localInputs.channel === 'default') {
+      localInputs.channel = '';
+    }
     if (isEditing) {
       res = await API.put(`/api/webhook/`, {
         ...localInputs,