reactor：【system 系统管理】area、dept、dict、loginlog 进一步统一代码风格

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

@@ -1,11 +1,10 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { SystemNoticeApi } from '#/api/system/notice';
 
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import { getRangePickerDefaultProps, } from '#/utils';
+import { z } from '#/adapter/form';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -21,38 +20,44 @@ export function useFormSchema(): VbenFormSchema[] {
     {
       fieldName: 'title',
       label: '公告标题',
-      rules: 'required',
       component: 'Input',
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '公告类型',
+      component: 'RadioGroup',
       componentProps: {
-        placeholder: '请输入公告标题',
+        options: getDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE, 'number'),
+        buttonStyle: 'solid',
+        optionType: 'button',
       },
+      rules: 'required',
     },
     {
       fieldName: 'content',
       label: '公告内容',
-      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: '公告状态（0正常 1关闭）',
-      rules: 'required',
+      label: '公告状态',
       component: 'RadioGroup',
       componentProps: {
-        options: [],
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
         buttonStyle: 'solid',
         optionType: 'button',
       },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+      },
     },
   ];
 }
@@ -65,45 +70,17 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '公告标题',
       component: 'Input',
       componentProps: {
-        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: '公告状态（0正常 1关闭）',
+      label: '公告状态',
       component: 'Select',
       componentProps: {
-        allowClear: true,
-        options: [],
-        placeholder: '请选择公告状态（0正常 1关闭）',
-      },
-    },
-    {
-      fieldName: 'createTime',
-      label: '创建时间',
-      component: 'RangePicker',
-      componentProps: {
-        ...getRangePickerDefaultProps(),
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择公告状态',
         allowClear: true,
       },
     },
@@ -111,28 +88,23 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns(): VxeTableGridOptions<SystemNoticeApi.Notice>['columns'] {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
     { type: 'checkbox', width: 40 },
     {
       field: 'id',
-      title: '公告ID',
-      minWidth: 120,
+      title: '公告编号',
+      minWidth: 100,
     },
     {
       field: 'title',
       title: '公告标题',
-      minWidth: 120,
-    },
-    {
-      field: 'content',
-      title: '公告内容',
-      minWidth: 120,
+      minWidth: 200,
     },
     {
       field: 'type',
-      title: '公告类型（1通知 2公告）',
-      minWidth: 120,
+      title: '公告类型',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.SYSTEM_NOTICE_TYPE },
@@ -140,18 +112,22 @@ export function useGridColumns(): VxeTableGridOptions<SystemNoticeApi.Notice>['c
     },
     {
       field: 'status',
-      title: '公告状态（0正常 1关闭）',
-      minWidth: 120,
+      title: '公告状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
     },
     {
       field: 'createTime',
       title: '创建时间',
-      minWidth: 120,
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       title: '操作',
-      width: 200,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },