From da3fd5b718eba2d3554946f84087049e78e05e7b Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Tue, 22 Apr 2025 11:25:11 +0800 Subject: [PATCH] style: system views code style --- apps/web-antd/src/views/system/area/data.ts | 9 +- apps/web-antd/src/views/system/area/index.vue | 7 +- .../src/views/system/area/modules/form.vue | 9 +- apps/web-antd/src/views/system/dept/data.ts | 17 +-- apps/web-antd/src/views/system/dept/index.vue | 37 ++++--- .../src/views/system/dept/modules/form.vue | 8 +- apps/web-antd/src/views/system/dict/index.vue | 17 +-- .../views/system/dict/modules/data-form.vue | 21 +++- .../views/system/dict/modules/data-grid.vue | 53 +++++---- .../views/system/dict/modules/type-form.vue | 13 ++- .../views/system/dict/modules/type-grid.vue | 44 +++++--- .../src/views/system/loginlog/data.ts | 5 +- .../src/views/system/loginlog/index.vue | 23 ++-- .../views/system/loginlog/modules/detail.vue | 35 ++++-- .../src/views/system/mail/account/data.ts | 13 ++- .../src/views/system/mail/account/index.vue | 25 +++-- .../system/mail/account/modules/form.vue | 23 ++-- .../src/views/system/mail/log/data.ts | 13 ++- .../src/views/system/mail/log/index.vue | 9 +- .../views/system/mail/log/modules/detail.vue | 22 +++- .../src/views/system/mail/template/data.ts | 9 +- .../src/views/system/mail/template/index.vue | 36 ++++-- .../system/mail/template/modules/form.vue | 19 +++- .../mail/template/modules/send-form.vue | 4 +- apps/web-antd/src/views/system/menu/data.ts | 50 +++++---- apps/web-antd/src/views/system/menu/index.vue | 48 +++++--- .../src/views/system/menu/modules/form.vue | 8 +- apps/web-antd/src/views/system/notice/data.ts | 14 ++- .../src/views/system/notice/index.vue | 37 ++++--- .../src/views/system/notice/modules/form.vue | 6 +- .../src/views/system/notify/message/data.ts | 9 +- .../src/views/system/notify/message/index.vue | 9 +- .../system/notify/message/modules/detail.vue | 27 +++-- .../src/views/system/notify/my/index.vue | 13 ++- .../views/system/notify/my/modules/detail.vue | 26 +++-- .../src/views/system/notify/template/data.ts | 15 +-- .../views/system/notify/template/index.vue | 43 +++++--- .../system/notify/template/modules/form.vue | 22 +++- .../notify/template/modules/send-form.vue | 9 +- .../src/views/system/oauth2/client/data.ts | 15 +-- .../src/views/system/oauth2/client/index.vue | 43 +++++--- .../system/oauth2/client/modules/form.vue | 19 +++- .../src/views/system/oauth2/token/data.ts | 7 +- .../src/views/system/oauth2/token/index.vue | 27 +++-- .../src/views/system/operatelog/data.ts | 3 +- .../src/views/system/operatelog/index.vue | 21 +++- .../system/operatelog/modules/detail.vue | 24 +++- apps/web-antd/src/views/system/post/data.ts | 10 +- apps/web-antd/src/views/system/post/index.vue | 44 +++++--- .../src/views/system/post/modules/form.vue | 6 +- apps/web-antd/src/views/system/role/data.ts | 9 +- apps/web-antd/src/views/system/role/index.vue | 73 +++++++----- .../modules/assign-data-permission-form.vue | 29 +++-- .../system/role/modules/assign-menu-form.vue | 27 ++--- .../src/views/system/role/modules/form.vue | 8 +- .../src/views/system/sms/channel/data.ts | 7 +- .../src/views/system/sms/channel/index.vue | 41 +++++-- .../views/system/sms/channel/modules/form.vue | 23 ++-- .../web-antd/src/views/system/sms/log/data.ts | 7 +- .../src/views/system/sms/log/index.vue | 15 ++- .../views/system/sms/log/modules/detail.vue | 40 +++++-- .../src/views/system/sms/template/data.ts | 5 +- .../src/views/system/sms/template/index.vue | 43 +++++--- .../system/sms/template/modules/form.vue | 16 ++- .../system/sms/template/modules/send-form.vue | 4 +- .../src/views/system/social/client/data.ts | 11 +- .../src/views/system/social/client/index.vue | 40 ++++--- .../system/social/client/modules/form.vue | 19 +++- .../src/views/system/social/user/data.ts | 3 +- .../src/views/system/social/user/index.vue | 20 ++-- .../system/social/user/modules/detail.vue | 27 +++-- apps/web-antd/src/views/system/tenant/data.ts | 11 +- .../src/views/system/tenant/index.vue | 39 ++++--- .../src/views/system/tenant/modules/form.vue | 6 +- .../src/views/system/tenantPackage/data.ts | 11 +- .../src/views/system/tenantPackage/index.vue | 38 +++++-- .../system/tenantPackage/modules/form.vue | 43 ++++++-- apps/web-antd/src/views/system/user/data.ts | 25 +++-- apps/web-antd/src/views/system/user/index.vue | 104 ++++++++++++------ .../system/user/modules/assign-role-form.vue | 5 +- .../views/system/user/modules/dept-tree.vue | 26 +++-- .../src/views/system/user/modules/form.vue | 6 +- .../views/system/user/modules/import-form.vue | 14 ++- .../user/modules/reset-password-form.vue | 3 +- 84 files changed, 1200 insertions(+), 624 deletions(-) diff --git a/apps/web-antd/src/views/system/area/data.ts b/apps/web-antd/src/views/system/area/data.ts index e4316f70..07af5d09 100644 --- a/apps/web-antd/src/views/system/area/data.ts +++ b/apps/web-antd/src/views/system/area/data.ts @@ -1,10 +1,7 @@ import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; -import type { VbenFormSchema } from '#/adapter/form'; -import type { OnActionClickFn } from '#/adapter/vxe-table'; -import type { SystemAreaApi } from '#/api/system/area'; -import { z } from '#/adapter/form'; -import { useAccess } from '@vben/access'; +import type { VbenFormSchema } from '#/adapter/form'; +import type { SystemAreaApi } from '#/api/system/area'; /** 查询 IP 的表单 */ export function useFormSchema(): VbenFormSchema[] { @@ -25,7 +22,7 @@ export function useFormSchema(): VbenFormSchema[] { componentProps: { placeholder: '展示查询 IP 结果', readonly: true, - } + }, }, ]; } diff --git a/apps/web-antd/src/views/system/area/index.vue b/apps/web-antd/src/views/system/area/index.vue index 88d71d21..e97f2f94 100644 --- a/apps/web-antd/src/views/system/area/index.vue +++ b/apps/web-antd/src/views/system/area/index.vue @@ -2,15 +2,16 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { Page, useVbenModal } from '@vben/common-ui'; -import { Button } from 'ant-design-vue'; import { Search } from '@vben/icons'; -import Form from './modules/form.vue'; -import { DocAlert } from '#/components/doc-alert'; + +import { Button } from 'ant-design-vue'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getAreaTree } from '#/api/system/area'; +import { DocAlert } from '#/components/doc-alert'; import { useGridColumns } from './data'; +import Form from './modules/form.vue'; const [FormModal, formModalApi] = useVbenModal({ connectedComponent: Form, diff --git a/apps/web-antd/src/views/system/area/modules/form.vue b/apps/web-antd/src/views/system/area/modules/form.vue index adce2420..a11e9b5f 100644 --- a/apps/web-antd/src/views/system/area/modules/form.vue +++ b/apps/web-antd/src/views/system/area/modules/form.vue @@ -1,16 +1,15 @@ diff --git a/apps/web-antd/src/views/system/dept/data.ts b/apps/web-antd/src/views/system/dept/data.ts index 2fd45840..1f3c3d69 100644 --- a/apps/web-antd/src/views/system/dept/data.ts +++ b/apps/web-antd/src/views/system/dept/data.ts @@ -1,15 +1,17 @@ import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; + import type { VbenFormSchema } from '#/adapter/form'; import type { OnActionClickFn } from '#/adapter/vxe-table'; import type { SystemDeptApi } from '#/api/system/dept'; +import { useAccess } from '@vben/access'; + import { z } from '#/adapter/form'; import { getDeptList } from '#/api/system/dept'; import { getSimpleUserList } from '#/api/system/user'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; import { CommonStatusEnum } from '#/utils/constants'; +import { DICT_TYPE, getDictOptions } from '#/utils/dict'; import { handleTree } from '#/utils/tree'; -import { useAccess } from '@vben/access'; const { hasAccessByCodes } = useAccess(); @@ -93,7 +95,7 @@ export function useFormSchema(): VbenFormSchema[] { rules: z .string() // TODO @芋艿:未来怎么拓展一个手机的 - .regex(/^1[3|4|5|6|7|8|9][0-9]\d{8}$/, '请输入正确的手机号码') + .regex(/^1[3-9|]\d{9}$/, '请输入正确的手机号码') .optional(), }, { @@ -103,10 +105,7 @@ export function useFormSchema(): VbenFormSchema[] { componentProps: { placeholder: '请输入邮箱', }, - rules: z - .string() - .email('请输入正确的邮箱地址') - .optional(), + rules: z.string().email('请输入正确的邮箱地址').optional(), }, { fieldName: 'status', @@ -141,7 +140,9 @@ export function useGridColumns( title: '负责人', minWidth: 150, formatter: (row) => { - return userList.find((user) => user.id === row.cellValue)?.nickname || '-'; + return ( + userList.find((user) => user.id === row.cellValue)?.nickname || '-' + ); }, }, { diff --git a/apps/web-antd/src/views/system/dept/index.vue b/apps/web-antd/src/views/system/dept/index.vue index ba5d22ed..b790d2de 100644 --- a/apps/web-antd/src/views/system/dept/index.vue +++ b/apps/web-antd/src/views/system/dept/index.vue @@ -1,18 +1,23 @@ diff --git a/apps/web-antd/src/views/system/dict/modules/data-form.vue b/apps/web-antd/src/views/system/dict/modules/data-form.vue index b740e473..c3a69ed6 100644 --- a/apps/web-antd/src/views/system/dict/modules/data-form.vue +++ b/apps/web-antd/src/views/system/dict/modules/data-form.vue @@ -1,12 +1,18 @@