Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev

2025-09-05 12:26:36 +08:00
parent 48ec3e15ab 0bf1635090
commit ffbaa89323
134 changed files with 280 additions and 290 deletions
--- a/apps/web-ele/src/views/infra/config/modules/form.vue
+++ b/apps/web-ele/src/views/infra/config/modules/form.vue
@@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getConfig(data.id as number);
+      formData.value = await getConfig(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/infra/dataSourceConfig/modules/form.vue
+++ b/apps/web-ele/src/views/infra/dataSourceConfig/modules/form.vue
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getDataSourceConfig(data.id as number);
+      formData.value = await getDataSourceConfig(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/infra/fileConfig/index.vue
+++ b/apps/web-ele/src/views/infra/fileConfig/index.vue
@@ -53,7 +53,6 @@ async function onMaster(row: InfraFileConfigApi.FileConfig) {
  });
  try {
    await updateFileConfigMaster(row.id as number);
-    loadingInstance.close();
    ElMessage.success($t('ui.actionMessage.operationSuccess'));
    onRefresh();
  } catch {
--- a/apps/web-ele/src/views/infra/fileConfig/modules/form.vue
+++ b/apps/web-ele/src/views/infra/fileConfig/modules/form.vue
@@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getFileConfig(data.id as number);
+      formData.value = await getFileConfig(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/product/brand/modules/form.vue
+++ b/apps/web-ele/src/views/mall/product/brand/modules/form.vue
@@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getBrand(data.id as number);
+      formData.value = await getBrand(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/product/category/modules/form.vue
+++ b/apps/web-ele/src/views/mall/product/category/modules/form.vue
@@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({
    modalApi.lock();
    try {
      if (data.id) {
-        data = await getCategory(data.id as number);
+        data = await getCategory(data.id);
      }
      // 设置到 values
      formData.value = data;
--- a/apps/web-ele/src/views/mall/product/comment/modules/form.vue
+++ b/apps/web-ele/src/views/mall/product/comment/modules/form.vue
@@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getComment(data.id as number);
+      formData.value = await getComment(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/product/property/modules/property-form.vue
+++ b/apps/web-ele/src/views/mall/product/property/modules/property-form.vue
@@ -69,7 +69,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getProperty(data.id as number);
+      formData.value = await getProperty(data.id);
      // 设置到 values
      if (formData.value) {
        await formApi.setValues(formData.value);
--- a/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
+++ b/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
@@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
    if (data && 'id' in data && data.id) {
      modalApi.lock();
      try {
-        formData.value = await getPropertyValue(data.id as number);
+        formData.value = await getPropertyValue(data.id);
        // 设置到 values
        if (formData.value) {
          await formApi.setValues(formData.value);
--- a/apps/web-ele/src/views/mall/promotion/article/category/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/article/category/modules/form.vue
@@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getArticleCategory(data.id as number);
+      formData.value = await getArticleCategory(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/promotion/article/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/article/modules/form.vue
@@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getArticle(data.id as number);
+      formData.value = await getArticle(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/promotion/banner/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/banner/modules/form.vue
@@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getBanner(data.id as number);
+      formData.value = await getBanner(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/promotion/bargain/activity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/bargain/activity/modules/form.vue
@@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getBargainActivity(data.id as number);
+      formData.value = await getBargainActivity(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue
@@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getCombinationActivity(data.id as number);
+      formData.value = await getCombinationActivity(data.id);
      // 设置到 values
      if (formData.value) {
        await formApi.setValues(formData.value);
--- a/apps/web-ele/src/views/mall/promotion/coupon/template/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/coupon/template/modules/form.vue
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getCouponTemplate(data.id as number);
+      formData.value = await getCouponTemplate(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
@@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getDiscountActivity(data.id as number);
+      formData.value = await getDiscountActivity(data.id);
      // 设置到 values
      if (formData.value) {
        await formApi.setValues(formData.value);
--- a/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue
@@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getDiyPage(data.id as number);
+      formData.value = await getDiyPage(data.id);
      // 设置到 values
      if (formData.value) {
        await formApi.setValues(formData.value);
--- a/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue
@@ -80,7 +80,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getDiyTemplate(data.id as number);
+      formData.value = await getDiyTemplate(data.id);
      // 设置到 values
      if (formData.value) {
        await formApi.setValues(formData.value);
--- a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
@@ -77,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getReward(data.id as number);
+      formData.value = await getReward(data.id);
      // 设置到 values
      if (formData.value) {
        await formApi.setValues(formData.value);
--- a/apps/web-ele/src/views/mall/promotion/seckill/activity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/seckill/activity/modules/form.vue
@@ -104,7 +104,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getSeckillActivity(data.id as number);
+      formData.value = await getSeckillActivity(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/promotion/seckill/config/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/seckill/config/modules/form.vue
@@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getSeckillConfig(data.id as number);
+      formData.value = await getSeckillConfig(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/trade/delivery/express/modules/form.vue
+++ b/apps/web-ele/src/views/mall/trade/delivery/express/modules/form.vue
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getDeliveryExpress(data.id as number);
+      formData.value = await getDeliveryExpress(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/form.vue
+++ b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/form.vue
@@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getDeliveryExpressTemplate(data.id as number);
+      formData.value = await getDeliveryExpressTemplate(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue
+++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue
@@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getDeliveryPickUpStore(data.id as number);
+      formData.value = await getDeliveryPickUpStore(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/modules/form.vue
+++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/modules/form.vue
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getDeliveryPickUpStore(data.id as number);
+      formData.value = await getDeliveryPickUpStore(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/member/group/modules/form.vue
+++ b/apps/web-ele/src/views/member/group/modules/form.vue
@@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getGroup(data.id as number);
+      formData.value = await getGroup(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/member/level/modules/form.vue
+++ b/apps/web-ele/src/views/member/level/modules/form.vue
@@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getLevel(data.id as number);
+      formData.value = await getLevel(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/member/signin/config/modules/form.vue
+++ b/apps/web-ele/src/views/member/signin/config/modules/form.vue
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getSignInConfig(data.id as number);
+      formData.value = await getSignInConfig(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/member/tag/modules/form.vue
+++ b/apps/web-ele/src/views/member/tag/modules/form.vue
@@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getMemberTag(data.id as number);
+      formData.value = await getMemberTag(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/member/user/modules/balance-form.vue
+++ b/apps/web-ele/src/views/member/user/modules/balance-form.vue
@@ -67,7 +67,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      const user = await getUser(data.id as number);
+      const user = await getUser(data.id);
      if (!user || !user.id) {
        return;
      }
--- a/apps/web-ele/src/views/member/user/modules/form.vue
+++ b/apps/web-ele/src/views/member/user/modules/form.vue
@@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getUser(data.id as number);
+      formData.value = await getUser(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/member/user/modules/leavel-form.vue
+++ b/apps/web-ele/src/views/member/user/modules/leavel-form.vue
@@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getUser(data.id as number);
+      formData.value = await getUser(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/member/user/modules/point-form.vue
+++ b/apps/web-ele/src/views/member/user/modules/point-form.vue
@@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getUser(data.id as number);
+      formData.value = await getUser(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/pay/wallet/rechargePackage/modules/form.vue
+++ b/apps/web-ele/src/views/pay/wallet/rechargePackage/modules/form.vue
@@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getPackage(data.id as number);
+      formData.value = await getPackage(data.id);
      // 转换金额单位
      formData.value.payPrice = Number.parseFloat(
        fenToYuan(formData.value.payPrice),
--- a/apps/web-ele/src/views/system/dict/modules/data-form.vue
+++ b/apps/web-ele/src/views/system/dict/modules/data-form.vue
@@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
    if (data && 'id' in data && data.id) {
      modalApi.lock();
      try {
-        formData.value = await getDictData(data.id as number);
+        formData.value = await getDictData(data.id);
        // 设置到 values
        if (formData.value) {
          await formApi.setValues(formData.value);
--- a/apps/web-ele/src/views/system/dict/modules/type-form.vue
+++ b/apps/web-ele/src/views/system/dict/modules/type-form.vue
@@ -69,7 +69,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getDictType(data.id as number);
+      formData.value = await getDictType(data.id);
      // 设置到 values
      if (formData.value) {
        await formApi.setValues(formData.value);
--- a/apps/web-ele/src/views/system/menu/modules/form.vue
+++ b/apps/web-ele/src/views/system/menu/modules/form.vue
@@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
    if (data.id) {
      modalApi.lock();
      try {
-        data = await getMenu(data.id as number);
+        data = await getMenu(data.id);
      } finally {
        modalApi.unlock();
      }
--- a/apps/web-ele/src/views/system/notice/data.ts
+++ b/apps/web-ele/src/views/system/notice/data.ts
@@ -1,13 +1,8 @@
 import type { VbenFormSchema } from '#/adapter/form';
-import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { SystemNoticeApi } from '#/api/system/notice';

-import { useAccess } from '@vben/access';
-
-import { z } from '#/adapter/form';
-import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils';
-
-const { hasAccessByCodes } = useAccess();
+import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps, } from '#/utils';

 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -23,44 +18,38 @@ export function useFormSchema(): VbenFormSchema[] {
    {
      fieldName: 'title',
      label: '公告标题',
+      rules: 'required',
      component: 'Input',
-      rules: 'required',
-    },
-    {
-      fieldName: 'type',
-      label: '公告类型',
-      component: 'RadioGroup',
      componentProps: {
-        options: getDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
+        placeholder: '请输入公告标题',
      },
-      rules: 'required',
    },
    {
      fieldName: 'content',
      label: '公告内容',
-      component: 'RichTextarea',
      rules: 'required',
+      component: 'RichTextarea',
+    },
+    {
+      fieldName: 'type',
+      label: '公告类型（1通知 2公告）',
+      rules: 'required',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE, 'number'),
+        placeholder: '请选择公告类型（1通知 2公告）',
+      },
    },
    {
      fieldName: 'status',
-      label: '公告状态',
+      label: '公告状态（0正常 1关闭）',
+      rules: 'required',
      component: 'RadioGroup',
      componentProps: {
-        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        options: [],
        buttonStyle: 'solid',
        optionType: 'button',
      },
-      rules: z.number().default(CommonStatusEnum.ENABLE),
-    },
-    {
-      fieldName: 'remark',
-      label: '备注',
-      component: 'Textarea',
-      componentProps: {
-        placeholder: '请输入备注',
-      },
    },
  ];
 }
@@ -73,17 +62,45 @@ export function useGridFormSchema(): VbenFormSchema[] {
      label: '公告标题',
      component: 'Input',
      componentProps: {
-        placeholder: '请输入公告标题',
        allowClear: true,
+        placeholder: '请输入公告标题',
+      },
+    },
+    {
+      fieldName: 'content',
+      label: '公告内容',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入公告内容',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '公告类型（1通知 2公告）',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE, 'number'),
+        placeholder: '请选择公告类型（1通知 2公告）',
      },
    },
    {
      fieldName: 'status',
-      label: '公告状态',
+      label: '公告状态（0正常 1关闭）',
      component: 'Select',
      componentProps: {
-        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        placeholder: '请选择公告状态',
+        allowClear: true,
+        options: [],
+        placeholder: '请选择公告状态（0正常 1关闭）',
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '创建时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
        allowClear: true,
      },
    },
@@ -91,28 +108,28 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }

 /** 列表的字段 */
-export function useGridColumns<T = SystemNoticeApi.Notice>(
-  onActionClick: OnActionClickFn<T>,
-): VxeTableGridOptions['columns'] {
+export function useGridColumns(): VxeTableGridOptions<SystemNoticeApi.Notice>['columns'] {
  return [
-    {
-      type: 'checkbox',
-      width: 40,
-    },
+    { type: 'checkbox', width: 40 },
    {
      field: 'id',
-      title: '公告编号',
-      minWidth: 100,
+      title: '公告ID',
+      minWidth: 120,
    },
    {
      field: 'title',
      title: '公告标题',
-      minWidth: 200,
+      minWidth: 120,
+    },
+    {
+      field: 'content',
+      title: '公告内容',
+      minWidth: 120,
    },
    {
      field: 'type',
-      title: '公告类型',
-      minWidth: 100,
+      title: '公告类型（1通知 2公告）',
+      minWidth: 120,
      cellRender: {
        name: 'CellDict',
        props: { type: DICT_TYPE.SYSTEM_NOTICE_TYPE },
@@ -120,48 +137,20 @@ export function useGridColumns<T = SystemNoticeApi.Notice>(
    },
    {
      field: 'status',
-      title: '公告状态',
-      minWidth: 100,
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.COMMON_STATUS },
-      },
+      title: '公告状态（0正常 1关闭）',
+      minWidth: 120,
    },
    {
      field: 'createTime',
      title: '创建时间',
-      minWidth: 180,
+      minWidth: 120,
      formatter: 'formatDateTime',
    },
    {
-      field: 'operation',
      title: '操作',
-      minWidth: 180,
-      align: 'center',
+      width: 200,
      fixed: 'right',
-      cellRender: {
-        attrs: {
-          nameField: 'title',
-          nameTitle: '公告',
-          onClick: onActionClick,
-        },
-        name: 'CellOperation',
-        options: [
-          {
-            code: 'edit',
-            show: hasAccessByCodes(['system:notice:update']),
-          },
-          {
-            code: 'push',
-            text: '推送',
-            show: hasAccessByCodes(['system:notice:update']),
-          },
-          {
-            code: 'delete',
-            show: hasAccessByCodes(['system:notice:delete']),
-          },
-        ],
-      },
+      slots: { default: 'actions' },
    },
  ];
 }
--- a/apps/web-ele/src/views/system/notice/index.vue
+++ b/apps/web-ele/src/views/system/notice/index.vue
@@ -1,14 +1,11 @@
 <script lang="ts" setup>
-import type {
-  OnActionClickParams,
-  VxeTableGridOptions,
-} from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { SystemNoticeApi } from '#/api/system/notice';

 import { ref } from 'vue';

 import { confirm, Page, useVbenModal } from '@vben/common-ui';
-import { isEmpty } from '@vben/utils';
+import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';

 import { ElLoading, ElMessage } from 'element-plus';

@@ -17,7 +14,6 @@ import {
  deleteNotice,
  deleteNoticeList,
  getNoticePage,
-  pushNotice,
 } from '#/api/system/notice';
 import { $t } from '#/locales';

@@ -34,39 +30,44 @@ function onRefresh() {
  gridApi.query();
 }

-/** 创建公告 */
-// TODO @霖：【规范讨论】方法名，要不要都换成 handleXXX 开头，和 ep 保持一致；
-function onCreate() {
+/** 创建通知公告 */
+function handleCreate() {
  formModalApi.setData(null).open();
 }

-/** 编辑公告 */
-function onEdit(row: SystemNoticeApi.Notice) {
+/** 编辑通知公告 */
+function handleEdit(row: SystemNoticeApi.Notice) {
  formModalApi.setData(row).open();
 }

-/** 删除公告 */
-async function onDelete(row: SystemNoticeApi.Notice) {
+/** 删除通知公告 */
+async function handleDelete(row: SystemNoticeApi.Notice) {
  const loadingInstance = ElLoading.service({
-    text: $t('ui.actionMessage.deleting', [row.title]),
-    fullscreen: true,
+    text: $t('ui.actionMessage.deleting', [row.id]),
  });
  try {
    await deleteNotice(row.id as number);
-    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.title]));
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.id]));
    onRefresh();
  } finally {
    loadingInstance.close();
  }
 }

-/** 批量删除公告 */
-async function onDeleteBatch() {
-  await confirm('确定要批量删除该公告吗？');
-  await deleteNoticeList(checkedIds.value);
-  checkedIds.value = [];
-  ElMessage.success($t('ui.actionMessage.deleteSuccess'));
-  onRefresh();
+/** 批量删除通知公告 */
+async function handleDeleteBatch() {
+  await confirm($t('ui.actionMessage.deleteBatchConfirm'));
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deletingBatch'),
+  });
+  try {
+    await deleteNoticeList(checkedIds.value);
+    checkedIds.value = [];
+    ElMessage.success($t('ui.actionMessage.deleteSuccess'));
+    onRefresh();
+  } finally {
+    loadingInstance.close();
+  }
 }

 const checkedIds = ref<number[]>([]);
@@ -78,41 +79,10 @@ function handleRowCheckboxChange({
  checkedIds.value = records.map((item) => item.id!);
 }

-/** 推送公告 */
-async function onPush(row: SystemNoticeApi.Notice) {
-  const loadingInstance = ElMessage({
-    message: $t('ui.actionMessage.processing', ['推送']),
-    type: 'info',
-    duration: 0,
-  });
-  try {
-    await pushNotice(row.id as number);
-    loadingInstance.close();
-    ElMessage.success($t('ui.actionMessage.operationSuccess'));
-  } finally {
-    loadingInstance.close();
-  }
-}
-
-/** 表格操作按钮的回调函数 */
-function onActionClick({
-  code,
-  row,
-}: OnActionClickParams<SystemNoticeApi.Notice>) {
-  switch (code) {
-    case 'delete': {
-      onDelete(row);
-      break;
-    }
-    case 'edit': {
-      onEdit(row);
-      break;
-    }
-    case 'push': {
-      onPush(row);
-      break;
-    }
-  }
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportNotice(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '通知公告.xls', source: data });
 }

 const [Grid, gridApi] = useVbenVxeGrid({
@@ -120,7 +90,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
    schema: useGridFormSchema(),
  },
  gridOptions: {
-    columns: useGridColumns(onActionClick),
+    columns: useGridColumns(),
    height: 'auto',
    keepSource: true,
    proxyConfig: {
@@ -136,6 +106,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
    },
    rowConfig: {
      keyField: 'id',
+      isHover: true,
    },
    toolbarConfig: {
      refresh: true,
@@ -152,29 +123,60 @@ const [Grid, gridApi] = useVbenVxeGrid({
 <template>
  <Page auto-content-height>
    <FormModal @success="onRefresh" />
-    <Grid table-title="公告列表">
+    <Grid table-title="通知公告列表">
      <template #toolbar-tools>
        <TableAction
          :actions="[
            {
-              label: $t('ui.actionTitle.create', ['公告']),
+              label: $t('ui.actionTitle.create', ['通知公告']),
              type: 'primary',
              icon: ACTION_ICON.ADD,
              auth: ['system:notice:create'],
-              onClick: onCreate,
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['system:notice:export'],
+              onClick: handleExport,
            },
            {
              label: $t('ui.actionTitle.deleteBatch'),
              type: 'danger',
              icon: ACTION_ICON.DELETE,
-              disabled: isEmpty(checkedIds),
              auth: ['system:notice:delete'],
-              onClick: onDeleteBatch,
+              disabled: isEmpty(checkedIds),
+              onClick: handleDeleteBatch,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['system:notice:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['system:notice:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.id]),
+                confirm: handleDelete.bind(null, row),
+              },
            },
          ]"
        />
      </template>
-      <!-- TODO @霖：【规范讨论】要不要类似 antd 一样，改成 TableAction；可见 /apps/web-ele/src/views/system/notice/index.vue 的 167 到 195 -->
    </Grid>
  </Page>
 </template>
--- a/apps/web-ele/src/views/system/notice/modules/form.vue
+++ b/apps/web-ele/src/views/system/notice/modules/form.vue
@@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getNotice(data.id as number);
+      formData.value = await getNotice(data.id);
      // 设置到 values
      if (formData.value) {
        await formApi.setValues(formData.value);
--- a/apps/web-ele/src/views/system/notify/template/index.vue
+++ b/apps/web-ele/src/views/system/notify/template/index.vue
@@ -70,7 +70,6 @@ async function onDelete(row: SystemNotifyTemplateApi.NotifyTemplate) {
  });
  try {
    await deleteNotifyTemplate(row.id as number);
-    loadingInstance.close();
    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
    onRefresh();
  } finally {
@@ -88,7 +87,6 @@ async function onDeleteBatch() {
  try {
    await deleteNotifyTemplateList(checkedIds.value);
    checkedIds.value = [];
-    loadingInstance.close();
    ElMessage.success($t('ui.actionMessage.deleteSuccess'));
    onRefresh();
  } finally {
--- a/apps/web-ele/src/views/system/notify/template/modules/form.vue
+++ b/apps/web-ele/src/views/system/notify/template/modules/form.vue
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getNotifyTemplate(data.id as number);
+      formData.value = await getNotifyTemplate(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/system/oauth2/client/modules/form.vue
+++ b/apps/web-ele/src/views/system/oauth2/client/modules/form.vue
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getOAuth2Client(data.id as number);
+      formData.value = await getOAuth2Client(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/system/post/modules/form.vue
+++ b/apps/web-ele/src/views/system/post/modules/form.vue
@@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getPost(data.id as number);
+      formData.value = await getPost(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue
+++ b/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue
@@ -78,7 +78,7 @@ const [Modal, modalApi] = useVbenModal({
      await loadDeptTree();
      toggleExpandAll();
      // 设置表单值, 一定要在加载树之后
-      await formApi.setValues(await getRole(data.id as number));
+      await formApi.setValues(await getRole(data.id));
    } finally {
      modalApi.unlock();
    }
--- a/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
    modalApi.lock();
    try {
      // 加载角色菜单
-      const menuIds = await getRoleMenuList(data.id as number);
+      const menuIds = await getRoleMenuList(data.id);
      await formApi.setFieldValue('menuIds', menuIds);

      await formApi.setValues(data);
--- a/apps/web-ele/src/views/system/role/modules/form.vue
+++ b/apps/web-ele/src/views/system/role/modules/form.vue
@@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getRole(data.id as number);
+      formData.value = await getRole(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/system/sms/channel/modules/form.vue
+++ b/apps/web-ele/src/views/system/sms/channel/modules/form.vue
@@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getSmsChannel(data.id as number);
+      formData.value = await getSmsChannel(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/system/social/client/modules/form.vue
+++ b/apps/web-ele/src/views/system/social/client/modules/form.vue
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getSocialClient(data.id as number);
+      formData.value = await getSocialClient(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {
--- a/apps/web-ele/src/views/system/tenant/modules/form.vue
+++ b/apps/web-ele/src/views/system/tenant/modules/form.vue
@@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getTenant(data.id as number);
+      formData.value = await getTenant(data.id);
      // 将数组转换为换行符分隔的字符串
      const formValues = {
        ...formData.value,
--- a/apps/web-ele/src/views/system/tenantPackage/modules/form.vue
+++ b/apps/web-ele/src/views/system/tenantPackage/modules/form.vue
@@ -82,7 +82,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getTenantPackage(data.id as number);
+      formData.value = await getTenantPackage(data.id);
      await formApi.setValues(data);
    } finally {
      modalApi.unlock();
--- a/apps/web-ele/src/views/system/user/modules/assign-role-form.vue
+++ b/apps/web-ele/src/views/system/user/modules/assign-role-form.vue
@@ -58,7 +58,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      const roleIds = await getUserRoleList(data.id as number);
+      const roleIds = await getUserRoleList(data.id);
      // 设置到 values
      await formApi.setValues({
        ...data,
--- a/apps/web-ele/src/views/system/user/modules/form.vue
+++ b/apps/web-ele/src/views/system/user/modules/form.vue
@@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
    }
    modalApi.lock();
    try {
-      formData.value = await getUser(data.id as number);
+      formData.value = await getUser(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
    } finally {