feat:通知公告功能对接，客户端功能对接

src/router/elegant/imports.ts

@@ -23,12 +23,14 @@ export const views: Record<LastLevelRouteKey, RouteComponent | (() => Promise<Ro
   home: () => import("@/views/home/index.vue"),
   "monitor_login-infor": () => import("@/views/monitor/login-infor/index.vue"),
   "monitor_oper-log": () => import("@/views/monitor/oper-log/index.vue"),
+  system_client: () => import("@/views/system/client/index.vue"),
   system_config: () => import("@/views/system/config/index.vue"),
   system_dept: () => import("@/views/system/dept/index.vue"),
   system_dict_data: () => import("@/views/system/dict/data/index.vue"),
   system_dict: () => import("@/views/system/dict/index.vue"),
   system_dict_type: () => import("@/views/system/dict/type/index.vue"),
   system_menu: () => import("@/views/system/menu/index.vue"),
+  system_notice: () => import("@/views/system/notice/index.vue"),
   system_post: () => import("@/views/system/post/index.vue"),
   system_tenant: () => import("@/views/system/tenant/index.vue"),
   system_user: () => import("@/views/system/user/index.vue"),

src/router/elegant/routes.ts

@@ -115,6 +115,15 @@ export const generatedRoutes: GeneratedRoute[] = [
       order: 1
     },
     children: [
+      {
+        name: 'system_client',
+        path: '/system/client',
+        component: 'view.system_client',
+        meta: {
+          title: 'system_client',
+          i18nKey: 'route.system_client'
+        }
+      },
       {
         name: 'system_config',
         path: '/system/config',
@@ -122,7 +131,18 @@ export const generatedRoutes: GeneratedRoute[] = [
         meta: {
           title: 'system_config',
           i18nKey: 'route.system_config'
-        }
+        },
+        children: [
+          {
+            name: 'system_config_notice',
+            path: '/system/config/notice',
+            component: 'view.system_config_notice',
+            meta: {
+              title: 'system_config_notice',
+              i18nKey: 'route.system_config_notice'
+            }
+          }
+        ]
       },
       {
         name: 'system_dept',
@@ -173,6 +193,15 @@ export const generatedRoutes: GeneratedRoute[] = [
           order: 3
         }
       },
+      {
+        name: 'system_notice',
+        path: '/system/notice',
+        component: 'view.system_notice',
+        meta: {
+          title: 'system_notice',
+          i18nKey: 'route.system_notice'
+        }
+      },
       {
         name: 'system_post',
         path: '/system/post',

src/router/elegant/transform.ts

@@ -173,12 +173,14 @@ const routeMap: RouteMap = {
   "monitor_login-infor": "/monitor/login-infor",
   "monitor_oper-log": "/monitor/oper-log",
   "system": "/system",
+  "system_client": "/system/client",
   "system_config": "/system/config",
   "system_dept": "/system/dept",
   "system_dict": "/system/dict",
   "system_dict_data": "/system/dict/data",
   "system_dict_type": "/system/dict/type",
   "system_menu": "/system/menu",
+  "system_notice": "/system/notice",
   "system_post": "/system/post",
   "system_tenant": "/system/tenant",
   "system_user": "/system/user",

src/service/api/system/client.ts

@@ -0,0 +1,36 @@
+import { request } from '@/service/request';
+
+/** 获取客户端列表 */
+export function fetchGetClientList (params?: Api.System.ClientSearchParams) {
+    return request<Api.System.ClientList>({
+        url: '/system/client/list',
+        method: 'get',
+        params
+    });
+}
+
+/** 新增客户端 */
+export function fetchCreateClient (data: Api.System.ClientOperateParams) {
+    return request<boolean>({
+        url: '/system/client',
+        method: 'post',
+        data
+    });
+}
+
+/** 修改客户端 */
+export function fetchUpdateClient (data: Api.System.ClientOperateParams) {
+    return request<boolean>({
+        url: '/system/client',
+        method: 'put',
+        data
+    });
+}
+
+/** 批量删除客户端 */
+export function fetchBatchDeleteClient (ids: CommonType.IdType[]) {
+    return request<boolean>({
+        url: `/system/client/${ids.join(',')}`,
+        method: 'delete'
+    });
+}

src/service/api/system/notice.ts

@@ -0,0 +1,36 @@
+import { request } from '@/service/request';
+
+/** 获取通知公告列表 */
+export function fetchGetNoticeList(params?: Api.System.NoticeSearchParams) {
+  return request<Api.System.NoticeList>({
+    url: '/system/notice/list',
+    method: 'get',
+    params
+  });
+}
+
+/** 新增通知公告 */
+export function fetchCreateNotice(data: Api.System.NoticeOperateParams) {
+  return request<boolean>({
+    url: '/system/notice',
+    method: 'post',
+    data
+  });
+}
+
+/** 修改通知公告 */
+export function fetchUpdateNotice(data: Api.System.NoticeOperateParams) {
+  return request<boolean>({
+    url: '/system/notice',
+    method: 'put',
+    data
+  });
+}
+
+/** 批量删除通知公告 */
+export function fetchBatchDeleteNotice(noticeIds: CommonType.IdType[]) {
+  return request<boolean>({
+    url: `/system/notice/${noticeIds.join(',')}`,
+    method: 'delete'
+  });
+}

src/typings/elegant-router.d.ts

@@ -27,12 +27,14 @@ declare module "@elegant-router/types" {
     "monitor_login-infor": "/monitor/login-infor";
     "monitor_oper-log": "/monitor/oper-log";
     "system": "/system";
+    "system_client": "/system/client";
     "system_config": "/system/config";
     "system_dept": "/system/dept";
     "system_dict": "/system/dict";
     "system_dict_data": "/system/dict/data";
     "system_dict_type": "/system/dict/type";
     "system_menu": "/system/menu";
+    "system_notice": "/system/notice";
     "system_post": "/system/post";
     "system_tenant": "/system/tenant";
     "system_user": "/system/user";
@@ -102,12 +104,14 @@ declare module "@elegant-router/types" {
     | "home"
     | "monitor_login-infor"
     | "monitor_oper-log"
+    | "system_client"
     | "system_config"
     | "system_dept"
     | "system_dict_data"
     | "system_dict"
     | "system_dict_type"
     | "system_menu"
+    | "system_notice"
     | "system_post"
     | "system_tenant"
     | "system_user"

src/views/system/client/index.vue

@@ -0,0 +1,233 @@
+<script setup lang="tsx">
+import { NButton, NPopconfirm } from 'naive-ui';
+import { fetchBatchDeleteClient, fetchGetClientList } from '@/service/api/system/client';
+import { $t } from '@/locales';
+import { useAuth } from '@/hooks/business/auth';
+import { useAppStore } from '@/store/modules/app';
+import { useDownload } from '@/hooks/business/download';
+import { useTable, useTableOperate } from '@/hooks/common/table';
+import { useDict } from '@/hooks/business/dict';
+import DictTag from '@/components/custom/dict-tag.vue';
+import ClientOperateDrawer from './modules/client-operate-drawer.vue';
+import ClientSearch from './modules/client-search.vue';
+defineOptions({
+  name: 'ClientList'
+});
+useDict('sys_grant_type');
+useDict('sys_device_type');
+useDict('sys_normal_disable');
+const appStore = useAppStore();
+const { download } = useDownload();
+const { hasAuth } = useAuth();
+
+const {
+  columns,
+  columnChecks,
+  data,
+  getData,
+  getDataByPage,
+  loading,
+  mobilePagination,
+  searchParams,
+  resetSearchParams
+} = useTable({
+  apiFn: fetchGetClientList,
+  apiParams: {
+    pageNum: 1,
+    pageSize: 10,
+    // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
+    // the value can not be undefined, otherwise the property in Form will not be reactive
+    clientKey: null,
+    clientSecret: null,
+    status: null
+  },
+  columns: () => [
+    {
+      type: 'selection',
+      align: 'center',
+      disabled: row => row.id === 1,
+      width: 48
+    },
+    {
+      key: 'index',
+      title: $t('common.index'),
+      align: 'center',
+      width: 64
+    },
+    {
+      key: 'clientId',
+      title: '客户端id',
+      align: 'center',
+      minWidth: 120
+    },
+    {
+      key: 'clientKey',
+      title: '客户端key',
+      align: 'center',
+      minWidth: 120
+    },
+    {
+      key: 'clientSecret',
+      title: '客户端秘钥',
+      align: 'center',
+      minWidth: 120
+    },
+    {
+      key: 'grantTypeList',
+      title: '授权类型',
+      align: 'center',
+      minWidth: 120,
+      render: row => {
+        return <DictTag value={row.grantTypeList} dict-code="sys_grant_type" />;
+      }
+    },
+    {
+      key: 'deviceType',
+      title: '设备类型',
+      align: 'center',
+      minWidth: 120,
+      render: row => {
+        return <DictTag value={row.deviceType} dict-code="sys_device_type" />;
+      }
+    },
+    {
+      key: 'activeTimeout',
+      title: 'token活跃超时时间',
+      align: 'center',
+      minWidth: 120,
+      render: row => {
+        return `${row.activeTimeout}秒`;
+      }
+    },
+    {
+      key: 'timeout',
+      title: 'token固定超时',
+      align: 'center',
+      minWidth: 120,
+      render: row => {
+        return `${row.timeout}秒`;
+      }
+    },
+    {
+      key: 'status',
+      title: '状态',
+      align: 'center',
+      minWidth: 120,
+      render: row => {
+        return <DictTag value={row.status} dict-code="sys_normal_disable" />;
+      }
+    },
+    {
+      key: 'operate',
+      title: $t('common.operate'),
+      align: 'center',
+      width: 130,
+      render: row => {
+        const editBtn = () => {
+          if (!hasAuth('system:client:edit')) {
+            return null;
+          }
+          return (
+            <NButton type="primary" ghost size="small" onClick={() => edit(row.id!)}>
+              {$t('common.edit')}
+            </NButton>
+          );
+        };
+
+        const deleteBtn = () => {
+          if (!hasAuth('system:client:remove')) {
+            return null;
+          }
+          return (
+            <NPopconfirm onPositiveClick={() => handleDelete(row.id!)} positive-text="确定" negative-text="取消">
+              {{
+                default: () => $t('common.confirmDelete'),
+                trigger: () => (
+                  <NButton disabled={row.id === 1} type="error" ghost size="small">
+                    {$t('common.delete')}
+                  </NButton>
+                )
+              }}
+            </NPopconfirm>
+          );
+        };
+
+        return (
+          <div class="flex-center gap-8px">
+            {editBtn()}
+            {deleteBtn()}
+          </div>
+        );
+      }
+    }
+  ]
+});
+
+const { drawerVisible, operateType, editingData, handleAdd, handleEdit, checkedRowKeys, onBatchDeleted, onDeleted } =
+  useTableOperate(data, getData);
+
+async function handleBatchDelete() {
+  // request
+  const { error } = await fetchBatchDeleteClient(checkedRowKeys.value);
+  if (error) return;
+  onBatchDeleted();
+}
+
+async function handleDelete(id: CommonType.IdType) {
+  // request
+  const { error } = await fetchBatchDeleteClient([id]);
+  if (error) return;
+  onDeleted();
+}
+
+async function edit(id: CommonType.IdType) {
+  handleEdit('id', id);
+}
+
+async function handleExport() {
+  download('/system/client/export', searchParams, `客户端_${new Date().getTime()}.xlsx`);
+}
+</script>
+
+<template>
+  <div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
+    <ClientSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
+    <NCard title="客户端列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
+      <template #header-extra>
+        <TableHeaderOperation
+          v-model:columns="columnChecks"
+          :disabled-delete="checkedRowKeys.length === 0"
+          :loading="loading"
+          :show-add="hasAuth('system:client:add')"
+          :show-delete="hasAuth('system:client:remove')"
+          :show-export="hasAuth('system:client:export')"
+          @add="handleAdd"
+          @delete="handleBatchDelete"
+          @export="handleExport"
+          @refresh="getData"
+        />
+      </template>
+      <NDataTable
+        v-model:checked-row-keys="checkedRowKeys"
+        :columns="columns"
+        :data="data"
+        size="small"
+        :flex-height="!appStore.isMobile"
+        :scroll-x="962"
+        :loading="loading"
+        remote
+        :row-key="row => row.id"
+        :pagination="mobilePagination"
+        class="sm:h-full"
+      />
+      <ClientOperateDrawer
+        v-model:visible="drawerVisible"
+        :operate-type="operateType"
+        :row-data="editingData"
+        @submitted="getDataByPage"
+      />
+    </NCard>
+  </div>
+</template>
+
+<style scoped></style>

src/views/system/client/modules/client-operate-drawer.vue

@@ -0,0 +1,196 @@
+<script setup lang="ts">
+import { computed, reactive, watch } from 'vue';
+import { useFormRules, useNaiveForm } from '@/hooks/common/form';
+import { $t } from '@/locales';
+import { fetchCreateClient, fetchUpdateClient } from '@/service/api/system/client';
+defineOptions({
+  name: 'ClientOperateDrawer'
+});
+
+interface Props {
+  /** the type of operation */
+  operateType: NaiveUI.TableOperateType;
+  /** the edit row data */
+  rowData?: Api.System.Client | null;
+}
+
+const props = defineProps<Props>();
+
+interface Emits {
+  (e: 'submitted'): void;
+}
+
+const emit = defineEmits<Emits>();
+
+const visible = defineModel<boolean>('visible', {
+  default: false
+});
+
+const { formRef, validate, restoreValidation } = useNaiveForm();
+const { createRequiredRule } = useFormRules();
+
+const title = computed(() => {
+  const titles: Record<NaiveUI.TableOperateType, string> = {
+    add: '新增客户端',
+    edit: '编辑客户端'
+  };
+  return titles[props.operateType];
+});
+
+type Model = Api.System.ClientOperateParams;
+
+const model: Model = reactive(createDefaultModel());
+
+function createDefaultModel(): Model {
+  return {
+    clientKey: '',
+    clientSecret: '',
+    grantTypeList: [],
+    deviceType: '',
+    activeTimeout: 1800,
+    timeout: 604800,
+    status: '0'
+  };
+}
+
+type RuleKey = Extract<
+  keyof Model,
+  'id' | 'clientKey' | 'clientSecret' | 'grantTypeList' | 'deviceType' | 'activeTimeout' | 'timeout'
+>;
+
+const rules: Record<RuleKey, App.Global.FormRule> = {
+  id: createRequiredRule('id不能为空'),
+  clientKey: createRequiredRule('客户端key不能为空'),
+  clientSecret: createRequiredRule('客户端秘钥不能为空'),
+  grantTypeList: createRequiredRule('授权类型不能为空'),
+  deviceType: createRequiredRule('设备类型不能为空'),
+  activeTimeout: createRequiredRule('token活跃超时时间不能为空'),
+  timeout: createRequiredRule('token固定超时不能为空')
+};
+
+function handleUpdateModelWhenEdit() {
+  if (props.operateType === 'add') {
+    Object.assign(model, createDefaultModel());
+    return;
+  }
+
+  if (props.operateType === 'edit' && props.rowData) {
+    Object.assign(model, props.rowData);
+  }
+}
+
+function closeDrawer() {
+  visible.value = false;
+}
+
+async function handleSubmit() {
+  await validate();
+
+  // request
+  if (props.operateType === 'add') {
+    const { clientKey, clientSecret, grantTypeList, deviceType, activeTimeout, timeout, status } = model;
+    const { error } = await fetchCreateClient({
+      clientKey,
+      clientSecret,
+      grantTypeList,
+      deviceType,
+      activeTimeout,
+      timeout,
+      status
+    });
+    if (error) return;
+  }
+
+  if (props.operateType === 'edit') {
+    const { id, clientId, clientKey, clientSecret, grantTypeList, deviceType, activeTimeout, timeout, status } = model;
+    const { error } = await fetchUpdateClient({
+      id,
+      clientId,
+      clientKey,
+      clientSecret,
+      grantTypeList,
+      deviceType,
+      activeTimeout,
+      timeout,
+      status
+    });
+    if (error) return;
+  }
+
+  window.$message?.success($t('common.updateSuccess'));
+  closeDrawer();
+  emit('submitted');
+}
+
+watch(visible, () => {
+  if (visible.value) {
+    handleUpdateModelWhenEdit();
+    restoreValidation();
+  }
+});
+</script>
+
+<template>
+  <NDrawer v-model:show="visible" :title="title" display-directive="show" :width="800" class="max-w-90%">
+    <NDrawerContent :title="title" :native-scrollbar="false" closable>
+      <NForm ref="formRef" :model="model" :rules="rules">
+        <NFormItem label="客户端id" path="clientId">
+          <NInput v-if="operateType === 'edit'" v-model:value="model.clientId" disabled placeholder="请输入客户端id" />
+        </NFormItem>
+        <NFormItem label="客户端key" path="clientKey">
+          <NInput v-model:value="model.clientKey" :disabled="operateType === 'edit'" placeholder="请输入客户端key" />
+        </NFormItem>
+        <NFormItem label="客户端秘钥" path="clientSecret">
+          <NInput
+            v-model:value="model.clientSecret"
+            :disabled="operateType === 'edit'"
+            placeholder="请输入客户端秘钥"
+          />
+        </NFormItem>
+        <NFormItem label="授权类型" path="grantType">
+          <DictSelect v-model:value="model.grantTypeList" dict-code="sys_grant_type" multiple />
+        </NFormItem>
+        <NFormItem label="设备类型" path="deviceType">
+          <DictSelect v-model:value="model.deviceType" dict-code="sys_device_type" />
+        </NFormItem>
+        <NFormItem label="token活跃超时时间" path="activeTimeout">
+          <template #label>
+            <div class="flex-center">
+              <FormTip content="指定时间无操作则过期(单位：秒), 默认30分钟(1800秒)" />
+              <span class="pl-3px">token活跃超时时间</span>
+            </div>
+          </template>
+          <NInputNumber v-model:value="model.activeTimeout" placeholder="请输入token活跃超时时间">
+            <template #suffix>
+              <span class="text-sm">秒</span>
+            </template>
+          </NInputNumber>
+        </NFormItem>
+        <NFormItem label="token固定超时" path="timeout">
+          <template #label>
+            <div class="flex-center">
+              <FormTip content="指定时间必定过期(单位：秒)，默认七天(604800秒)" />
+              <span class="pl-3px">token固定超时</span>
+            </div>
+          </template>
+          <NInputNumber v-model:value="model.timeout" placeholder="请输入token固定超时">
+            <template #suffix>
+              <span class="text-sm">秒</span>
+            </template>
+          </NInputNumber>
+        </NFormItem>
+        <NFormItem label="状态" path="status">
+          <DictRadio v-model:value="model.status" :disabled="model.id == 1" dict-code="sys_normal_disable" />
+        </NFormItem>
+      </NForm>
+      <template #footer>
+        <NSpace :size="16">
+          <NButton @click="closeDrawer">{{ $t('common.cancel') }}</NButton>
+          <NButton type="primary" @click="handleSubmit">{{ $t('common.confirm') }}</NButton>
+        </NSpace>
+      </template>
+    </NDrawerContent>
+  </NDrawer>
+</template>
+
+<style scoped></style>

src/views/system/client/modules/client-search.vue

@@ -0,0 +1,73 @@
+<script setup lang="ts">
+import { $t } from '@/locales';
+import { useNaiveForm } from '@/hooks/common/form';
+defineOptions({
+  name: 'ClientSearch'
+});
+
+interface Emits {
+  (e: 'reset'): void;
+  (e: 'search'): void;
+}
+
+const emit = defineEmits<Emits>();
+
+const { formRef, validate, restoreValidation } = useNaiveForm();
+
+const model = defineModel<Api.System.ClientSearchParams>('model', { required: true });
+
+async function reset() {
+  await restoreValidation();
+  emit('reset');
+}
+
+async function search() {
+  await validate();
+  emit('search');
+}
+</script>
+
+<template>
+  <NCard :bordered="false" size="small" class="card-wrapper">
+    <NCollapse>
+      <NCollapseItem :title="$t('common.search')" name="user-search">
+        <NForm ref="formRef" :model="model" label-placement="left" :label-width="90">
+          <NGrid responsive="screen" item-responsive>
+            <NFormItemGi span="24 s:12 m:6" label="客户端key" path="clientKey" class="pr-24px">
+              <NInput v-model:value="model.clientKey" placeholder="请输入客户端key" />
+            </NFormItemGi>
+            <NFormItemGi span="24 s:12 m:6" label="客户端秘钥" path="clientSecret" class="pr-24px">
+              <NInput v-model:value="model.clientSecret" placeholder="请输入客户端秘钥" />
+            </NFormItemGi>
+            <NFormItemGi span="24 s:12 m:6" label="状态" path="status" class="pr-24px">
+              <DictSelect
+                v-model:value="model.status"
+                placeholder="请选择状态"
+                dict-code="sys_normal_disable"
+                clearable
+              />
+            </NFormItemGi>
+            <NFormItemGi span="24" class="pr-24px">
+              <NSpace class="w-full" justify="end">
+                <NButton @click="reset">
+                  <template #icon>
+                    <icon-ic-round-refresh class="text-icon" />
+                  </template>
+                  {{ $t('common.reset') }}
+                </NButton>
+                <NButton type="primary" ghost @click="search">
+                  <template #icon>
+                    <icon-ic-round-search class="text-icon" />
+                  </template>
+                  {{ $t('common.search') }}
+                </NButton>
+              </NSpace>
+            </NFormItemGi>
+          </NGrid>
+        </NForm>
+      </NCollapseItem>
+    </NCollapse>
+  </NCard>
+</template>
+
+<style scoped></style>

src/views/system/notice/index.vue

@@ -0,0 +1,198 @@
+<script setup lang="tsx">
+import { NButton, NPopconfirm } from 'naive-ui';
+import { $t } from '@/locales';
+import { fetchBatchDeleteNotice, fetchGetNoticeList } from '@/service/api/system/notice';
+import { useAuth } from '@/hooks/business/auth';
+import { useAppStore } from '@/store/modules/app';
+import { useDownload } from '@/hooks/business/download';
+import { useTable, useTableOperate } from '@/hooks/common/table';
+import { useDict } from '@/hooks/business/dict';
+import DictTag from '@/components/custom/dict-tag.vue';
+import NoticeOperateDrawer from './modules/notice-operate-drawer.vue';
+import NoticeSearch from './modules/notice-search.vue';
+defineOptions({
+  name: 'NoticeList'
+});
+
+useDict('sys_notice_type');
+useDict('sys_normal_disable');
+const appStore = useAppStore();
+const { download } = useDownload();
+const { hasAuth } = useAuth();
+
+const {
+  columns,
+  columnChecks,
+  data,
+  getData,
+  getDataByPage,
+  loading,
+  mobilePagination,
+  searchParams,
+  resetSearchParams
+} = useTable({
+  apiFn: fetchGetNoticeList,
+  apiParams: {
+    pageNum: 1,
+    pageSize: 10,
+    // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
+    // the value can not be undefined, otherwise the property in Form will not be reactive
+    noticeTitle: null,
+    noticeType: null
+  },
+  columns: () => [
+    {
+      type: 'selection',
+      align: 'center',
+      width: 48
+    },
+    {
+      key: 'noticeTitle',
+      title: '公告标题',
+      align: 'center',
+      width: 300
+    },
+    {
+      key: 'noticeType',
+      title: '公告类型',
+      align: 'center',
+      minWidth: 120,
+      render(row) {
+        return <DictTag size="small" value={row.noticeType} dictCode="sys_notice_type" />;
+      }
+    },
+    {
+      key: 'status',
+      title: '公告状态',
+      align: 'center',
+      minWidth: 120,
+      render(row) {
+        return <DictTag size="small" value={row.status} dictCode="sys_normal_disable" />;
+      }
+    },
+    {
+      key: 'createByName',
+      title: '创建者',
+      align: 'center',
+      minWidth: 120
+    },
+    {
+      key: 'createTime',
+      title: '创建时间',
+      align: 'center',
+      minWidth: 120
+    },
+    {
+      key: 'operate',
+      title: $t('common.operate'),
+      align: 'center',
+      width: 130,
+      render: row => {
+        const editBtn = () => {
+          if (!hasAuth('system:notice:edit')) {
+            return null;
+          }
+          return (
+            <NButton type="primary" ghost size="small" onClick={() => edit(row.noticeId!)}>
+              {$t('common.edit')}
+            </NButton>
+          );
+        };
+
+        const deleteBtn = () => {
+          if (!hasAuth('system:notice:remove')) {
+            return null;
+          }
+          return (
+            <NPopconfirm onPositiveClick={() => handleDelete(row.noticeId!)}>
+              {{
+                default: () => $t('common.confirmDelete'),
+                trigger: () => (
+                  <NButton type="error" ghost size="small">
+                    {$t('common.delete')}
+                  </NButton>
+                )
+              }}
+            </NPopconfirm>
+          );
+        };
+
+        return (
+          <div class="flex-center gap-8px">
+            {editBtn()}
+            {deleteBtn()}
+          </div>
+        );
+      }
+    }
+  ]
+});
+
+const { drawerVisible, operateType, editingData, handleAdd, handleEdit, checkedRowKeys, onBatchDeleted, onDeleted } =
+  useTableOperate(data, getData);
+
+async function handleBatchDelete() {
+  // request
+  const { error } = await fetchBatchDeleteNotice(checkedRowKeys.value);
+  if (error) return;
+  onBatchDeleted();
+}
+
+async function handleDelete(noticeId: CommonType.IdType) {
+  // request
+  const { error } = await fetchBatchDeleteNotice([noticeId]);
+  if (error) return;
+  onDeleted();
+}
+
+async function edit(noticeId: CommonType.IdType) {
+  handleEdit('noticeId', noticeId);
+}
+
+async function handleExport() {
+  download('/system/notice/export', searchParams, `通知公告_${new Date().getTime()}.xlsx`);
+}
+</script>
+
+<template>
+  <div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
+    <NoticeSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
+    <NCard title="通知公告列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
+      <template #header-extra>
+        <TableHeaderOperation
+          v-model:columns="columnChecks"
+          :disabled-delete="checkedRowKeys.length === 0"
+          :loading="loading"
+          :show-add="hasAuth('system:notice:add')"
+          :show-delete="hasAuth('system:notice:remove')"
+          :show-export="hasAuth('system:notice:export')"
+          @add="handleAdd"
+          @delete="handleBatchDelete"
+          @export="handleExport"
+          @refresh="getData"
+        />
+      </template>
+      <NDataTable
+        v-model:checked-row-keys="checkedRowKeys"
+        :columns="columns"
+        :data="data"
+        size="small"
+        :flex-height="!appStore.isMobile"
+        :scroll-x="962"
+        :loading="loading"
+        remote
+        :row-key="row => row.noticeId"
+        :pagination="mobilePagination"
+        class="sm:h-full"
+      />
+      <NoticeOperateDrawer
+        v-model:visible="drawerVisible"
+        :operate-type="operateType"
+        :row-data="editingData"
+        @submitted="getDataByPage"
+      />
+    </NCard>
+  </div>
+</template>
+
+<style scoped></style>

src/views/system/notice/modules/notice-operate-drawer.vue

@@ -0,0 +1,134 @@
+<script setup lang="ts">
+import { computed, reactive, watch } from 'vue';
+import { useFormRules, useNaiveForm } from '@/hooks/common/form';
+import { $t } from '@/locales';
+import { fetchCreateNotice, fetchUpdateNotice } from '@/service/api/system/notice';
+defineOptions({
+  name: 'NoticeOperateDrawer'
+});
+
+interface Props {
+  /** the type of operation */
+  operateType: NaiveUI.TableOperateType;
+  /** the edit row data */
+  rowData?: Api.System.Notice | null;
+}
+
+const props = defineProps<Props>();
+
+interface Emits {
+  (e: 'submitted'): void;
+}
+
+const emit = defineEmits<Emits>();
+
+const visible = defineModel<boolean>('visible', {
+  default: false
+});
+
+const { formRef, validate, restoreValidation } = useNaiveForm();
+const { createRequiredRule } = useFormRules();
+
+const title = computed(() => {
+  const titles: Record<NaiveUI.TableOperateType, string> = {
+    add: '新增通知公告',
+    edit: '编辑通知公告'
+  };
+  return titles[props.operateType];
+});
+
+type Model = Api.System.NoticeOperateParams;
+
+const model: Model = reactive(createDefaultModel());
+
+function createDefaultModel(): Model {
+  return {
+    noticeTitle: '',
+    noticeType: '1',
+    noticeContent: '',
+    status: '0'
+  };
+}
+
+type RuleKey = Extract<keyof Model, 'noticeId' | 'noticeTitle' | 'noticeType' | 'noticeContent' | 'status'>;
+
+const rules: Record<RuleKey, App.Global.FormRule> = {
+  noticeId: createRequiredRule('公告ID不能为空'),
+  noticeTitle: createRequiredRule('公告标题不能为空'),
+  noticeType: createRequiredRule('公告类型不能为空'),
+  noticeContent: createRequiredRule('公告内容不能为空'),
+  status: createRequiredRule('公告状态不能为空')
+};
+
+function handleUpdateModelWhenEdit() {
+  if (props.operateType === 'add') {
+    Object.assign(model, createDefaultModel());
+    return;
+  }
+
+  if (props.operateType === 'edit' && props.rowData) {
+    Object.assign(model, props.rowData);
+  }
+}
+
+function closeDrawer() {
+  visible.value = false;
+}
+
+async function handleSubmit() {
+  await validate();
+
+  // request
+  if (props.operateType === 'add') {
+    const { noticeTitle, noticeType, noticeContent, status } = model;
+    const { error } = await fetchCreateNotice({ noticeTitle, noticeType, noticeContent, status });
+    if (error) return;
+  }
+
+  if (props.operateType === 'edit') {
+    const { noticeId, noticeTitle, noticeType, noticeContent, status } = model;
+    const { error } = await fetchUpdateNotice({ noticeId, noticeTitle, noticeType, noticeContent, status });
+    if (error) return;
+  }
+
+  window.$message?.success($t('common.updateSuccess'));
+  closeDrawer();
+  emit('submitted');
+}
+
+watch(visible, () => {
+  if (visible.value) {
+    handleUpdateModelWhenEdit();
+    restoreValidation();
+  }
+});
+</script>
+
+<template>
+  <NDrawer v-model:show="visible" :title="title" display-directive="show" :width="800" class="max-w-90%">
+    <NDrawerContent :title="title" :native-scrollbar="false" closable>
+      <NForm ref="formRef" :model="model" :rules="rules">
+        <NFormItem label="公告标题" path="noticeTitle">
+          <NInput v-model:value="model.noticeTitle" placeholder="请输入公告标题" />
+        </NFormItem>
+        <NFormItem label="公告类型" path="noticeType">
+          <DictRadio v-model:value="model.noticeType" dict-code="sys_notice_type" />
+        </NFormItem>
+        <NFormItem label="公告内容" path="noticeContent">
+          <NInput v-model:value="model.noticeContent" type="textarea" placeholder="请输入公告内容" />
+        </NFormItem>
+        <NFormItem label="公告状态" path="status">
+          <DictRadio v-model:value="model.status" dict-code="sys_normal_disable" />
+        </NFormItem>
+      </NForm>
+      <template #footer>
+        <NSpace :size="16">
+          <NButton @click="closeDrawer">{{ $t('common.cancel') }}</NButton>
+          <NButton type="primary" @click="handleSubmit">{{ $t('common.confirm') }}</NButton>
+        </NSpace>
+      </template>
+    </NDrawerContent>
+  </NDrawer>
+</template>
+
+<style scoped></style>

src/views/system/notice/modules/notice-search.vue

@@ -0,0 +1,65 @@
+<script setup lang="ts">
+import { $t } from '@/locales';
+import { useNaiveForm } from '@/hooks/common/form';
+defineOptions({
+  name: 'NoticeSearch'
+});
+
+interface Emits {
+  (e: 'reset'): void;
+  (e: 'search'): void;
+}
+
+const emit = defineEmits<Emits>();
+
+const { formRef, validate, restoreValidation } = useNaiveForm();
+
+const model = defineModel<Api.System.NoticeSearchParams>('model', { required: true });
+
+async function reset() {
+  await restoreValidation();
+  emit('reset');
+}
+
+async function search() {
+  await validate();
+  emit('search');
+}
+</script>
+
+<template>
+  <NCard :bordered="false" size="small" class="card-wrapper">
+    <NCollapse>
+      <NCollapseItem :title="$t('common.search')" name="user-search">
+        <NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
+          <NGrid responsive="screen" item-responsive>
+            <NFormItemGi span="24 s:12 m:6" label="公告标题" path="noticeTitle" class="pr-24px">
+              <NInput v-model:value="model.noticeTitle" placeholder="请输入公告标题" />
+            </NFormItemGi>
+            <NFormItemGi span="24 s:12 m:6" label="公告类型" path="noticeType" class="pr-24px">
+              <DictSelect v-model:value="model.noticeType" dict-code="sys_notice_type" placeholder="请选择公告类型" />
+            </NFormItemGi>
+            <NFormItemGi span="24" class="pr-24px">
+              <NSpace class="w-full" justify="end">
+                <NButton @click="reset">
+                  <template #icon>
+                    <icon-ic-round-refresh class="text-icon" />
+                  </template>
+                  {{ $t('common.reset') }}
+                </NButton>
+                <NButton type="primary" ghost @click="search">
+                  <template #icon>
+                    <icon-ic-round-search class="text-icon" />
+                  </template>
+                  {{ $t('common.search') }}
+                </NButton>
+              </NSpace>
+            </NFormItemGi>
+          </NGrid>
+        </NForm>
+      </NCollapseItem>
+    </NCollapse>
+  </NCard>
+</template>
+
+<style scoped></style>