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

2025-10-16 16:38:50 +08:00
parent 0094459b22 3f6c405376
commit afdf859900
48 changed files with 210 additions and 203 deletions
--- a/apps/web-antd/src/views/mall/promotion/banner/data.ts
+++ b/apps/web-antd/src/views/mall/promotion/banner/data.ts
@@ -1,17 +1,19 @@
-import type { VbenFormSchema } from '#/adapter/form';
-import type { VxeGridPropTypes } from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';

-import { DICT_TYPE } from '@vben/constants';
+import type { VbenFormSchema } from '#/adapter/form';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';

+import { z } from '#/adapter/form';
 import { getRangePickerDefaultProps } from '#/utils';

 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
  return [
    {
-      component: 'Input',
      fieldName: 'id',
+      component: 'Input',
      dependencies: {
        triggerFields: [''],
        show: () => false,
@@ -19,14 +21,20 @@ export function useFormSchema(): VbenFormSchema[] {
    },
    {
      fieldName: 'title',
-      label: 'Banner标题',
+      label: 'Banner 标题',
      component: 'Input',
+      componentProps: {
+        placeholder: '请输入 Banner 标题',
+      },
      rules: 'required',
    },
    {
      fieldName: 'picUrl',
      label: '图片地址',
      component: 'ImageUpload',
+      componentProps: {
+        placeholder: '请上传图片',
+      },
      rules: 'required',
    },
    {
@@ -44,6 +52,9 @@ export function useFormSchema(): VbenFormSchema[] {
      fieldName: 'url',
      label: '跳转地址',
      component: 'Input',
+      componentProps: {
+        placeholder: '请输入跳转地址',
+      },
      rules: 'required',
    },
    {
@@ -65,7 +76,7 @@ export function useFormSchema(): VbenFormSchema[] {
        buttonStyle: 'solid',
        optionType: 'button',
      },
-      rules: 'required',
+      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
    {
      fieldName: 'memo',
@@ -84,18 +95,18 @@ export function useGridFormSchema(): VbenFormSchema[] {
  return [
    {
      fieldName: 'title',
-      label: 'Banner标题',
+      label: 'Banner 标题',
      component: 'Input',
      componentProps: {
-        placeholder: '请输入Banner标题',
+        placeholder: '请输入 Banner 标题',
      },
    },
    {
      fieldName: 'status',
-      label: '状态',
+      label: '活动状态',
      component: 'Select',
      componentProps: {
-        placeholder: '请选择状态',
+        placeholder: '请选择活动状态',
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
      },
    },
@@ -112,16 +123,17 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }

 /** 表格列配置 */
-export function useGridColumns(): VxeGridPropTypes.Columns {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
  return [
    {
      title: 'Banner标题',
      field: 'title',
+      minWidth: 100,
    },
    {
      title: '图片',
      field: 'picUrl',
-      width: 80,
+      minWidth: 80,
      cellRender: {
        name: 'CellImage',
      },
@@ -129,7 +141,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
    {
      title: '状态',
      field: 'status',
-      width: 150,
+      minWidth: 150,
      cellRender: {
        name: 'CellDictTag',
        props: {
@@ -140,7 +152,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
    {
      title: '定位',
      field: 'position',
-      width: 150,
+      minWidth: 150,
      cellRender: {
        name: 'CellDictTag',
        props: {
@@ -151,21 +163,23 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
    {
      title: '跳转地址',
      field: 'url',
+      minWidth: 200,
    },
    {
      title: '创建时间',
      field: 'createTime',
-      width: 180,
+      minWidth: 180,
      formatter: 'formatDateTime',
    },
    {
      title: '排序',
      field: 'sort',
-      width: 100,
+      minWidth: 100,
    },
    {
      title: '描述',
      field: 'memo',
+      minWidth: 150,
    },
    {
      title: '操作',
--- a/apps/web-antd/src/views/mall/promotion/banner/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/banner/index.vue
@@ -2,7 +2,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallBannerApi } from '#/api/mall/market/banner';

-import { Page, useVbenModal } from '@vben/common-ui';
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';

 import { message } from 'ant-design-vue';

@@ -23,17 +23,17 @@ function handleRefresh() {
  gridApi.query();
 }

-/** 创建Banner */
+/** 创建 Banner */
 function handleCreate() {
  formModalApi.setData(null).open();
 }

-/** 编辑Banner */
+/** 编辑 Banner */
 function handleEdit(row: MallBannerApi.Banner) {
  formModalApi.setData(row).open();
 }

-/** 删除Banner */
+/** 删除 Banner */
 async function handleDelete(row: MallBannerApi.Banner) {
  const hideLoading = message.loading({
    content: $t('ui.actionMessage.deleting', [row.title]),
@@ -41,9 +41,7 @@ async function handleDelete(row: MallBannerApi.Banner) {
  });
  try {
    await deleteBanner(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.title]),
-    });
+    message.success($t('ui.actionMessage.deleteSuccess', [row.title]));
    handleRefresh();
  } finally {
    hideLoading();
@@ -71,6 +69,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
    },
    rowConfig: {
      keyField: 'id',
+      isHover: true,
    },
    toolbarConfig: {
      refresh: true,
@@ -82,6 +81,13 @@ const [Grid, gridApi] = useVbenVxeGrid({

 <template>
  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【营销】内容管理"
+        url="https://doc.iocoder.cn/mall/promotion-content/"
+      />
+    </template>
+
    <FormModal @success="handleRefresh" />
    <Grid table-title="Banner列表">
      <template #toolbar-tools>
--- a/apps/web-antd/src/views/mall/promotion/banner/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/banner/modules/form.vue
@@ -18,8 +18,7 @@ import { $t } from '#/locales';
 import { useFormSchema } from '../data';

 const emit = defineEmits(['success']);
-
-const formData = ref<MallBannerApi.Banner>();
+const formData = ref<SystemUserApi.User>();
 const getTitle = computed(() => {
  return formData.value?.id
    ? $t('ui.actionTitle.edit', ['Banner'])
@@ -81,7 +80,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>

 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-2/5">
    <Form class="mx-4" />
  </Modal>
 </template>
--- a/apps/web-ele/src/views/_core/profile/modules/base-info.vue
+++ b/apps/web-ele/src/views/_core/profile/modules/base-info.vue
@@ -60,8 +60,6 @@ const [Form, formApi] = useVbenForm({
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.SYSTEM_USER_SEX, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number(),
    },
--- a/apps/web-ele/src/views/infra/config/data.ts
+++ b/apps/web-ele/src/views/infra/config/data.ts
@@ -59,8 +59,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING, 'boolean'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      defaultValue: true,
      rules: 'required',
--- a/apps/web-ele/src/views/infra/demo/demo01/data.ts
+++ b/apps/web-ele/src/views/infra/demo/demo01/data.ts
@@ -34,8 +34,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.SYSTEM_USER_SEX, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
    },
    {
--- a/apps/web-ele/src/views/infra/demo/demo03/erp/data.ts
+++ b/apps/web-ele/src/views/infra/demo/demo03/erp/data.ts
@@ -34,8 +34,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.SYSTEM_USER_SEX, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
    },
    {
--- a/apps/web-ele/src/views/infra/demo/demo03/inner/data.ts
+++ b/apps/web-ele/src/views/infra/demo/demo03/inner/data.ts
@@ -34,8 +34,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.SYSTEM_USER_SEX, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
    },
    {
--- a/apps/web-ele/src/views/infra/demo/demo03/normal/data.ts
+++ b/apps/web-ele/src/views/infra/demo/demo03/normal/data.ts
@@ -34,8 +34,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.SYSTEM_USER_SEX, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
    },
    {
--- a/apps/web-ele/src/views/infra/fileConfig/data.ts
+++ b/apps/web-ele/src/views/infra/fileConfig/data.ts
@@ -131,8 +131,6 @@ export function useFormSchema(): VbenFormSchema[] {
          { label: '主动模式', value: 'Active' },
          { label: '被动模式', value: 'Passive' },
        ],
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: 'required',
      dependencies: {
@@ -202,8 +200,6 @@ export function useFormSchema(): VbenFormSchema[] {
          { label: '启用', value: true },
          { label: '禁用', value: false },
        ],
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: 'required',
      dependencies: {
@@ -221,8 +217,6 @@ export function useFormSchema(): VbenFormSchema[] {
          { label: '公开', value: true },
          { label: '私有', value: false },
        ],
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: 'required',
      dependencies: {
--- a/apps/web-ele/src/views/mall/product/brand/data.ts
+++ b/apps/web-ele/src/views/mall/product/brand/data.ts
@@ -54,8 +54,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/mall/product/category/data.ts
+++ b/apps/web-ele/src/views/mall/product/category/data.ts
@@ -78,8 +78,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/mall/promotion/article/category/data.ts
+++ b/apps/web-ele/src/views/mall/promotion/article/category/data.ts
@@ -1,9 +1,10 @@
 import type { VbenFormSchema } from '#/adapter/form';
-import type { VxeGridPropTypes } from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';

-import { DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';

+import { z } from '#/adapter/form';
 import { getRangePickerDefaultProps } from '#/utils';

 /** 新增/修改的表单 */
@@ -21,21 +22,28 @@ export function useFormSchema(): VbenFormSchema[] {
      fieldName: 'name',
      label: '分类名称',
      component: 'Input',
+      componentProps: {
+        placeholder: '请输入分类名称',
+      },
      rules: 'required',
    },
    {
      fieldName: 'picUrl',
-      label: '图标地址',
+      label: '分类图片',
      component: 'ImageUpload',
+      componentProps: {
+        placeholder: '请上传分类图片',
+      },
    },
    {
      fieldName: 'sort',
-      label: '排序',
+      label: '显示顺序',
      component: 'InputNumber',
      componentProps: {
        min: 0,
+        placeholder: '请输入显示顺序',
        controlsPosition: 'right',
-        placeholder: '请输入排序',
+        class: '!w-full',
      },
      rules: 'required',
    },
@@ -45,10 +53,8 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
-      rules: 'required',
+      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
  ];
 }
@@ -62,6 +68,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
      component: 'Input',
      componentProps: {
        placeholder: '请输入分类名称',
+        allowClear: true,
      },
    },
    {
@@ -70,6 +77,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
      component: 'Select',
      componentProps: {
        placeholder: '请选择状态',
+        allowClear: true,
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
      },
    },
@@ -79,58 +87,58 @@ export function useGridFormSchema(): VbenFormSchema[] {
      component: 'RangePicker',
      componentProps: {
        ...getRangePickerDefaultProps(),
-        clearable: true,
+        allowClear: true,
      },
    },
  ];
 }

 /** 表格列配置 */
-export function useGridColumns(): VxeGridPropTypes.Columns {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
  return [
    {
-      title: '编号',
      field: 'id',
-      width: 100,
+      title: '编号',
+      minWidth: 100,
    },
    {
-      title: '分类名称',
      field: 'name',
+      title: '分类名称',
      minWidth: 240,
+      align: 'left',
+      fixed: 'left',
    },
    {
-      title: '分类图片',
      field: 'picUrl',
-      width: 80,
+      title: '分类图片',
+      minWidth: 80,
      cellRender: {
        name: 'CellImage',
      },
    },
    {
-      title: '状态',
      field: 'status',
-      width: 150,
+      title: '状态',
+      minWidth: 150,
      cellRender: {
-        name: 'CellDictTag',
-        props: {
-          dictType: DICT_TYPE.COMMON_STATUS,
-        },
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
      },
    },
    {
-      title: '排序',
      field: 'sort',
-      width: 150,
+      title: '显示顺序',
+      minWidth: 150,
    },
    {
-      title: '创建时间',
      field: 'createTime',
-      width: 180,
+      title: '创建时间',
+      minWidth: 180,
      formatter: 'formatDateTime',
    },
    {
      title: '操作',
-      width: 180,
+      minWidth: 220,
      fixed: 'right',
      slots: { default: 'actions' },
    },
--- a/apps/web-ele/src/views/mall/promotion/article/category/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/article/category/index.vue
@@ -2,7 +2,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallArticleCategoryApi } from '#/api/mall/promotion/articleCategory';

-import { Page, useVbenModal } from '@vben/common-ui';
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';

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

@@ -42,7 +42,7 @@ async function handleDelete(row: MallArticleCategoryApi.ArticleCategory) {
    text: $t('ui.actionMessage.deleting', [row.name]),
  });
  try {
-    await deleteArticleCategory(row.id as number);
+    await deleteArticleCategory(row.id!);
    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
    handleRefresh();
  } finally {
@@ -71,6 +71,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
    },
    rowConfig: {
      keyField: 'id',
+      isHover: true,
    },
    toolbarConfig: {
      refresh: true,
@@ -82,6 +83,13 @@ const [Grid, gridApi] = useVbenVxeGrid({

 <template>
  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【营销】内容管理"
+        url="https://doc.iocoder.cn/mall/promotion-content/"
+      />
+    </template>
+
    <FormModal @success="handleRefresh" />
    <Grid table-title="文章分类列表">
      <template #toolbar-tools>
--- 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
@@ -32,7 +32,7 @@ const [Form, formApi] = useVbenForm({
      class: 'w-full',
    },
    formItemClass: 'col-span-2',
-    labelWidth: 120,
+    labelWidth: 80,
  },
  layout: 'horizontal',
  schema: useFormSchema(),
@@ -84,7 +84,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>

 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-2/5">
    <Form class="mx-4" />
  </Modal>
 </template>
--- a/apps/web-ele/src/views/mall/promotion/article/data.ts
+++ b/apps/web-ele/src/views/mall/promotion/article/data.ts
@@ -1,5 +1,6 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeGridPropTypes } from '#/adapter/vxe-table';
+import type { MallArticleCategoryApi } from '#/api/mall/promotion/articleCategory';

 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -8,12 +9,19 @@ import { z } from '#/adapter/form';
 import { getSimpleArticleCategoryList } from '#/api/mall/promotion/articleCategory';
 import { getRangePickerDefaultProps } from '#/utils';

+let categoryList: MallArticleCategoryApi.ArticleCategory[] = [];
+async function getCategoryData() {
+  categoryList = await getSimpleArticleCategoryList();
+}
+
+getCategoryData();
+
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
  return [
    {
-      component: 'Input',
      fieldName: 'id',
+      component: 'Input',
      dependencies: {
        triggerFields: [''],
        show: () => false,
@@ -23,6 +31,9 @@ export function useFormSchema(): VbenFormSchema[] {
      fieldName: 'title',
      label: '文章标题',
      component: 'Input',
+      componentProps: {
+        placeholder: '请输入文章标题',
+      },
      rules: 'required',
    },
    {
@@ -33,6 +44,7 @@ export function useFormSchema(): VbenFormSchema[] {
        api: getSimpleArticleCategoryList,
        labelField: 'name',
        valueField: 'id',
+        placeholder: '请选择文章分类',
      },
      rules: 'required',
    },
@@ -40,16 +52,26 @@ export function useFormSchema(): VbenFormSchema[] {
      fieldName: 'author',
      label: '文章作者',
      component: 'Input',
+      componentProps: {
+        placeholder: '请输入文章作者',
+      },
    },
    {
      fieldName: 'introduction',
      label: '文章简介',
      component: 'Input',
+      componentProps: {
+        placeholder: '请输入文章简介',
+      },
    },
    {
      fieldName: 'picUrl',
      label: '文章封面',
      component: 'ImageUpload',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请上传文章封面',
+      },
      rules: 'required',
    },
    {
@@ -58,9 +80,9 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING, 'boolean'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
+      rules: 'required',
+      defaultValue: true,
    },
    {
      fieldName: 'recommendBanner',
@@ -68,15 +90,19 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING, 'boolean'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
+      rules: 'required',
+      defaultValue: true,
    },
-    // TODO: @霖：商品关联
    {
+      // TODO: @puhui999：商品关联
      fieldName: 'spuId',
      label: '商品关联',
      component: 'Input',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入商品 SPU 编号',
+      },
    },
    {
      fieldName: 'sort',
@@ -84,10 +110,11 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'InputNumber',
      componentProps: {
        min: 0,
+        placeholder: '请输入排序',
        controlsPosition: 'right',
-        placeholder: '请输入品牌排序',
+        class: '!w-full',
      },
-      rules: z.number().min(0).default(1),
+      rules: 'required',
    },
    {
      fieldName: 'status',
@@ -95,15 +122,15 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
    {
-      fieldName: 'description',
+      fieldName: 'content',
      label: '文章内容',
      component: 'RichTextarea',
+      rules: 'required',
+      formItemClass: 'col-span-2',
    },
  ];
 }
@@ -112,19 +139,25 @@ export function useFormSchema(): VbenFormSchema[] {
 export function useGridFormSchema(): VbenFormSchema[] {
  return [
    {
-      fieldName: 'name',
+      fieldName: 'categoryId',
      label: '文章分类',
      component: 'ApiSelect',
      componentProps: {
        api: getSimpleArticleCategoryList,
        labelField: 'name',
        valueField: 'id',
+        placeholder: '请选择文章分类',
+        allowClear: true,
      },
    },
    {
      fieldName: 'title',
      label: '文章标题',
      component: 'Input',
+      componentProps: {
+        placeholder: '请输入文章标题',
+        allowClear: true,
+      },
    },
    {
      fieldName: 'status',
@@ -132,6 +165,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
      component: 'Select',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择状态',
+        allowClear: true,
      },
    },
    {
@@ -140,27 +175,29 @@ export function useGridFormSchema(): VbenFormSchema[] {
      component: 'RangePicker',
      componentProps: {
        ...getRangePickerDefaultProps(),
-        clearable: true,
+        allowClear: true,
      },
    },
  ];
 }

-/** 表格列配置 */
+/** 列表的字段 */
 export function useGridColumns(): VxeGridPropTypes.Columns {
  return [
    {
      field: 'id',
      title: '编号',
-      fixed: 'left',
+      minWidth: 100,
    },
    {
      field: 'title',
      title: '标题',
+      minWidth: 200,
    },
    {
      field: 'picUrl',
      title: '封面',
+      minWidth: 120,
      cellRender: {
        name: 'CellImage',
      },
@@ -168,26 +205,34 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
    {
      field: 'categoryId',
      title: '分类',
+      minWidth: 100,
+      formatter: ({ cellValue }) =>
+        categoryList.find((item) => item.id === cellValue)?.name || '-',
    },
    {
      field: 'browseCount',
      title: '浏览量',
+      minWidth: 100,
    },
    {
      field: 'author',
      title: '作者',
+      minWidth: 120,
    },
    {
      field: 'introduction',
      title: '文章简介',
+      minWidth: 250,
    },
    {
      field: 'sort',
      title: '排序',
+      minWidth: 80,
    },
    {
      field: 'status',
      title: '状态',
+      minWidth: 100,
      cellRender: {
        name: 'CellDict',
        props: { type: DICT_TYPE.COMMON_STATUS },
@@ -196,6 +241,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
    {
      field: 'createTime',
      title: '创建时间',
+      minWidth: 180,
      formatter: 'formatDateTime',
    },
    {
--- a/apps/web-ele/src/views/mall/promotion/article/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/article/index.vue
@@ -2,7 +2,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallArticleApi } from '#/api/mall/promotion/article';

-import { Page, useVbenModal } from '@vben/common-ui';
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';

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

@@ -23,17 +23,17 @@ function handleRefresh() {
  gridApi.query();
 }

-/** 创建品牌 */
+/** 创建文章 */
 function handleCreate() {
  formModalApi.setData(null).open();
 }

-/** 编辑品牌 */
+/** 编辑文章 */
 function handleEdit(row: MallArticleApi.Article) {
  formModalApi.setData(row).open();
 }

-/** 删除品牌 */
+/** 删除文章 */
 async function handleDelete(row: MallArticleApi.Article) {
  const loadingInstance = ElLoading.service({
    text: $t('ui.actionMessage.deleting', [row.title]),
@@ -68,6 +68,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
    },
    rowConfig: {
      keyField: 'id',
+      isHover: true,
    },
    toolbarConfig: {
      refresh: true,
@@ -79,6 +80,13 @@ const [Grid, gridApi] = useVbenVxeGrid({

 <template>
  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【营销】内容管理"
+        url="https://doc.iocoder.cn/mall/promotion-content/"
+      />
+    </template>
+
    <FormModal @success="handleRefresh" />
    <Grid table-title="文章列表">
      <template #toolbar-tools>
--- a/apps/web-ele/src/views/mall/promotion/article/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/article/modules/form.vue
@@ -31,9 +31,9 @@ const [Form, formApi] = useVbenForm({
    componentProps: {
      class: 'w-full',
    },
-    formItemClass: 'col-span-2',
    labelWidth: 120,
  },
+  wrapperClass: 'grid-cols-2',
  layout: 'horizontal',
  schema: useFormSchema(),
  showDefaultActions: false,
@@ -81,7 +81,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>

 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-2/5">
    <Form class="mx-4" />
  </Modal>
 </template>
--- a/apps/web-ele/src/views/mall/promotion/banner/data.ts
+++ b/apps/web-ele/src/views/mall/promotion/banner/data.ts
@@ -1,17 +1,19 @@
-import type { VbenFormSchema } from '#/adapter/form';
-import type { VxeGridPropTypes } from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';

-import { DICT_TYPE } from '@vben/constants';
+import type { VbenFormSchema } from '#/adapter/form';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';

+import { z } from '#/adapter/form';
 import { getRangePickerDefaultProps } from '#/utils';

 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
  return [
    {
-      component: 'Input',
      fieldName: 'id',
+      component: 'Input',
      dependencies: {
        triggerFields: [''],
        show: () => false,
@@ -19,14 +21,20 @@ export function useFormSchema(): VbenFormSchema[] {
    },
    {
      fieldName: 'title',
-      label: 'Banner标题',
+      label: 'Banner 标题',
      component: 'Input',
+      componentProps: {
+        placeholder: '请输入 Banner 标题',
+      },
      rules: 'required',
    },
    {
      fieldName: 'picUrl',
      label: '图片地址',
      component: 'ImageUpload',
+      componentProps: {
+        placeholder: '请上传图片',
+      },
      rules: 'required',
    },
    {
@@ -35,8 +43,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.PROMOTION_BANNER_POSITION, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: 'required',
    },
@@ -44,6 +50,9 @@ export function useFormSchema(): VbenFormSchema[] {
      fieldName: 'url',
      label: '跳转地址',
      component: 'Input',
+      componentProps: {
+        placeholder: '请输入跳转地址',
+      },
      rules: 'required',
    },
    {
@@ -52,7 +61,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'InputNumber',
      componentProps: {
        min: 0,
-        controlsPosition: 'right',
        placeholder: '请输入排序',
      },
      rules: 'required',
@@ -63,10 +71,8 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
-      rules: 'required',
+      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
    {
      fieldName: 'memo',
@@ -85,18 +91,18 @@ export function useGridFormSchema(): VbenFormSchema[] {
  return [
    {
      fieldName: 'title',
-      label: 'Banner标题',
+      label: 'Banner 标题',
      component: 'Input',
      componentProps: {
-        placeholder: '请输入Banner标题',
+        placeholder: '请输入 Banner 标题',
      },
    },
    {
      fieldName: 'status',
-      label: '状态',
+      label: '活动状态',
      component: 'Select',
      componentProps: {
-        placeholder: '请选择状态',
+        placeholder: '请选择活动状态',
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
      },
    },
@@ -113,16 +119,17 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }

 /** 表格列配置 */
-export function useGridColumns(): VxeGridPropTypes.Columns {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
  return [
    {
      title: 'Banner标题',
      field: 'title',
+      minWidth: 100,
    },
    {
      title: '图片',
      field: 'picUrl',
-      width: 80,
+      minWidth: 80,
      cellRender: {
        name: 'CellImage',
      },
@@ -130,7 +137,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
    {
      title: '状态',
      field: 'status',
-      width: 150,
+      minWidth: 150,
      cellRender: {
        name: 'CellDictTag',
        props: {
@@ -141,7 +148,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
    {
      title: '定位',
      field: 'position',
-      width: 150,
+      minWidth: 150,
      cellRender: {
        name: 'CellDictTag',
        props: {
@@ -152,21 +159,23 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
    {
      title: '跳转地址',
      field: 'url',
+      minWidth: 200,
    },
    {
      title: '创建时间',
      field: 'createTime',
-      width: 180,
+      minWidth: 180,
      formatter: 'formatDateTime',
    },
    {
      title: '排序',
      field: 'sort',
-      width: 100,
+      minWidth: 100,
    },
    {
      title: '描述',
      field: 'memo',
+      minWidth: 150,
    },
    {
      title: '操作',
--- a/apps/web-ele/src/views/mall/promotion/banner/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/banner/index.vue
@@ -2,7 +2,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallBannerApi } from '#/api/mall/market/banner';

-import { Page, useVbenModal } from '@vben/common-ui';
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';

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

@@ -23,17 +23,17 @@ function handleRefresh() {
  gridApi.query();
 }

-/** 创建Banner */
+/** 创建 Banner */
 function handleCreate() {
  formModalApi.setData(null).open();
 }

-/** 编辑Banner */
+/** 编辑 Banner */
 function handleEdit(row: MallBannerApi.Banner) {
  formModalApi.setData(row).open();
 }

-/** 删除Banner */
+/** 删除 Banner */
 async function handleDelete(row: MallBannerApi.Banner) {
  const loadingInstance = ElLoading.service({
    text: $t('ui.actionMessage.deleting', [row.title]),
@@ -68,6 +68,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
    },
    rowConfig: {
      keyField: 'id',
+      isHover: true,
    },
    toolbarConfig: {
      refresh: true,
@@ -79,6 +80,13 @@ const [Grid, gridApi] = useVbenVxeGrid({

 <template>
  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【营销】内容管理"
+        url="https://doc.iocoder.cn/mall/promotion-content/"
+      />
+    </template>
+
    <FormModal @success="handleRefresh" />
    <Grid table-title="Banner列表">
      <template #toolbar-tools>
--- a/apps/web-ele/src/views/mall/promotion/banner/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/banner/modules/form.vue
@@ -18,8 +18,7 @@ import { $t } from '#/locales';
 import { useFormSchema } from '../data';

 const emit = defineEmits(['success']);
-
-const formData = ref<MallBannerApi.Banner>();
+const formData = ref<SystemUserApi.User>();
 const getTitle = computed(() => {
  return formData.value?.id
    ? $t('ui.actionTitle.edit', ['Banner'])
@@ -81,7 +80,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>

 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-2/5">
    <Form class="mx-4" />
  </Modal>
 </template>
--- a/apps/web-ele/src/views/mall/promotion/coupon/template/data.ts
+++ b/apps/web-ele/src/views/mall/promotion/coupon/template/data.ts
@@ -101,8 +101,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/mall/promotion/seckill/config/data.ts
+++ b/apps/web-ele/src/views/mall/promotion/seckill/config/data.ts
@@ -59,8 +59,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: 'required',
    },
--- a/apps/web-ele/src/views/mall/trade/delivery/express/data.ts
+++ b/apps/web-ele/src/views/mall/trade/delivery/express/data.ts
@@ -60,8 +60,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/data.ts
+++ b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/data.ts
@@ -130,8 +130,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.EXPRESS_CHARGE_MODE, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(1),
    },
--- a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/data.ts
+++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/data.ts
@@ -97,8 +97,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/mall/trade/order/data.ts
+++ b/apps/web-ele/src/views/mall/trade/order/data.ts
@@ -420,8 +420,6 @@ export function useDeliveryFormSchema(): VbenFormSchema[] {
          { label: '快递', value: 'express' },
          { label: '无需发货', value: 'none' },
        ],
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      defaultValue: 'express',
    },
--- a/apps/web-ele/src/views/member/group/data.ts
+++ b/apps/web-ele/src/views/member/group/data.ts
@@ -29,8 +29,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/member/level/data.ts
+++ b/apps/web-ele/src/views/member/level/data.ts
@@ -83,8 +83,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/member/signin/config/data.ts
+++ b/apps/web-ele/src/views/member/signin/config/data.ts
@@ -64,8 +64,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/member/user/data.ts
+++ b/apps/web-ele/src/views/member/user/data.ts
@@ -39,8 +39,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE).optional(),
    },
@@ -71,8 +69,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.SYSTEM_USER_SEX, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
    },
    {
@@ -384,8 +380,6 @@ export function useBalanceFormSchema(): VbenFormSchema[] {
          { label: '增加', value: 1 },
          { label: '减少', value: -1 },
        ],
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      defaultValue: 1,
    },
@@ -461,8 +455,6 @@ export function usePointFormSchema(): VbenFormSchema[] {
          { label: '增加', value: 1 },
          { label: '减少', value: -1 },
        ],
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      defaultValue: 1,
    },
--- a/apps/web-ele/src/views/pay/wallet/rechargePackage/data.ts
+++ b/apps/web-ele/src/views/pay/wallet/rechargePackage/data.ts
@@ -57,8 +57,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/dept/data.ts
+++ b/apps/web-ele/src/views/system/dept/data.ts
@@ -110,8 +110,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/dict/data.ts
+++ b/apps/web-ele/src/views/system/dict/data.ts
@@ -50,8 +50,6 @@ export function useTypeFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
@@ -231,8 +229,6 @@ export function useDataFormSchema(): VbenFormSchema[] {
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
        placeholder: '请选择状态',
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/mail/account/data.ts
+++ b/apps/web-ele/src/views/system/mail/account/data.ts
@@ -71,8 +71,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING, 'boolean'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.boolean().default(true),
    },
@@ -82,8 +80,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING, 'boolean'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.boolean().default(false),
    },
--- a/apps/web-ele/src/views/system/mail/template/data.ts
+++ b/apps/web-ele/src/views/system/mail/template/data.ts
@@ -78,8 +78,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/menu/data.ts
+++ b/apps/web-ele/src/views/system/menu/data.ts
@@ -90,8 +90,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.SYSTEM_MENU_TYPE, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(SystemMenuTypeEnum.DIR),
    },
@@ -214,8 +212,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
@@ -228,8 +224,6 @@ export function useFormSchema(): VbenFormSchema[] {
          { label: '总是', value: true },
          { label: '不是', value: false },
        ],
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: 'required',
      defaultValue: true,
@@ -250,8 +244,6 @@ export function useFormSchema(): VbenFormSchema[] {
          { label: '缓存', value: true },
          { label: '不缓存', value: false },
        ],
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: 'required',
      defaultValue: true,
--- a/apps/web-ele/src/views/system/notice/data.ts
+++ b/apps/web-ele/src/views/system/notice/data.ts
@@ -29,8 +29,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: 'required',
    },
@@ -46,8 +44,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/notify/template/data.ts
+++ b/apps/web-ele/src/views/system/notify/template/data.ts
@@ -74,8 +74,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/oauth2/client/data.ts
+++ b/apps/web-ele/src/views/system/oauth2/client/data.ts
@@ -64,8 +64,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/post/data.ts
+++ b/apps/web-ele/src/views/system/post/data.ts
@@ -44,8 +44,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/role/data.ts
+++ b/apps/web-ele/src/views/system/role/data.ts
@@ -52,8 +52,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/sms/channel/data.ts
+++ b/apps/web-ele/src/views/system/sms/channel/data.ts
@@ -43,8 +43,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/sms/template/data.ts
+++ b/apps/web-ele/src/views/system/sms/template/data.ts
@@ -65,8 +65,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/social/client/data.ts
+++ b/apps/web-ele/src/views/system/social/client/data.ts
@@ -45,8 +45,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.USER_TYPE, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: 'required',
    },
@@ -87,8 +85,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/tenant/data.ts
+++ b/apps/web-ele/src/views/system/tenant/data.ts
@@ -113,8 +113,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/tenantPackage/data.ts
+++ b/apps/web-ele/src/views/system/tenantPackage/data.ts
@@ -36,8 +36,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },
--- a/apps/web-ele/src/views/system/user/data.ts
+++ b/apps/web-ele/src/views/system/user/data.ts
@@ -100,8 +100,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.SYSTEM_USER_SEX, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(1),
    },
@@ -111,8 +109,6 @@ export function useFormSchema(): VbenFormSchema[] {
      component: 'RadioGroup',
      componentProps: {
        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
      },
      rules: z.number().default(CommonStatusEnum.ENABLE),
    },