From d0dbb951cfd543e9eb178639d704af73c646b2eb Mon Sep 17 00:00:00 2001
From: xingyuv <xingyu4j@vip.qq.com>
Date: Fri, 24 Mar 2023 13:31:46 +0800
Subject: [PATCH] feat: modal style

---
 src/views/infra/config/ConfigModal.vue           | 11 +++--------
 .../dataSourceConfig/DataSourceConfigModal.vue   | 11 +++--------
 src/views/infra/fileConfig/FileConfigModal.vue   |  9 ++-------
 src/views/infra/job/JobModal.vue                 |  9 ++-------
 src/views/system/errorCode/ErrorCodeModal.vue    |  2 +-
 src/views/system/mail/account/AccountModal.vue   | 11 +++--------
 src/views/system/mail/account/index.vue          | 16 +++++++---------
 src/views/system/mail/template/TemplateModal.vue | 11 +++--------
 src/views/system/menu/MenuModal.vue              | 11 +++--------
 src/views/system/notice/NoticeModal.vue          | 11 +++--------
 .../system/notify/template/TemplateModal.vue     | 11 +++--------
 src/views/system/oauth2/client/ClientModal.vue   |  9 ++-------
 src/views/system/role/RoleModal.vue              | 11 +++--------
 src/views/system/role/RoleScopeModal.vue         |  8 ++------
 .../system/sensitiveWord/SensitiveWordModal.vue  |  9 ++-------
 src/views/system/sms/SmsChannelModal.vue         | 11 +++--------
 src/views/system/sms/SmsTemplateModal.vue        |  9 ++-------
 src/views/system/tenant/TenantModal.vue          | 11 +++--------
 .../system/tenantPackage/TenantPackageModal.vue  | 11 +++--------
 src/views/system/user/UserModal.vue              | 11 +++--------
 20 files changed, 56 insertions(+), 147 deletions(-)

diff --git a/src/views/infra/config/ConfigModal.vue b/src/views/infra/config/ConfigModal.vue
index 7839aca..024a86a 100644
--- a/src/views/infra/config/ConfigModal.vue
+++ b/src/views/infra/config/ConfigModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="ConfigModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './config.data'
@@ -12,10 +12,9 @@ import { createConfig, getConfig, updateConfig } from '@/api/infra/config'
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getConfig(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增配置' : '编辑配置'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/infra/dataSourceConfig/DataSourceConfigModal.vue b/src/views/infra/dataSourceConfig/DataSourceConfigModal.vue
index 6a9239d..efb78ba 100644
--- a/src/views/infra/dataSourceConfig/DataSourceConfigModal.vue
+++ b/src/views/infra/dataSourceConfig/DataSourceConfigModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="DataSourceConfigModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './dataSourceConfig.data'
@@ -12,10 +12,9 @@ import { createPost, getPost, updatePost } from '@/api/system/post'
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getPost(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增数据源' : '编辑数据源'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/infra/fileConfig/FileConfigModal.vue b/src/views/infra/fileConfig/FileConfigModal.vue
index d5fd831..2ee19ca 100644
--- a/src/views/infra/fileConfig/FileConfigModal.vue
+++ b/src/views/infra/fileConfig/FileConfigModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="FileConfigModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './ficleConfig.data'
@@ -12,7 +12,6 @@ import { createFileConfig, getFileConfig, updateFileConfig } from '@/api/infra/f
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
   labelWidth: 100,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getFileConfig(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增文件配置' : '编辑文件配置'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/infra/job/JobModal.vue b/src/views/infra/job/JobModal.vue
index 7bc4fde..4a9a80e 100644
--- a/src/views/infra/job/JobModal.vue
+++ b/src/views/infra/job/JobModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="JobModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './job.data'
@@ -12,7 +12,6 @@ import { createJob, getJob, updateJob } from '@/api/infra/job'
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
   labelWidth: 100,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getJob(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增定时任务' : '编辑定时任务'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/errorCode/ErrorCodeModal.vue b/src/views/system/errorCode/ErrorCodeModal.vue
index 403ecdf..25d034b 100644
--- a/src/views/system/errorCode/ErrorCodeModal.vue
+++ b/src/views/system/errorCode/ErrorCodeModal.vue
@@ -14,7 +14,7 @@ const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
diff --git a/src/views/system/mail/account/AccountModal.vue b/src/views/system/mail/account/AccountModal.vue
index c759a4e..2d9361e 100644
--- a/src/views/system/mail/account/AccountModal.vue
+++ b/src/views/system/mail/account/AccountModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="MailAccountModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './account.data'
@@ -12,10 +12,9 @@ import { createMailAccount, getMailAccount, updateMailAccount } from '@/api/syst
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getMailAccount(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增邮箱' : '编辑邮箱'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/mail/account/index.vue b/src/views/system/mail/account/index.vue
index 0746aa1..9e55545 100644
--- a/src/views/system/mail/account/index.vue
+++ b/src/views/system/mail/account/index.vue
@@ -2,17 +2,20 @@
   <div>
     <BasicTable @register="registerTable">
       <template #toolbar>
-        <a-button type="primary" :preIcon="IconEnum.ADD" @click="handleCreate"> {{ t('action.create') }} </a-button>
+        <a-button type="primary" v-auth="['system:mail-account:create']" :preIcon="IconEnum.ADD" @click="handleCreate">
+          {{ t('action.create') }}
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
           <TableAction
             :actions="[
-              { icon: IconEnum.EDIT, label: t('action.edit'), onClick: handleEdit.bind(null, record) },
+              { icon: IconEnum.EDIT, label: t('action.edit'), auth: 'system:mail-account:update', onClick: handleEdit.bind(null, record) },
               {
                 icon: IconEnum.DELETE,
                 color: 'error',
                 label: t('action.delete'),
+                auth: 'system:mail-account:delete',
                 popConfirm: {
                   title: t('common.delMessage'),
                   placement: 'left',
@@ -60,16 +63,11 @@ const [registerTable, { reload }] = useTable({
 })
 
 function handleCreate() {
-  openModal(true, {
-    isUpdate: false
-  })
+  openModal(true, { isUpdate: false })
 }
 
 function handleEdit(record: Recordable) {
-  openModal(true, {
-    record,
-    isUpdate: true
-  })
+  openModal(true, { record, isUpdate: true })
 }
 
 async function handleDelete(record: Recordable) {
diff --git a/src/views/system/mail/template/TemplateModal.vue b/src/views/system/mail/template/TemplateModal.vue
index 2581c28..f5223be 100644
--- a/src/views/system/mail/template/TemplateModal.vue
+++ b/src/views/system/mail/template/TemplateModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="MailTemplateModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './template.data'
@@ -12,10 +12,9 @@ import { createMailTemplate, getMailTemplate, updateMailTemplate } from '@/api/s
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getMailTemplate(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增邮箱' : '编辑邮箱'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/menu/MenuModal.vue b/src/views/system/menu/MenuModal.vue
index 4062d66..36c3189 100644
--- a/src/views/system/menu/MenuModal.vue
+++ b/src/views/system/menu/MenuModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="MenuModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './menu.data'
@@ -12,10 +12,9 @@ import { createMenu, getMenu, updateMenu } from '@/api/system/menu'
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getMenu(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增菜单' : '编辑菜单'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/notice/NoticeModal.vue b/src/views/system/notice/NoticeModal.vue
index 92af209..dce3329 100644
--- a/src/views/system/notice/NoticeModal.vue
+++ b/src/views/system/notice/NoticeModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="NoticeModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './notice.data'
@@ -12,10 +12,9 @@ import { createNotice, getNotice, updateNotice } from '@/api/system/notice'
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getNotice(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增公告' : '编辑公告'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/notify/template/TemplateModal.vue b/src/views/system/notify/template/TemplateModal.vue
index 792e0c9..ae604f0 100644
--- a/src/views/system/notify/template/TemplateModal.vue
+++ b/src/views/system/notify/template/TemplateModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="NotifyTemplateModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './template.data'
@@ -12,10 +12,9 @@ import { createNotifyTemplate, getNotifyTemplate, updateNotifyTemplate } from '@
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getNotifyTemplate(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增岗位' : '编辑岗位'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/oauth2/client/ClientModal.vue b/src/views/system/oauth2/client/ClientModal.vue
index 0363c53..7a51630 100644
--- a/src/views/system/oauth2/client/ClientModal.vue
+++ b/src/views/system/oauth2/client/ClientModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="ClientModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './client.data'
@@ -12,7 +12,6 @@ import { createOAuth2Client, getOAuth2Client, updateOAuth2Client } from '@/api/s
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
   labelWidth: 160,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getOAuth2Client(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增应用' : '编辑应用'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/role/RoleModal.vue b/src/views/system/role/RoleModal.vue
index 258bde4..fb317ab 100644
--- a/src/views/system/role/RoleModal.vue
+++ b/src/views/system/role/RoleModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="RoleModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './role.data'
@@ -12,10 +12,9 @@ import { createRole, getRole, updateRole } from '@/api/system/role'
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getRole(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/role/RoleScopeModal.vue b/src/views/system/role/RoleScopeModal.vue
index 2c77201..20fb071 100644
--- a/src/views/system/role/RoleScopeModal.vue
+++ b/src/views/system/role/RoleScopeModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="RoleScopeModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { dataScopeFormSchema } from './role.data'
@@ -12,7 +12,6 @@ import { createRole, getRole, updateRole } from '@/api/system/role'
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
   labelWidth: 100,
@@ -29,13 +28,10 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
 
   if (unref(isUpdate)) {
     const res = await getRole(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/sensitiveWord/SensitiveWordModal.vue b/src/views/system/sensitiveWord/SensitiveWordModal.vue
index bff8ee1..7d026f8 100644
--- a/src/views/system/sensitiveWord/SensitiveWordModal.vue
+++ b/src/views/system/sensitiveWord/SensitiveWordModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="SensitiveWordModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './sensitiveWord.data'
@@ -12,7 +12,6 @@ import { createSensitiveWord, getSensitiveWord, updateSensitiveWord } from '@/ap
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
   labelWidth: 100,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getSensitiveWord(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增敏感词' : '编辑敏感词'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/sms/SmsChannelModal.vue b/src/views/system/sms/SmsChannelModal.vue
index fc28153..d148f57 100644
--- a/src/views/system/sms/SmsChannelModal.vue
+++ b/src/views/system/sms/SmsChannelModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="SmsChannelModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './smsChannel.data'
@@ -12,10 +12,9 @@ import { createSmsChannel, getSmsChannel, updateSmsChannel } from '@/api/system/
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getSmsChannel(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增短信渠道' : '编辑短信渠道'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/sms/SmsTemplateModal.vue b/src/views/system/sms/SmsTemplateModal.vue
index 97f4d21..03f5785 100644
--- a/src/views/system/sms/SmsTemplateModal.vue
+++ b/src/views/system/sms/SmsTemplateModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="SmsTemplateModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './smsTemplate.data'
@@ -12,7 +12,6 @@ import { createSmsTemplate, getSmsTemplate, updateSmsTemplate } from '@/api/syst
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
   labelWidth: 100,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getSmsTemplate(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增短信模版' : '编辑短信模版'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/tenant/TenantModal.vue b/src/views/system/tenant/TenantModal.vue
index c754417..424f5be 100644
--- a/src/views/system/tenant/TenantModal.vue
+++ b/src/views/system/tenant/TenantModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="TenantModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './tenant.data'
@@ -12,10 +12,9 @@ import { createTenant, getTenant, updateTenant } from '@/api/system/tenant'
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getTenant(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增租户' : '编辑租户'))
-
 async function handleSubmit() {
   try {
     const values = await validate()
diff --git a/src/views/system/tenantPackage/TenantPackageModal.vue b/src/views/system/tenantPackage/TenantPackageModal.vue
index f8a4bb1..8848df1 100644
--- a/src/views/system/tenantPackage/TenantPackageModal.vue
+++ b/src/views/system/tenantPackage/TenantPackageModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm">
       <template #menuIds="{ model, field }">
         <BasicTree
@@ -16,7 +16,7 @@
   </BasicModal>
 </template>
 <script lang="ts" setup name="TenantPackageModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicForm, useForm } from '@/components/Form'
 import { BasicTree, TreeItem } from '@/components/Tree'
 import { BasicModal, useModalInner } from '@/components/Modal'
@@ -27,13 +27,12 @@ import { handleTree } from '@/utils/tree'
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 const menuTree = ref<TreeItem[]>([])
 const menuKeys = ref<(string | number)[]>([])
 const menuHalfKeys = ref<(string | number)[]>([])
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -46,18 +45,14 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getTenantPackage(data.record.id)
-    rowId.value = res.id
     const menus = await listSimpleMenus()
     menuTree.value = handleTree(menus, 'id')
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增租户套餐' : '编辑租户套餐'))
-
 function menuCheck(checkedKeys, e) {
   menuKeys.value = checkedKeys as (string | number)[]
   menuHalfKeys.value = e.halfCheckedKeys as (string | number)[]
diff --git a/src/views/system/user/UserModal.vue b/src/views/system/user/UserModal.vue
index 5a94a4b..8eb2bcc 100644
--- a/src/views/system/user/UserModal.vue
+++ b/src/views/system/user/UserModal.vue
@@ -1,10 +1,10 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
 <script lang="ts" setup name="UserModal">
-import { ref, computed, unref } from 'vue'
+import { ref, unref } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { BasicForm, useForm } from '@/components/Form'
 import { formSchema } from './user.data'
@@ -12,10 +12,9 @@ import { createUser, getUser, updateUser } from '@/api/system/user'
 
 const emit = defineEmits(['success', 'register'])
 const isUpdate = ref(true)
-const rowId = ref()
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-  labelWidth: 100,
+  labelWidth: 120,
   baseColProps: { span: 24 },
   schemas: formSchema,
   showActionButtonGroup: false,
@@ -26,16 +25,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   resetFields()
   setModalProps({ confirmLoading: false })
   isUpdate.value = !!data?.isUpdate
-
   if (unref(isUpdate)) {
     const res = await getUser(data.record.id)
-    rowId.value = res.id
     setFieldsValue({ ...res })
   }
 })
 
-const getTitle = computed(() => (!unref(isUpdate) ? '新增用户' : '编辑用户'))
-
 async function handleSubmit() {
   try {
     const values = await validate()