fix: naive code

2025-10-17 11:24:07 +08:00
parent 9499a80e8a
commit a5e3406849
39 changed files with 112 additions and 175 deletions
--- 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),
    },
--- 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!);
--- 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),
    },
--- 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
--- 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),
    },
--- 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 添加',
      },
    },
--- 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,
--- 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),
    },
--- 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),
    },
--- 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!);
--- 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: '请输入资源',
      },
    },
--- 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);
--- 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),
    },
--- 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),
    },
--- 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),
    },
--- 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: '手机号',
--- 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),
    },
--- 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!);
--- 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),
    },
--- 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),
--- 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),
    },
--- 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),
--- 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),
    },
--- 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),
--- 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"
--- 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: '请选择角色',
      },
    },