From 7400a760250c2592b74ed1be50b2a85e7443df13 Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Mon, 21 Apr 2025 10:05:31 +0800
Subject: [PATCH 01/11] feat: add `@abp/webhooks` package

---
 .../vben5/packages/@abp/webhooks/package.json | 41 +++++++++++++++++++
 .../packages/@abp/webhooks/src/api/index.ts   |  0
 .../@abp/webhooks/src/components/index.ts     |  0
 .../vben5/packages/@abp/webhooks/src/index.ts |  3 ++
 .../packages/@abp/webhooks/src/types/index.ts |  0
 .../packages/@abp/webhooks/tsconfig.json      |  6 +++
 6 files changed, 50 insertions(+)
 create mode 100644 apps/vben5/packages/@abp/webhooks/package.json
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/api/index.ts
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/components/index.ts
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/index.ts
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/types/index.ts
 create mode 100644 apps/vben5/packages/@abp/webhooks/tsconfig.json

diff --git a/apps/vben5/packages/@abp/webhooks/package.json b/apps/vben5/packages/@abp/webhooks/package.json
new file mode 100644
index 000000000..e3a3f9a72
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/package.json
@@ -0,0 +1,41 @@
+{
+  "name": "@abp/webhooks",
+  "version": "9.0.4",
+  "homepage": "https://github.com/colinin/abp-next-admin",
+  "bugs": "https://github.com/colinin/abp-next-admin/issues",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/colinin/abp-next-admin.git",
+    "directory": "packages/@abp/webhooks"
+  },
+  "license": "MIT",
+  "type": "module",
+  "sideEffects": [
+    "**/*.css"
+  ],
+  "exports": {
+    ".": {
+      "types": "./src/index.ts",
+      "default": "./src/index.ts"
+    }
+  },
+  "dependencies": {
+    "@abp/core": "workspace:*",
+    "@abp/request": "workspace:*",
+    "@abp/ui": "workspace:*",
+    "@ant-design/icons-vue": "catalog:",
+    "@vben/access": "workspace:*",
+    "@vben/common-ui": "workspace:*",
+    "@vben/hooks": "workspace:*",
+    "@vben/icons": "workspace:*",
+    "@vben/layouts": "workspace:*",
+    "@vben/locales": "workspace:*",
+    "ant-design-vue": "catalog:",
+    "lodash.clonedeep": "catalog:",
+    "vue": "catalog:*",
+    "vxe-table": "catalog:"
+  },
+  "devDependencies": {
+    "@types/lodash.clonedeep": "catalog:"
+  }
+}
diff --git a/apps/vben5/packages/@abp/webhooks/src/api/index.ts b/apps/vben5/packages/@abp/webhooks/src/api/index.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/index.ts b/apps/vben5/packages/@abp/webhooks/src/components/index.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/vben5/packages/@abp/webhooks/src/index.ts b/apps/vben5/packages/@abp/webhooks/src/index.ts
new file mode 100644
index 000000000..314dad0cd
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/index.ts
@@ -0,0 +1,3 @@
+export * from './api';
+export * from './components';
+export * from './types';
diff --git a/apps/vben5/packages/@abp/webhooks/src/types/index.ts b/apps/vben5/packages/@abp/webhooks/src/types/index.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/vben5/packages/@abp/webhooks/tsconfig.json b/apps/vben5/packages/@abp/webhooks/tsconfig.json
new file mode 100644
index 000000000..ce1a891fb
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "@vben/tsconfig/web.json",
+  "include": ["src"],
+  "exclude": ["node_modules"]
+}

From eb31c27d0c7d4fca3ca4eea1df50991c2c61a0df Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Mon, 21 Apr 2025 10:26:53 +0800
Subject: [PATCH 02/11] feat(vben5): add webhook groups page

---
 apps/vben5/apps/app-antd/package.json         |   1 +
 .../app-antd/src/locales/langs/en-US/abp.json |   4 +
 .../app-antd/src/locales/langs/zh-CN/abp.json |   4 +
 .../app-antd/src/router/routes/modules/abp.ts |  19 ++
 .../src/views/webhooks/groups/index.vue       |  15 ++
 .../src/api/useWebhookGroupDefinitionsApi.ts  | 100 ++++++++
 .../groups/WebhookGroupDefinitionTable.vue    | 234 ++++++++++++++++++
 .../@abp/webhooks/src/components/index.ts     |   1 +
 .../webhooks/src/constants/permissions.ts     |  10 +
 .../@abp/webhooks/src/types/groups.ts         |  31 +++
 .../packages/@abp/webhooks/src/types/index.ts |   1 +
 11 files changed, 420 insertions(+)
 create mode 100644 apps/vben5/apps/app-antd/src/views/webhooks/groups/index.vue
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/api/useWebhookGroupDefinitionsApi.ts
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/types/groups.ts

diff --git a/apps/vben5/apps/app-antd/package.json b/apps/vben5/apps/app-antd/package.json
index 4b1e3c565..74ec14a0d 100644
--- a/apps/vben5/apps/app-antd/package.json
+++ b/apps/vben5/apps/app-antd/package.json
@@ -43,6 +43,7 @@
     "@abp/settings": "workspace:*",
     "@abp/tasks": "workspace:*",
     "@abp/ui": "workspace:*",
+    "@abp/webhooks": "workspace:*",
     "@vben/access": "workspace:*",
     "@vben/common-ui": "workspace:*",
     "@vben/constants": "workspace:*",
diff --git a/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json b/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json
index 0ba5e1273..ad4031f55 100644
--- a/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json
+++ b/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json
@@ -113,5 +113,9 @@
     "jobInfo": {
       "title": "Job Manage"
     }
+  },
+  "webhooks": {
+    "title": "Webhooks",
+    "groups": "Groups"
   }
 }
diff --git a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json
index d6eaf0e02..e22314e36 100644
--- a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json
+++ b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json
@@ -113,5 +113,9 @@
     "jobInfo": {
       "title": "作业管理"
     }
+  },
+  "webhooks": {
+    "title": "Webhook管理",
+    "groups": "Webhook分组"
   }
 }
diff --git a/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts b/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts
index 1b4e0f24d..e4c7b825f 100644
--- a/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts
+++ b/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts
@@ -450,6 +450,25 @@ const routes: RouteRecordRaw[] = [
           },
         ],
       },
+      {
+        meta: {
+          title: $t('abp.webhooks.title'),
+          icon: 'material-symbols:webhook',
+        },
+        name: 'WebhooksManagement',
+        path: '/webhooks',
+        children: [
+          {
+            meta: {
+              title: $t('abp.webhooks.groups'),
+              icon: 'lucide:group',
+            },
+            name: 'WebhookGroupDefinitions',
+            path: '/webhooks/groups',
+            component: () => import('#/views/webhooks/groups/index.vue'),
+          },
+        ],
+      },
       {
         name: 'AbpDemo',
         path: '/abp/demos',
diff --git a/apps/vben5/apps/app-antd/src/views/webhooks/groups/index.vue b/apps/vben5/apps/app-antd/src/views/webhooks/groups/index.vue
new file mode 100644
index 000000000..660110dc7
--- /dev/null
+++ b/apps/vben5/apps/app-antd/src/views/webhooks/groups/index.vue
@@ -0,0 +1,15 @@
+<script lang="ts" setup>
+import { Page } from '@vben/common-ui';
+
+import { WebhookGroupDefinitionTable } from '@abp/webhooks';
+
+defineOptions({
+  name: 'WebhookGroupDefinitions',
+});
+</script>
+
+<template>
+  <Page>
+    <WebhookGroupDefinitionTable />
+  </Page>
+</template>
diff --git a/apps/vben5/packages/@abp/webhooks/src/api/useWebhookGroupDefinitionsApi.ts b/apps/vben5/packages/@abp/webhooks/src/api/useWebhookGroupDefinitionsApi.ts
new file mode 100644
index 000000000..2cbd2559e
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/api/useWebhookGroupDefinitionsApi.ts
@@ -0,0 +1,100 @@
+import type { ListResultDto } from '@abp/core';
+
+import type {
+  WebhookGroupDefinitionCreateDto,
+  WebhookGroupDefinitionDto,
+  WebhookGroupDefinitionGetListInput,
+  WebhookGroupDefinitionUpdateDto,
+} from '../types/groups';
+
+import { useRequest } from '@abp/request';
+
+export function useWebhookGroupDefinitionsApi() {
+  const { cancel, request } = useRequest();
+
+  /**
+   * 删除Webhook分组定义
+   * @param name Webhook分组名称
+   */
+  function deleteApi(name: string): Promise<void> {
+    return request(`/api/webhooks/definitions/groups/${name}`, {
+      method: 'DELETE',
+    });
+  }
+
+  /**
+   * 查询Webhook分组定义
+   * @param name Webhook分组名称
+   * @returns Webhook分组定义数据传输对象
+   */
+  function getApi(name: string): Promise<WebhookGroupDefinitionDto> {
+    return request<WebhookGroupDefinitionDto>(
+      `/api/webhooks/definitions/groups/${name}`,
+      {
+        method: 'GET',
+      },
+    );
+  }
+
+  /**
+   * 查询Webhook分组定义列表
+   * @param input Webhook分组过滤条件
+   * @returns Webhook分组定义数据传输对象列表
+   */
+  function getListApi(
+    input?: WebhookGroupDefinitionGetListInput,
+  ): Promise<ListResultDto<WebhookGroupDefinitionDto>> {
+    return request<ListResultDto<WebhookGroupDefinitionDto>>(
+      `/api/webhooks/definitions/groups`,
+      {
+        method: 'GET',
+        params: input,
+      },
+    );
+  }
+
+  /**
+   * 创建Webhook分组定义
+   * @param input Webhook分组定义参数
+   * @returns Webhook分组定义数据传输对象
+   */
+  function createApi(
+    input: WebhookGroupDefinitionCreateDto,
+  ): Promise<WebhookGroupDefinitionDto> {
+    return request<WebhookGroupDefinitionDto>(
+      '/api/webhooks/definitions/groups',
+      {
+        data: input,
+        method: 'POST',
+      },
+    );
+  }
+
+  /**
+   * 更新Webhook分组定义
+   * @param name Webhook分组名称
+   * @param input Webhook分组定义参数
+   * @returns Webhook分组定义数据传输对象
+   */
+  function updateApi(
+    name: string,
+    input: WebhookGroupDefinitionUpdateDto,
+  ): Promise<WebhookGroupDefinitionDto> {
+    return request<WebhookGroupDefinitionDto>(
+      `/api/webhooks/definitions/groups/${name}`,
+      {
+        data: input,
+        method: 'PUT',
+      },
+    );
+  }
+
+  return {
+    cancel,
+    createApi,
+    deleteApi,
+    getApi,
+    getListApi,
+    updateApi,
+  };
+}
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue b/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue
new file mode 100644
index 000000000..81caa231d
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue
@@ -0,0 +1,234 @@
+<script setup lang="ts">
+import type { VxeGridListeners, VxeGridProps } from '@abp/ui';
+import type { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
+
+import type { VbenFormProps } from '@vben/common-ui';
+
+import type { WebhookGroupDefinitionDto } from '../../../types/groups';
+
+import { h, onMounted, reactive, ref } from 'vue';
+
+import { createIconifyIcon } from '@vben/icons';
+import { $t } from '@vben/locales';
+
+import { useLocalization, useLocalizationSerializer } from '@abp/core';
+import { useVbenVxeGrid } from '@abp/ui';
+import {
+  DeleteOutlined,
+  EditOutlined,
+  EllipsisOutlined,
+  PlusOutlined,
+} from '@ant-design/icons-vue';
+import { Button, Dropdown, Menu, message, Modal } from 'ant-design-vue';
+
+import { useWebhookGroupDefinitionsApi } from '../../../api/useWebhookGroupDefinitionsApi';
+import { GroupDefinitionsPermissions } from '../../../constants/permissions';
+
+defineOptions({
+  name: 'WebhookGroupDefinitionTable',
+});
+
+const MenuItem = Menu.Item;
+
+const WebhookIcon = createIconifyIcon('material-symbols:webhook');
+
+const permissionGroups = ref<WebhookGroupDefinitionDto[]>([]);
+const pageState = reactive({
+  current: 1,
+  size: 10,
+  total: 0,
+});
+
+const { Lr } = useLocalization();
+const { deserialize } = useLocalizationSerializer();
+const { deleteApi, getListApi } = useWebhookGroupDefinitionsApi();
+
+const formOptions: VbenFormProps = {
+  collapsed: false,
+  handleReset: onReset,
+  async handleSubmit(params) {
+    pageState.current = 1;
+    await onGet(params);
+  },
+  schema: [
+    {
+      component: 'Input',
+      fieldName: 'filter',
+      formItemClass: 'col-span-2 items-baseline',
+      label: $t('AbpUi.Search'),
+    },
+  ],
+  showCollapseButton: true,
+  submitOnEnter: true,
+};
+
+const gridOptions: VxeGridProps<WebhookGroupDefinitionDto> = {
+  columns: [
+    {
+      align: 'left',
+      field: 'name',
+      minWidth: 150,
+      title: $t('WebhooksManagement.DisplayName:Name'),
+    },
+    {
+      align: 'left',
+      field: 'displayName',
+      minWidth: 150,
+      title: $t('WebhooksManagement.DisplayName:DisplayName'),
+    },
+    {
+      field: 'action',
+      fixed: 'right',
+      slots: { default: 'action' },
+      title: $t('AbpUi.Actions'),
+      width: 220,
+    },
+  ],
+  exportConfig: {},
+  keepSource: true,
+  toolbarConfig: {
+    custom: true,
+    export: true,
+    refresh: false,
+    zoom: true,
+  },
+};
+
+const gridEvents: VxeGridListeners<WebhookGroupDefinitionDto> = {
+  pageChange(params) {
+    pageState.current = params.currentPage;
+    pageState.size = params.pageSize;
+    onPageChange();
+  },
+};
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions,
+  gridEvents,
+  gridOptions,
+});
+
+async function onGet(input?: Record<string, string>) {
+  try {
+    gridApi.setLoading(true);
+    const { items } = await getListApi(input);
+    pageState.total = items.length;
+    permissionGroups.value = items.map((item) => {
+      const localizableString = deserialize(item.displayName);
+      return {
+        ...item,
+        displayName: Lr(localizableString.resourceName, localizableString.name),
+      };
+    });
+    onPageChange();
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+async function onReset() {
+  await gridApi.formApi.resetForm();
+  const input = await gridApi.formApi.getValues();
+  await onGet(input);
+}
+
+function onPageChange() {
+  const items = permissionGroups.value.slice(
+    (pageState.current - 1) * pageState.size,
+    pageState.current * pageState.size,
+  );
+  gridApi.setGridOptions({
+    data: items,
+    pagerConfig: {
+      currentPage: pageState.current,
+      pageSize: pageState.size,
+      total: pageState.total,
+    },
+  });
+}
+
+function onCreate() {}
+
+function onUpdate(_row: WebhookGroupDefinitionDto) {}
+
+function onMenuClick(_row: WebhookGroupDefinitionDto, info: MenuInfo) {
+  switch (info.key) {
+    case 'permissions': {
+      break;
+    }
+  }
+}
+
+function onDelete(row: WebhookGroupDefinitionDto) {
+  Modal.confirm({
+    centered: true,
+    content: `${$t('AbpUi.ItemWillBeDeletedMessageWithFormat', [row.name])}`,
+    onOk: async () => {
+      await deleteApi(row.name);
+      message.success($t('AbpUi.DeletedSuccessfully'));
+      onGet();
+    },
+    title: $t('AbpUi.AreYouSure'),
+  });
+}
+
+onMounted(onGet);
+</script>
+
+<template>
+  <Grid :table-title="$t('WebhooksManagement.GroupDefinitions')">
+    <template #toolbar-tools>
+      <Button
+        :icon="h(PlusOutlined)"
+        type="primary"
+        v-access:code="[GroupDefinitionsPermissions.Create]"
+        @click="onCreate"
+      >
+        {{ $t('WebhooksManagement.GroupDefinitions:AddNew') }}
+      </Button>
+    </template>
+    <template #action="{ row }">
+      <div class="flex flex-row">
+        <div :class="`${row.isStatic ? 'w-full' : 'basis-1/3'}`">
+          <Button
+            :icon="h(EditOutlined)"
+            block
+            type="link"
+            v-access:code="[GroupDefinitionsPermissions.Update]"
+            @click="onUpdate(row)"
+          >
+            {{ $t('AbpUi.Edit') }}
+          </Button>
+        </div>
+        <template v-if="!row.isStatic">
+          <div class="basis-1/3">
+            <Button
+              :icon="h(DeleteOutlined)"
+              block
+              danger
+              type="link"
+              v-access:code="[GroupDefinitionsPermissions.Delete]"
+              @click="onDelete(row)"
+            >
+              {{ $t('AbpUi.Delete') }}
+            </Button>
+          </div>
+          <div class="basis-1/3">
+            <Dropdown>
+              <template #overlay>
+                <Menu @click="(info) => onMenuClick(row, info)">
+                  <MenuItem key="webhooks" :icon="h(WebhookIcon)">
+                    {{ $t('WebhooksManagement.Webhooks:AddNew') }}
+                  </MenuItem>
+                </Menu>
+              </template>
+              <Button :icon="h(EllipsisOutlined)" type="link" />
+            </Dropdown>
+          </div>
+        </template>
+      </div>
+    </template>
+  </Grid>
+</template>
+
+<style scoped></style>
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/index.ts b/apps/vben5/packages/@abp/webhooks/src/components/index.ts
index e69de29bb..5632abd6d 100644
--- a/apps/vben5/packages/@abp/webhooks/src/components/index.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/components/index.ts
@@ -0,0 +1 @@
+export { default as WebhookGroupDefinitionTable } from './definitions/groups/WebhookGroupDefinitionTable.vue';
diff --git a/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts b/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts
new file mode 100644
index 000000000..25334ca12
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts
@@ -0,0 +1,10 @@
+/** 分组权限 */
+export const GroupDefinitionsPermissions = {
+  /** 新增 */
+  Create: 'AbpWebhooks.GroupDefinitions.Create',
+  Default: 'AbpWebhooks.GroupDefinitions',
+  /** 删除 */
+  Delete: 'AbpWebhooks.GroupDefinitions.Delete',
+  /** 更新 */
+  Update: 'AbpWebhooks.GroupDefinitions.Update',
+};
diff --git a/apps/vben5/packages/@abp/webhooks/src/types/groups.ts b/apps/vben5/packages/@abp/webhooks/src/types/groups.ts
new file mode 100644
index 000000000..d02df50b7
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/types/groups.ts
@@ -0,0 +1,31 @@
+import type { IHasConcurrencyStamp, IHasExtraProperties } from '@abp/core';
+
+interface WebhookGroupDefinitionDto extends IHasExtraProperties {
+  displayName: string;
+  isStatic: boolean;
+  name: string;
+}
+
+interface WebhookGroupDefinitionCreateOrUpdateDto extends IHasExtraProperties {
+  displayName: string;
+}
+
+interface WebhookGroupDefinitionCreateDto
+  extends WebhookGroupDefinitionCreateOrUpdateDto {
+  name: string;
+}
+
+interface WebhookGroupDefinitionUpdateDto
+  extends IHasConcurrencyStamp,
+    WebhookGroupDefinitionCreateOrUpdateDto {}
+
+interface WebhookGroupDefinitionGetListInput {
+  filter?: string;
+}
+
+export type {
+  WebhookGroupDefinitionCreateDto,
+  WebhookGroupDefinitionDto,
+  WebhookGroupDefinitionGetListInput,
+  WebhookGroupDefinitionUpdateDto,
+};
diff --git a/apps/vben5/packages/@abp/webhooks/src/types/index.ts b/apps/vben5/packages/@abp/webhooks/src/types/index.ts
index e69de29bb..d20b7e110 100644
--- a/apps/vben5/packages/@abp/webhooks/src/types/index.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/types/index.ts
@@ -0,0 +1 @@
+export * from './groups';

From d5a9573a4f4e5f601ef6f6adccdd99ba717e8469 Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Mon, 21 Apr 2025 10:33:19 +0800
Subject: [PATCH 03/11] feat(vben5): add webhook groups modal

---
 .../groups/WebhookGroupDefinitionModal.vue    | 150 ++++++++++++++++++
 .../groups/WebhookGroupDefinitionTable.vue    |  20 ++-
 2 files changed, 167 insertions(+), 3 deletions(-)
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionModal.vue

diff --git a/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionModal.vue b/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionModal.vue
new file mode 100644
index 000000000..bddcec827
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionModal.vue
@@ -0,0 +1,150 @@
+<script setup lang="ts">
+import type { PropertyInfo } from '@abp/ui';
+import type { FormInstance } from 'ant-design-vue';
+
+import type { WebhookGroupDefinitionDto } from '../../../types/groups';
+
+import { defineEmits, defineOptions, ref, toValue, useTemplateRef } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+
+import { LocalizableInput, PropertyTable } from '@abp/ui';
+import { Form, Input, message, Tabs } from 'ant-design-vue';
+
+import { useWebhookGroupDefinitionsApi } from '../../../api/useWebhookGroupDefinitionsApi';
+
+defineOptions({
+  name: 'WebhookGroupDefinitionModal',
+});
+const emits = defineEmits<{
+  (event: 'change', data: WebhookGroupDefinitionDto): void;
+}>();
+
+const FormItem = Form.Item;
+const TabPane = Tabs.TabPane;
+
+type TabKeys = 'basic' | 'props';
+
+const defaultModel = {} as WebhookGroupDefinitionDto;
+
+const isEditModel = ref(false);
+const activeTab = ref<TabKeys>('basic');
+const form = useTemplateRef<FormInstance>('form');
+const formModel = ref<WebhookGroupDefinitionDto>({ ...defaultModel });
+
+const { cancel, createApi, getApi, updateApi } =
+  useWebhookGroupDefinitionsApi();
+const [Modal, modalApi] = useVbenModal({
+  class: 'w-1/2',
+  draggable: true,
+  fullscreenButton: false,
+  onCancel() {
+    modalApi.close();
+  },
+  onClosed() {
+    cancel('WebhookGroupDefinitionModal has closed!');
+  },
+  onConfirm: async () => {
+    await form.value?.validate();
+    const api = isEditModel.value
+      ? updateApi(formModel.value.name, toValue(formModel))
+      : createApi(toValue(formModel));
+    modalApi.setState({ submitting: true });
+    api
+      .then((res) => {
+        message.success($t('AbpUi.SavedSuccessfully'));
+        emits('change', res);
+        modalApi.close();
+      })
+      .finally(() => {
+        modalApi.setState({ submitting: false });
+      });
+  },
+  onOpenChange: async (isOpen: boolean) => {
+    if (isOpen) {
+      isEditModel.value = false;
+      activeTab.value = 'basic';
+      formModel.value = { ...defaultModel };
+      modalApi.setState({
+        showConfirmButton: true,
+        title: $t('WebhooksManagement.GroupDefinitions:AddNew'),
+      });
+      try {
+        modalApi.setState({ loading: true });
+        const { name } = modalApi.getData<WebhookGroupDefinitionDto>();
+        name && (await onGet(name));
+      } finally {
+        modalApi.setState({ loading: false });
+      }
+    }
+  },
+  title: $t('WebhooksManagement.GroupDefinitions:AddNew'),
+});
+async function onGet(name: string) {
+  isEditModel.value = true;
+  const dto = await getApi(name);
+  formModel.value = dto;
+  modalApi.setState({
+    showConfirmButton: !dto.isStatic,
+    title: `${$t('WebhooksManagement.GroupDefinitions')} - ${dto.name}`,
+  });
+}
+function onPropChange(prop: PropertyInfo) {
+  formModel.value.extraProperties ??= {};
+  formModel.value.extraProperties[prop.key] = prop.value;
+}
+function onPropDelete(prop: PropertyInfo) {
+  formModel.value.extraProperties ??= {};
+  delete formModel.value.extraProperties[prop.key];
+}
+</script>
+
+<template>
+  <Modal>
+    <Form
+      ref="form"
+      :label-col="{ span: 6 }"
+      :model="formModel"
+      :wrapper-col="{ span: 18 }"
+    >
+      <Tabs v-model:active-key="activeTab">
+        <!-- 基本信息 -->
+        <TabPane key="basic" :tab="$t('WebhooksManagement.BasicInfo')">
+          <FormItem
+            :label="$t('WebhooksManagement.DisplayName:Name')"
+            name="name"
+            required
+          >
+            <Input
+              v-model:value="formModel.name"
+              :disabled="formModel.isStatic"
+              autocomplete="off"
+            />
+          </FormItem>
+          <FormItem
+            :label="$t('WebhooksManagement.DisplayName:DisplayName')"
+            name="displayName"
+            required
+          >
+            <LocalizableInput
+              v-model:value="formModel.displayName"
+              :disabled="formModel.isStatic"
+            />
+          </FormItem>
+        </TabPane>
+        <!-- 属性 -->
+        <TabPane key="props" :tab="$t('WebhooksManagement.Properties')">
+          <PropertyTable
+            :data="formModel.extraProperties"
+            :disabled="formModel.isStatic"
+            @change="onPropChange"
+            @delete="onPropDelete"
+          />
+        </TabPane>
+      </Tabs>
+    </Form>
+  </Modal>
+</template>
+
+<style scoped></style>
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue b/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue
index 81caa231d..cee14ad53 100644
--- a/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue
+++ b/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue
@@ -6,8 +6,9 @@ import type { VbenFormProps } from '@vben/common-ui';
 
 import type { WebhookGroupDefinitionDto } from '../../../types/groups';
 
-import { h, onMounted, reactive, ref } from 'vue';
+import { defineAsyncComponent, h, onMounted, reactive, ref } from 'vue';
 
+import { useVbenModal } from '@vben/common-ui';
 import { createIconifyIcon } from '@vben/icons';
 import { $t } from '@vben/locales';
 
@@ -102,6 +103,12 @@ const gridEvents: VxeGridListeners<WebhookGroupDefinitionDto> = {
   },
 };
 
+const [WebhookGroupDefinitionModal, groupModalApi] = useVbenModal({
+  connectedComponent: defineAsyncComponent(
+    () => import('./WebhookGroupDefinitionModal.vue'),
+  ),
+});
+
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions,
   gridEvents,
@@ -147,9 +154,15 @@ function onPageChange() {
   });
 }
 
-function onCreate() {}
+function onCreate() {
+  groupModalApi.setData({});
+  groupModalApi.open();
+}
 
-function onUpdate(_row: WebhookGroupDefinitionDto) {}
+function onUpdate(row: WebhookGroupDefinitionDto) {
+  groupModalApi.setData(row);
+  groupModalApi.open();
+}
 
 function onMenuClick(_row: WebhookGroupDefinitionDto, info: MenuInfo) {
   switch (info.key) {
@@ -229,6 +242,7 @@ onMounted(onGet);
       </div>
     </template>
   </Grid>
+  <WebhookGroupDefinitionModal @change="() => gridApi.query()" />
 </template>
 
 <style scoped></style>

From 8c834631b8fe024d2cd1f948771fb647b110a769 Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Mon, 21 Apr 2025 11:01:21 +0800
Subject: [PATCH 04/11] =?UTF-8?q?fix(vben5):=20=E4=BF=AE=E5=A4=8D=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=A8=A1=E5=BC=8F=E5=8F=AF=E5=8F=98=E6=9B=B4=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definitions/groups/WebhookGroupDefinitionModal.vue          | 2 +-
 .../definitions/groups/WebhookGroupDefinitionTable.vue          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionModal.vue b/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionModal.vue
index bddcec827..019bb8934 100644
--- a/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionModal.vue
+++ b/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionModal.vue
@@ -118,7 +118,7 @@ function onPropDelete(prop: PropertyInfo) {
           >
             <Input
               v-model:value="formModel.name"
-              :disabled="formModel.isStatic"
+              :disabled="formModel.isStatic || isEditModel"
               autocomplete="off"
             />
           </FormItem>
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue b/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue
index cee14ad53..8eb3443c2 100644
--- a/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue
+++ b/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue
@@ -242,7 +242,7 @@ onMounted(onGet);
       </div>
     </template>
   </Grid>
-  <WebhookGroupDefinitionModal @change="() => gridApi.query()" />
+  <WebhookGroupDefinitionModal @change="() => onGet()" />
 </template>
 
 <style scoped></style>

From 7d18d00b3b6b0fe2750a6bd0523828a6f92ad0f0 Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Mon, 21 Apr 2025 11:27:41 +0800
Subject: [PATCH 05/11] =?UTF-8?q?feat(vben5):=20=E5=A2=9E=E5=8A=A0webhook?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app-antd/src/locales/langs/en-US/abp.json |   3 +-
 .../app-antd/src/locales/langs/zh-CN/abp.json |   3 +-
 .../app-antd/src/router/routes/modules/abp.ts |   9 +
 .../src/views/webhooks/definitions/index.vue  |  15 +
 .../packages/@abp/webhooks/src/api/index.ts   |   2 +
 .../src/api/useWebhookDefinitionsApi.ts       |  91 +++++
 .../webhooks/WebhookDefinitionTable.vue       | 328 ++++++++++++++++++
 .../@abp/webhooks/src/components/index.ts     |   1 +
 .../webhooks/src/constants/permissions.ts     |  11 +
 .../@abp/webhooks/src/types/definitions.ts    |  40 +++
 .../packages/@abp/webhooks/src/types/index.ts |   1 +
 11 files changed, 502 insertions(+), 2 deletions(-)
 create mode 100644 apps/vben5/apps/app-antd/src/views/webhooks/definitions/index.vue
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/api/useWebhookDefinitionsApi.ts
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/components/definitions/webhooks/WebhookDefinitionTable.vue
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/types/definitions.ts

diff --git a/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json b/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json
index ad4031f55..80be45b1f 100644
--- a/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json
+++ b/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json
@@ -116,6 +116,7 @@
   },
   "webhooks": {
     "title": "Webhooks",
-    "groups": "Groups"
+    "groups": "Groups",
+    "definitions": "Definitions"
   }
 }
diff --git a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json
index e22314e36..4d3eff156 100644
--- a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json
+++ b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json
@@ -116,6 +116,7 @@
   },
   "webhooks": {
     "title": "Webhook管理",
-    "groups": "Webhook分组"
+    "groups": "Webhook分组",
+    "definitions": "Webhook定义"
   }
 }
diff --git a/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts b/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts
index e4c7b825f..709a89c04 100644
--- a/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts
+++ b/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts
@@ -467,6 +467,15 @@ const routes: RouteRecordRaw[] = [
             path: '/webhooks/groups',
             component: () => import('#/views/webhooks/groups/index.vue'),
           },
+          {
+            meta: {
+              title: $t('abp.webhooks.definitions'),
+              icon: 'material-symbols:webhook',
+            },
+            name: 'WebhookDefinitions',
+            path: '/webhooks/definitions',
+            component: () => import('#/views/webhooks/definitions/index.vue'),
+          },
         ],
       },
       {
diff --git a/apps/vben5/apps/app-antd/src/views/webhooks/definitions/index.vue b/apps/vben5/apps/app-antd/src/views/webhooks/definitions/index.vue
new file mode 100644
index 000000000..c8a497b4b
--- /dev/null
+++ b/apps/vben5/apps/app-antd/src/views/webhooks/definitions/index.vue
@@ -0,0 +1,15 @@
+<script lang="ts" setup>
+import { Page } from '@vben/common-ui';
+
+import { WebhookDefinitionTable } from '@abp/webhooks';
+
+defineOptions({
+  name: 'WebhookDefinitions',
+});
+</script>
+
+<template>
+  <Page>
+    <WebhookDefinitionTable />
+  </Page>
+</template>
diff --git a/apps/vben5/packages/@abp/webhooks/src/api/index.ts b/apps/vben5/packages/@abp/webhooks/src/api/index.ts
index e69de29bb..12a6e651a 100644
--- a/apps/vben5/packages/@abp/webhooks/src/api/index.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/api/index.ts
@@ -0,0 +1,2 @@
+export * from './useWebhookDefinitionsApi';
+export * from './useWebhookGroupDefinitionsApi';
diff --git a/apps/vben5/packages/@abp/webhooks/src/api/useWebhookDefinitionsApi.ts b/apps/vben5/packages/@abp/webhooks/src/api/useWebhookDefinitionsApi.ts
new file mode 100644
index 000000000..e582b62f4
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/api/useWebhookDefinitionsApi.ts
@@ -0,0 +1,91 @@
+import type { ListResultDto } from '@abp/core';
+
+import type {
+  WebhookDefinitionCreateDto,
+  WebhookDefinitionDto,
+  WebhookDefinitionGetListInput,
+  WebhookDefinitionUpdateDto,
+} from '../types/definitions';
+
+import { useRequest } from '@abp/request';
+
+export function useWebhookDefinitionsApi() {
+  const { cancel, request } = useRequest();
+
+  /**
+   * 删除Webhook定义
+   * @param name Webhook名称
+   */
+  function deleteApi(name: string): Promise<void> {
+    return request(`/api/webhooks/definitions/${name}`, {
+      method: 'DELETE',
+    });
+  }
+
+  /**
+   * 查询Webhook定义
+   * @param name Webhook名称
+   * @returns Webhook定义数据传输对象
+   */
+  function getApi(name: string): Promise<WebhookDefinitionDto> {
+    return request<WebhookDefinitionDto>(`/api/webhooks/definitions/${name}`, {
+      method: 'GET',
+    });
+  }
+
+  /**
+   * 查询Webhook定义列表
+   * @param input Webhook过滤条件
+   * @returns Webhook定义数据传输对象列表
+   */
+  function getListApi(
+    input?: WebhookDefinitionGetListInput,
+  ): Promise<ListResultDto<WebhookDefinitionDto>> {
+    return request<ListResultDto<WebhookDefinitionDto>>(
+      `/api/webhooks/definitions`,
+      {
+        method: 'GET',
+        params: input,
+      },
+    );
+  }
+
+  /**
+   * 创建Webhook定义
+   * @param input Webhook定义参数
+   * @returns Webhook定义数据传输对象
+   */
+  function createApi(
+    input: WebhookDefinitionCreateDto,
+  ): Promise<WebhookDefinitionDto> {
+    return request<WebhookDefinitionDto>('/api/webhooks/definitions', {
+      data: input,
+      method: 'POST',
+    });
+  }
+
+  /**
+   * 更新Webhook定义
+   * @param name Webhook名称
+   * @param input Webhook定义参数
+   * @returns Webhook定义数据传输对象
+   */
+  function updateApi(
+    name: string,
+    input: WebhookDefinitionUpdateDto,
+  ): Promise<WebhookDefinitionDto> {
+    return request<WebhookDefinitionDto>(`/api/webhooks/definitions/${name}`, {
+      data: input,
+      method: 'PUT',
+    });
+  }
+
+  return {
+    cancel,
+    createApi,
+    deleteApi,
+    getApi,
+    getListApi,
+    updateApi,
+  };
+}
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/definitions/webhooks/WebhookDefinitionTable.vue b/apps/vben5/packages/@abp/webhooks/src/components/definitions/webhooks/WebhookDefinitionTable.vue
new file mode 100644
index 000000000..0120ef14e
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/components/definitions/webhooks/WebhookDefinitionTable.vue
@@ -0,0 +1,328 @@
+<script setup lang="ts">
+import type { VxeGridListeners, VxeGridProps } from '@abp/ui';
+
+import type { VbenFormProps } from '@vben/common-ui';
+
+import type { WebhookDefinitionDto } from '../../../types/definitions';
+import type { WebhookGroupDefinitionDto } from '../../../types/groups';
+
+import { h, onMounted, reactive, ref } from 'vue';
+
+import { $t } from '@vben/locales';
+
+import {
+  listToTree,
+  useLocalization,
+  useLocalizationSerializer,
+} from '@abp/core';
+import { useVbenVxeGrid } from '@abp/ui';
+import {
+  CheckOutlined,
+  CloseOutlined,
+  DeleteOutlined,
+  EditOutlined,
+  PlusOutlined,
+} from '@ant-design/icons-vue';
+import { Button, message, Modal, Tag } from 'ant-design-vue';
+import { VxeGrid } from 'vxe-table';
+
+import { useWebhookDefinitionsApi } from '../../../api/useWebhookDefinitionsApi';
+import { useWebhookGroupDefinitionsApi } from '../../../api/useWebhookGroupDefinitionsApi';
+import { WebhookDefinitionsPermissions } from '../../../constants/permissions';
+
+defineOptions({
+  name: 'WebhookDefinitionTable',
+});
+
+interface DefinitionItem {
+  children: DefinitionItem[];
+  description?: string;
+  displayName: string;
+  groupName: string;
+  isEnabled: boolean;
+  isStatic: boolean;
+  name: string;
+  requiredFeatures?: string[];
+}
+interface DefinitionGroup {
+  displayName: string;
+  items: DefinitionItem[];
+  name: string;
+}
+
+const { Lr } = useLocalization();
+const { deserialize } = useLocalizationSerializer();
+const { getListApi: getGroupsApi } = useWebhookGroupDefinitionsApi();
+const { deleteApi, getListApi: getDefinitionsApi } = useWebhookDefinitionsApi();
+
+const definitionGroups = ref<DefinitionGroup[]>([]);
+const pageState = reactive({
+  current: 1,
+  size: 10,
+  total: 0,
+});
+
+const formOptions: VbenFormProps = {
+  // 默认展开
+  collapsed: false,
+  handleReset: onReset,
+  async handleSubmit(params) {
+    pageState.current = 1;
+    await onGet(params);
+  },
+  schema: [
+    {
+      component: 'Input',
+      fieldName: 'filter',
+      formItemClass: 'col-span-2 items-baseline',
+      label: $t('AbpUi.Search'),
+    },
+  ],
+  // 控制表单是否显示折叠按钮
+  showCollapseButton: true,
+  // 按下回车时是否提交表单
+  submitOnEnter: true,
+};
+
+const gridOptions: VxeGridProps<WebhookGroupDefinitionDto> = {
+  columns: [
+    {
+      align: 'center',
+      type: 'seq',
+      width: 50,
+    },
+    {
+      align: 'left',
+      field: 'group',
+      slots: { content: 'group' },
+      type: 'expand',
+      width: 50,
+    },
+    {
+      align: 'left',
+      field: 'name',
+      minWidth: 150,
+      title: $t('WebhooksManagement.DisplayName:Name'),
+    },
+    {
+      align: 'left',
+      field: 'displayName',
+      minWidth: 150,
+      title: $t('WebhooksManagement.DisplayName:DisplayName'),
+    },
+  ],
+  expandConfig: {
+    padding: true,
+    trigger: 'row',
+  },
+  exportConfig: {},
+  keepSource: true,
+  toolbarConfig: {
+    custom: true,
+    export: true,
+    refresh: false,
+    zoom: true,
+  },
+};
+const subGridColumns: VxeGridProps<WebhookDefinitionDto>['columns'] = [
+  {
+    align: 'center',
+    type: 'seq',
+    width: 50,
+  },
+  {
+    align: 'left',
+    field: 'isEnabled',
+    minWidth: 120,
+    slots: { default: 'isEnabled' },
+    title: $t('WebhooksManagement.DisplayName:IsEnabled'),
+  },
+  {
+    align: 'left',
+    field: 'name',
+    minWidth: 150,
+    title: $t('WebhooksManagement.DisplayName:Name'),
+    treeNode: true,
+  },
+  {
+    align: 'left',
+    field: 'displayName',
+    minWidth: 120,
+    title: $t('WebhooksManagement.DisplayName:DisplayName'),
+  },
+  {
+    align: 'left',
+    field: 'description',
+    minWidth: 120,
+    title: $t('WebhooksManagement.DisplayName:Description'),
+  },
+  {
+    align: 'left',
+    field: 'features',
+    minWidth: 150,
+    slots: { default: 'features' },
+    title: $t('WebhooksManagement.DisplayName:RequiredFeatures'),
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
+    title: $t('AbpUi.Actions'),
+    width: 220,
+  },
+];
+
+const gridEvents: VxeGridListeners<WebhookGroupDefinitionDto> = {
+  pageChange(params) {
+    pageState.current = params.currentPage;
+    pageState.size = params.pageSize;
+    onPageChange();
+  },
+};
+
+const [GroupGrid, gridApi] = useVbenVxeGrid({
+  formOptions,
+  gridEvents,
+  gridOptions,
+});
+
+async function onGet(input?: Record<string, string>) {
+  try {
+    gridApi.setLoading(true);
+    const groupRes = await getGroupsApi(input);
+    const definitionRes = await getDefinitionsApi(input);
+    pageState.total = groupRes.items.length;
+    definitionGroups.value = groupRes.items.map((group) => {
+      const localizableGroup = deserialize(group.displayName);
+      const definitions = definitionRes.items
+        .filter((definition) => definition.groupName === group.name)
+        .map((definition) => {
+          const displayName = deserialize(definition.displayName);
+          const description = deserialize(definition.displayName);
+          return {
+            ...definition,
+            description: Lr(description.resourceName, description.name),
+            displayName: Lr(displayName.resourceName, displayName.name),
+          };
+        });
+      return {
+        ...group,
+        displayName: Lr(localizableGroup.resourceName, localizableGroup.name),
+        items: listToTree(definitions, {
+          id: 'name',
+          pid: 'parentName',
+        }),
+      };
+    });
+    onPageChange();
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+async function onReset() {
+  await gridApi.formApi.resetForm();
+  const input = await gridApi.formApi.getValues();
+  await onGet(input);
+}
+
+function onPageChange() {
+  const items = definitionGroups.value.slice(
+    (pageState.current - 1) * pageState.size,
+    pageState.current * pageState.size,
+  );
+  gridApi.setGridOptions({
+    data: items,
+    pagerConfig: {
+      currentPage: pageState.current,
+      pageSize: pageState.size,
+      total: pageState.total,
+    },
+  });
+}
+
+function onCreate() {}
+
+function onUpdate(_row: WebhookDefinitionDto) {}
+
+function onDelete(row: WebhookDefinitionDto) {
+  Modal.confirm({
+    centered: true,
+    content: `${$t('AbpUi.ItemWillBeDeletedMessageWithFormat', [row.name])}`,
+    onOk: async () => {
+      await deleteApi(row.name);
+      message.success($t('AbpUi.DeletedSuccessfully'));
+      onGet();
+    },
+    title: $t('AbpUi.AreYouSure'),
+  });
+}
+
+onMounted(onGet);
+</script>
+
+<template>
+  <GroupGrid :table-title="$t('WebhooksManagement.WebhookDefinitions')">
+    <template #toolbar-tools>
+      <Button
+        :icon="h(PlusOutlined)"
+        type="primary"
+        v-access:code="[WebhookDefinitionsPermissions.Create]"
+        @click="onCreate"
+      >
+        {{ $t('WebhooksManagement.Webhooks:AddNew') }}
+      </Button>
+    </template>
+    <template #group="{ row: group }">
+      <VxeGrid
+        :columns="subGridColumns"
+        :data="group.items"
+        :tree-config="{
+          trigger: 'row',
+          rowField: 'name',
+          childrenField: 'children',
+        }"
+      >
+        <template #isEnabled="{ row }">
+          <div class="flex flex-row justify-center">
+            <CheckOutlined v-if="row.isEnabled" class="text-green-500" />
+            <CloseOutlined v-else class="text-red-500" />
+          </div>
+        </template>
+        <template #features="{ row }">
+          <div class="flex flex-row justify-center gap-1">
+            <template v-for="feature in row.features" :key="feature">
+              <Tag color="blue">{{ feature }}</Tag>
+            </template>
+          </div>
+        </template>
+        <template #action="{ row: definition }">
+          <div class="flex flex-row">
+            <Button
+              :icon="h(EditOutlined)"
+              block
+              type="link"
+              v-access:code="[WebhookDefinitionsPermissions.Update]"
+              @click="onUpdate(definition)"
+            >
+              {{ $t('AbpUi.Edit') }}
+            </Button>
+            <Button
+              v-if="!definition.isStatic"
+              :icon="h(DeleteOutlined)"
+              block
+              danger
+              type="link"
+              v-access:code="[WebhookDefinitionsPermissions.Delete]"
+              @click="onDelete(definition)"
+            >
+              {{ $t('AbpUi.Delete') }}
+            </Button>
+          </div>
+        </template>
+      </VxeGrid>
+    </template>
+  </GroupGrid>
+</template>
+
+<style scoped></style>
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/index.ts b/apps/vben5/packages/@abp/webhooks/src/components/index.ts
index 5632abd6d..14b4c03ac 100644
--- a/apps/vben5/packages/@abp/webhooks/src/components/index.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/components/index.ts
@@ -1 +1,2 @@
 export { default as WebhookGroupDefinitionTable } from './definitions/groups/WebhookGroupDefinitionTable.vue';
+export { default as WebhookDefinitionTable } from './definitions/webhooks/WebhookDefinitionTable.vue';
diff --git a/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts b/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts
index 25334ca12..73156c1b8 100644
--- a/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts
@@ -8,3 +8,14 @@ export const GroupDefinitionsPermissions = {
   /** 更新 */
   Update: 'AbpWebhooks.GroupDefinitions.Update',
 };
+
+/** Webhook定义权限 */
+export const WebhookDefinitionsPermissions = {
+  /** 新增 */
+  Create: 'AbpWebhooks.Definitions.Create',
+  Default: 'AbpWebhooks.Definitions',
+  /** 删除 */
+  Delete: 'AbpWebhooks.Definitions.Delete',
+  /** 更新 */
+  Update: 'AbpWebhooks.Definitions.Update',
+};
diff --git a/apps/vben5/packages/@abp/webhooks/src/types/definitions.ts b/apps/vben5/packages/@abp/webhooks/src/types/definitions.ts
new file mode 100644
index 000000000..2f3391d7d
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/types/definitions.ts
@@ -0,0 +1,40 @@
+import type { IHasConcurrencyStamp, IHasExtraProperties } from '@abp/core';
+
+interface WebhookDefinitionDto extends IHasExtraProperties {
+  description?: string;
+  displayName: string;
+  groupName: string;
+  isEnabled: boolean;
+  isStatic: boolean;
+  name: string;
+  requiredFeatures?: string[];
+}
+
+interface WebhookDefinitionCreateOrUpdateDto extends IHasExtraProperties {
+  description?: string;
+  displayName: string;
+  isEnabled: boolean;
+  requiredFeatures?: string[];
+}
+
+interface WebhookDefinitionCreateDto
+  extends WebhookDefinitionCreateOrUpdateDto {
+  groupName: string;
+  name: string;
+}
+
+interface WebhookDefinitionUpdateDto
+  extends IHasConcurrencyStamp,
+    WebhookDefinitionCreateOrUpdateDto {}
+
+interface WebhookDefinitionGetListInput {
+  filter?: string;
+  groupName?: string;
+}
+
+export type {
+  WebhookDefinitionCreateDto,
+  WebhookDefinitionDto,
+  WebhookDefinitionGetListInput,
+  WebhookDefinitionUpdateDto,
+};
diff --git a/apps/vben5/packages/@abp/webhooks/src/types/index.ts b/apps/vben5/packages/@abp/webhooks/src/types/index.ts
index d20b7e110..6a41718f6 100644
--- a/apps/vben5/packages/@abp/webhooks/src/types/index.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/types/index.ts
@@ -1 +1,2 @@
+export * from './definitions';
 export * from './groups';

From 9e071e00846d65f50b66fa493c94224d2509cca3 Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Mon, 21 Apr 2025 13:17:56 +0800
Subject: [PATCH 06/11] =?UTF-8?q?feat(vben5):=20=E5=A2=9E=E5=8A=A0webhook?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vben5/packages/@abp/webhooks/package.json |   1 +
 .../groups/WebhookGroupDefinitionTable.vue    |  14 +-
 .../webhooks/WebhookDefinitionModal.vue       | 357 ++++++++++++++++++
 .../webhooks/WebhookDefinitionTable.vue       |  28 +-
 4 files changed, 391 insertions(+), 9 deletions(-)
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/components/definitions/webhooks/WebhookDefinitionModal.vue

diff --git a/apps/vben5/packages/@abp/webhooks/package.json b/apps/vben5/packages/@abp/webhooks/package.json
index e3a3f9a72..54f439f47 100644
--- a/apps/vben5/packages/@abp/webhooks/package.json
+++ b/apps/vben5/packages/@abp/webhooks/package.json
@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "@abp/core": "workspace:*",
+    "@abp/features": "workspace:*",
     "@abp/request": "workspace:*",
     "@abp/ui": "workspace:*",
     "@ant-design/icons-vue": "catalog:",
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue b/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue
index 8eb3443c2..20dc6a10c 100644
--- a/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue
+++ b/apps/vben5/packages/@abp/webhooks/src/components/definitions/groups/WebhookGroupDefinitionTable.vue
@@ -108,6 +108,11 @@ const [WebhookGroupDefinitionModal, groupModalApi] = useVbenModal({
     () => import('./WebhookGroupDefinitionModal.vue'),
   ),
 });
+const [WebhookDefinitionModal, defineModalApi] = useVbenModal({
+  connectedComponent: defineAsyncComponent(
+    () => import('../webhooks/WebhookDefinitionModal.vue'),
+  ),
+});
 
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions,
@@ -164,9 +169,13 @@ function onUpdate(row: WebhookGroupDefinitionDto) {
   groupModalApi.open();
 }
 
-function onMenuClick(_row: WebhookGroupDefinitionDto, info: MenuInfo) {
+function onMenuClick(row: WebhookGroupDefinitionDto, info: MenuInfo) {
   switch (info.key) {
-    case 'permissions': {
+    case 'webhooks': {
+      defineModalApi.setData({
+        groupName: row.name,
+      });
+      defineModalApi.open();
       break;
     }
   }
@@ -243,6 +252,7 @@ onMounted(onGet);
     </template>
   </Grid>
   <WebhookGroupDefinitionModal @change="() => onGet()" />
+  <WebhookDefinitionModal />
 </template>
 
 <style scoped></style>
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/definitions/webhooks/WebhookDefinitionModal.vue b/apps/vben5/packages/@abp/webhooks/src/components/definitions/webhooks/WebhookDefinitionModal.vue
new file mode 100644
index 000000000..1496b80bb
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/components/definitions/webhooks/WebhookDefinitionModal.vue
@@ -0,0 +1,357 @@
+<script setup lang="ts">
+import type {
+  FeatureDefinitionDto,
+  FeatureGroupDefinitionDto,
+} from '@abp/features';
+import type { PropertyInfo } from '@abp/ui';
+import type { FormInstance } from 'ant-design-vue';
+
+import type { WebhookDefinitionDto } from '../../../types/definitions';
+import type { WebhookGroupDefinitionDto } from '../../../types/groups';
+
+import {
+  computed,
+  defineEmits,
+  defineOptions,
+  ref,
+  toValue,
+  useTemplateRef,
+} from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+
+import {
+  isNullOrWhiteSpace,
+  listToTree,
+  useAuthorization,
+  useLocalization,
+  useLocalizationSerializer,
+} from '@abp/core';
+import {
+  useFeatureDefinitionsApi,
+  useFeatureGroupDefinitionsApi,
+} from '@abp/features';
+import { LocalizableInput, PropertyTable, valueTypeSerializer } from '@abp/ui';
+import {
+  Checkbox,
+  Form,
+  Input,
+  message,
+  Select,
+  Tabs,
+  TreeSelect,
+} from 'ant-design-vue';
+
+import { useWebhookGroupDefinitionsApi } from '../../../api';
+import { useWebhookDefinitionsApi } from '../../../api/useWebhookDefinitionsApi';
+
+defineOptions({
+  name: 'WebhookDefinitionModal',
+});
+const emits = defineEmits<{
+  (event: 'change', data: WebhookDefinitionDto): void;
+}>();
+
+const FormItem = Form.Item;
+const TabPane = Tabs.TabPane;
+
+interface FeatureTreeData {
+  checkable?: boolean;
+  children: FeatureTreeData[];
+  displayName: string;
+  groupName: string;
+  name: string;
+}
+
+type TabKeys = 'basic' | 'props';
+
+const defaultModel: WebhookDefinitionDto = {
+  displayName: '',
+  extraProperties: {},
+  groupName: '',
+  isEnabled: true,
+  isStatic: false,
+  name: '',
+  requiredFeatures: [],
+};
+
+const isEditModel = ref(false);
+const activeTab = ref<TabKeys>('basic');
+const form = useTemplateRef<FormInstance>('form');
+const formModel = ref<WebhookDefinitionDto>({ ...defaultModel });
+const webhookGroups = ref<WebhookGroupDefinitionDto[]>([]);
+const features = ref<FeatureDefinitionDto[]>([]);
+const featureGroups = ref<FeatureGroupDefinitionDto[]>([]);
+
+const { isGranted } = useAuthorization();
+const { cancel, createApi, getApi, updateApi } = useWebhookDefinitionsApi();
+const { getListApi: getGroupDefinitionsApi } = useWebhookGroupDefinitionsApi();
+const { getListApi: getFeaturesApi } = useFeatureDefinitionsApi();
+const { getListApi: getFeatureGroupsApi } = useFeatureGroupDefinitionsApi();
+const { Lr } = useLocalization();
+const { deserialize } = useLocalizationSerializer();
+
+const getFeatureOptions = computed(() => {
+  const featureOptions: FeatureTreeData[] = [];
+  featureGroups.value.forEach((group) => {
+    featureOptions.push({
+      checkable: false,
+      displayName: group.displayName,
+      groupName: group.name,
+      name: group.name,
+      children: listToTree(
+        features.value.filter((x) => x.groupName === group.name),
+        {
+          id: 'name',
+          pid: 'parentName',
+        },
+      ),
+    });
+  });
+  return featureOptions;
+});
+const getRequiredFeatures = computed(() => {
+  const featureNames = formModel.value.requiredFeatures ?? [];
+  const requiredFeatures = features.value
+    .filter((feature) => featureNames.includes(feature.name))
+    .map((feature) => {
+      return {
+        label: feature.displayName,
+        value: feature.name,
+      };
+    });
+  return requiredFeatures;
+});
+
+const [Modal, modalApi] = useVbenModal({
+  class: 'w-1/2',
+  draggable: true,
+  fullscreenButton: false,
+  onCancel() {
+    modalApi.close();
+  },
+  onClosed() {
+    cancel('WebhookDefinitionModal has closed!');
+  },
+  onConfirm: async () => {
+    await form.value?.validate();
+    const input = toValue(formModel);
+    const api = isEditModel.value
+      ? updateApi(formModel.value.name, input)
+      : createApi(input);
+    try {
+      modalApi.setState({ submitting: true });
+      const res = await api;
+      emits('change', res);
+      message.success($t('AbpUi.SavedSuccessfully'));
+      modalApi.close();
+    } finally {
+      modalApi.setState({ submitting: false });
+    }
+  },
+  onOpenChange: async (isOpen: boolean) => {
+    if (isOpen) {
+      isEditModel.value = false;
+      activeTab.value = 'basic';
+      formModel.value = { ...defaultModel };
+      modalApi.setState({
+        loading: true,
+        showConfirmButton: true,
+        title: $t('WebhooksManagement.Webhooks:AddNew'),
+      });
+      try {
+        const { groupName, name } = modalApi.getData<WebhookDefinitionDto>();
+        await onInit(groupName);
+        name && (await onGet(name));
+      } finally {
+        modalApi.setState({ loading: false });
+      }
+    }
+  },
+  title: $t('WebhooksManagement.Webhooks:AddNew'),
+});
+async function onGet(name: string) {
+  isEditModel.value = true;
+  const dto = await getApi(name);
+  formModel.value = dto;
+  modalApi.setState({
+    showConfirmButton: !dto.isStatic,
+    title: `${$t('WebhooksManagement.WebhookDefinitions')} - ${dto.name}`,
+  });
+}
+async function onInit(groupName?: string) {
+  const [webhookGroupRes, featureGroupItems, featureItems] = await Promise.all([
+    getGroupDefinitionsApi({ filter: groupName }),
+    onInitFeatureGroups(),
+    onInitFeatures(),
+  ]);
+  featureGroups.value = featureGroupItems;
+  features.value = featureItems;
+  webhookGroups.value = webhookGroupRes.items.map((group) => {
+    const displayName = deserialize(group.displayName);
+    return {
+      ...group,
+      displayName: Lr(displayName.resourceName, displayName.name),
+    };
+  });
+  if (webhookGroupRes.items.length === 1) {
+    formModel.value.groupName = webhookGroupRes.items[0]!.name;
+  }
+}
+async function onInitFeatures() {
+  if (!isGranted(['FeatureManagement.Definitions'])) {
+    return [];
+  }
+  const { items } = await getFeaturesApi();
+  return items
+    .filter((item) => {
+      if (!isNullOrWhiteSpace(item.valueType)) {
+        const valueType = valueTypeSerializer.deserialize(item.valueType);
+        if (valueType.validator.name !== 'BOOLEAN') {
+          return false;
+        }
+      }
+      return true;
+    })
+    .map((item) => {
+      const displayName = deserialize(item.displayName);
+      const feature = {
+        ...item,
+        displayName: Lr(displayName.resourceName, displayName.name),
+      };
+      return feature;
+    });
+}
+async function onInitFeatureGroups() {
+  if (!isGranted(['FeatureManagement.GroupDefinitions'])) {
+    return [];
+  }
+  const { items } = await getFeatureGroupsApi();
+  return items.map((item) => {
+    const displayName = deserialize(item.displayName);
+    return {
+      ...item,
+      displayName: Lr(displayName.resourceName, displayName.name),
+    };
+  });
+}
+function onFeaturesChange(value: any[]) {
+  formModel.value.requiredFeatures = value.map((item) => item.value);
+}
+function onPropChange(prop: PropertyInfo) {
+  formModel.value.extraProperties ??= {};
+  formModel.value.extraProperties[prop.key] = prop.value;
+}
+function onPropDelete(prop: PropertyInfo) {
+  formModel.value.extraProperties ??= {};
+  delete formModel.value.extraProperties[prop.key];
+}
+</script>
+
+<template>
+  <Modal>
+    <Form
+      ref="form"
+      :label-col="{ span: 6 }"
+      :model="formModel"
+      :wrapper-col="{ span: 18 }"
+    >
+      <Tabs v-model:active-key="activeTab">
+        <!-- 基本信息 -->
+        <TabPane key="basic" :tab="$t('WebhooksManagement.BasicInfo')">
+          <FormItem
+            name="isEnabled"
+            :label="$t('WebhooksManagement.DisplayName:IsEnabled')"
+          >
+            <Checkbox
+              :disabled="formModel.isStatic"
+              v-model:checked="formModel.isEnabled"
+            >
+              {{ $t('WebhooksManagement.DisplayName:IsEnabled') }}
+            </Checkbox>
+          </FormItem>
+          <FormItem
+            name="groupName"
+            :label="$t('WebhooksManagement.DisplayName:GroupName')"
+            required
+          >
+            <Select
+              :disabled="formModel.isStatic"
+              :allow-clear="true"
+              v-model:value="formModel.groupName"
+              :options="webhookGroups"
+              :field-names="{ label: 'displayName', value: 'name' }"
+            />
+          </FormItem>
+          <FormItem
+            :label="$t('WebhooksManagement.DisplayName:Name')"
+            name="name"
+            required
+          >
+            <Input
+              v-model:value="formModel.name"
+              :disabled="formModel.isStatic"
+              autocomplete="off"
+            />
+          </FormItem>
+          <FormItem
+            :label="$t('WebhooksManagement.DisplayName:DisplayName')"
+            name="displayName"
+            required
+          >
+            <LocalizableInput
+              v-model:value="formModel.displayName"
+              :disabled="formModel.isStatic"
+            />
+          </FormItem>
+          <FormItem
+            name="description"
+            :label="$t('WebhooksManagement.DisplayName:Description')"
+          >
+            <LocalizableInput
+              :disabled="formModel.isStatic"
+              :allow-clear="true"
+              v-model:value="formModel.description"
+            />
+          </FormItem>
+          <FormItem
+            v-if="
+              isGranted(
+                [
+                  'FeatureManagement.GroupDefinitions',
+                  'FeatureManagement.Definitions',
+                ],
+                true,
+              )
+            "
+            name="requiredFeatures"
+            :label="$t('WebhooksManagement.DisplayName:RequiredFeatures')"
+          >
+            <TreeSelect
+              :tree-data="getFeatureOptions"
+              :disabled="formModel.isStatic"
+              allow-clear
+              tree-checkable
+              tree-check-strictly
+              :field-names="{ label: 'displayName', value: 'name' }"
+              :value="getRequiredFeatures"
+              @change="onFeaturesChange"
+            />
+          </FormItem>
+        </TabPane>
+        <!-- 属性 -->
+        <TabPane key="props" :tab="$t('WebhooksManagement.Properties')">
+          <PropertyTable
+            :data="formModel.extraProperties"
+            :disabled="formModel.isStatic"
+            @change="onPropChange"
+            @delete="onPropDelete"
+          />
+        </TabPane>
+      </Tabs>
+    </Form>
+  </Modal>
+</template>
+
+<style scoped></style>
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/definitions/webhooks/WebhookDefinitionTable.vue b/apps/vben5/packages/@abp/webhooks/src/components/definitions/webhooks/WebhookDefinitionTable.vue
index 0120ef14e..e25660be3 100644
--- a/apps/vben5/packages/@abp/webhooks/src/components/definitions/webhooks/WebhookDefinitionTable.vue
+++ b/apps/vben5/packages/@abp/webhooks/src/components/definitions/webhooks/WebhookDefinitionTable.vue
@@ -6,8 +6,9 @@ import type { VbenFormProps } from '@vben/common-ui';
 import type { WebhookDefinitionDto } from '../../../types/definitions';
 import type { WebhookGroupDefinitionDto } from '../../../types/groups';
 
-import { h, onMounted, reactive, ref } from 'vue';
+import { defineAsyncComponent, h, onMounted, reactive, ref } from 'vue';
 
+import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
 import {
@@ -158,9 +159,9 @@ const subGridColumns: VxeGridProps<WebhookDefinitionDto>['columns'] = [
   },
   {
     align: 'left',
-    field: 'features',
+    field: 'requiredFeatures',
     minWidth: 150,
-    slots: { default: 'features' },
+    slots: { default: 'requiredFeatures' },
     title: $t('WebhooksManagement.DisplayName:RequiredFeatures'),
   },
   {
@@ -186,6 +187,12 @@ const [GroupGrid, gridApi] = useVbenVxeGrid({
   gridOptions,
 });
 
+const [WebhookDefinitionModal, groupModalApi] = useVbenModal({
+  connectedComponent: defineAsyncComponent(
+    () => import('./WebhookDefinitionModal.vue'),
+  ),
+});
+
 async function onGet(input?: Record<string, string>) {
   try {
     gridApi.setLoading(true);
@@ -241,9 +248,15 @@ function onPageChange() {
   });
 }
 
-function onCreate() {}
+function onCreate() {
+  groupModalApi.setData({});
+  groupModalApi.open();
+}
 
-function onUpdate(_row: WebhookDefinitionDto) {}
+function onUpdate(row: WebhookDefinitionDto) {
+  groupModalApi.setData(row);
+  groupModalApi.open();
+}
 
 function onDelete(row: WebhookDefinitionDto) {
   Modal.confirm({
@@ -289,9 +302,9 @@ onMounted(onGet);
             <CloseOutlined v-else class="text-red-500" />
           </div>
         </template>
-        <template #features="{ row }">
+        <template #requiredFeatures="{ row }">
           <div class="flex flex-row justify-center gap-1">
-            <template v-for="feature in row.features" :key="feature">
+            <template v-for="feature in row.requiredFeatures" :key="feature">
               <Tag color="blue">{{ feature }}</Tag>
             </template>
           </div>
@@ -323,6 +336,7 @@ onMounted(onGet);
       </VxeGrid>
     </template>
   </GroupGrid>
+  <WebhookDefinitionModal @change="() => onGet()" />
 </template>
 
 <style scoped></style>

From 065b5180dc85871baabe39aed01de5cc05e13034 Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Mon, 21 Apr 2025 17:06:22 +0800
Subject: [PATCH 07/11] =?UTF-8?q?feat(vben5):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86Webhook=E8=AE=A2=E9=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app-antd/src/locales/langs/en-US/abp.json |   3 +-
 .../app-antd/src/locales/langs/zh-CN/abp.json |   3 +-
 .../app-antd/src/router/routes/modules/abp.ts |   9 +
 .../views/webhooks/subscriptions/index.vue    |  15 +
 .../vben5/packages/@abp/webhooks/package.json |   6 +-
 .../packages/@abp/webhooks/src/api/index.ts   |   1 +
 .../webhooks/src/api/useSubscriptionsApi.ts   | 123 +++++++
 .../@abp/webhooks/src/components/index.ts     |   1 +
 .../WebhookSubscriptionModal.vue              | 309 +++++++++++++++++
 .../WebhookSubscriptionTable.vue              | 317 ++++++++++++++++++
 .../webhooks/src/constants/permissions.ts     |  11 +
 .../packages/@abp/webhooks/src/types/index.ts |   1 +
 .../@abp/webhooks/src/types/subscriptions.ts  |  73 ++++
 13 files changed, 869 insertions(+), 3 deletions(-)
 create mode 100644 apps/vben5/apps/app-antd/src/views/webhooks/subscriptions/index.vue
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/api/useSubscriptionsApi.ts
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/components/subscriptions/WebhookSubscriptionModal.vue
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/components/subscriptions/WebhookSubscriptionTable.vue
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/types/subscriptions.ts

diff --git a/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json b/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json
index 80be45b1f..6de53754e 100644
--- a/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json
+++ b/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json
@@ -117,6 +117,7 @@
   "webhooks": {
     "title": "Webhooks",
     "groups": "Groups",
-    "definitions": "Definitions"
+    "definitions": "Definitions",
+    "subscriptions": "Subscriptions"
   }
 }
diff --git a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json
index 4d3eff156..08ff8f8e5 100644
--- a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json
+++ b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json
@@ -117,6 +117,7 @@
   "webhooks": {
     "title": "Webhook管理",
     "groups": "Webhook分组",
-    "definitions": "Webhook定义"
+    "definitions": "Webhook定义",
+    "subscriptions": "管理订阅"
   }
 }
diff --git a/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts b/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts
index 709a89c04..2ec6407a1 100644
--- a/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts
+++ b/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts
@@ -476,6 +476,15 @@ const routes: RouteRecordRaw[] = [
             path: '/webhooks/definitions',
             component: () => import('#/views/webhooks/definitions/index.vue'),
           },
+          {
+            meta: {
+              title: $t('abp.webhooks.subscriptions'),
+              icon: 'material-symbols:subscriptions',
+            },
+            name: 'WebhookSubscriptions',
+            path: '/webhooks/subscriptions',
+            component: () => import('#/views/webhooks/subscriptions/index.vue'),
+          },
         ],
       },
       {
diff --git a/apps/vben5/apps/app-antd/src/views/webhooks/subscriptions/index.vue b/apps/vben5/apps/app-antd/src/views/webhooks/subscriptions/index.vue
new file mode 100644
index 000000000..a05d1bf98
--- /dev/null
+++ b/apps/vben5/apps/app-antd/src/views/webhooks/subscriptions/index.vue
@@ -0,0 +1,15 @@
+<script lang="ts" setup>
+import { Page } from '@vben/common-ui';
+
+import { WebhookSubscriptionTable } from '@abp/webhooks';
+
+defineOptions({
+  name: 'WebhookSubscriptions',
+});
+</script>
+
+<template>
+  <Page>
+    <WebhookSubscriptionTable />
+  </Page>
+</template>
diff --git a/apps/vben5/packages/@abp/webhooks/package.json b/apps/vben5/packages/@abp/webhooks/package.json
index 54f439f47..f62762874 100644
--- a/apps/vben5/packages/@abp/webhooks/package.json
+++ b/apps/vben5/packages/@abp/webhooks/package.json
@@ -20,9 +20,11 @@
     }
   },
   "dependencies": {
+    "@abp/components": "workspace:*",
     "@abp/core": "workspace:*",
     "@abp/features": "workspace:*",
     "@abp/request": "workspace:*",
+    "@abp/saas": "workspace:*",
     "@abp/ui": "workspace:*",
     "@ant-design/icons-vue": "catalog:",
     "@vben/access": "workspace:*",
@@ -33,10 +35,12 @@
     "@vben/locales": "workspace:*",
     "ant-design-vue": "catalog:",
     "lodash.clonedeep": "catalog:",
+    "lodash.debounce": "catalog:",
     "vue": "catalog:*",
     "vxe-table": "catalog:"
   },
   "devDependencies": {
-    "@types/lodash.clonedeep": "catalog:"
+    "@types/lodash.clonedeep": "catalog:",
+    "@types/lodash.debounce": "catalog:"
   }
 }
diff --git a/apps/vben5/packages/@abp/webhooks/src/api/index.ts b/apps/vben5/packages/@abp/webhooks/src/api/index.ts
index 12a6e651a..0a30bdd2a 100644
--- a/apps/vben5/packages/@abp/webhooks/src/api/index.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/api/index.ts
@@ -1,2 +1,3 @@
+export * from './useSubscriptionsApi';
 export * from './useWebhookDefinitionsApi';
 export * from './useWebhookGroupDefinitionsApi';
diff --git a/apps/vben5/packages/@abp/webhooks/src/api/useSubscriptionsApi.ts b/apps/vben5/packages/@abp/webhooks/src/api/useSubscriptionsApi.ts
new file mode 100644
index 000000000..50c8914e8
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/api/useSubscriptionsApi.ts
@@ -0,0 +1,123 @@
+import type { ListResultDto, PagedResultDto } from '@abp/core';
+
+import type {
+  WebhookAvailableGroupDto,
+  WebhookSubscriptionCreateDto,
+  WebhookSubscriptionDeleteManyInput,
+  WebhookSubscriptionDto,
+  WebhookSubscriptionGetListInput,
+  WebhookSubscriptionUpdateDto,
+} from '../types/subscriptions';
+
+import { useRequest } from '@abp/request';
+
+export function useSubscriptionsApi() {
+  const { cancel, request } = useRequest();
+
+  /**
+   * 创建订阅
+   * @param input 参数
+   * @returns 订阅Dto
+   */
+  function createApi(
+    input: WebhookSubscriptionCreateDto,
+  ): Promise<WebhookSubscriptionDto> {
+    return request<WebhookSubscriptionDto>(`/api/webhooks/subscriptions`, {
+      data: input,
+      method: 'POST',
+    });
+  }
+  /**
+   * 删除订阅
+   * @param id 订阅Id
+   */
+  function deleteApi(id: string): Promise<void> {
+    return request(`/api/webhooks/subscriptions/${id}`, {
+      method: 'DELETE',
+    });
+  }
+  /**
+   * 批量删除订阅
+   * @param input 参数
+   */
+  function bulkDeleteApi(
+    input: WebhookSubscriptionDeleteManyInput,
+  ): Promise<void> {
+    return request(`/api/webhooks/subscriptions/delete-many`, {
+      data: input,
+      method: 'DELETE',
+    });
+  }
+  /**
+   * 查询所有可用的Webhook分组列表
+   * @returns Webhook分组列表
+   */
+  function getAllAvailableWebhooksApi(): Promise<
+    ListResultDto<WebhookAvailableGroupDto>
+  > {
+    return request<ListResultDto<WebhookAvailableGroupDto>>(
+      `/api/webhooks/subscriptions/availables`,
+      {
+        method: 'GET',
+      },
+    );
+  }
+  /**
+   * 查询订阅
+   * @param id 订阅Id
+   * @returns 订阅Dto
+   */
+  function getApi(id: string): Promise<WebhookSubscriptionDto> {
+    return request<WebhookSubscriptionDto>(
+      `/api/webhooks/subscriptions/${id}`,
+      {
+        method: 'GET',
+      },
+    );
+  }
+  /**
+   * 查询订阅分页列表
+   * @param input 过滤参数
+   * @returns 订阅Dto列表
+   */
+  function getPagedListApi(
+    input: WebhookSubscriptionGetListInput,
+  ): Promise<PagedResultDto<WebhookSubscriptionDto>> {
+    return request<PagedResultDto<WebhookSubscriptionDto>>(
+      `/api/webhooks/subscriptions`,
+      {
+        method: 'GET',
+        params: input,
+      },
+    );
+  }
+  /**
+   * 更新订阅
+   * @param id 订阅Id
+   * @param input 更新参数
+   * @returns 订阅Dto
+   */
+  function updateApi(
+    id: string,
+    input: WebhookSubscriptionUpdateDto,
+  ): Promise<WebhookSubscriptionDto> {
+    return request<WebhookSubscriptionDto>(
+      `/api/webhooks/subscriptions/${id}`,
+      {
+        data: input,
+        method: 'PUT',
+      },
+    );
+  }
+
+  return {
+    bulkDeleteApi,
+    cancel,
+    createApi,
+    deleteApi,
+    getAllAvailableWebhooksApi,
+    getApi,
+    getPagedListApi,
+    updateApi,
+  };
+}
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/index.ts b/apps/vben5/packages/@abp/webhooks/src/components/index.ts
index 14b4c03ac..41763338c 100644
--- a/apps/vben5/packages/@abp/webhooks/src/components/index.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/components/index.ts
@@ -1,2 +1,3 @@
 export { default as WebhookGroupDefinitionTable } from './definitions/groups/WebhookGroupDefinitionTable.vue';
 export { default as WebhookDefinitionTable } from './definitions/webhooks/WebhookDefinitionTable.vue';
+export { default as WebhookSubscriptionTable } from './subscriptions/WebhookSubscriptionTable.vue';
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/subscriptions/WebhookSubscriptionModal.vue b/apps/vben5/packages/@abp/webhooks/src/components/subscriptions/WebhookSubscriptionModal.vue
new file mode 100644
index 000000000..8fa68daa4
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/components/subscriptions/WebhookSubscriptionModal.vue
@@ -0,0 +1,309 @@
+<script setup lang="ts">
+import type { TenantDto } from '@abp/saas';
+import type { PropertyInfo } from '@abp/ui';
+import type { FormInstance } from 'ant-design-vue';
+
+import type {
+  WebhookAvailableGroupDto,
+  WebhookSubscriptionDto,
+} from '../../types';
+
+import { defineEmits, defineOptions, ref, toValue, useTemplateRef } from 'vue';
+
+import { useAccess } from '@vben/access';
+import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+
+import { isNullOrWhiteSpace } from '@abp/core';
+import { useTenantsApi } from '@abp/saas';
+import { PropertyTable } from '@abp/ui';
+import {
+  Checkbox,
+  Form,
+  Input,
+  InputNumber,
+  InputPassword,
+  message,
+  Select,
+  Tabs,
+  Textarea,
+  Tooltip,
+} from 'ant-design-vue';
+import debounce from 'lodash.debounce';
+
+import { useSubscriptionsApi } from '../../api/useSubscriptionsApi';
+
+defineOptions({
+  name: 'WebhookSubscriptionModal',
+});
+const emits = defineEmits<{
+  (event: 'change', data: WebhookSubscriptionDto): void;
+}>();
+
+const FormItem = Form.Item;
+const FormItemRest = Form.ItemRest;
+const SelectGroup = Select.OptGroup;
+const SelectOption = Select.Option;
+const TabPane = Tabs.TabPane;
+
+const defaultModel: WebhookSubscriptionDto = {
+  creationTime: new Date(),
+  displayName: '',
+  extraProperties: {},
+  id: '',
+  isActive: true,
+  isStatic: false,
+  webhooks: [],
+  webhookUri: '',
+};
+type TabActiveKey = 'basic' | 'headers';
+
+const isEditModel = ref(false);
+const activeTabKey = ref<TabActiveKey>('basic');
+const form = useTemplateRef<FormInstance>('form');
+const formModel = ref<WebhookSubscriptionDto>({ ...defaultModel });
+const webhookGroups = ref<WebhookAvailableGroupDto[]>([]);
+const tenants = ref<TenantDto[]>([]);
+
+const { hasAccessByCodes } = useAccess();
+const { getPagedListApi: getTenantsApi } = useTenantsApi();
+const { cancel, createApi, getAllAvailableWebhooksApi, getApi, updateApi } =
+  useSubscriptionsApi();
+
+const [Modal, modalApi] = useVbenModal({
+  class: 'w-1/2',
+  draggable: true,
+  fullscreenButton: false,
+  onCancel() {
+    modalApi.close();
+  },
+  onClosed() {
+    cancel('WebhookSubscriptionModal has closed!');
+  },
+  onConfirm: async () => {
+    await form.value?.validate();
+    const input = toValue(formModel);
+    const api = isEditModel.value
+      ? updateApi(formModel.value.id, input)
+      : createApi(input);
+    try {
+      modalApi.setState({ submitting: true });
+      const res = await api;
+      emits('change', res);
+      message.success($t('AbpUi.SavedSuccessfully'));
+      modalApi.close();
+    } finally {
+      modalApi.setState({ submitting: false });
+    }
+  },
+  onOpenChange: async (isOpen: boolean) => {
+    if (isOpen) {
+      isEditModel.value = false;
+      activeTabKey.value = 'basic';
+      formModel.value = { ...defaultModel };
+      modalApi.setState({
+        loading: true,
+        showConfirmButton: true,
+        title: $t('WebhooksManagement.Subscriptions:AddNew'),
+      });
+      try {
+        const { id } = modalApi.getData<WebhookSubscriptionDto>();
+        await onInit();
+        !isNullOrWhiteSpace(id) && (await onGet(id));
+      } finally {
+        modalApi.setState({ loading: false });
+      }
+    }
+  },
+  title: $t('WebhooksManagement.Subscriptions:AddNew'),
+});
+async function onGet(id: string) {
+  isEditModel.value = true;
+  const dto = await getApi(id);
+  formModel.value = dto;
+  modalApi.setState({
+    showConfirmButton: !dto.isStatic,
+    title: $t('WebhooksManagement.Subscriptions:Edit'),
+  });
+}
+async function onInit() {
+  const [webhookGroupRes, tenantRes] = await Promise.all([
+    getAllAvailableWebhooksApi(),
+    onInitTenants(),
+  ]);
+  webhookGroups.value = webhookGroupRes.items;
+  tenants.value = tenantRes;
+}
+async function onInitTenants(filter?: string) {
+  if (!hasAccessByCodes(['AbpSaas.Tenants'])) {
+    return [];
+  }
+  const { items } = await getTenantsApi({ filter });
+  return items;
+}
+function onWebhooksFilter(onputValue: string, option: any) {
+  if (option.displayname) {
+    return option.displayname.includes(onputValue);
+  }
+  if (option.label) {
+    return option.label.includes(onputValue);
+  }
+  return true;
+}
+const onTenantsSearch = debounce(async (input?: string) => {
+  const tenantRes = await onInitTenants(input);
+  tenants.value = tenantRes;
+}, 500);
+function onPropChange(prop: PropertyInfo) {
+  formModel.value.headers ??= {};
+  formModel.value.headers[prop.key] = prop.value;
+}
+function onPropDelete(prop: PropertyInfo) {
+  formModel.value.headers ??= {};
+  delete formModel.value.headers[prop.key];
+}
+</script>
+
+<template>
+  <Modal>
+    <Form
+      ref="form"
+      :label-col="{ span: 6 }"
+      :model="formModel"
+      :wrapper-col="{ span: 18 }"
+    >
+      <Tabs v-model:active-key="activeTabKey">
+        <TabPane key="basic" :tab="$t('WebhooksManagement.BasicInfo')">
+          <FormItem
+            name="isActive"
+            :label="$t('WebhooksManagement.DisplayName:IsActive')"
+            :extra="$t('WebhooksManagement.Description:IsActive')"
+          >
+            <Checkbox
+              :disabled="formModel.isStatic"
+              v-model:checked="formModel.isActive"
+            >
+              {{ $t('WebhooksManagement.DisplayName:IsActive') }}
+            </Checkbox>
+          </FormItem>
+          <FormItem
+            :label="$t('WebhooksManagement.DisplayName:WebhookUri')"
+            :extra="$t('WebhooksManagement.Description:WebhookUri')"
+            name="webhookUri"
+            required
+          >
+            <Input
+              v-model:value="formModel.webhookUri"
+              :disabled="formModel.isStatic"
+              autocomplete="off"
+              allow-clear
+            />
+          </FormItem>
+          <FormItem
+            name="webhooks"
+            :label="$t('WebhooksManagement.DisplayName:Webhooks')"
+            :extra="$t('WebhooksManagement.Description:Webhooks')"
+          >
+            <Select
+              :disabled="formModel.isStatic"
+              allow-clear
+              mode="multiple"
+              v-model:value="formModel.webhooks"
+              :filter-option="onWebhooksFilter"
+            >
+              <SelectGroup
+                v-for="group in webhookGroups"
+                :key="group.name"
+                :label="group.displayName"
+              >
+                <SelectOption
+                  v-for="option in group.webhooks"
+                  :key="option.name"
+                  :value="option.name"
+                  :displayname="option.displayName"
+                >
+                  <Tooltip placement="right">
+                    <template #title>
+                      {{ option.description }}
+                    </template>
+                    {{ option.displayName }}
+                  </Tooltip>
+                </SelectOption>
+              </SelectGroup>
+            </Select>
+          </FormItem>
+          <FormItem
+            v-if="hasAccessByCodes(['AbpSaas.Tenants'])"
+            :label="$t('WebhooksManagement.DisplayName:TenantId')"
+            :extra="$t('WebhooksManagement.Description:TenantId')"
+            name="tenantId"
+          >
+            <Select
+              v-model:value="formModel.tenantId"
+              :disabled="formModel.isStatic"
+              :options="tenants"
+              :field-names="{ label: 'normalizedName', value: 'id' }"
+              :filter-option="false"
+              @search="onTenantsSearch"
+              show-search
+              allow-clear
+            />
+          </FormItem>
+          <FormItem
+            :label="$t('WebhooksManagement.DisplayName:TimeoutDuration')"
+            :extra="$t('WebhooksManagement.Description:TimeoutDuration')"
+            name="timeoutDuration"
+          >
+            <InputNumber
+              class="w-full"
+              v-model:value="formModel.timeoutDuration"
+              :disabled="formModel.isStatic"
+              :min="10"
+              :max="300"
+              autocomplete="off"
+            />
+          </FormItem>
+          <FormItem
+            :label="$t('WebhooksManagement.DisplayName:Secret')"
+            :extra="$t('WebhooksManagement.Description:Secret')"
+            name="secret"
+          >
+            <InputPassword
+              v-model:value="formModel.secret"
+              :disabled="formModel.isStatic"
+              autocomplete="off"
+              allow-clear
+            />
+          </FormItem>
+          <FormItem
+            :label="$t('WebhooksManagement.DisplayName:Description')"
+            name="description"
+          >
+            <Textarea
+              v-model:value="formModel.description"
+              :disabled="formModel.isStatic"
+              :auto-size="{ minRows: 3 }"
+              autocomplete="off"
+              allow-clear
+            />
+          </FormItem>
+        </TabPane>
+        <TabPane
+          key="headers"
+          :tab="$t('WebhooksManagement.DisplayName:Headers')"
+        >
+          <FormItemRest>
+            <PropertyTable
+              :data="formModel.headers"
+              :disabled="formModel.isStatic"
+              @change="onPropChange"
+              @delete="onPropDelete"
+            />
+          </FormItemRest>
+        </TabPane>
+      </Tabs>
+    </Form>
+  </Modal>
+</template>
+
+<style scoped></style>
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/subscriptions/WebhookSubscriptionTable.vue b/apps/vben5/packages/@abp/webhooks/src/components/subscriptions/WebhookSubscriptionTable.vue
new file mode 100644
index 000000000..46e1f9474
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/components/subscriptions/WebhookSubscriptionTable.vue
@@ -0,0 +1,317 @@
+<script setup lang="ts">
+import type { VxeGridListeners, VxeGridProps } from '@abp/ui';
+
+import type { VbenFormProps } from '@vben/common-ui';
+
+import type { WebhookSubscriptionDto } from '../../types/subscriptions';
+
+import { defineAsyncComponent, h, ref } from 'vue';
+
+import { useAccess } from '@vben/access';
+import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+
+import { formatToDateTime } from '@abp/core';
+import { useTenantsApi } from '@abp/saas';
+import { useVbenVxeGrid } from '@abp/ui';
+import {
+  CheckOutlined,
+  CloseOutlined,
+  DeleteOutlined,
+  EditOutlined,
+  PlusOutlined,
+} from '@ant-design/icons-vue';
+import { Button, message, Modal, Tag } from 'ant-design-vue';
+import debounce from 'lodash.debounce';
+
+import { useSubscriptionsApi } from '../../api/useSubscriptionsApi';
+import { WebhookSubscriptionPermissions } from '../../constants/permissions';
+
+defineOptions({
+  name: 'WebhookSubscriptionTable',
+});
+
+const { hasAccessByCodes } = useAccess();
+const { getPagedListApi: getTenantsApi } = useTenantsApi();
+const { cancel, deleteApi, getAllAvailableWebhooksApi, getPagedListApi } =
+  useSubscriptionsApi();
+
+const tenantFilter = ref<string>();
+const selectedKeys = ref<string[]>([]);
+
+const formOptions: VbenFormProps = {
+  collapsed: true,
+  collapsedRows: 2,
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+  },
+  fieldMappingTime: [
+    [
+      'creationTime',
+      ['beginCreationTime', 'endCreationTime'],
+      ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
+    ],
+  ],
+  schema: [
+    {
+      component: 'ApiSelect',
+      componentProps: () => {
+        return {
+          allowClear: true,
+          api: getTenantsApi,
+          filterOption: false,
+          labelField: 'normalizedName',
+          onSearch: debounce((filter?: string) => {
+            tenantFilter.value = filter;
+          }, 500),
+          params: {
+            filter: tenantFilter.value || undefined,
+          },
+          resultField: 'items',
+          showSearch: true,
+          valueField: 'id',
+        };
+      },
+      fieldName: 'tenantId',
+      label: $t('WebhooksManagement.DisplayName:TenantId'),
+    },
+    {
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: onInitWebhooks,
+        filterOption: (onputValue: string, option: any) => {
+          return option.label.includes(onputValue);
+        },
+        showSearch: true,
+      },
+      fieldName: 'webhooks',
+      label: $t('WebhooksManagement.DisplayName:Webhooks'),
+    },
+    {
+      component: 'RangePicker',
+      fieldName: 'creationTime',
+      label: $t('WebhooksManagement.DisplayName:CreationTime'),
+    },
+    {
+      component: 'Input',
+      fieldName: 'webhookUri',
+      formItemClass: 'col-span-2 items-baseline',
+      label: $t('WebhooksManagement.DisplayName:WebhookUri'),
+    },
+    {
+      component: 'Checkbox',
+      fieldName: 'isActive',
+      label: $t('WebhooksManagement.DisplayName:IsActive'),
+    },
+    {
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+      },
+      fieldName: 'filter',
+      formItemClass: 'col-span-3 items-baseline',
+      label: $t('AbpUi.Search'),
+    },
+  ],
+  // 控制表单是否显示折叠按钮
+  showCollapseButton: true,
+  // 按下回车时是否提交表单
+  submitOnEnter: true,
+};
+
+const gridOptions: VxeGridProps<WebhookSubscriptionDto> = {
+  columns: [
+    {
+      align: 'center',
+      fixed: 'left',
+      type: 'checkbox',
+      width: 40,
+    },
+    {
+      align: 'left',
+      field: 'isActive',
+      fixed: 'left',
+      minWidth: 150,
+      slots: { default: 'isActive' },
+      title: $t('WebhooksManagement.DisplayName:IsActive'),
+    },
+    {
+      align: 'left',
+      field: 'tenantId',
+      fixed: 'left',
+      minWidth: 150,
+      title: $t('WebhooksManagement.DisplayName:TenantId'),
+    },
+    {
+      align: 'left',
+      field: 'webhookUri',
+      fixed: 'left',
+      minWidth: 300,
+      title: $t('WebhooksManagement.DisplayName:WebhookUri'),
+    },
+    {
+      align: 'left',
+      field: 'description',
+      minWidth: 150,
+      title: $t('WebhooksManagement.DisplayName:Description'),
+    },
+    {
+      align: 'left',
+      field: 'creationTime',
+      formatter({ cellValue }) {
+        return cellValue ? formatToDateTime(cellValue) : '';
+      },
+      minWidth: 120,
+      title: $t('WebhooksManagement.DisplayName:CreationTime'),
+    },
+    {
+      align: 'left',
+      field: 'webhooks',
+      minWidth: 150,
+      slots: { default: 'webhooks' },
+      title: $t('WebhooksManagement.DisplayName:Webhooks'),
+    },
+    {
+      field: 'action',
+      fixed: 'right',
+      slots: { default: 'action' },
+      title: $t('AbpUi.Actions'),
+      width: 200,
+    },
+  ],
+  exportConfig: {},
+  keepSource: true,
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues) => {
+        return await getPagedListApi({
+          maxResultCount: page.pageSize,
+          skipCount: (page.currentPage - 1) * page.pageSize,
+          ...formValues,
+        });
+      },
+    },
+    response: {
+      total: 'totalCount',
+      list: 'items',
+    },
+  },
+  toolbarConfig: {
+    custom: true,
+    export: true,
+    // import: true,
+    refresh: true,
+    zoom: true,
+  },
+};
+
+const gridEvents: VxeGridListeners<WebhookSubscriptionDto> = {
+  checkboxAll: (params) => {
+    selectedKeys.value = params.records.map((record) => record.id);
+  },
+  checkboxChange: (params) => {
+    selectedKeys.value = params.records.map((record) => record.id);
+  },
+};
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions,
+  gridEvents,
+  gridOptions,
+});
+
+const [WebhookSubscriptionModal, modalApi] = useVbenModal({
+  connectedComponent: defineAsyncComponent(
+    () => import('./WebhookSubscriptionModal.vue'),
+  ),
+});
+
+async function onInitWebhooks() {
+  if (hasAccessByCodes([WebhookSubscriptionPermissions.Default])) {
+    const { items } = await getAllAvailableWebhooksApi();
+    return items.map((group) => {
+      return {
+        label: group.displayName,
+        options: group.webhooks.map((p) => {
+          return {
+            label: p.displayName,
+            value: p.name,
+          };
+        }),
+        value: group.name,
+      };
+    });
+  }
+  return [];
+}
+
+function onCreate() {
+  modalApi.setData({});
+  modalApi.open();
+}
+
+function onUpdate(row: WebhookSubscriptionDto) {
+  modalApi.setData(row);
+  modalApi.open();
+}
+
+function onDelete(row: WebhookSubscriptionDto) {
+  Modal.confirm({
+    centered: true,
+    content: $t('AbpUi.ItemWillBeDeletedMessageWithFormat', [row.title]),
+    onCancel: () => {
+      cancel();
+    },
+    onOk: async () => {
+      await deleteApi(row.id);
+      message.success($t('AbpUi.DeletedSuccessfully'));
+      await gridApi.query();
+    },
+    title: $t('AbpUi.AreYouSure'),
+  });
+}
+</script>
+
+<template>
+  <Grid :table-title="$t('WebhooksManagement.Subscriptions')">
+    <template #toolbar-tools>
+      <Button :icon="h(PlusOutlined)" type="primary" @click="onCreate">
+        {{ $t('WebhooksManagement.Subscriptions:AddNew') }}
+      </Button>
+    </template>
+    <template #isActive="{ row }">
+      <div class="flex flex-row justify-center">
+        <CheckOutlined v-if="row.isActive" class="text-green-500" />
+        <CloseOutlined v-else class="text-red-500" />
+      </div>
+    </template>
+    <template #webhooks="{ row }">
+      <div class="flex flex-row justify-center gap-1">
+        <template v-for="webhook in row.webhooks" :key="webhook">
+          <Tag color="blue">{{ webhook }}</Tag>
+        </template>
+      </div>
+    </template>
+    <template #action="{ row }">
+      <div class="flex flex-row">
+        <Button :icon="h(EditOutlined)" type="link" @click="onUpdate(row)">
+          {{ $t('AbpUi.Edit') }}
+        </Button>
+        <Button
+          :icon="h(DeleteOutlined)"
+          danger
+          type="link"
+          @click="onDelete(row)"
+        >
+          {{ $t('AbpUi.Delete') }}
+        </Button>
+      </div>
+    </template>
+  </Grid>
+  <WebhookSubscriptionModal @change="() => gridApi.query()" />
+</template>
+
+<style lang="scss" scoped></style>
diff --git a/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts b/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts
index 73156c1b8..f64defbbc 100644
--- a/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts
@@ -19,3 +19,14 @@ export const WebhookDefinitionsPermissions = {
   /** 更新 */
   Update: 'AbpWebhooks.Definitions.Update',
 };
+
+/** Webhook订阅权限 */
+export const WebhookSubscriptionPermissions = {
+  /** 新增 */
+  Create: 'AbpWebhooks.Subscriptions.Create',
+  Default: 'AbpWebhooks.Subscriptions',
+  /** 删除 */
+  Delete: 'AbpWebhooks.Subscriptions.Delete',
+  /** 更新 */
+  Update: 'AbpWebhooks.Subscriptions.Update',
+};
diff --git a/apps/vben5/packages/@abp/webhooks/src/types/index.ts b/apps/vben5/packages/@abp/webhooks/src/types/index.ts
index 6a41718f6..2815a630b 100644
--- a/apps/vben5/packages/@abp/webhooks/src/types/index.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/types/index.ts
@@ -1,2 +1,3 @@
 export * from './definitions';
 export * from './groups';
+export * from './subscriptions';
diff --git a/apps/vben5/packages/@abp/webhooks/src/types/subscriptions.ts b/apps/vben5/packages/@abp/webhooks/src/types/subscriptions.ts
new file mode 100644
index 000000000..e88459dfb
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/types/subscriptions.ts
@@ -0,0 +1,73 @@
+import type {
+  CreationAuditedEntityDto,
+  IHasConcurrencyStamp,
+  PagedAndSortedResultRequestDto,
+} from '@abp/core';
+
+interface WebhookSubscriptionDto
+  extends CreationAuditedEntityDto<string>,
+    IHasConcurrencyStamp {
+  description?: string;
+  headers?: Record<string, string>;
+  isActive: boolean;
+  secret?: string;
+  tenantId?: string;
+  timeoutDuration?: number;
+  webhooks: string[];
+  webhookUri: string;
+}
+
+interface WebhookSubscriptionCreateOrUpdateDto {
+  description?: string;
+  headers?: Record<string, string>;
+  isActive: boolean;
+  secret?: string;
+  tenantId?: string;
+  timeoutDuration?: number;
+  webhooks: string[];
+  webhookUri: string;
+}
+
+type WebhookSubscriptionCreateDto = WebhookSubscriptionCreateOrUpdateDto;
+
+interface WebhookSubscriptionUpdateDto
+  extends IHasConcurrencyStamp,
+    WebhookSubscriptionCreateOrUpdateDto {}
+
+interface WebhookSubscriptionDeleteManyInput {
+  recordIds: string[];
+}
+
+interface WebhookSubscriptionGetListInput
+  extends PagedAndSortedResultRequestDto {
+  beginCreationTime?: Date;
+  endCreationTime?: Date;
+  filter?: string;
+  isActive?: boolean;
+  secret?: string;
+  tenantId?: string;
+  webhooks?: string;
+  webhookUri?: string;
+}
+
+interface WebhookAvailableDto {
+  description?: string;
+  displayName: string;
+  name: string;
+}
+
+interface WebhookAvailableGroupDto {
+  displayName: string;
+  name: string;
+  webhooks: WebhookAvailableDto[];
+}
+
+export type {
+  WebhookAvailableDto,
+  WebhookAvailableGroupDto,
+  WebhookSubscriptionCreateDto,
+  WebhookSubscriptionDeleteManyInput,
+  WebhookSubscriptionDto,
+  WebhookSubscriptionGetListInput,
+  WebhookSubscriptionUpdateDto,
+};

From 3bbd2a1cb5f59ee47a5796488dd367fa5604d560 Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Mon, 21 Apr 2025 17:47:50 +0800
Subject: [PATCH 08/11] =?UTF-8?q?feat(vben5):=20=E5=A2=9E=E5=8A=A0http?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BB=A3=E7=A0=81hooks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../@abp/request/src/constants/httpStatus.ts  | 44 +++++++++++
 .../@abp/request/src/constants/index.ts       |  1 +
 .../packages/@abp/request/src/hooks/index.ts  |  1 +
 .../request/src/hooks/useHttpStatusCodeMap.ts | 76 +++++++++++++++++++
 apps/vben5/packages/@abp/request/src/index.ts |  1 +
 5 files changed, 123 insertions(+)
 create mode 100644 apps/vben5/packages/@abp/request/src/constants/httpStatus.ts
 create mode 100644 apps/vben5/packages/@abp/request/src/constants/index.ts
 create mode 100644 apps/vben5/packages/@abp/request/src/hooks/useHttpStatusCodeMap.ts

diff --git a/apps/vben5/packages/@abp/request/src/constants/httpStatus.ts b/apps/vben5/packages/@abp/request/src/constants/httpStatus.ts
new file mode 100644
index 000000000..4256fe315
--- /dev/null
+++ b/apps/vben5/packages/@abp/request/src/constants/httpStatus.ts
@@ -0,0 +1,44 @@
+export enum HttpStatusCode {
+  Accepted = 202,
+  Ambiguous = 300,
+  BadGateway = 502,
+  BadRequest = 400,
+  Conflict = 409,
+  Continue = 100,
+  Created = 201,
+  ExpectationFailed = 417,
+  Forbidden = 403,
+  GatewayTimeout = 504,
+  Gone = 410,
+  HttpVersionNotSupported = 505,
+  InternalServerError = 500,
+  LengthRequired = 411,
+  MethodNotAllowed = 405,
+  Moved = 301,
+  NoContent = 204,
+  NonAuthoritativeInformation = 203,
+  NotAcceptable = 406,
+  NotFound = 404,
+  NotImplemented = 501,
+  NotModified = 304,
+  OK = 200,
+  PartialContent = 206,
+  PaymentRequired = 402,
+  PreconditionFailed = 412,
+  ProxyAuthenticationRequired = 407,
+  Redirect = 302,
+  RedirectKeepVerb = 307,
+  RedirectMethod = 303,
+  RequestedRangeNotSatisfiable = 416,
+  RequestEntityTooLarge = 413,
+  RequestTimeout = 408,
+  RequestUriTooLong = 414,
+  ResetContent = 205,
+  ServiceUnavailable = 503,
+  SwitchingProtocols = 101,
+  Unauthorized = 401,
+  UnsupportedMediaType = 415,
+  Unused = 306,
+  UpgradeRequired = 426,
+  UseProxy = 305,
+}
diff --git a/apps/vben5/packages/@abp/request/src/constants/index.ts b/apps/vben5/packages/@abp/request/src/constants/index.ts
new file mode 100644
index 000000000..6b6cc383f
--- /dev/null
+++ b/apps/vben5/packages/@abp/request/src/constants/index.ts
@@ -0,0 +1 @@
+export * from './httpStatus';
diff --git a/apps/vben5/packages/@abp/request/src/hooks/index.ts b/apps/vben5/packages/@abp/request/src/hooks/index.ts
index 0c4767a5f..229c41551 100644
--- a/apps/vben5/packages/@abp/request/src/hooks/index.ts
+++ b/apps/vben5/packages/@abp/request/src/hooks/index.ts
@@ -1,3 +1,4 @@
 export * from './useErrorFormat';
+export * from './useHttpStatusCodeMap';
 export * from './useRequest';
 export * from './useWrapperResult';
diff --git a/apps/vben5/packages/@abp/request/src/hooks/useHttpStatusCodeMap.ts b/apps/vben5/packages/@abp/request/src/hooks/useHttpStatusCodeMap.ts
new file mode 100644
index 000000000..ac442b7d1
--- /dev/null
+++ b/apps/vben5/packages/@abp/request/src/hooks/useHttpStatusCodeMap.ts
@@ -0,0 +1,76 @@
+import { HttpStatusCode } from '../constants/httpStatus';
+
+export function useHttpStatusCodeMap() {
+  const httpStatusCodeMap: { [key: number]: string } = {
+    [HttpStatusCode.Accepted]: '202 - Accepted',
+    [HttpStatusCode.Ambiguous]: '300 - Ambiguous/Multiple Choices',
+    [HttpStatusCode.BadGateway]: '502 - Bad Gateway',
+    [HttpStatusCode.BadRequest]: '400 - Bad Request',
+    [HttpStatusCode.Conflict]: '409 - Conflict',
+    [HttpStatusCode.Continue]: '100 - Continue',
+    [HttpStatusCode.Created]: '201 - Created',
+    [HttpStatusCode.ExpectationFailed]: '417 - Expectation Failed',
+    [HttpStatusCode.Forbidden]: '403 - Forbidden',
+    [HttpStatusCode.GatewayTimeout]: '504 - Gateway Timeout',
+    [HttpStatusCode.Gone]: '410 - Gone',
+    [HttpStatusCode.HttpVersionNotSupported]:
+      '505 - Http Version Not Supported',
+    [HttpStatusCode.InternalServerError]: '500 - Internal Server Error',
+    [HttpStatusCode.LengthRequired]: '411 - Length Required',
+    [HttpStatusCode.MethodNotAllowed]: '405 - Method Not Allowed',
+    [HttpStatusCode.Moved]: '301 - Moved/Moved Permanently',
+    [HttpStatusCode.NoContent]: '204 - No Content',
+    [HttpStatusCode.NonAuthoritativeInformation]:
+      '203 - Non Authoritative Information',
+    [HttpStatusCode.NotAcceptable]: '406 - Not Acceptable',
+    [HttpStatusCode.NotFound]: '404 - Not Found',
+    [HttpStatusCode.NotImplemented]: '501 - Not Implemented',
+    [HttpStatusCode.NotModified]: '304 - Not Modified',
+    [HttpStatusCode.OK]: '200 - OK',
+    [HttpStatusCode.PartialContent]: '206 - Partial Content',
+    [HttpStatusCode.PaymentRequired]: '402 - Payment Required',
+    [HttpStatusCode.PreconditionFailed]: '412 - Precondition Failed',
+    [HttpStatusCode.ProxyAuthenticationRequired]:
+      '407 - Proxy Authentication Required',
+    [HttpStatusCode.Redirect]: '302 - Found/Redirect',
+    [HttpStatusCode.RedirectKeepVerb]:
+      '307 - Redirect Keep Verb/Temporary Redirect',
+    [HttpStatusCode.RedirectMethod]: '303 - Redirect Method/See Other',
+    [HttpStatusCode.RequestedRangeNotSatisfiable]:
+      '416 - Requested Range Not Satisfiable',
+    [HttpStatusCode.RequestEntityTooLarge]: '413 - Request Entity Too Large',
+    [HttpStatusCode.RequestTimeout]: '408 - Request Timeout',
+    [HttpStatusCode.RequestUriTooLong]: '414 - Request Uri Too Long',
+    [HttpStatusCode.ResetContent]: '205 - Reset Content',
+    [HttpStatusCode.ServiceUnavailable]: '503 - Service Unavailable',
+    [HttpStatusCode.SwitchingProtocols]: '101 - Switching Protocols',
+    [HttpStatusCode.Unauthorized]: '401 - Unauthorized',
+    [HttpStatusCode.UnsupportedMediaType]: '415 - Unsupported Media Type',
+    [HttpStatusCode.Unused]: '306 - Unused',
+    [HttpStatusCode.UpgradeRequired]: '426 - Upgrade Required',
+    [HttpStatusCode.UseProxy]: '305 - Use Proxy',
+  };
+
+  function getHttpStatusColor(statusCode: HttpStatusCode) {
+    if (statusCode < 200) {
+      return 'default';
+    }
+    if (statusCode >= 200 && statusCode < 300) {
+      return 'success';
+    }
+    if (statusCode >= 300 && statusCode < 400) {
+      return 'processing';
+    }
+    if (statusCode >= 400 && statusCode < 500) {
+      return 'warning';
+    }
+    if (statusCode >= 500) {
+      return 'error';
+    }
+  }
+
+  return {
+    getHttpStatusColor,
+    httpStatusCodeMap,
+  };
+}
diff --git a/apps/vben5/packages/@abp/request/src/index.ts b/apps/vben5/packages/@abp/request/src/index.ts
index 5c13205f7..af59094a0 100644
--- a/apps/vben5/packages/@abp/request/src/index.ts
+++ b/apps/vben5/packages/@abp/request/src/index.ts
@@ -6,6 +6,7 @@ import type { RequestClientOptions } from '@vben/request';
 import { useAppConfig } from '@vben/hooks';
 import { RequestClient } from '@vben/request';
 
+export * from './constants';
 export * from './hooks';
 export * from './types';
 

From 14335836c72a383636e7896e5c03b61f6a904a3f Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Mon, 21 Apr 2025 17:48:24 +0800
Subject: [PATCH 09/11] =?UTF-8?q?feat(vben5):=20=E5=A2=9E=E5=8A=A0Webhook?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app-antd/src/locales/langs/en-US/abp.json |   3 +-
 .../app-antd/src/locales/langs/zh-CN/abp.json |   3 +-
 .../app-antd/src/router/routes/modules/abp.ts |   9 +
 .../views/webhooks/send-attempts/index.vue    |  15 ++
 .../packages/@abp/webhooks/src/api/index.ts   |   1 +
 .../webhooks/src/api/useSendAttemptsApi.ts    |  93 +++++++
 .../@abp/webhooks/src/components/index.ts     |   1 +
 .../send-attempts/WebhookSendAttemptTable.vue | 253 ++++++++++++++++++
 .../WebhookSubscriptionTable.vue              |   4 +-
 .../packages/@abp/webhooks/src/types/index.ts |   1 +
 .../@abp/webhooks/src/types/sendAttempts.ts   |  51 ++++
 11 files changed, 430 insertions(+), 4 deletions(-)
 create mode 100644 apps/vben5/apps/app-antd/src/views/webhooks/send-attempts/index.vue
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/api/useSendAttemptsApi.ts
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptTable.vue
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/types/sendAttempts.ts

diff --git a/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json b/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json
index 6de53754e..2bda6ce06 100644
--- a/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json
+++ b/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json
@@ -118,6 +118,7 @@
     "title": "Webhooks",
     "groups": "Groups",
     "definitions": "Definitions",
-    "subscriptions": "Subscriptions"
+    "subscriptions": "Subscriptions",
+    "sendAttempts": "Send Attempts"
   }
 }
diff --git a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json
index 08ff8f8e5..5efb8914d 100644
--- a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json
+++ b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json
@@ -118,6 +118,7 @@
     "title": "Webhook管理",
     "groups": "Webhook分组",
     "definitions": "Webhook定义",
-    "subscriptions": "管理订阅"
+    "subscriptions": "管理订阅",
+    "sendAttempts": "发送记录"
   }
 }
diff --git a/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts b/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts
index 2ec6407a1..11889b8f0 100644
--- a/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts
+++ b/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts
@@ -485,6 +485,15 @@ const routes: RouteRecordRaw[] = [
             path: '/webhooks/subscriptions',
             component: () => import('#/views/webhooks/subscriptions/index.vue'),
           },
+          {
+            meta: {
+              title: $t('abp.webhooks.sendAttempts'),
+              icon: 'material-symbols:history',
+            },
+            name: 'WebhookSendAttempts',
+            path: '/webhooks/send-attempts',
+            component: () => import('#/views/webhooks/send-attempts/index.vue'),
+          },
         ],
       },
       {
diff --git a/apps/vben5/apps/app-antd/src/views/webhooks/send-attempts/index.vue b/apps/vben5/apps/app-antd/src/views/webhooks/send-attempts/index.vue
new file mode 100644
index 000000000..c4ba9230d
--- /dev/null
+++ b/apps/vben5/apps/app-antd/src/views/webhooks/send-attempts/index.vue
@@ -0,0 +1,15 @@
+<script lang="ts" setup>
+import { Page } from '@vben/common-ui';
+
+import { WebhookSendAttemptTable } from '@abp/webhooks';
+
+defineOptions({
+  name: 'WebhookSendAttempts',
+});
+</script>
+
+<template>
+  <Page>
+    <WebhookSendAttemptTable />
+  </Page>
+</template>
diff --git a/apps/vben5/packages/@abp/webhooks/src/api/index.ts b/apps/vben5/packages/@abp/webhooks/src/api/index.ts
index 0a30bdd2a..acbff7f7e 100644
--- a/apps/vben5/packages/@abp/webhooks/src/api/index.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/api/index.ts
@@ -1,3 +1,4 @@
+export * from './useSendAttemptsApi';
 export * from './useSubscriptionsApi';
 export * from './useWebhookDefinitionsApi';
 export * from './useWebhookGroupDefinitionsApi';
diff --git a/apps/vben5/packages/@abp/webhooks/src/api/useSendAttemptsApi.ts b/apps/vben5/packages/@abp/webhooks/src/api/useSendAttemptsApi.ts
new file mode 100644
index 000000000..5cf292be5
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/api/useSendAttemptsApi.ts
@@ -0,0 +1,93 @@
+import type { PagedResultDto } from '@abp/core';
+
+import type {
+  WebhookSendRecordDeleteManyInput,
+  WebhookSendRecordDto,
+  WebhookSendRecordGetListInput,
+  WebhookSendRecordResendManyInput,
+} from '../types/sendAttempts';
+
+import { useRequest } from '@abp/request';
+
+export function useSendAttemptsApi() {
+  const { cancel, request } = useRequest();
+
+  /**
+   * 查询发送记录
+   * @param id 记录Id
+   * @returns 发送记录Dto
+   */
+  function getApi(id: string): Promise<WebhookSendRecordDto> {
+    return request<WebhookSendRecordDto>(`/api/webhooks/send-attempts/${id}`, {
+      method: 'GET',
+    });
+  }
+  /**
+   * 删除发送记录
+   * @param id 记录Id
+   */
+  function deleteApi(id: string): Promise<void> {
+    return request(`/api/webhooks/send-attempts/${id}`, {
+      method: 'DELETE',
+    });
+  }
+  /**
+   * 批量删除发送记录
+   * @param input 参数
+   */
+  function bulkDeleteApi(
+    input: WebhookSendRecordDeleteManyInput,
+  ): Promise<void> {
+    return request(`/api/webhooks/send-attempts/delete-many`, {
+      data: input,
+      method: 'DELETE',
+    });
+  }
+  /**
+   * 查询发送记录分页列表
+   * @param input 过滤参数
+   * @returns 发送记录Dto分页列表
+   */
+  function getPagedListApi(
+    input: WebhookSendRecordGetListInput,
+  ): Promise<PagedResultDto<WebhookSendRecordDto>> {
+    return request<PagedResultDto<WebhookSendRecordDto>>(
+      `/api/webhooks/send-attempts`,
+      {
+        method: 'GET',
+        params: input,
+      },
+    );
+  }
+  /**
+   * 重新发送
+   * @param id 记录Id
+   */
+  function reSendApi(id: string): Promise<void> {
+    return request(`/api/webhooks/send-attempts/${id}/resend`, {
+      method: 'POST',
+    });
+  }
+  /**
+   * 批量重新发送
+   * @param input 参数
+   */
+  function bulkReSendApi(
+    input: WebhookSendRecordResendManyInput,
+  ): Promise<void> {
+    return request(`/api/webhooks/send-attempts/resend-many`, {
+      data: input,
+      method: 'POST',
+    });
+  }
+
+  return {
+    bulkDeleteApi,
+    bulkReSendApi,
+    cancel,
+    deleteApi,
+    getApi,
+    getPagedListApi,
+    reSendApi,
+  };
+}
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/index.ts b/apps/vben5/packages/@abp/webhooks/src/components/index.ts
index 41763338c..55dd81137 100644
--- a/apps/vben5/packages/@abp/webhooks/src/components/index.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/components/index.ts
@@ -1,3 +1,4 @@
 export { default as WebhookGroupDefinitionTable } from './definitions/groups/WebhookGroupDefinitionTable.vue';
 export { default as WebhookDefinitionTable } from './definitions/webhooks/WebhookDefinitionTable.vue';
+export { default as WebhookSendAttemptTable } from './send-attempts/WebhookSendAttemptTable.vue';
 export { default as WebhookSubscriptionTable } from './subscriptions/WebhookSubscriptionTable.vue';
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptTable.vue b/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptTable.vue
new file mode 100644
index 000000000..13a1585a8
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptTable.vue
@@ -0,0 +1,253 @@
+<script setup lang="ts">
+import type { VxeGridListeners, VxeGridProps } from '@abp/ui';
+
+import type { VbenFormProps } from '@vben/common-ui';
+
+import type { WebhookSendRecordDto } from '../../types/sendAttempts';
+
+import { h, ref } from 'vue';
+
+import { $t } from '@vben/locales';
+
+import { formatToDateTime } from '@abp/core';
+import { useHttpStatusCodeMap } from '@abp/request';
+import { useTenantsApi } from '@abp/saas';
+import { useVbenVxeGrid } from '@abp/ui';
+import { DeleteOutlined, EditOutlined } from '@ant-design/icons-vue';
+import { Button, message, Modal, Tag } from 'ant-design-vue';
+import debounce from 'lodash.debounce';
+
+import { useSendAttemptsApi } from '../../api/useSendAttemptsApi';
+
+defineOptions({
+  name: 'WebhookSendAttemptTable',
+});
+
+const { getPagedListApi: getTenantsApi } = useTenantsApi();
+const { cancel, deleteApi, getPagedListApi } = useSendAttemptsApi();
+const { getHttpStatusColor, httpStatusCodeMap } = useHttpStatusCodeMap();
+
+const tenantFilter = ref<string>();
+const selectedKeys = ref<string[]>([]);
+
+const httpStatusOptions = Object.keys(httpStatusCodeMap).map((key) => {
+  return {
+    label: httpStatusCodeMap[Number(key)],
+    value: key,
+  };
+});
+
+const formOptions: VbenFormProps = {
+  collapsed: true,
+  collapsedRows: 3,
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+  },
+  fieldMappingTime: [
+    [
+      'creationTime',
+      ['beginCreationTime', 'endCreationTime'],
+      ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
+    ],
+  ],
+  schema: [
+    {
+      component: 'ApiSelect',
+      componentProps: () => {
+        return {
+          allowClear: true,
+          api: getTenantsApi,
+          filterOption: false,
+          labelField: 'normalizedName',
+          onSearch: debounce((filter?: string) => {
+            tenantFilter.value = filter;
+          }, 500),
+          params: {
+            filter: tenantFilter.value || undefined,
+          },
+          resultField: 'items',
+          showSearch: true,
+          valueField: 'id',
+        };
+      },
+      fieldName: 'tenantId',
+      label: $t('WebhooksManagement.DisplayName:TenantId'),
+    },
+    {
+      component: 'RangePicker',
+      fieldName: 'creationTime',
+      label: $t('WebhooksManagement.DisplayName:CreationTime'),
+    },
+    {
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: [
+          {
+            label: $t('WebhooksManagement.ResponseState:Successed'),
+            value: true,
+          },
+          {
+            label: $t('WebhooksManagement.ResponseState:Failed'),
+            value: false,
+          },
+        ],
+      },
+      fieldName: 'state',
+      label: $t('WebhooksManagement.DisplayName:State'),
+    },
+    {
+      component: 'Select',
+      componentProps: {
+        options: httpStatusOptions,
+      },
+      fieldName: 'responseStatusCode',
+      label: $t('WebhooksManagement.DisplayName:ResponseStatusCode'),
+    },
+    {
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+      },
+      fieldName: 'filter',
+      formItemClass: 'col-span-2 items-baseline',
+      label: $t('AbpUi.Search'),
+    },
+  ],
+  // 控制表单是否显示折叠按钮
+  showCollapseButton: true,
+  // 按下回车时是否提交表单
+  submitOnEnter: true,
+};
+
+const gridOptions: VxeGridProps<WebhookSendRecordDto> = {
+  columns: [
+    {
+      align: 'center',
+      type: 'checkbox',
+      width: 40,
+    },
+    {
+      align: 'left',
+      field: 'tenantId',
+      minWidth: 150,
+      title: $t('WebhooksManagement.DisplayName:TenantId'),
+    },
+    {
+      align: 'left',
+      field: 'responseStatusCode',
+      minWidth: 150,
+      slots: { default: 'responseStatusCode' },
+      title: $t('WebhooksManagement.DisplayName:ResponseStatusCode'),
+    },
+    {
+      align: 'left',
+      field: 'creationTime',
+      formatter({ cellValue }) {
+        return cellValue ? formatToDateTime(cellValue) : '';
+      },
+      minWidth: 120,
+      title: $t('WebhooksManagement.DisplayName:CreationTime'),
+    },
+    {
+      align: 'center',
+      field: 'response',
+      minWidth: 300,
+      title: $t('WebhooksManagement.DisplayName:Response'),
+    },
+    {
+      field: 'action',
+      fixed: 'right',
+      slots: { default: 'action' },
+      title: $t('AbpUi.Actions'),
+      width: 200,
+    },
+  ],
+  exportConfig: {},
+  keepSource: true,
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues) => {
+        return await getPagedListApi({
+          maxResultCount: page.pageSize,
+          skipCount: (page.currentPage - 1) * page.pageSize,
+          ...formValues,
+        });
+      },
+    },
+    response: {
+      total: 'totalCount',
+      list: 'items',
+    },
+  },
+  toolbarConfig: {
+    custom: true,
+    export: true,
+    // import: true,
+    refresh: true,
+    zoom: true,
+  },
+};
+
+const gridEvents: VxeGridListeners<WebhookSendRecordDto> = {
+  checkboxAll: (params) => {
+    selectedKeys.value = params.records.map((record) => record.id);
+  },
+  checkboxChange: (params) => {
+    selectedKeys.value = params.records.map((record) => record.id);
+  },
+};
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions,
+  gridEvents,
+  gridOptions,
+});
+
+function onUpdate(_row: WebhookSendRecordDto) {}
+
+function onDelete(row: WebhookSendRecordDto) {
+  Modal.confirm({
+    centered: true,
+    content: $t('AbpUi.ItemWillBeDeletedMessageWithFormat', [row.title]),
+    onCancel: () => {
+      cancel();
+    },
+    onOk: async () => {
+      await deleteApi(row.id);
+      message.success($t('AbpUi.DeletedSuccessfully'));
+      await gridApi.query();
+    },
+    title: $t('AbpUi.AreYouSure'),
+  });
+}
+</script>
+
+<template>
+  <Grid :table-title="$t('WebhooksManagement.SendAttempts')">
+    <template #responseStatusCode="{ row }">
+      <Tag :color="getHttpStatusColor(row.responseStatusCode)">
+        {{ httpStatusCodeMap[row.responseStatusCode] }}
+      </Tag>
+    </template>
+    <template #action="{ row }">
+      <div class="flex flex-row">
+        <Button :icon="h(EditOutlined)" type="link" @click="onUpdate(row)">
+          {{ $t('AbpUi.Edit') }}
+        </Button>
+        <Button
+          :icon="h(DeleteOutlined)"
+          danger
+          type="link"
+          @click="onDelete(row)"
+        >
+          {{ $t('AbpUi.Delete') }}
+        </Button>
+      </div>
+    </template>
+  </Grid>
+</template>
+
+<style lang="scss" scoped></style>
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/subscriptions/WebhookSubscriptionTable.vue b/apps/vben5/packages/@abp/webhooks/src/components/subscriptions/WebhookSubscriptionTable.vue
index 46e1f9474..d96f61d43 100644
--- a/apps/vben5/packages/@abp/webhooks/src/components/subscriptions/WebhookSubscriptionTable.vue
+++ b/apps/vben5/packages/@abp/webhooks/src/components/subscriptions/WebhookSubscriptionTable.vue
@@ -168,9 +168,9 @@ const gridOptions: VxeGridProps<WebhookSubscriptionDto> = {
       title: $t('WebhooksManagement.DisplayName:CreationTime'),
     },
     {
-      align: 'left',
+      align: 'center',
       field: 'webhooks',
-      minWidth: 150,
+      minWidth: 300,
       slots: { default: 'webhooks' },
       title: $t('WebhooksManagement.DisplayName:Webhooks'),
     },
diff --git a/apps/vben5/packages/@abp/webhooks/src/types/index.ts b/apps/vben5/packages/@abp/webhooks/src/types/index.ts
index 2815a630b..371b52ee2 100644
--- a/apps/vben5/packages/@abp/webhooks/src/types/index.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/types/index.ts
@@ -1,3 +1,4 @@
 export * from './definitions';
 export * from './groups';
+export * from './sendAttempts';
 export * from './subscriptions';
diff --git a/apps/vben5/packages/@abp/webhooks/src/types/sendAttempts.ts b/apps/vben5/packages/@abp/webhooks/src/types/sendAttempts.ts
new file mode 100644
index 000000000..582e0e3c2
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/types/sendAttempts.ts
@@ -0,0 +1,51 @@
+import type { EntityDto, PagedAndSortedResultRequestDto } from '@abp/core';
+
+import { HttpStatusCode } from '@abp/request';
+
+interface WebhookEventRecordDto extends EntityDto<string> {
+  creationTime: Date;
+  data?: string;
+  tenantId?: string;
+  webhookName: string;
+}
+
+interface WebhookSendRecordDto extends EntityDto<string> {
+  creationTime: Date;
+  lastModificationTime?: Date;
+  requestHeaders?: Record<string, string>;
+  response?: string;
+  responseHeaders?: Record<string, string>;
+  responseStatusCode?: HttpStatusCode;
+  sendExactSameData: boolean;
+  tenantId?: string;
+  webhookEvent: WebhookEventRecordDto;
+  webhookEventId: string;
+  webhookSubscriptionId: string;
+}
+
+interface WebhookSendRecordDeleteManyInput {
+  recordIds: string[];
+}
+
+interface WebhookSendRecordResendManyInput {
+  recordIds: string[];
+}
+
+interface WebhookSendRecordGetListInput extends PagedAndSortedResultRequestDto {
+  beginCreationTime?: Date;
+  endCreationTime?: Date;
+  filter?: string;
+  responseStatusCode?: HttpStatusCode;
+  state?: boolean;
+  subscriptionId?: string;
+  tenantId?: string;
+  webhookEventId?: string;
+}
+
+export type {
+  WebhookEventRecordDto,
+  WebhookSendRecordDeleteManyInput,
+  WebhookSendRecordDto,
+  WebhookSendRecordGetListInput,
+  WebhookSendRecordResendManyInput,
+};

From 55999f7facaa0e0213d3f39259c4f44ad7df6ebf Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Mon, 21 Apr 2025 18:13:10 +0800
Subject: [PATCH 10/11] =?UTF-8?q?feat(vben5):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86Webhook=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../send-attempts/WebhookSendAttemptTable.vue | 139 +++++++++++++++++-
 .../webhooks/src/constants/permissions.ts     |   9 ++
 2 files changed, 143 insertions(+), 5 deletions(-)

diff --git a/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptTable.vue b/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptTable.vue
index 13a1585a8..6fb0c3986 100644
--- a/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptTable.vue
+++ b/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptTable.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { VxeGridListeners, VxeGridProps } from '@abp/ui';
+import type { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 
 import type { VbenFormProps } from '@vben/common-ui';
 
@@ -7,24 +8,42 @@ import type { WebhookSendRecordDto } from '../../types/sendAttempts';
 
 import { h, ref } from 'vue';
 
+import { useAccess } from '@vben/access';
+import { createIconifyIcon } from '@vben/icons';
 import { $t } from '@vben/locales';
 
 import { formatToDateTime } from '@abp/core';
 import { useHttpStatusCodeMap } from '@abp/request';
 import { useTenantsApi } from '@abp/saas';
 import { useVbenVxeGrid } from '@abp/ui';
-import { DeleteOutlined, EditOutlined } from '@ant-design/icons-vue';
-import { Button, message, Modal, Tag } from 'ant-design-vue';
+import {
+  DeleteOutlined,
+  EditOutlined,
+  EllipsisOutlined,
+} from '@ant-design/icons-vue';
+import { Button, Dropdown, Menu, message, Modal, Tag } from 'ant-design-vue';
 import debounce from 'lodash.debounce';
 
 import { useSendAttemptsApi } from '../../api/useSendAttemptsApi';
+import { WebhooksSendAttemptsPermissions } from '../../constants/permissions';
 
 defineOptions({
   name: 'WebhookSendAttemptTable',
 });
 
+const MenuItem = Menu.Item;
+const SendMessageIcon = createIconifyIcon('ant-design:send-outlined');
+
+const { hasAccessByCodes } = useAccess();
 const { getPagedListApi: getTenantsApi } = useTenantsApi();
-const { cancel, deleteApi, getPagedListApi } = useSendAttemptsApi();
+const {
+  bulkDeleteApi,
+  bulkReSendApi,
+  cancel,
+  deleteApi,
+  getPagedListApi,
+  reSendApi,
+} = useSendAttemptsApi();
 const { getHttpStatusColor, httpStatusCodeMap } = useHttpStatusCodeMap();
 
 const tenantFilter = ref<string>();
@@ -162,7 +181,7 @@ const gridOptions: VxeGridProps<WebhookSendRecordDto> = {
       fixed: 'right',
       slots: { default: 'action' },
       title: $t('AbpUi.Actions'),
-      width: 200,
+      width: 220,
     },
   ],
   exportConfig: {},
@@ -223,10 +242,96 @@ function onDelete(row: WebhookSendRecordDto) {
     title: $t('AbpUi.AreYouSure'),
   });
 }
+async function onMenuClick(row: WebhookSendRecordDto, info: MenuInfo) {
+  switch (info.key) {
+    case 'send': {
+      await onSend(row);
+      break;
+    }
+  }
+}
+async function onSend(row: WebhookSendRecordDto) {
+  Modal.confirm({
+    centered: true,
+    content: `${$t('WebhooksManagement.ItemWillBeResendMessageWithFormat', [$t('WebhooksManagement.SelectedItems')])}`,
+    onOk: async () => {
+      try {
+        gridApi.setLoading(true);
+        await reSendApi(row.id);
+        message.success($t('WebhooksManagement.SuccessfullySent'));
+        gridApi.query();
+      } finally {
+        gridApi.setLoading(false);
+      }
+    },
+    title: $t('AbpUi.AreYouSure'),
+  });
+}
+async function onSendMany(keys: string[]) {
+  Modal.confirm({
+    centered: true,
+    content: `${$t('WebhooksManagement.ItemWillBeResendMessageWithFormat', [$t('WebhooksManagement.SelectedItems')])}`,
+    onOk: async () => {
+      try {
+        gridApi.setLoading(true);
+        await bulkReSendApi({ recordIds: keys });
+        message.success($t('WebhooksManagement.SuccessfullySent'));
+        // 重新查询
+        gridApi.query();
+      } finally {
+        gridApi.setLoading(false);
+      }
+    },
+    title: $t('AbpUi.AreYouSure'),
+  });
+}
+async function onDeleteMany(keys: string[]) {
+  Modal.confirm({
+    centered: true,
+    content: `${$t('AbpUi.ItemWillBeDeletedMessageWithFormat', [$t('WebhooksManagement.SelectedItems')])}`,
+    onOk: async () => {
+      try {
+        gridApi.setLoading(true);
+        await bulkDeleteApi({ recordIds: keys });
+        message.success($t('AbpUi.DeletedSuccessfully'));
+        // 清理选中的key
+        selectedKeys.value = selectedKeys.value.filter(
+          (key) => !keys.includes(key),
+        );
+        // 重新查询
+        gridApi.query();
+      } finally {
+        gridApi.setLoading(false);
+      }
+    },
+    title: $t('AbpUi.AreYouSure'),
+  });
+}
 </script>
 
 <template>
   <Grid :table-title="$t('WebhooksManagement.SendAttempts')">
+    <template #toolbar-tools>
+      <div v-if="selectedKeys.length > 0" class="flex flex-row gap-2">
+        <Button
+          v-if="hasAccessByCodes([WebhooksSendAttemptsPermissions.Resend])"
+          :icon="h(SendMessageIcon)"
+          type="primary"
+          @click="onSendMany(selectedKeys)"
+        >
+          {{ $t('WebhooksManagement.Resend') }}
+        </Button>
+        <Button
+          v-if="hasAccessByCodes([WebhooksSendAttemptsPermissions.Delete])"
+          :icon="h(DeleteOutlined)"
+          type="primary"
+          danger
+          @click="onDeleteMany(selectedKeys)"
+        >
+          {{ $t('AbpUi.Delete') }}
+        </Button>
+      </div>
+    </template>
     <template #responseStatusCode="{ row }">
       <Tag :color="getHttpStatusColor(row.responseStatusCode)">
         {{ httpStatusCodeMap[row.responseStatusCode] }}
@@ -234,10 +339,16 @@ function onDelete(row: WebhookSendRecordDto) {
     </template>
     <template #action="{ row }">
       <div class="flex flex-row">
-        <Button :icon="h(EditOutlined)" type="link" @click="onUpdate(row)">
+        <Button
+          v-if="hasAccessByCodes([WebhooksSendAttemptsPermissions.Default])"
+          :icon="h(EditOutlined)"
+          type="link"
+          @click="onUpdate(row)"
+        >
           {{ $t('AbpUi.Edit') }}
         </Button>
         <Button
+          v-if="hasAccessByCodes([WebhooksSendAttemptsPermissions.Delete])"
           :icon="h(DeleteOutlined)"
           danger
           type="link"
@@ -245,6 +356,24 @@ function onDelete(row: WebhookSendRecordDto) {
         >
           {{ $t('AbpUi.Delete') }}
         </Button>
+        <Dropdown>
+          <template #overlay>
+            <Menu @click="(info) => onMenuClick(row, info)">
+              <MenuItem
+                v-if="
+                  hasAccessByCodes([WebhooksSendAttemptsPermissions.Resend])
+                "
+                key="send"
+              >
+                <div class="flex flex-row items-center gap-[4px]">
+                  <SendMessageIcon color="green" />
+                  {{ $t('WebhooksManagement.Resend') }}
+                </div>
+              </MenuItem>
+            </Menu>
+          </template>
+          <Button :icon="h(EllipsisOutlined)" type="link" />
+        </Dropdown>
       </div>
     </template>
   </Grid>
diff --git a/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts b/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts
index f64defbbc..c4b6468dc 100644
--- a/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/constants/permissions.ts
@@ -30,3 +30,12 @@ export const WebhookSubscriptionPermissions = {
   /** 更新 */
   Update: 'AbpWebhooks.Subscriptions.Update',
 };
+
+/** Webhook发送记录权限 */
+export const WebhooksSendAttemptsPermissions = {
+  Default: 'AbpWebhooks.SendAttempts',
+  /** 删除 */
+  Delete: 'AbpWebhooks.SendAttempts.Delete',
+  /** 更新 */
+  Resend: 'AbpWebhooks.SendAttempts.Resend',
+};

From 6e9ae340006c5ffcb2dcbb969266c43333b1dc6f Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Tue, 22 Apr 2025 08:47:00 +0800
Subject: [PATCH 11/11] =?UTF-8?q?feat(vben5):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AE=B0=E5=BD=95drawer=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WebhookSendAttemptDrawer.vue              | 239 ++++++++++++++++++
 .../send-attempts/WebhookSendAttemptTable.vue |  27 +-
 .../@abp/webhooks/src/types/sendAttempts.ts   |   6 +-
 3 files changed, 263 insertions(+), 9 deletions(-)
 create mode 100644 apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptDrawer.vue

diff --git a/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptDrawer.vue b/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptDrawer.vue
new file mode 100644
index 000000000..36f0245a5
--- /dev/null
+++ b/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptDrawer.vue
@@ -0,0 +1,239 @@
+<script setup lang="ts">
+import type { TenantDto } from '@abp/saas';
+
+import type { WebhookSendRecordDto, WebhookSubscriptionDto } from '../../types';
+
+import { ref } from 'vue';
+
+import { useAccess } from '@vben/access';
+import { useVbenDrawer } from '@vben/common-ui';
+
+import { CodeEditor } from '@abp/components/codeeditor';
+import { Tinymce } from '@abp/components/tinymce';
+import { formatToDateTime, isNullOrWhiteSpace } from '@abp/core';
+import { useHttpStatusCodeMap } from '@abp/request';
+import { useTenantsApi } from '@abp/saas';
+import {
+  Checkbox,
+  DatePicker,
+  Form,
+  Input,
+  InputPassword,
+  Tabs,
+  Tag,
+  Textarea,
+} from 'ant-design-vue';
+
+import { useSendAttemptsApi, useSubscriptionsApi } from '../../api';
+import { WebhookSubscriptionPermissions } from '../../constants/permissions';
+
+const FormItem = Form.Item;
+const TabPane = Tabs.TabPane;
+
+type TabKey = 'basic' | 'event' | 'subscriber';
+
+const activeTabKey = ref<TabKey>('basic');
+const formModel = ref<WebhookSendRecordDto>();
+const webhookSubscription = ref<WebhookSubscriptionDto>();
+const webhookTenant = ref<TenantDto>();
+
+const { hasAccessByCodes } = useAccess();
+const { getApi } = useSendAttemptsApi();
+const { getApi: getTenantApi } = useTenantsApi();
+const { getApi: getSubscriptionApi } = useSubscriptionsApi();
+const { getHttpStatusColor, httpStatusCodeMap } = useHttpStatusCodeMap();
+
+const [Drawer, drawerApi] = useVbenDrawer({
+  class: 'w-1/2',
+  async onOpenChange(isOpen) {
+    formModel.value = undefined;
+    webhookTenant.value = undefined;
+    webhookSubscription.value = undefined;
+    if (isOpen) {
+      await onInit();
+    }
+  },
+});
+
+async function onInit() {
+  const dto = drawerApi.getData<WebhookSendRecordDto>();
+  if (isNullOrWhiteSpace(dto.id)) {
+    return;
+  }
+  const [sendRecordDto, subscriptionDto, tenantDto] = await Promise.all([
+    getApi(dto.id),
+    onInitSubscription(dto.webhookSubscriptionId),
+    onInitTenant(dto.tenantId),
+  ]);
+  formModel.value = sendRecordDto;
+  webhookSubscription.value = subscriptionDto;
+  webhookTenant.value = tenantDto;
+}
+
+async function onInitSubscription(subscriptionId: string) {
+  if (!hasAccessByCodes([WebhookSubscriptionPermissions.Default])) {
+    return undefined;
+  }
+  return await getSubscriptionApi(subscriptionId);
+}
+
+async function onInitTenant(tenantId?: string) {
+  // TODO: 公开saas模块常量?
+  if (isNullOrWhiteSpace(tenantId) || !hasAccessByCodes(['AbpSaas.Tenants'])) {
+    return undefined;
+  }
+  return await getTenantApi(tenantId);
+}
+</script>
+
+<template>
+  <Drawer :title="$t('WebhooksManagement.SendAttempts')">
+    <Form :model="formModel" layout="vertical">
+      <Tabs v-if="formModel" v-model:active-key="activeTabKey">
+        <TabPane key="basic" :tab="$t('WebhooksManagement.BasicInfo')">
+          <FormItem
+            v-if="webhookTenant"
+            name="tenantId"
+            :label="$t('WebhooksManagement.DisplayName:TenantId')"
+          >
+            <Input :value="webhookTenant.name" disabled />
+          </FormItem>
+          <FormItem name="sendExactSameData">
+            <Checkbox :checked="formModel.sendExactSameData" disabled>
+              {{ $t('WebhooksManagement.DisplayName:SendExactSameData') }}
+            </Checkbox>
+          </FormItem>
+          <FormItem
+            name="creationTime"
+            :label="$t('WebhooksManagement.DisplayName:CreationTime')"
+          >
+            <DatePicker
+              class="w-full"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :value="formModel.creationTime"
+              disabled
+              show-time
+            />
+          </FormItem>
+          <FormItem
+            name="requestHeaders"
+            :label="$t('WebhooksManagement.DisplayName:RequestHeaders')"
+          >
+            <CodeEditor :value="formModel.requestHeaders" readonly />
+          </FormItem>
+          <FormItem
+            v-if="formModel.responseStatusCode"
+            name="responseStatusCode"
+            :label="$t('WebhooksManagement.DisplayName:ResponseStatusCode')"
+          >
+            <Tag :color="getHttpStatusColor(formModel.responseStatusCode)">
+              {{ httpStatusCodeMap[formModel.responseStatusCode] }}
+            </Tag>
+          </FormItem>
+          <FormItem
+            name="responseHeaders"
+            :label="$t('WebhooksManagement.DisplayName:ResponseHeaders')"
+          >
+            <CodeEditor :value="formModel.responseHeaders" readonly />
+          </FormItem>
+          <FormItem
+            name="response"
+            :label="$t('WebhooksManagement.DisplayName:Response')"
+          >
+            <Tinymce
+              :value="formModel.response"
+              :toolbar="[]"
+              :plugins="[]"
+              readonly
+            />
+          </FormItem>
+        </TabPane>
+        <TabPane key="event" :tab="$t('WebhooksManagement.WebhookEvent')">
+          <FormItem
+            name="webhookEventId"
+            :label="$t('WebhooksManagement.DisplayName:WebhookEventId')"
+          >
+            <Input :value="formModel.webhookEventId" disabled />
+          </FormItem>
+          <FormItem
+            :name="['webhookEvent', 'webhookName']"
+            :label="$t('WebhooksManagement.DisplayName:WebhookName')"
+          >
+            <Input :value="formModel.webhookEvent.webhookName" disabled />
+          </FormItem>
+          <FormItem
+            :name="['webhookEvent', 'creationTime']"
+            :label="$t('WebhooksManagement.DisplayName:CreationTime')"
+          >
+            <DatePicker
+              class="w-full"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :value="formModel.webhookEvent.creationTime"
+              disabled
+              show-time
+            />
+          </FormItem>
+          <FormItem
+            :name="['webhookEvent', 'data']"
+            :label="$t('WebhooksManagement.DisplayName:Data')"
+          >
+            <CodeEditor :value="formModel.webhookEvent.data" readonly />
+          </FormItem>
+        </TabPane>
+        <TabPane
+          v-if="webhookSubscription"
+          key="subscriber"
+          :tab="$t('WebhooksManagement.Subscriptions')"
+        >
+          <FormItem>
+            <Checkbox :checked="webhookSubscription.isActive" disabled>
+              {{ $t('WebhooksManagement.DisplayName:IsActive') }}
+            </Checkbox>
+          </FormItem>
+          <FormItem
+            :label="$t('WebhooksManagement.DisplayName:WebhookSubscriptionId')"
+          >
+            <Input :value="webhookSubscription.id" disabled />
+          </FormItem>
+          <FormItem :label="$t('WebhooksManagement.DisplayName:WebhookUri')">
+            <Input :value="webhookSubscription.webhookUri" disabled />
+          </FormItem>
+          <FormItem :label="$t('WebhooksManagement.DisplayName:Description')">
+            <Textarea
+              :auto-size="{ minRows: 3 }"
+              :value="webhookSubscription.description"
+              disabled
+            />
+          </FormItem>
+          <FormItem :label="$t('WebhooksManagement.DisplayName:Secret')">
+            <InputPassword :value="webhookSubscription.secret" disabled />
+          </FormItem>
+          <FormItem :label="$t('WebhooksManagement.DisplayName:CreationTime')">
+            <DatePicker
+              class="w-full"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :value="formatToDateTime(webhookSubscription.creationTime)"
+              disabled
+              show-time
+            />
+          </FormItem>
+          <FormItem :label="$t('WebhooksManagement.DisplayName:Webhooks')">
+            <template
+              v-for="webhook in webhookSubscription.webhooks"
+              :key="webhook"
+            >
+              <Tag color="blue">
+                {{ webhook }}
+              </Tag>
+            </template>
+          </FormItem>
+          <FormItem :label="$t('WebhooksManagement.DisplayName:Headers')">
+            <CodeEditor :value="webhookSubscription.headers" readonly />
+          </FormItem>
+        </TabPane>
+      </Tabs>
+    </Form>
+  </Drawer>
+</template>
+
+<style scoped></style>
diff --git a/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptTable.vue b/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptTable.vue
index 6fb0c3986..277bdb5b4 100644
--- a/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptTable.vue
+++ b/apps/vben5/packages/@abp/webhooks/src/components/send-attempts/WebhookSendAttemptTable.vue
@@ -6,9 +6,10 @@ import type { VbenFormProps } from '@vben/common-ui';
 
 import type { WebhookSendRecordDto } from '../../types/sendAttempts';
 
-import { h, ref } from 'vue';
+import { defineAsyncComponent, h, ref } from 'vue';
 
 import { useAccess } from '@vben/access';
+import { useVbenDrawer } from '@vben/common-ui';
 import { createIconifyIcon } from '@vben/icons';
 import { $t } from '@vben/locales';
 
@@ -106,11 +107,11 @@ const formOptions: VbenFormProps = {
         options: [
           {
             label: $t('WebhooksManagement.ResponseState:Successed'),
-            value: true,
+            value: 'true',
           },
           {
             label: $t('WebhooksManagement.ResponseState:Failed'),
-            value: false,
+            value: 'false',
           },
         ],
       },
@@ -225,12 +226,23 @@ const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions,
 });
 
-function onUpdate(_row: WebhookSendRecordDto) {}
+const [WebhookSendAttemptDrawer, drawerApi] = useVbenDrawer({
+  connectedComponent: defineAsyncComponent(
+    () => import('./WebhookSendAttemptDrawer.vue'),
+  ),
+});
+
+function onUpdate(row: WebhookSendRecordDto) {
+  drawerApi.setData(row);
+  drawerApi.open();
+}
 
 function onDelete(row: WebhookSendRecordDto) {
   Modal.confirm({
     centered: true,
-    content: $t('AbpUi.ItemWillBeDeletedMessageWithFormat', [row.title]),
+    content: $t('AbpUi.ItemWillBeDeletedMessageWithFormat', [
+      $t('WebhooksManagement.SelectedItems'),
+    ]),
     onCancel: () => {
       cancel();
     },
@@ -253,7 +265,9 @@ async function onMenuClick(row: WebhookSendRecordDto, info: MenuInfo) {
 async function onSend(row: WebhookSendRecordDto) {
   Modal.confirm({
     centered: true,
-    content: `${$t('WebhooksManagement.ItemWillBeResendMessageWithFormat', [$t('WebhooksManagement.SelectedItems')])}`,
+    content: $t('WebhooksManagement.ItemWillBeResendMessageWithFormat', [
+      $t('WebhooksManagement.SelectedItems'),
+    ]),
     onOk: async () => {
       try {
         gridApi.setLoading(true);
@@ -377,6 +391,7 @@ async function onDeleteMany(keys: string[]) {
       </div>
     </template>
   </Grid>
+  <WebhookSendAttemptDrawer />
 </template>
 
 <style lang="scss" scoped></style>
diff --git a/apps/vben5/packages/@abp/webhooks/src/types/sendAttempts.ts b/apps/vben5/packages/@abp/webhooks/src/types/sendAttempts.ts
index 582e0e3c2..6f68e36c3 100644
--- a/apps/vben5/packages/@abp/webhooks/src/types/sendAttempts.ts
+++ b/apps/vben5/packages/@abp/webhooks/src/types/sendAttempts.ts
@@ -3,15 +3,15 @@ import type { EntityDto, PagedAndSortedResultRequestDto } from '@abp/core';
 import { HttpStatusCode } from '@abp/request';
 
 interface WebhookEventRecordDto extends EntityDto<string> {
-  creationTime: Date;
+  creationTime: string;
   data?: string;
   tenantId?: string;
   webhookName: string;
 }
 
 interface WebhookSendRecordDto extends EntityDto<string> {
-  creationTime: Date;
-  lastModificationTime?: Date;
+  creationTime: string;
+  lastModificationTime?: string;
   requestHeaders?: Record<string, string>;
   response?: string;
   responseHeaders?: Record<string, string>;