diff --git a/apps/web-naive/src/views/infra/config/data.ts b/apps/web-naive/src/views/infra/config/data.ts
index 0b01c24a8..c5aaf85b8 100644
--- a/apps/web-naive/src/views/infra/config/data.ts
+++ b/apps/web-naive/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',
diff --git a/apps/web-naive/src/views/infra/demo/demo01/data.ts b/apps/web-naive/src/views/infra/demo/demo01/data.ts
index 1e15da499..a13c0518d 100644
--- a/apps/web-naive/src/views/infra/demo/demo01/data.ts
+++ b/apps/web-naive/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',
       },
     },
     {
@@ -44,9 +42,8 @@ export function useFormSchema(): VbenFormSchema[] {
       rules: 'required',
       component: 'DatePicker',
       componentProps: {
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        type: 'datetime',
+        valueFormat: 'YYYY-MM-dd HH:mm:ss',
       },
     },
     {
diff --git a/apps/web-naive/src/views/infra/demo/demo03/erp/data.ts b/apps/web-naive/src/views/infra/demo/demo03/erp/data.ts
index 384edb312..56d996089 100644
--- a/apps/web-naive/src/views/infra/demo/demo03/erp/data.ts
+++ b/apps/web-naive/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',
       },
     },
     {
@@ -44,9 +42,8 @@ export function useFormSchema(): VbenFormSchema[] {
       rules: 'required',
       component: 'DatePicker',
       componentProps: {
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        type: 'datetime',
+        valueFormat: 'YYYY-MM-dd HH:mm:ss',
       },
     },
     {
diff --git a/apps/web-naive/src/views/infra/demo/demo03/inner/data.ts b/apps/web-naive/src/views/infra/demo/demo03/inner/data.ts
index 843e67f28..e5662a0bd 100644
--- a/apps/web-naive/src/views/infra/demo/demo03/inner/data.ts
+++ b/apps/web-naive/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',
       },
     },
     {
@@ -44,9 +42,8 @@ export function useFormSchema(): VbenFormSchema[] {
       rules: 'required',
       component: 'DatePicker',
       componentProps: {
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        type: 'datetime',
+        valueFormat: 'YYYY-MM-dd HH:mm:ss',
       },
     },
     {
diff --git a/apps/web-naive/src/views/infra/demo/demo03/inner/index.vue b/apps/web-naive/src/views/infra/demo/demo03/inner/index.vue
index 059dd2a70..976b2da1a 100644
--- a/apps/web-naive/src/views/infra/demo/demo03/inner/index.vue
+++ b/apps/web-naive/src/views/infra/demo/demo03/inner/index.vue
@@ -57,9 +57,7 @@ function handleEdit(row: Demo03StudentApi.Demo03Student) {
 async function handleDelete(row: Demo03StudentApi.Demo03Student) {
   const hideLoading = message.loading(
     $t('ui.actionMessage.deleting', [row.id]),
-    {
-      duration: 0,
-    },
+    { duration: 0 },
   );
   try {
     await deleteDemo03Student(row.id!);
diff --git a/apps/web-naive/src/views/infra/demo/demo03/normal/data.ts b/apps/web-naive/src/views/infra/demo/demo03/normal/data.ts
index 3a1f04e44..f8b8bccb4 100644
--- a/apps/web-naive/src/views/infra/demo/demo03/normal/data.ts
+++ b/apps/web-naive/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',
       },
     },
     {
@@ -44,9 +42,8 @@ export function useFormSchema(): VbenFormSchema[] {
       rules: 'required',
       component: 'DatePicker',
       componentProps: {
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        type: 'datetime',
+        valueFormat: 'YYYY-MM-dd HH:mm:ss',
       },
     },
     {
diff --git a/apps/web-naive/src/views/infra/demo/demo03/normal/index.vue b/apps/web-naive/src/views/infra/demo/demo03/normal/index.vue
index d21b0ccee..35de85ddf 100644
--- a/apps/web-naive/src/views/infra/demo/demo03/normal/index.vue
+++ b/apps/web-naive/src/views/infra/demo/demo03/normal/index.vue
@@ -50,9 +50,7 @@ function handleEdit(row: Demo03StudentApi.Demo03Student) {
 async function handleDelete(row: Demo03StudentApi.Demo03Student) {
   const hideLoading = message.loading(
     $t('ui.actionMessage.deleting', [row.id]),
-    {
-      duration: 0,
-    },
+    { duration: 0 },
   );
   try {
     await deleteDemo03Student(row.id!);
diff --git a/apps/web-naive/src/views/infra/file/index.vue b/apps/web-naive/src/views/infra/file/index.vue
index b0cccd21d..0e9bbe99a 100644
--- a/apps/web-naive/src/views/infra/file/index.vue
+++ b/apps/web-naive/src/views/infra/file/index.vue
@@ -53,9 +53,7 @@ async function handleCopyUrl(row: InfraFileApi.File) {
 async function handleDelete(row: InfraFileApi.File) {
   const hideLoading = message.loading(
     $t('ui.actionMessage.deleting', [row.name || row.path]),
-    {
-      duration: 0,
-    },
+    { duration: 0 },
   );
   try {
     await deleteFile(row.id!);
diff --git a/apps/web-naive/src/views/infra/file/modules/form.vue b/apps/web-naive/src/views/infra/file/modules/form.vue
index bdc7f7b7e..a1a93e122 100644
--- a/apps/web-naive/src/views/infra/file/modules/form.vue
+++ b/apps/web-naive/src/views/infra/file/modules/form.vue
@@ -3,7 +3,7 @@ import type { UploadFileInfo } from 'naive-ui';
 
 import { useVbenModal } from '@vben/common-ui';
 
-import { NUpload } from 'naive-ui';
+import { NUpload, NUploadDragger } from 'naive-ui';
 
 import { useVbenForm } from '#/adapter/form';
 import { message } from '#/adapter/naive';
@@ -50,8 +50,11 @@ const [Modal, modalApi] = useVbenModal({
 });
 
 /** 上传前 */
-function beforeUpload(file: UploadFileInfo) {
-  formApi.setFieldValue('file', file);
+function beforeUpload(data: {
+  file: UploadFileInfo;
+  fileList: UploadFileInfo[];
+}) {
+  formApi.setFieldValue('file', data.file.file);
   return false;
 }
 </script>
@@ -62,21 +65,23 @@ function beforeUpload(file: UploadFileInfo) {
       <template #file>
         <div class="w-full">
           <!-- 上传区域 -->
-          <NUpload.Dragger
+          <NUpload
             name="file"
-            :max-count="1"
+            :max="1"
+            :multiple="false"
             accept=".jpg,.png,.gif,.webp"
-            :before-upload="beforeUpload"
-            list-type="picture-card"
+            @before-upload="beforeUpload"
           >
-            <p class="ant-upload-drag-icon">
-              <span class="icon-[ant-design--inbox-outlined] text-2xl"></span>
-            </p>
-            <p class="ant-upload-text">点击或拖拽文件到此区域上传</p>
-            <p class="ant-upload-hint">
-              支持 .jpg、.png、.gif、.webp 格式图片文件
-            </p>
-          </NUpload.Dragger>
+            <NUploadDragger>
+              <p class="ant-upload-drag-icon">
+                <span class="icon-[ant-design--inbox-outlined] text-2xl"></span>
+              </p>
+              <p class="ant-upload-text">点击或拖拽文件到此区域上传</p>
+              <p class="ant-upload-hint">
+                支持 .jpg、.png、.gif、.webp 格式图片文件
+              </p>
+            </NUploadDragger>
+          </NUpload>
         </div>
       </template>
     </Form>
diff --git a/apps/web-naive/src/views/infra/fileConfig/data.ts b/apps/web-naive/src/views/infra/fileConfig/data.ts
index 01b8dd01d..85e5fb3cd 100644
--- a/apps/web-naive/src/views/infra/fileConfig/data.ts
+++ b/apps/web-naive/src/views/infra/fileConfig/data.ts
@@ -130,8 +130,6 @@ export function useFormSchema(): VbenFormSchema[] {
           { label: '主动模式', value: 'Active' },
           { label: '被动模式', value: 'Passive' },
         ],
-        buttonStyle: 'solid',
-        optionType: 'button',
       },
       rules: 'required',
       dependencies: {
@@ -201,8 +199,6 @@ export function useFormSchema(): VbenFormSchema[] {
           { label: '启用', value: true },
           { label: '禁用', value: false },
         ],
-        buttonStyle: 'solid',
-        optionType: 'button',
       },
       rules: 'required',
       dependencies: {
@@ -220,8 +216,6 @@ export function useFormSchema(): VbenFormSchema[] {
           { label: '公开', value: true },
           { label: '私有', value: false },
         ],
-        buttonStyle: 'solid',
-        optionType: 'button',
       },
       rules: 'required',
       dependencies: {
@@ -326,7 +320,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       title: '操作',
-      width: 240,
+      width: 280,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-naive/src/views/infra/fileConfig/index.vue b/apps/web-naive/src/views/infra/fileConfig/index.vue
index 47eee8237..e37ba8eda 100644
--- a/apps/web-naive/src/views/infra/fileConfig/index.vue
+++ b/apps/web-naive/src/views/infra/fileConfig/index.vue
@@ -45,9 +45,7 @@ function handleEdit(row: InfraFileConfigApi.FileConfig) {
 async function handleMaster(row: InfraFileConfigApi.FileConfig) {
   const hideLoading = message.loading(
     $t('ui.actionMessage.updating', [row.name]),
-    {
-      duration: 0,
-    },
+    { duration: 0 },
   );
   try {
     await updateFileConfigMaster(row.id!);
@@ -83,9 +81,7 @@ async function handleTest(row: InfraFileConfigApi.FileConfig) {
 async function handleDelete(row: InfraFileConfigApi.FileConfig) {
   const hideLoading = message.loading(
     $t('ui.actionMessage.deleting', [row.name]),
-    {
-      duration: 0,
-    },
+    { duration: 0 },
   );
   try {
     await deleteFileConfig(row.id!);
diff --git a/apps/web-naive/src/views/infra/job/index.vue b/apps/web-naive/src/views/infra/job/index.vue
index f8afb03c2..139d4e3e3 100644
--- a/apps/web-naive/src/views/infra/job/index.vue
+++ b/apps/web-naive/src/views/infra/job/index.vue
@@ -110,9 +110,7 @@ function handleLog(row?: InfraJobApi.Job) {
 async function handleDelete(row: InfraJobApi.Job) {
   const hideLoading = message.loading(
     $t('ui.actionMessage.deleting', [row.name]),
-    {
-      duration: 0,
-    },
+    { duration: 0 },
   );
   try {
     await deleteJob(row.id!);
diff --git a/apps/web-naive/src/views/infra/job/logger/data.ts b/apps/web-naive/src/views/infra/job/logger/data.ts
index 1dfcd5f68..cf1ec6d88 100644
--- a/apps/web-naive/src/views/infra/job/logger/data.ts
+++ b/apps/web-naive/src/views/infra/job/logger/data.ts
@@ -9,8 +9,6 @@ import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { formatDateTime } from '@vben/utils';
 
-import dayjs from 'dayjs';
-
 import { DictTag } from '#/components/dict-tag';
 
 /** 列表的搜索表单 */
@@ -31,12 +29,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'DatePicker',
       componentProps: {
         clearable: true,
+        type: 'datetime',
+        valueFormat: 'YYYY-MM-dd HH:mm:ss',
+        defaultTime: '00:00:00',
         placeholder: '选择开始执行时间',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        showTime: {
-          format: 'HH:mm:ss',
-          defaultValue: dayjs('00:00:00', 'HH:mm:ss'),
-        },
       },
     },
     {
@@ -45,12 +41,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'DatePicker',
       componentProps: {
         clearable: true,
+        type: 'datetime',
+        valueFormat: 'YYYY-MM-dd HH:mm:ss',
+        defaultTime: '23:59:59',
         placeholder: '选择结束执行时间',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        showTime: {
-          format: 'HH:mm:ss',
-          defaultValue: dayjs('23:59:59', 'HH:mm:ss'),
-        },
       },
     },
     {
diff --git a/apps/web-naive/src/views/system/dept/data.ts b/apps/web-naive/src/views/system/dept/data.ts
index 2357d958b..4db10e0f6 100644
--- a/apps/web-naive/src/views/system/dept/data.ts
+++ b/apps/web-naive/src/views/system/dept/data.ts
@@ -108,8 +108,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),
     },
diff --git a/apps/web-naive/src/views/system/dept/index.vue b/apps/web-naive/src/views/system/dept/index.vue
index 43d090192..5850e0947 100644
--- a/apps/web-naive/src/views/system/dept/index.vue
+++ b/apps/web-naive/src/views/system/dept/index.vue
@@ -51,9 +51,7 @@ function handleEdit(row: SystemDeptApi.Dept) {
 async function handleDelete(row: SystemDeptApi.Dept) {
   const hideLoading = message.loading(
     $t('ui.actionMessage.deleting', [row.name]),
-    {
-      duration: 0,
-    },
+    { duration: 0 },
   );
   try {
     await deleteDept(row.id!);
diff --git a/apps/web-naive/src/views/system/dict/data.ts b/apps/web-naive/src/views/system/dict/data.ts
index 3cc948443..a6412bd1f 100644
--- a/apps/web-naive/src/views/system/dict/data.ts
+++ b/apps/web-naive/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),
     },
@@ -234,8 +232,6 @@ export function useDataFormSchema(): VbenFormSchema[] {
       componentProps: {
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
         placeholder: '请选择状态',
-        buttonStyle: 'solid',
-        optionType: 'button',
       },
       rules: z.number().default(CommonStatusEnum.ENABLE),
     },
diff --git a/apps/web-naive/src/views/system/dict/modules/data-grid.vue b/apps/web-naive/src/views/system/dict/modules/data-grid.vue
index f36df5b2e..4f2eeb25e 100644
--- a/apps/web-naive/src/views/system/dict/modules/data-grid.vue
+++ b/apps/web-naive/src/views/system/dict/modules/data-grid.vue
@@ -7,6 +7,8 @@ import { ref, watch } from 'vue';
 import { confirm, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
 
+import { NTag } from 'naive-ui';
+
 import { message } from '#/adapter/naive';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -173,10 +175,14 @@ watch(
         />
       </template>
       <template #colorType="{ row }">
-        <Tag :color="row.colorType">{{ row.colorType }}</Tag>
+        <NTag v-if="row.colorType" :type="row.colorType as any">
+          {{ row.colorType }}
+        </NTag>
       </template>
       <template #cssClass="{ row }">
-        <Tag :color="row.cssClass">{{ row.cssClass }}</Tag>
+        <NTag v-if="row.cssClass" :color="{ color: row.cssClass }">
+          {{ row.cssClass }}
+        </NTag>
       </template>
       <template #actions="{ row }">
         <TableAction
diff --git a/apps/web-naive/src/views/system/mail/account/data.ts b/apps/web-naive/src/views/system/mail/account/data.ts
index 08dd38d9a..50de2366b 100644
--- a/apps/web-naive/src/views/system/mail/account/data.ts
+++ b/apps/web-naive/src/views/system/mail/account/data.ts
@@ -38,8 +38,9 @@ export function useFormSchema(): VbenFormSchema[] {
     {
       fieldName: 'password',
       label: '密码',
-      component: 'InputPassword',
+      component: 'Input',
       componentProps: {
+        type: 'password',
         placeholder: '请输入密码',
       },
       rules: 'required',
@@ -70,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),
     },
@@ -81,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),
     },
diff --git a/apps/web-naive/src/views/system/mail/template/data.ts b/apps/web-naive/src/views/system/mail/template/data.ts
index 66b447139..29a0221d9 100644
--- a/apps/web-naive/src/views/system/mail/template/data.ts
+++ b/apps/web-naive/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),
     },
@@ -122,8 +120,9 @@ export function useSendMailFormSchema(): VbenFormSchema[] {
       label: '收件邮箱',
       component: 'Select',
       componentProps: {
-        mode: 'tags',
-        clearable: true,
+        tag: true,
+        multiple: true,
+        filterable: true,
         placeholder: '请输入收件邮箱，按 Enter 添加',
       },
     },
@@ -132,8 +131,9 @@ export function useSendMailFormSchema(): VbenFormSchema[] {
       label: '抄送邮箱',
       component: 'Select',
       componentProps: {
-        mode: 'tags',
-        clearable: true,
+        tag: true,
+        multiple: true,
+        filterable: true,
         placeholder: '请输入抄送邮箱，按 Enter 添加',
       },
     },
@@ -142,8 +142,9 @@ export function useSendMailFormSchema(): VbenFormSchema[] {
       label: '密送邮箱',
       component: 'Select',
       componentProps: {
-        mode: 'tags',
-        clearable: true,
+        tag: true,
+        multiple: true,
+        filterable: true,
         placeholder: '请输入密送邮箱，按 Enter 添加',
       },
     },
diff --git a/apps/web-naive/src/views/system/menu/data.ts b/apps/web-naive/src/views/system/menu/data.ts
index 1c624980d..40508807d 100644
--- a/apps/web-naive/src/views/system/menu/data.ts
+++ b/apps/web-naive/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),
     },
@@ -164,14 +162,15 @@ export function useFormSchema(): VbenFormSchema[] {
     {
       fieldName: 'componentName',
       label: '组件名称',
-      component: 'AutoComplete',
+      component: 'Select',
       componentProps: {
         clearable: true,
-        filterOption(input: string, option: { value: string }) {
+        filterable: true,
+        placeholder: '请选择组件名称',
+        options: componentKeys.map((v) => ({ label: v, value: v })),
+        filter(input: string, option: { value: string }) {
           return option.value.toLowerCase().includes(input.toLowerCase());
         },
-        placeholder: '请选择组件名称',
-        options: componentKeys.map((v) => ({ value: v })),
       },
       dependencies: {
         triggerFields: ['type'],
@@ -212,8 +211,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),
     },
@@ -226,8 +223,6 @@ export function useFormSchema(): VbenFormSchema[] {
           { label: '总是', value: true },
           { label: '不是', value: false },
         ],
-        buttonStyle: 'solid',
-        optionType: 'button',
       },
       rules: 'required',
       defaultValue: true,
@@ -248,8 +243,6 @@ export function useFormSchema(): VbenFormSchema[] {
           { label: '缓存', value: true },
           { label: '不缓存', value: false },
         ],
-        buttonStyle: 'solid',
-        optionType: 'button',
       },
       rules: 'required',
       defaultValue: true,
diff --git a/apps/web-naive/src/views/system/notice/data.ts b/apps/web-naive/src/views/system/notice/data.ts
index 3ea6dcc3e..f7772dcae 100644
--- a/apps/web-naive/src/views/system/notice/data.ts
+++ b/apps/web-naive/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),
     },
diff --git a/apps/web-naive/src/views/system/notify/template/data.ts b/apps/web-naive/src/views/system/notify/template/data.ts
index 011bbe992..23052fc7b 100644
--- a/apps/web-naive/src/views/system/notify/template/data.ts
+++ b/apps/web-naive/src/views/system/notify/template/data.ts
@@ -75,8 +75,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),
     },
diff --git a/apps/web-naive/src/views/system/notify/template/index.vue b/apps/web-naive/src/views/system/notify/template/index.vue
index ab0037993..fa35f304b 100644
--- a/apps/web-naive/src/views/system/notify/template/index.vue
+++ b/apps/web-naive/src/views/system/notify/template/index.vue
@@ -61,9 +61,7 @@ function handleSend(row: SystemNotifyTemplateApi.NotifyTemplate) {
 async function handleDelete(row: SystemNotifyTemplateApi.NotifyTemplate) {
   const hideLoading = message.loading(
     $t('ui.actionMessage.deleting', [row.name]),
-    {
-      duration: 0,
-    },
+    { duration: 0 },
   );
   try {
     await deleteNotifyTemplate(row.id!);
diff --git a/apps/web-naive/src/views/system/oauth2/client/data.ts b/apps/web-naive/src/views/system/oauth2/client/data.ts
index cbc7c8108..1cd49da3b 100644
--- a/apps/web-naive/src/views/system/oauth2/client/data.ts
+++ b/apps/web-naive/src/views/system/oauth2/client/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),
     },
@@ -96,7 +94,8 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         options: getDictOptions(DICT_TYPE.SYSTEM_OAUTH2_GRANT_TYPE),
-        mode: 'multiple',
+        tag: true,
+        multiple: true,
         placeholder: '请输入授权类型',
       },
       rules: 'required',
@@ -107,8 +106,9 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         placeholder: '请输入授权范围',
-        mode: 'tags',
-        clearable: true,
+        tag: true,
+        multiple: true,
+        filterable: true,
       },
     },
     {
@@ -117,7 +117,9 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         placeholder: '请输入自动授权范围',
-        mode: 'multiple',
+        tag: true,
+        multiple: true,
+        filterable: true,
       },
       dependencies: {
         triggerFields: ['scopes'],
@@ -137,7 +139,9 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         placeholder: '请输入可重定向的 URI 地址',
-        mode: 'tags',
+        tag: true,
+        multiple: true,
+        filterable: true,
       },
       rules: 'required',
     },
@@ -147,7 +151,9 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         placeholder: '请输入权限',
-        mode: 'tags',
+        tag: true,
+        multiple: true,
+        filterable: true,
       },
     },
     {
@@ -155,7 +161,9 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '资源',
       component: 'Select',
       componentProps: {
-        mode: 'tags',
+        tag: true,
+        multiple: true,
+        filterable: true,
         placeholder: '请输入资源',
       },
     },
diff --git a/apps/web-naive/src/views/system/oauth2/token/index.vue b/apps/web-naive/src/views/system/oauth2/token/index.vue
index 3358311e5..ff9c291e7 100644
--- a/apps/web-naive/src/views/system/oauth2/token/index.vue
+++ b/apps/web-naive/src/views/system/oauth2/token/index.vue
@@ -26,9 +26,7 @@ function handleRefresh() {
 async function handleDelete(row: SystemOAuth2TokenApi.OAuth2Token) {
   const hideLoading = message.loading(
     $t('ui.actionMessage.deleting', ['令牌']),
-    {
-      duration: 0,
-    },
+    { duration: 0 },
   );
   try {
     await deleteOAuth2Token(row.accessToken);
diff --git a/apps/web-naive/src/views/system/post/data.ts b/apps/web-naive/src/views/system/post/data.ts
index 5098cb080..2a19a71d0 100644
--- a/apps/web-naive/src/views/system/post/data.ts
+++ b/apps/web-naive/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),
     },
diff --git a/apps/web-naive/src/views/system/role/data.ts b/apps/web-naive/src/views/system/role/data.ts
index 42e9f22ca..faa8c4301 100644
--- a/apps/web-naive/src/views/system/role/data.ts
+++ b/apps/web-naive/src/views/system/role/data.ts
@@ -50,8 +50,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),
     },
diff --git a/apps/web-naive/src/views/system/sms/channel/data.ts b/apps/web-naive/src/views/system/sms/channel/data.ts
index 7f04ef629..b4976761d 100644
--- a/apps/web-naive/src/views/system/sms/channel/data.ts
+++ b/apps/web-naive/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),
     },
diff --git a/apps/web-naive/src/views/system/sms/log/data.ts b/apps/web-naive/src/views/system/sms/log/data.ts
index 4644bd7cf..8f7cf3aad 100644
--- a/apps/web-naive/src/views/system/sms/log/data.ts
+++ b/apps/web-naive/src/views/system/sms/log/data.ts
@@ -95,12 +95,6 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       title: '编号',
       minWidth: 100,
     },
-    {
-      field: 'createTime',
-      title: '创建时间',
-      minWidth: 180,
-      formatter: 'formatDateTime',
-    },
     {
       field: 'mobile',
       title: '手机号',
diff --git a/apps/web-naive/src/views/system/sms/template/data.ts b/apps/web-naive/src/views/system/sms/template/data.ts
index 062468169..33c29b7e8 100644
--- a/apps/web-naive/src/views/system/sms/template/data.ts
+++ b/apps/web-naive/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),
     },
diff --git a/apps/web-naive/src/views/system/sms/template/index.vue b/apps/web-naive/src/views/system/sms/template/index.vue
index ced74e682..36a8bf87e 100644
--- a/apps/web-naive/src/views/system/sms/template/index.vue
+++ b/apps/web-naive/src/views/system/sms/template/index.vue
@@ -61,9 +61,7 @@ function handleSend(row: SystemSmsTemplateApi.SmsTemplate) {
 async function handleDelete(row: SystemSmsTemplateApi.SmsTemplate) {
   const hideLoading = message.loading(
     $t('ui.actionMessage.deleting', [row.name]),
-    {
-      duration: 0,
-    },
+    { duration: 0 },
   );
   try {
     await deleteSmsTemplate(row.id!);
diff --git a/apps/web-naive/src/views/system/social/client/data.ts b/apps/web-naive/src/views/system/social/client/data.ts
index 8ddb5c242..3290374ec 100644
--- a/apps/web-naive/src/views/system/social/client/data.ts
+++ b/apps/web-naive/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),
     },
diff --git a/apps/web-naive/src/views/system/social/client/index.vue b/apps/web-naive/src/views/system/social/client/index.vue
index 09ba2d6b0..756192d5e 100644
--- a/apps/web-naive/src/views/system/social/client/index.vue
+++ b/apps/web-naive/src/views/system/social/client/index.vue
@@ -41,10 +41,10 @@ function handleEdit(row: SystemSocialClientApi.SocialClient) {
 
 /** 删除社交客户端 */
 async function handleDelete(row: SystemSocialClientApi.SocialClient) {
-  const hideLoading = message.loading({
-    content: $t('ui.actionMessage.deleting', [row.name]),
-    duration: 0,
-  });
+  const hideLoading = message.loading(
+    $t('ui.actionMessage.deleting', [row.name]),
+    { duration: 0 },
+  );
   try {
     await deleteSocialClient(row.id!);
     message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
@@ -57,8 +57,7 @@ async function handleDelete(row: SystemSocialClientApi.SocialClient) {
 /** 批量删除社交客户端 */
 async function handleDeleteBatch() {
   await confirm($t('ui.actionMessage.deleteBatchConfirm'));
-  const hideLoading = message.loading({
-    content: $t('ui.actionMessage.deletingBatch'),
+  const hideLoading = message.loading($t('ui.actionMessage.deletingBatch'), {
     duration: 0,
   });
   try {
@@ -150,6 +149,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
             {
               label: $t('common.edit'),
               type: 'primary',
+              text: true,
               icon: ACTION_ICON.EDIT,
               auth: ['system:social-client:update'],
               onClick: handleEdit.bind(null, row),
diff --git a/apps/web-naive/src/views/system/tenant/data.ts b/apps/web-naive/src/views/system/tenant/data.ts
index 6bca0e524..af5a11e41 100644
--- a/apps/web-naive/src/views/system/tenant/data.ts
+++ b/apps/web-naive/src/views/system/tenant/data.ts
@@ -72,7 +72,10 @@ export function useFormSchema(): VbenFormSchema[] {
     {
       label: '用户密码',
       fieldName: 'password',
-      component: 'InputPassword',
+      component: 'Input',
+      componentProps: {
+        type: 'password',
+      },
       rules: 'required',
       dependencies: {
         triggerFields: ['id'],
@@ -90,8 +93,8 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'expireTime',
       component: 'DatePicker',
       componentProps: {
-        format: 'YYYY-MM-DD',
-        valueFormat: 'x',
+        type: 'datetime',
+        valueFormat: 'YYYY-MM-dd HH:mm:ss',
         placeholder: '请选择过期时间',
       },
       rules: 'required',
@@ -102,8 +105,9 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         placeholder: '请输入绑定域名',
-        mode: 'tags',
-        clearable: true,
+        tag: true,
+        multiple: true,
+        filterable: true,
       },
     },
     {
@@ -112,8 +116,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),
     },
diff --git a/apps/web-naive/src/views/system/tenant/index.vue b/apps/web-naive/src/views/system/tenant/index.vue
index d325063c6..e5a7459c1 100644
--- a/apps/web-naive/src/views/system/tenant/index.vue
+++ b/apps/web-naive/src/views/system/tenant/index.vue
@@ -162,6 +162,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
             {
               label: $t('common.edit'),
               type: 'primary',
+              text: true,
               icon: ACTION_ICON.EDIT,
               auth: ['system:tenant:update'],
               onClick: handleEdit.bind(null, row),
diff --git a/apps/web-naive/src/views/system/tenantPackage/data.ts b/apps/web-naive/src/views/system/tenantPackage/data.ts
index 221c781eb..b4e192ac3 100644
--- a/apps/web-naive/src/views/system/tenantPackage/data.ts
+++ b/apps/web-naive/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),
     },
diff --git a/apps/web-naive/src/views/system/tenantPackage/index.vue b/apps/web-naive/src/views/system/tenantPackage/index.vue
index 9b2470d9c..59b5c8672 100644
--- a/apps/web-naive/src/views/system/tenantPackage/index.vue
+++ b/apps/web-naive/src/views/system/tenantPackage/index.vue
@@ -149,6 +149,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
             {
               label: $t('common.edit'),
               type: 'primary',
+              text: true,
               icon: ACTION_ICON.EDIT,
               auth: ['system:tenant-package:update'],
               onClick: handleEdit.bind(null, row),
diff --git a/apps/web-naive/src/views/system/tenantPackage/modules/form.vue b/apps/web-naive/src/views/system/tenantPackage/modules/form.vue
index 6f3b363c0..6daf7b407 100644
--- a/apps/web-naive/src/views/system/tenantPackage/modules/form.vue
+++ b/apps/web-naive/src/views/system/tenantPackage/modules/form.vue
@@ -135,7 +135,7 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   <Modal :title="getTitle" class="w-2/5">
     <Form class="mx-6">
       <template #menuIds="slotProps">
-        <NSpin :show="menuLoading" content-class="w-full">
+        <NSpin :show="menuLoading" class="w-full">
           <Tree
             class="max-h-96 overflow-y-auto"
             :tree-data="menuTree"
diff --git a/apps/web-naive/src/views/system/user/data.ts b/apps/web-naive/src/views/system/user/data.ts
index d1795e20a..7528dde14 100644
--- a/apps/web-naive/src/views/system/user/data.ts
+++ b/apps/web-naive/src/views/system/user/data.ts
@@ -33,7 +33,10 @@ export function useFormSchema(): VbenFormSchema[] {
     {
       label: '用户密码',
       fieldName: 'password',
-      component: 'InputPassword',
+      component: 'Input',
+      componentProps: {
+        type: 'password',
+      },
       rules: 'required',
       dependencies: {
         triggerFields: ['id'],
@@ -70,7 +73,8 @@ export function useFormSchema(): VbenFormSchema[] {
         api: getSimplePostList,
         labelField: 'name',
         valueField: 'id',
-        mode: 'multiple',
+        tag: true,
+        multiple: true,
         placeholder: '请选择岗位',
       },
     },
@@ -97,8 +101,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),
     },
@@ -108,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),
     },
@@ -219,7 +219,8 @@ export function useAssignRoleFormSchema(): VbenFormSchema[] {
         api: getSimpleRoleList,
         labelField: 'name',
         valueField: 'id',
-        mode: 'multiple',
+        tag: true,
+        multiple: true,
         placeholder: '请选择角色',
       },
     },