From 9a0941d6e7c935353da5404963352c1f3d9c8d7c Mon Sep 17 00:00:00 2001 From: xingyuv Date: Wed, 22 Mar 2023 14:13:21 +0800 Subject: [PATCH] style: modal code style --- src/views/base/profile/PasswordModal.vue | 4 +- src/views/system/area/AreaModal.vue | 40 +++++++++++++++++ src/views/system/area/area.data.ts | 28 ++++++++++++ src/views/system/area/index.vue | 45 ++++++++++++++++++- src/views/system/dept/DeptModal.vue | 8 +--- src/views/system/dict/DictDataModal.vue | 8 +--- src/views/system/dict/DictTypeModal.vue | 8 +--- src/views/system/errorCode/ErrorCodeModal.vue | 8 +--- .../system/mail/account/AccountModal.vue | 8 +--- .../system/mail/template/TemplateModal.vue | 8 +--- src/views/system/menu/MenuModal.vue | 8 +--- src/views/system/notice/NoticeModal.vue | 8 +--- .../system/oauth2/client/ClientModal.vue | 8 +--- src/views/system/post/PostModal.vue | 8 +--- src/views/system/role/RoleModal.vue | 8 +--- src/views/system/role/RoleScopeModal.vue | 8 +--- .../sensitiveWord/SensitiveWordModal.vue | 8 +--- src/views/system/sms/SmsTemplateModal.vue | 8 +--- src/views/system/tenant/TenantModal.vue | 8 +--- .../tenantPackage/TenantPackageModal.vue | 8 +--- src/views/system/user/UserModal.vue | 8 +--- 21 files changed, 147 insertions(+), 106 deletions(-) create mode 100644 src/views/system/area/AreaModal.vue create mode 100644 src/views/system/area/area.data.ts diff --git a/src/views/base/profile/PasswordModal.vue b/src/views/base/profile/PasswordModal.vue index 032df74..6f93b4a 100644 --- a/src/views/base/profile/PasswordModal.vue +++ b/src/views/base/profile/PasswordModal.vue @@ -19,9 +19,7 @@ const [registerForm, { resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: passwordSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(() => { diff --git a/src/views/system/area/AreaModal.vue b/src/views/system/area/AreaModal.vue new file mode 100644 index 0000000..25ca1c9 --- /dev/null +++ b/src/views/system/area/AreaModal.vue @@ -0,0 +1,40 @@ + + diff --git a/src/views/system/area/area.data.ts b/src/views/system/area/area.data.ts new file mode 100644 index 0000000..5473570 --- /dev/null +++ b/src/views/system/area/area.data.ts @@ -0,0 +1,28 @@ +import { BasicColumn, FormSchema } from '@/components/Table' + +export const columns: BasicColumn[] = [ + { + title: '编号', + dataIndex: 'id', + width: 100 + }, + { + title: '名字', + dataIndex: 'name', + width: 180 + } +] + +export const formSchema: FormSchema[] = [ + { + label: 'IP', + field: 'IP', + required: true, + component: 'Input' + }, + { + label: '地址', + field: 'result', + component: 'Input' + } +] diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index 3b64cfc..519f258 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -1,3 +1,46 @@ + diff --git a/src/views/system/dept/DeptModal.vue b/src/views/system/dept/DeptModal.vue index db7e071..3620cf8 100644 --- a/src/views/system/dept/DeptModal.vue +++ b/src/views/system/dept/DeptModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getDeptApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/dict/DictDataModal.vue b/src/views/system/dict/DictDataModal.vue index d4bdfbb..c2f7593 100644 --- a/src/views/system/dict/DictDataModal.vue +++ b/src/views/system/dict/DictDataModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: dataFormSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getDictDataApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } else { setFieldsValue({ dictType: data.record diff --git a/src/views/system/dict/DictTypeModal.vue b/src/views/system/dict/DictTypeModal.vue index 2b395af..60585ee 100644 --- a/src/views/system/dict/DictTypeModal.vue +++ b/src/views/system/dict/DictTypeModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: typeFormSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getDictTypeApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/errorCode/ErrorCodeModal.vue b/src/views/system/errorCode/ErrorCodeModal.vue index ab50c50..6426cd2 100644 --- a/src/views/system/errorCode/ErrorCodeModal.vue +++ b/src/views/system/errorCode/ErrorCodeModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getErrorCodeApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/mail/account/AccountModal.vue b/src/views/system/mail/account/AccountModal.vue index 655e915..4c79f74 100644 --- a/src/views/system/mail/account/AccountModal.vue +++ b/src/views/system/mail/account/AccountModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getMailAccountApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/mail/template/TemplateModal.vue b/src/views/system/mail/template/TemplateModal.vue index 57698f1..e4579e5 100644 --- a/src/views/system/mail/template/TemplateModal.vue +++ b/src/views/system/mail/template/TemplateModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getMailTemplateApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/menu/MenuModal.vue b/src/views/system/menu/MenuModal.vue index ff96c06..1571522 100644 --- a/src/views/system/menu/MenuModal.vue +++ b/src/views/system/menu/MenuModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getMenuApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/notice/NoticeModal.vue b/src/views/system/notice/NoticeModal.vue index 5dd34d0..f0dbfa4 100644 --- a/src/views/system/notice/NoticeModal.vue +++ b/src/views/system/notice/NoticeModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getNoticeApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/oauth2/client/ClientModal.vue b/src/views/system/oauth2/client/ClientModal.vue index fff606b..bc52833 100644 --- a/src/views/system/oauth2/client/ClientModal.vue +++ b/src/views/system/oauth2/client/ClientModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getOAuth2ClientApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/post/PostModal.vue b/src/views/system/post/PostModal.vue index ccfbdd6..6d8dcc8 100644 --- a/src/views/system/post/PostModal.vue +++ b/src/views/system/post/PostModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getPostApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/role/RoleModal.vue b/src/views/system/role/RoleModal.vue index aa31f95..f5a9015 100644 --- a/src/views/system/role/RoleModal.vue +++ b/src/views/system/role/RoleModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getRoleApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/role/RoleScopeModal.vue b/src/views/system/role/RoleScopeModal.vue index cefa30a..358e521 100644 --- a/src/views/system/role/RoleScopeModal.vue +++ b/src/views/system/role/RoleScopeModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: dataScopeFormSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getRoleApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/sensitiveWord/SensitiveWordModal.vue b/src/views/system/sensitiveWord/SensitiveWordModal.vue index 5e0c763..d064683 100644 --- a/src/views/system/sensitiveWord/SensitiveWordModal.vue +++ b/src/views/system/sensitiveWord/SensitiveWordModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getSensitiveWordApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/sms/SmsTemplateModal.vue b/src/views/system/sms/SmsTemplateModal.vue index 0740c04..437ea7a 100644 --- a/src/views/system/sms/SmsTemplateModal.vue +++ b/src/views/system/sms/SmsTemplateModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getSmsTemplateApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/tenant/TenantModal.vue b/src/views/system/tenant/TenantModal.vue index 5a1e649..2f822a4 100644 --- a/src/views/system/tenant/TenantModal.vue +++ b/src/views/system/tenant/TenantModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getTenantApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/tenantPackage/TenantPackageModal.vue b/src/views/system/tenantPackage/TenantPackageModal.vue index 3b6c64a..b9e313f 100644 --- a/src/views/system/tenantPackage/TenantPackageModal.vue +++ b/src/views/system/tenantPackage/TenantPackageModal.vue @@ -37,9 +37,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -54,9 +52,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data rowId.value = res.id const menus = await listSimpleMenusApi() menuTree.value = handleTree(menus, 'id') - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } }) diff --git a/src/views/system/user/UserModal.vue b/src/views/system/user/UserModal.vue index 874b7cf..6e0e0de 100644 --- a/src/views/system/user/UserModal.vue +++ b/src/views/system/user/UserModal.vue @@ -19,9 +19,7 @@ const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({ baseColProps: { span: 24 }, schemas: formSchema, showActionButtonGroup: false, - actionColOptions: { - span: 23 - } + actionColOptions: { span: 23 } }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -32,9 +30,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data if (unref(isUpdate)) { const res = await getUserApi(data.record.id) rowId.value = res.id - setFieldsValue({ - ...res - }) + setFieldsValue({ ...res }) } })