feat: 通知公告

apps/web-antd/src/api/system/notice/index.ts

@@ -26,7 +26,5 @@ export function noticeUpdate(data: any) {
 }
 
 export function noticeRemove(noticeIds: IDS) {
-  return requestClient.deleteWithMsg<void>(
+  return requestClient.deleteWithMsg<void>(`${Api.root}/${noticeIds}`);
-    `${Api.root}/${noticeIds.join(',')}`,
-  );
 }

apps/web-antd/src/views/system/notice/data.ts

@@ -1,9 +1,10 @@
-import type { FormSchemaGetter } from '#/adapter';
+import type { FormSchemaGetter, VxeGridProps } from '#/adapter';
 
 import { DictEnum } from '@vben/constants';
 import { getPopupContainer } from '@vben/utils';
 
 import { getDictOptions } from '#/utils/dict';
+import { renderDict } from '#/utils/render';
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -27,6 +28,50 @@ export const querySchema: FormSchemaGetter = () => [
   },
 ];
 
+export const columns: VxeGridProps['columns'] = [
+  { type: 'checkbox', width: 60 },
+  {
+    title: '公告标题',
+    field: 'noticeTitle',
+  },
+  {
+    title: '公告类型',
+    field: 'noticeType',
+    width: 120,
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.noticeType, DictEnum.SYS_NOTICE_TYPE);
+      },
+    },
+  },
+  {
+    title: '状态',
+    field: 'status',
+    width: 120,
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.status, DictEnum.SYS_NOTICE_STATUS);
+      },
+    },
+  },
+  {
+    title: '创建人',
+    field: 'createByName',
+    width: 150,
+  },
+  {
+    title: '创建时间',
+    field: 'createTime',
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
+    title: '操作',
+    width: 180,
+  },
+];
+
 export const modalSchema: FormSchemaGetter = () => [
   {
     component: 'Input',

apps/web-antd/src/views/system/notice/index.vue

@@ -1,54 +1,158 @@
 <script setup lang="ts">
-import { Page, useVbenModal } from '@vben/common-ui';
+import type { Recordable } from '@vben/types';
 
-import { Card } from 'ant-design-vue';
+import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 
-import { useVbenForm } from '#/adapter';
+import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import dayjs from 'dayjs';
 
-import { querySchema } from './data';
+import { useVbenVxeGrid, type VxeGridProps } from '#/adapter';
+import { noticeList, noticeRemove } from '#/api/system/notice';
+
+import { columns, querySchema } from './data';
 import noticeModal from './notice-modal.vue';
 
+const formOptions: VbenFormProps = {
+  schema: querySchema(),
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+};
+
+const gridOptions: VxeGridProps = {
+  checkboxConfig: {
+    // 高亮
+    highlight: true,
+    // 翻页时保留选中状态
+    reserve: true,
+    // 点击行选中
+    // trigger: 'row',
+  },
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {},
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues) => {
+        // 区间选择器处理
+        if (formValues?.createTime) {
+          formValues.params = {
+            beginTime: dayjs(formValues.createTime[0]).format(
+              'YYYY-MM-DD 00:00:00',
+            ),
+            endTime: dayjs(formValues.createTime[1]).format(
+              'YYYY-MM-DD 23:59:59',
+            ),
+          };
+          Reflect.deleteProperty(formValues, 'createTime');
+        } else {
+          Reflect.deleteProperty(formValues, 'params');
+        }
+
+        return await noticeList({
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          ...formValues,
+        });
+      },
+    },
+  },
+  rowConfig: {
+    isHover: true,
+    keyField: 'noticeId',
+  },
+  round: true,
+  align: 'center',
+  showOverflow: true,
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({ formOptions, gridOptions });
 const [NoticeModal, modalApi] = useVbenModal({
   connectedComponent: noticeModal,
 });
 
 function handleAdd() {
-  modalApi.setData({ update: false });
+  modalApi.setData({});
   modalApi.open();
 }
 
-const [QueryForm] = useVbenForm({
+async function handleEdit(record: Recordable<any>) {
-  // 默认展开
+  modalApi.setData({ id: record.noticeId });
-  collapsed: false,
+  modalApi.open();
-  // 所有表单项共用，可单独在表单内覆盖
+}
-  commonConfig: {
+
-    // 所有表单项
+async function handleDelete(row: Recordable<any>) {
-    componentProps: {
+  await noticeRemove(row.noticeId);
-      class: 'w-full',
+  await tableApi.reload();
+}
+
+function handleMultiDelete() {
+  const rows = tableApi.grid.getCheckboxRecords();
+  const ids = rows.map((row: any) => row.noticeId);
+  Modal.confirm({
+    title: '提示',
+    okType: 'danger',
+    content: `确认删除选中的${ids.length}条记录吗？`,
+    onOk: async () => {
+      await noticeRemove(ids);
+      await tableApi.reload();
     },
-  },
+  });
-  schema: querySchema(),
+}
-  // 是否可展开
-  showCollapseButton: true,
-  submitButtonOptions: {
-    text: '查询',
-  },
-  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-});
 </script>
 
 <template>
-  <Page content-class="flex flex-col gap-4">
+  <Page :auto-content-height="true">
-    <Card>
+    <BasicTable>
-      <QueryForm />
+      <template #toolbar-actions>
-    </Card>
+        <span class="pl-[7px] text-[16px]">通知公告列表</span>
-    <Card>
+      </template>
-      <div class="flex justify-end">
+      <template #toolbar-tools>
-        <a-button type="primary" @click="handleAdd">
+        <Space>
-          {{ $t('pages.common.add') }}
+          <a-button
-        </a-button>
+            danger
-      </div>
+            type="primary"
-    </Card>
+            v-access:code="['system:notice:delete']"
-    <NoticeModal />
+            @click="handleMultiDelete"
+          >
+            {{ $t('pages.common.delete') }}
+          </a-button>
+          <a-button
+            type="primary"
+            v-access:code="['system:notice:add']"
+            @click="handleAdd"
+          >
+            {{ $t('pages.common.add') }}
+          </a-button>
+        </Space>
+      </template>
+      <template #action="{ row }">
+        <Space>
+          <a-button
+            size="small"
+            type="link"
+            v-access:code="['system:notice:edit']"
+            @click="handleEdit(row)"
+          >
+            {{ $t('pages.common.edit') }}
+          </a-button>
+          <Popconfirm
+            placement="left"
+            title="确认删除？"
+            @confirm="handleDelete(row)"
+          >
+            <a-button
+              danger
+              size="small"
+              type="link"
+              v-access:code="['system:notice:delete']"
+              @click.stop=""
+            >
+              {{ $t('pages.common.delete') }}
+            </a-button>
+          </Popconfirm>
+        </Space>
+      </template>
+    </BasicTable>
+    <NoticeModal @reload="tableApi.reload()" />
   </Page>
 </template>