给所有组件添加name属性预防未知bug!!!

src/views/system/area/AreaForm.vue

@@ -1,27 +1,28 @@
 <template>
-  <Dialog title="IP 查询" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" title="IP 查询">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="80px"
-      v-loading="formLoading"
     >
       <el-form-item label="IP" prop="ip">
         <el-input v-model="formData.ip" placeholder="请输入 IP 地址" />
       </el-form-item>
       <el-form-item label="地址" prop="result">
-        <el-input v-model="formData.result" readonly placeholder="展示查询 IP 结果" />
+        <el-input v-model="formData.result" placeholder="展示查询 IP 结果" readonly />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemAreaForm" setup>
 import * as AreaApi from '@/api/system/area'
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示

src/views/system/dept/DeptForm.vue

@@ -1,31 +1,31 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="80px"
-      v-loading="formLoading"
     >
       <el-form-item label="上级部门" prop="parentId">
         <el-tree-select
           v-model="formData.parentId"
           :data="deptTree"
           :props="defaultProps"
-          value-key="deptId"
-          placeholder="请选择上级部门"
           check-strictly
           default-expand-all
+          placeholder="请选择上级部门"
+          value-key="deptId"
         />
       </el-form-item>
       <el-form-item label="部门名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入部门名称" />
       </el-form-item>
       <el-form-item label="显示排序" prop="sort">
-        <el-input-number v-model="formData.sort" controls-position="right" :min="0" />
+        <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
       </el-form-item>
       <el-form-item label="负责人" prop="leaderUserId">
-        <el-select v-model="formData.leaderUserId" placeholder="请输入负责人" clearable>
+        <el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">
           <el-option
             v-for="item in userList"
             :key="item.id"
@@ -35,13 +35,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="联系电话" prop="phone">
-        <el-input v-model="formData.phone" placeholder="请输入联系电话" maxlength="11" />
+        <el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话" />
       </el-form-item>
       <el-form-item label="邮箱" prop="email">
-        <el-input v-model="formData.email" placeholder="请输入邮箱" maxlength="50" />
+        <el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="formData.status" placeholder="请选择状态" clearable>
+        <el-select v-model="formData.status" clearable placeholder="请选择状态">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
@@ -57,12 +57,13 @@
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemDeptForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { handleTree, defaultProps } from '@/utils/tree'
+import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
 import { CommonStatusEnum } from '@/utils/constants'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/dict/DictTypeForm.vue

@@ -1,19 +1,19 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="80px"
-      v-loading="formLoading"
     >
       <el-form-item label="字典名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入字典名称" />
       </el-form-item>
       <el-form-item label="字典类型" prop="type">
         <el-input
-          :disabled="typeof formData.id !== 'undefined'"
           v-model="formData.type"
+          :disabled="typeof formData.id !== 'undefined'"
           placeholder="请输入参数名称"
         />
       </el-form-item>
@@ -29,19 +29,20 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" type="textarea" placeholder="请输入内容" />
+        <el-input v-model="formData.remark" placeholder="请输入内容" type="textarea" />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemDictTypeForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as DictTypeApi from '@/api/system/dict/dict.type'
 import { CommonStatusEnum } from '@/utils/constants'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/dict/data/DictDataForm.vue

@@ -1,16 +1,16 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="80px"
-      v-loading="formLoading"
     >
       <el-form-item label="字典类型" prop="type">
         <el-input
-          :disabled="typeof formData.id !== 'undefined'"
           v-model="formData.dictType"
+          :disabled="typeof formData.id !== 'undefined'"
           placeholder="请输入参数名称"
         />
       </el-form-item>
@@ -21,7 +21,7 @@
         <el-input v-model="formData.value" placeholder="请输入数据键值" />
       </el-form-item>
       <el-form-item label="显示排序" prop="sort">
-        <el-input-number v-model="formData.sort" controls-position="right" :min="0" />
+        <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-radio-group v-model="formData.status">
@@ -48,19 +48,20 @@
         <el-input v-model="formData.cssClass" placeholder="请输入 CSS Class" />
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" type="textarea" placeholder="请输入内容" />
+        <el-input v-model="formData.remark" placeholder="请输入内容" type="textarea" />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemDictDataForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as DictDataApi from '@/api/system/dict/dict.data'
 import { CommonStatusEnum } from '@/utils/constants'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/errorCode/ErrorCodeForm.vue

@@ -1,32 +1,32 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="100px"
-      v-loading="formLoading"
     >
       <el-form-item label="应用名" prop="applicationName">
-        <el-input v-model="formData.applicationName" placeholder="请输入应用名" clearable />
+        <el-input v-model="formData.applicationName" clearable placeholder="请输入应用名" />
       </el-form-item>
       <el-form-item label="错误码编码" prop="code">
-        <el-input v-model="formData.code" placeholder="请输入错误码编码" clearable />
+        <el-input v-model="formData.code" clearable placeholder="请输入错误码编码" />
       </el-form-item>
       <el-form-item label="错误码提示" prop="message">
-        <el-input v-model="formData.message" placeholder="请输入错误码提示" clearable />
+        <el-input v-model="formData.message" clearable placeholder="请输入错误码提示" />
       </el-form-item>
       <el-form-item label="备注" prop="memo">
-        <el-input v-model="formData.memo" placeholder="请输入备注" clearable />
+        <el-input v-model="formData.memo" clearable placeholder="请输入备注" />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemErrorCodeForm" setup>
 import * as ErrorCodeApi from '@/api/system/errorCode'
 
 const { t } = useI18n() // 国际化

src/views/system/loginlog/LoginLogDetail.vue

@@ -1,6 +1,6 @@
 <template>
-  <Dialog title="详情" v-model="dialogVisible" width="800">
-    <el-descriptions border :column="1">
+  <Dialog v-model="dialogVisible" title="详情" width="800">
+    <el-descriptions :column="1" border>
       <el-descriptions-item label="日志编号" min-width="120">
         {{ detailData.id }}
       </el-descriptions-item>
@@ -25,7 +25,7 @@
     </el-descriptions>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemLoginLogDetail" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as LoginLogApi from '@/api/system/loginLog'

src/views/system/mail/account/MailAccountDetail.vue

@@ -1,9 +1,9 @@
 <template>
-  <Dialog title="详情" v-model="dialogVisible">
-    <Descriptions :schema="allSchemas.detailSchema" :data="detailData" />
+  <Dialog v-model="dialogVisible" title="详情">
+    <Descriptions :data="detailData" :schema="allSchemas.detailSchema" />
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemMailAccountDetail" setup>
 import * as MailAccountApi from '@/api/system/mail/account'
 import { allSchemas } from './account.data'
 

src/views/system/mail/account/MailAccountForm.vue

@@ -1,15 +1,16 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <Form ref="formRef" :schema="allSchemas.formSchema" :rules="rules" v-loading="formLoading" />
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <Form ref="formRef" v-loading="formLoading" :rules="rules" :schema="allSchemas.formSchema" />
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemMailAccountForm" setup>
 import * as MailAccountApi from '@/api/system/mail/account'
-import { rules, allSchemas } from './account.data'
+import { allSchemas, rules } from './account.data'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/mail/log/MailLogDetail.vue

@@ -1,6 +1,6 @@
 <template>
-  <Dialog title="详情" v-model="dialogVisible" :scroll="true" :max-height="500">
-    <Descriptions :schema="allSchemas.detailSchema" :data="detailData">
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情">
+    <Descriptions :data="detailData" :schema="allSchemas.detailSchema">
       <!-- 展示 HTML 内容 -->
       <template #templateContent="{ row }">
         <div v-html="row.templateContent"></div>
@@ -8,7 +8,7 @@
     </Descriptions>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemMailLogDetail" setup>
 import * as MailLogApi from '@/api/system/mail/log'
 import { allSchemas } from './log.data'
 

src/views/system/mail/template/MailTemplateForm.vue

@@ -1,21 +1,22 @@
 <template>
   <Dialog
-    :title="dialogTitle"
     v-model="dialogVisible"
-    :scroll="true"
-    :width="800"
     :max-height="500"
+    :scroll="true"
+    :title="dialogTitle"
+    :width="800"
   >
-    <Form ref="formRef" :schema="allSchemas.formSchema" :rules="rules" v-loading="formLoading" />
+    <Form ref="formRef" v-loading="formLoading" :rules="rules" :schema="allSchemas.formSchema" />
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemMailTemplateForm" setup>
 import * as MailTemplateApi from '@/api/system/mail/template'
 import { allSchemas, rules } from './template.data'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/mail/template/MailTemplateSendForm.vue

@@ -1,14 +1,14 @@
 <template>
-  <Dialog title="测试" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" title="测试">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="120px"
-      v-loading="formLoading"
     >
       <el-form-item label="模板内容" prop="content">
-        <Editor :model-value="formData.content" readonly height="150px" />
+        <Editor :model-value="formData.content" height="150px" readonly />
       </el-form-item>
       <el-form-item label="收件邮箱" prop="mail">
         <el-input v-model="formData.mail" placeholder="请输入收件邮箱" />
@@ -26,13 +26,14 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemMailTemplateSendForm" setup>
 import * as MailTemplateApi from '@/api/system/mail/template'
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示

src/views/system/menu/MenuForm.vue

@@ -1,24 +1,24 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="100px"
-      v-loading="formLoading"
     >
       <el-form-item label="上级菜单">
         <el-tree-select
-          node-key="id"
           v-model="formData.parentId"
-          :props="defaultProps"
           :data="menuTree"
           :default-expanded-keys="[0]"
+          :props="defaultProps"
           check-strictly
+          node-key="id"
         />
       </el-form-item>
       <el-form-item label="菜单名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入菜单名称" clearable />
+        <el-input v-model="formData.name" clearable placeholder="请输入菜单名称" />
       </el-form-item>
       <el-form-item label="菜单类型" prop="type">
         <el-radio-group v-model="formData.type">
@@ -31,35 +31,35 @@
           </el-radio-button>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="菜单图标" v-if="formData.type !== 3">
+      <el-form-item v-if="formData.type !== 3" label="菜单图标">
         <IconSelect v-model="formData.icon" clearable />
       </el-form-item>
-      <el-form-item label="路由地址" prop="path" v-if="formData.type !== 3">
+      <el-form-item v-if="formData.type !== 3" label="路由地址" prop="path">
         <template #label>
           <Tooltip
-            titel="路由地址"
             message="访问的路由地址，如：`user`。如需外网地址时，则以 `http(s)://` 开头"
+            titel="路由地址"
           />
         </template>
-        <el-input v-model="formData.path" placeholder="请输入路由地址" clearable />
+        <el-input v-model="formData.path" clearable placeholder="请输入路由地址" />
       </el-form-item>
-      <el-form-item label="组件地址" prop="component" v-if="formData.type === 2">
-        <el-input v-model="formData.component" placeholder="例如说：system/user/index" clearable />
+      <el-form-item v-if="formData.type === 2" label="组件地址" prop="component">
+        <el-input v-model="formData.component" clearable placeholder="例如说：system/user/index" />
       </el-form-item>
-      <el-form-item label="组件名字" prop="componentName" v-if="formData.type === 2">
-        <el-input v-model="formData.componentName" placeholder="例如说：SystemUser" clearable />
+      <el-form-item v-if="formData.type === 2" label="组件名字" prop="componentName">
+        <el-input v-model="formData.componentName" clearable placeholder="例如说：SystemUser" />
       </el-form-item>
-      <el-form-item label="权限标识" prop="permission" v-if="formData.type !== 1">
+      <el-form-item v-if="formData.type !== 1" label="权限标识" prop="permission">
         <template #label>
           <Tooltip
-            titel="权限标识"
             message="Controller 方法上的权限字符，如：@PreAuthorize(`@ss.hasPermission('system:user:list')`)"
+            titel="权限标识"
           />
         </template>
-        <el-input v-model="formData.permission" placeholder="请输入权限标识" clearable />
+        <el-input v-model="formData.permission" clearable placeholder="请输入权限标识" />
       </el-form-item>
       <el-form-item label="显示排序" prop="sort">
-        <el-input-number v-model="formData.sort" controls-position="right" :min="0" clearable />
+        <el-input-number v-model="formData.sort" :min="0" clearable controls-position="right" />
       </el-form-item>
       <el-form-item label="菜单状态" prop="status">
         <el-radio-group v-model="formData.status">
@@ -72,52 +72,53 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="显示状态" prop="visible" v-if="formData.type !== 3">
+      <el-form-item v-if="formData.type !== 3" label="显示状态" prop="visible">
         <template #label>
-          <Tooltip titel="显示状态" message="选择隐藏时，路由将不会出现在侧边栏，但仍然可以访问" />
+          <Tooltip message="选择隐藏时，路由将不会出现在侧边栏，但仍然可以访问" titel="显示状态" />
         </template>
         <el-radio-group v-model="formData.visible">
-          <el-radio border key="true" :label="true">显示</el-radio>
-          <el-radio border key="false" :label="false">隐藏</el-radio>
+          <el-radio key="true" :label="true" border>显示</el-radio>
+          <el-radio key="false" :label="false" border>隐藏</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="总是显示" prop="alwaysShow" v-if="formData.type !== 3">
+      <el-form-item v-if="formData.type !== 3" label="总是显示" prop="alwaysShow">
         <template #label>
           <Tooltip
-            titel="总是显示"
             message="选择不是时，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单"
+            titel="总是显示"
           />
         </template>
         <el-radio-group v-model="formData.alwaysShow">
-          <el-radio border key="true" :label="true">总是</el-radio>
-          <el-radio border key="false" :label="false">不是</el-radio>
+          <el-radio key="true" :label="true" border>总是</el-radio>
+          <el-radio key="false" :label="false" border>不是</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="缓存状态" prop="keepAlive" v-if="formData.type === 2">
+      <el-form-item v-if="formData.type === 2" label="缓存状态" prop="keepAlive">
         <template #label>
           <Tooltip
-            titel="缓存状态"
             message="选择缓存时，则会被 `keep-alive` 缓存，必须填写「组件名称」字段"
+            titel="缓存状态"
           />
         </template>
         <el-radio-group v-model="formData.keepAlive">
-          <el-radio border key="true" :label="true">缓存</el-radio>
-          <el-radio border key="false" :label="false">不缓存</el-radio>
+          <el-radio key="true" :label="true" border>缓存</el-radio>
+          <el-radio key="false" :label="false" border>不缓存</el-radio>
         </el-radio-group>
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemMenuForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as MenuApi from '@/api/system/menu'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { SystemMenuTypeEnum, CommonStatusEnum } from '@/utils/constants'
-import { handleTree, defaultProps } from '@/utils/tree'
+import { CommonStatusEnum, SystemMenuTypeEnum } from '@/utils/constants'
+import { defaultProps, handleTree } from '@/utils/tree'
+
 const { wsCache } = useCache()
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

src/views/system/notice/NoticeForm.vue

@@ -1,11 +1,11 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="80px"
-      v-loading="formLoading"
     >
       <el-form-item label="公告标题" prop="title">
         <el-input v-model="formData.title" placeholder="请输入公告标题" />
@@ -14,7 +14,7 @@
         <Editor :model-value="formData.content" height="150px" />
       </el-form-item>
       <el-form-item label="公告类型" prop="type">
-        <el-select v-model="formData.type" placeholder="请选择公告类型" clearable>
+        <el-select v-model="formData.type" clearable placeholder="请选择公告类型">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE)"
             :key="parseInt(dict.value)"
@@ -24,7 +24,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="formData.status" placeholder="请选择状态" clearable>
+        <el-select v-model="formData.status" clearable placeholder="请选择状态">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="parseInt(dict.value)"
@@ -34,19 +34,20 @@
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" type="textarea" placeholder="请输备注" />
+        <el-input v-model="formData.remark" placeholder="请输备注" type="textarea" />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemNoticeForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as NoticeApi from '@/api/system/notice'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/notify/message/NotifyMessageDetail.vue

@@ -1,6 +1,6 @@
 <template>
-  <Dialog title="详情" v-model="dialogVisible" :scroll="true" :max-height="500">
-    <el-descriptions border :column="1">
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情">
+    <el-descriptions :column="1" border>
       <el-descriptions-item label="编号" min-width="120">
         {{ detailData.id }}
       </el-descriptions-item>
@@ -40,7 +40,7 @@
     </el-descriptions>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemNotifyMessageDetail" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'

src/views/system/notify/my/MyNotifyMessageDetail.vue

@@ -1,6 +1,6 @@
 <template>
-  <Dialog title="消息详情" v-model="dialogVisible" :scroll="true" :max-height="500">
-    <el-descriptions border :column="1">
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="消息详情">
+    <el-descriptions :column="1" border>
       <el-descriptions-item label="发送人">
         {{ detailData.templateNickname }}
       </el-descriptions-item>
@@ -13,7 +13,7 @@
       <el-descriptions-item label="是否已读">
         <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="detailData.readStatus" />
       </el-descriptions-item>
-      <el-descriptions-item label="阅读时间" v-if="detailData.readStatus">
+      <el-descriptions-item v-if="detailData.readStatus" label="阅读时间">
         {{ formatDate(detailData.readTime) }}
       </el-descriptions-item>
       <el-descriptions-item label="内容">
@@ -22,7 +22,7 @@
     </el-descriptions>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="MyNotifyMessageDetailDetail" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'

src/views/system/oauth2/client/ClientForm.vue

@@ -1,11 +1,11 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" scroll max-height="500px">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" max-height="500px" scroll>
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="160px"
-      v-loading="formLoading"
     >
       <el-form-item label="客户端编号" prop="secret">
         <el-input v-model="formData.clientId" placeholder="请输入客户端编号" />
@@ -20,7 +20,7 @@
         <UploadImg v-model="formData.logo" :limit="1" />
       </el-form-item>
       <el-form-item label="应用描述">
-        <el-input type="textarea" v-model="formData.description" placeholder="请输入应用名" />
+        <el-input v-model="formData.description" placeholder="请输入应用名" type="textarea" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-radio-group v-model="formData.status">
@@ -42,8 +42,8 @@
       <el-form-item label="授权类型" prop="authorizedGrantTypes">
         <el-select
           v-model="formData.authorizedGrantTypes"
-          multiple
           filterable
+          multiple
           placeholder="请输入授权类型"
           style="width: 500px"
         >
@@ -58,9 +58,9 @@
       <el-form-item label="授权范围" prop="scopes">
         <el-select
           v-model="formData.scopes"
-          multiple
-          filterable
           allow-create
+          filterable
+          multiple
           placeholder="请输入授权范围"
           style="width: 500px"
         >
@@ -70,8 +70,8 @@
       <el-form-item label="自动授权范围" prop="autoApproveScopes">
         <el-select
           v-model="formData.autoApproveScopes"
-          multiple
           filterable
+          multiple
           placeholder="请输入授权范围"
           style="width: 500px"
         >
@@ -81,9 +81,9 @@
       <el-form-item label="可重定向的 URI 地址" prop="redirectUris">
         <el-select
           v-model="formData.redirectUris"
-          multiple
-          filterable
           allow-create
+          filterable
+          multiple
           placeholder="请输入可重定向的 URI 地址"
           style="width: 500px"
         >
@@ -98,9 +98,9 @@
       <el-form-item label="权限" prop="authorities">
         <el-select
           v-model="formData.authorities"
-          multiple
-          filterable
           allow-create
+          filterable
+          multiple
           placeholder="请输入权限"
           style="width: 500px"
         >
@@ -115,9 +115,9 @@
       <el-form-item label="资源" prop="resourceIds">
         <el-select
           v-model="formData.resourceIds"
-          multiple
-          filterable
           allow-create
+          filterable
+          multiple
           placeholder="请输入资源"
           style="width: 500px"
         >
@@ -131,22 +131,23 @@
       </el-form-item>
       <el-form-item label="附加信息" prop="additionalInformation">
         <el-input
-          type="textarea"
           v-model="formData.additionalInformation"
           placeholder="请输入附加信息，JSON 格式数据"
+          type="textarea"
         />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemOAuth2ClientForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as ClientApi from '@/api/system/oauth2/client'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/operatelog/OperateLogDetail.vue

@@ -1,6 +1,6 @@
 <template>
-  <Dialog title="详情" v-model="dialogVisible" :scroll="true" :max-height="500" width="800">
-    <el-descriptions border :column="1">
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情" width="800">
+    <el-descriptions :column="1" border>
       <el-descriptions-item label="日志主键" min-width="120">
         {{ detailData.id }}
       </el-descriptions-item>
@@ -25,10 +25,10 @@
       <el-descriptions-item label="操作名">
         {{ detailData.name }}
       </el-descriptions-item>
-      <el-descriptions-item label="操作内容" v-if="detailData.content">
+      <el-descriptions-item v-if="detailData.content" label="操作内容">
         {{ detailData.content }}
       </el-descriptions-item>
-      <el-descriptions-item label="操作拓展参数" v-if="detailData.exts">
+      <el-descriptions-item v-if="detailData.exts" label="操作拓展参数">
         {{ detailData.exts }}
       </el-descriptions-item>
       <el-descriptions-item label="请求 URL">
@@ -48,16 +48,16 @@
         <div v-if="detailData.resultCode === 0">正常</div>
         <div v-else>失败({{ detailData.resultCode }})</div>
       </el-descriptions-item>
-      <el-descriptions-item label="操作结果" v-if="detailData.resultCode === 0">
+      <el-descriptions-item v-if="detailData.resultCode === 0" label="操作结果">
         {{ detailData.resultData }}
       </el-descriptions-item>
-      <el-descriptions-item label="失败提示" v-if="detailData.resultCode > 0">
+      <el-descriptions-item v-if="detailData.resultCode > 0" label="失败提示">
         {{ detailData.resultMsg }}
       </el-descriptions-item>
     </el-descriptions>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemOperateLogDetail" setup>
 import { formatDate } from '@/utils/formatTime'
 import * as OperateLogApi from '@/api/system/operatelog'
 

src/views/system/post/PostForm.vue

@@ -1,11 +1,11 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="80px"
-      v-loading="formLoading"
     >
       <el-form-item label="岗位标题" prop="name">
         <el-input v-model="formData.name" placeholder="请输入岗位标题" />
@@ -17,7 +17,7 @@
         <el-input v-model="formData.sort" placeholder="请输入岗位顺序" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="formData.status" placeholder="请选择状态" clearable>
+        <el-select v-model="formData.status" clearable placeholder="请选择状态">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
@@ -27,16 +27,16 @@
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" type="textarea" placeholder="请输备注" />
+        <el-input v-model="formData.remark" placeholder="请输备注" type="textarea" />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemPostForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as PostApi from '@/api/system/post'

src/views/system/role/RoleAssignMenuForm.vue

@@ -1,6 +1,6 @@
 <template>
-  <Dialog title="菜单权限" v-model="dialogVisible">
-    <el-form ref="formRef" :model="formData" label-width="80px" v-loading="formLoading">
+  <Dialog v-model="dialogVisible" title="菜单权限">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
       <el-form-item label="角色名称">
         <el-tag>{{ formData.name }}</el-tag>
       </el-form-item>
@@ -13,42 +13,43 @@
             全选/全不选:
             <el-switch
               v-model="treeNodeAll"
-              inline-prompt
               active-text="是"
               inactive-text="否"
+              inline-prompt
               @change="handleCheckedTreeNodeAll"
             />
             全部展开/折叠:
             <el-switch
               v-model="menuExpand"
-              inline-prompt
               active-text="展开"
               inactive-text="折叠"
+              inline-prompt
               @change="handleCheckedTreeExpand"
             />
           </template>
           <el-tree
             ref="treeRef"
+            :data="menuOptions"
+            :props="defaultProps"
+            empty-text="加载中，请稍候"
             node-key="id"
             show-checkbox
-            :props="defaultProps"
-            :data="menuOptions"
-            empty-text="加载中，请稍候"
           />
         </el-card>
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
-import { handleTree, defaultProps } from '@/utils/tree'
+<script lang="ts" name="SystemRoleAssignMenuForm" setup>
+import { defaultProps, handleTree } from '@/utils/tree'
 import * as RoleApi from '@/api/system/role'
 import * as MenuApi from '@/api/system/menu'
 import * as PermissionApi from '@/api/system/permission'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/role/RoleDataPermissionForm.vue

@@ -1,6 +1,6 @@
 <template>
-  <Dialog title="菜单权限" v-model="dialogVisible" width="800">
-    <el-form ref="formRef" :model="formData" label-width="80px" v-loading="formLoading">
+  <Dialog v-model="dialogVisible" title="菜单权限" width="800">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
       <el-form-item label="角色名称">
         <el-tag>{{ formData.name }}</el-tag>
       </el-form-item>
@@ -19,8 +19,8 @@
       </el-form-item>
     </el-form>
     <el-form-item
-      label="权限范围"
       v-if="formData.dataScope === SystemDataScopeEnum.DEPT_CUSTOM"
+      label="权限范围"
       style="display: flex"
     >
       <el-card class="card" shadow="never">
@@ -28,47 +28,48 @@
           全选/全不选:
           <el-switch
             v-model="treeNodeAll"
-            inline-prompt
             active-text="是"
             inactive-text="否"
+            inline-prompt
             @change="handleCheckedTreeNodeAll()"
           />
           全部展开/折叠:
           <el-switch
             v-model="deptExpand"
-            inline-prompt
             active-text="展开"
             inactive-text="折叠"
+            inline-prompt
             @change="handleCheckedTreeExpand"
           />
           父子联动(选中父节点，自动选择子节点):
-          <el-switch v-model="checkStrictly" inline-prompt active-text="是" inactive-text="否" />
+          <el-switch v-model="checkStrictly" active-text="是" inactive-text="否" inline-prompt />
         </template>
         <el-tree
           ref="treeRef"
+          :check-strictly="!checkStrictly"
+          :data="deptOptions"
+          :props="defaultProps"
+          default-expand-all
+          empty-text="加载中，请稍后"
           node-key="id"
           show-checkbox
-          :check-strictly="!checkStrictly"
-          :props="defaultProps"
-          :data="deptOptions"
-          empty-text="加载中，请稍后"
-          default-expand-all
         />
       </el-card>
     </el-form-item>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemRoleDataPermissionForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { handleTree, defaultProps } from '@/utils/tree'
+import { defaultProps, handleTree } from '@/utils/tree'
 import { SystemDataScopeEnum } from '@/utils/constants'
 import * as RoleApi from '@/api/system/role'
 import * as DeptApi from '@/api/system/dept'
 import * as PermissionApi from '@/api/system/permission'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/role/RoleForm.vue

@@ -1,11 +1,11 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="80px"
-      v-loading="formLoading"
     >
       <el-form-item label="角色名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入角色名称" />
@@ -17,7 +17,7 @@
         <el-input v-model="formData.sort" placeholder="请输入显示顺序" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="formData.status" placeholder="请选择状态" clearable>
+        <el-select v-model="formData.status" clearable placeholder="请选择状态">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
@@ -27,19 +27,20 @@
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" type="textarea" placeholder="请输备注" />
+        <el-input v-model="formData.remark" placeholder="请输备注" type="textarea" />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemRoleForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as RoleApi from '@/api/system/role'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/role/index.vue

@@ -5,32 +5,32 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
-      class="-mb-15px"
-      :model="queryParams"
       ref="queryFormRef"
       :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
       label-width="68px"
     >
       <el-form-item label="角色名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入角色名称"
-          clearable
-          @keyup.enter="handleQuery"
           class="!w-240px"
+          clearable
+          placeholder="请输入角色名称"
+          @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="角色标识" prop="code">
         <el-input
           v-model="queryParams.code"
-          placeholder="请输入角色标识"
-          clearable
-          @keyup.enter="handleQuery"
           class="!w-240px"
+          clearable
+          placeholder="请输入角色标识"
+          @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
+        <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择状态">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
@@ -42,33 +42,41 @@
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['system:role:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
         </el-button>
         <el-button
-          type="success"
+          v-hasPermi="['system:role:create']"
           plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['system:role:export']"
+          type="primary"
+          @click="openForm('create')"
         >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button
+          v-hasPermi="['system:role:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
+        >
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
         </el-button>
       </el-form-item>
     </el-form>
@@ -77,59 +85,59 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="角色编号" align="center" prop="id" />
-      <el-table-column label="角色名称" align="center" prop="name" />
-      <el-table-column label="角色类型" align="center" prop="type" />
-      <el-table-column label="角色标识" align="center" prop="code" />
-      <el-table-column label="显示顺序" align="center" prop="sort" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column align="center" label="角色编号" prop="id" />
+      <el-table-column align="center" label="角色名称" prop="name" />
+      <el-table-column align="center" label="角色类型" prop="type" />
+      <el-table-column align="center" label="角色标识" prop="code" />
+      <el-table-column align="center" label="显示顺序" prop="sort" />
+      <el-table-column align="center" label="备注" prop="remark" />
+      <el-table-column align="center" label="状态" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column
-        label="创建时间"
+        :formatter="dateFormatter"
         align="center"
+        label="创建时间"
         prop="createTime"
         width="180"
-        :formatter="dateFormatter"
       />
-      <el-table-column :width="300" label="操作" align="center">
+      <el-table-column :width="300" align="center" label="操作">
         <template #default="scope">
           <el-button
+            v-hasPermi="['system:role:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['system:role:update']"
           >
             编辑
           </el-button>
           <el-button
+            v-hasPermi="['system:permission:assign-role-menu']"
             link
-            type="primary"
             preIcon="ep:basketball"
             title="菜单权限"
-            v-hasPermi="['system:permission:assign-role-menu']"
+            type="primary"
             @click="openAssignMenuForm(scope.row)"
           >
             菜单权限
           </el-button>
           <el-button
+            v-hasPermi="['system:permission:assign-role-data-scope']"
             link
-            type="primary"
             preIcon="ep:coin"
             title="数据权限"
-            v-hasPermi="['system:permission:assign-role-data-scope']"
+            type="primary"
             @click="openDataPermissionForm(scope.row)"
           >
             数据权限
           </el-button>
           <el-button
+            v-hasPermi="['system:role:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['system:role:delete']"
           >
             删除
           </el-button>
@@ -138,9 +146,9 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
     />
   </ContentWrap>
@@ -152,7 +160,7 @@
   <!-- 表单弹窗：数据权限 -->
   <RoleDataPermissionForm ref="dataPermissionFormRef" />
 </template>
-<script setup lang="tsx" name="SystemRole">
+<script lang="ts" name="SystemRole" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
@@ -160,6 +168,7 @@ import * as RoleApi from '@/api/system/role'
 import RoleForm from './RoleForm.vue'
 import RoleAssignMenuForm from './RoleAssignMenuForm.vue'
 import RoleDataPermissionForm from './RoleDataPermissionForm.vue'
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/system/sensitiveWord/SensitiveWordForm.vue

@@ -1,11 +1,11 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="80px"
-      v-loading="formLoading"
     >
       <el-form-item label="敏感词" prop="name">
         <el-input v-model="formData.name" placeholder="请输入敏感词" />
@@ -27,9 +27,9 @@
       <el-form-item label="标签" prop="tags">
         <el-select
           v-model="formData.tags"
-          multiple
-          filterable
           allow-create
+          filterable
+          multiple
           placeholder="请选择文章标签"
           style="width: 380px"
         >
@@ -38,15 +38,16 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts" name="SensitiveWordForm">
+<script lang="ts" name="SystemSensitiveWordForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as SensitiveWordApi from '@/api/system/sensitiveWord'
 import { CommonStatusEnum } from '@/utils/constants'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/sensitiveWord/SensitiveWordTestForm.vue

@@ -1,21 +1,21 @@
 <template>
-  <Dialog title="检测敏感词" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" title="检测敏感词">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="80px"
-      v-loading="formLoading"
     >
       <el-form-item label="文本" prop="text">
-        <el-input type="textarea" v-model="formData.text" placeholder="请输入测试文本" />
+        <el-input v-model="formData.text" placeholder="请输入测试文本" type="textarea" />
       </el-form-item>
       <el-form-item label="标签" prop="tags">
         <el-select
           v-model="formData.tags"
-          multiple
-          filterable
           allow-create
+          filterable
+          multiple
           placeholder="请选择标签"
           style="width: 380px"
         >
@@ -24,13 +24,14 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">检 测</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">检 测</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemSensitiveWordTestForm" setup>
 import * as SensitiveWordApi from '@/api/system/sensitiveWord'
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示

src/views/system/sensitiveWord/index.vue

@@ -2,34 +2,34 @@
   <!-- 搜索工作栏 -->
   <ContentWrap>
     <el-form
-      class="-mb-15px"
-      :model="queryParams"
       ref="queryFormRef"
       :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
       label-width="68px"
     >
       <el-form-item label="敏感词" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入敏感词"
-          clearable
-          @keyup.enter="handleQuery"
           class="!w-240px"
+          clearable
+          placeholder="请输入敏感词"
+          @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="标签" prop="tag">
         <el-select
           v-model="queryParams.tag"
-          placeholder="请选择标签"
-          clearable
-          @keyup.enter="handleQuery"
           class="!w-240px"
+          clearable
+          placeholder="请选择标签"
+          @keyup.enter="handleQuery"
         >
           <el-option v-for="tag in tagList" :key="tag" :label="tag" :value="tag" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择启用状态" clearable>
+        <el-select v-model="queryParams.status" clearable placeholder="请选择启用状态">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
@@ -42,36 +42,45 @@
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
         <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
           v-hasPermi="['system:sensitive-word:create']"
+          plain
+          type="primary"
+          @click="openForm('create')"
         >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
         </el-button>
         <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
           v-hasPermi="['system:sensitive-word:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
         >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
         </el-button>
-        <el-button type="warning" plain @click="openTestForm">
-          <Icon icon="ep:document-checked" class="mr-5px" /> 测试
+        <el-button plain type="warning" @click="openTestForm">
+          <Icon class="mr-5px" icon="ep:document-checked" />
+          测试
         </el-button>
       </el-form-item>
     </el-form>
@@ -80,48 +89,48 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="敏感词" align="center" prop="name" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column align="center" label="编号" prop="id" />
+      <el-table-column align="center" label="敏感词" prop="name" />
+      <el-table-column align="center" label="状态" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="描述" align="center" prop="description" />
-      <el-table-column label="标签" align="center" prop="tags">
+      <el-table-column align="center" label="描述" prop="description" />
+      <el-table-column align="center" label="标签" prop="tags">
         <template #default="scope">
           <el-tag
-            class="mr-5px"
             v-for="tag in scope.row.tags"
             :key="tag"
             :disable-transitions="true"
+            class="mr-5px"
           >
             {{ tag }}
           </el-tag>
         </template>
       </el-table-column>
       <el-table-column
-        label="创建时间"
+        :formatter="dateFormatter"
         align="center"
+        label="创建时间"
         prop="createTime"
         width="180"
-        :formatter="dateFormatter"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column align="center" label="操作">
         <template #default="scope">
           <el-button
+            v-hasPermi="['infra:config:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['infra:config:update']"
           >
             编辑
           </el-button>
           <el-button
+            v-hasPermi="['infra:config:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['infra:config:delete']"
           >
             删除
           </el-button>
@@ -130,9 +139,9 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
     />
   </ContentWrap>
@@ -143,13 +152,14 @@
   <!-- 表单弹窗：测试敏感词 -->
   <SensitiveWordTestForm ref="testFormRef" />
 </template>
-<script setup lang="ts" name="SystemSensitiveWordhao">
+<script lang="ts" name="SystemSensitiveWordHao" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as SensitiveWordApi from '@/api/system/sensitiveWord'
 import SensitiveWordForm from './SensitiveWordForm.vue'
 import SensitiveWordTestForm from './SensitiveWordTestForm.vue'
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/system/sms/channel/SmsChannelForm.vue

@@ -1,17 +1,17 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="130px"
-      v-loading="formLoading"
     >
       <el-form-item label="短信签名" prop="signature">
         <el-input v-model="formData.signature" placeholder="请输入短信签名" />
       </el-form-item>
       <el-form-item label="渠道编码" prop="code">
-        <el-select v-model="formData.code" placeholder="请选择渠道编码" clearable>
+        <el-select v-model="formData.code" clearable placeholder="请选择渠道编码">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE)"
             :key="dict.value"
@@ -45,15 +45,16 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemSmsChannelForm" setup>
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
 import * as SmsChannelApi from '@/api/system/sms/smsChannel'
 import { CommonStatusEnum } from '@/utils/constants'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/sms/log/SmsLogDetail.vue

@@ -1,6 +1,6 @@
 <template>
-  <Dialog title="详情" v-model="dialogVisible" :scroll="true" :max-height="500" width="800">
-    <el-descriptions border :column="1">
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情" width="800">
+    <el-descriptions :column="1" border>
       <el-descriptions-item label="日志主键" min-width="120">
         {{ detailData.id }}
       </el-descriptions-item>
@@ -59,7 +59,7 @@
     </el-descriptions>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemSmsLogDetail" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as SmsLogApi from '@/api/system/sms/smsLog'

src/views/system/sms/template/SmsTemplateForm.vue

@@ -1,22 +1,22 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="140px"
-      v-loading="formLoading"
     >
       <el-form-item label="短信渠道编号" prop="channelId">
         <el-select v-model="formData.channelId" placeholder="请选择短信渠道编号">
           <el-option
             v-for="channel in channelList"
             :key="channel.id"
-            :value="channel.id"
             :label="
               channel.signature +
               `【 ${getDictLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, channel.code)}】`
             "
+            :value="channel.id"
           />
         </el-select>
       </el-form-item>
@@ -37,7 +37,7 @@
         <el-input v-model="formData.name" placeholder="请输入模板名称" />
       </el-form-item>
       <el-form-item label="模板内容" prop="content">
-        <el-input type="textarea" v-model="formData.content" placeholder="请输入模板内容" />
+        <el-input v-model="formData.content" placeholder="请输入模板内容" type="textarea" />
       </el-form-item>
       <el-form-item label="开启状态" prop="status">
         <el-radio-group v-model="formData.status">
@@ -58,16 +58,17 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
-import { DICT_TYPE, getIntDictOptions, getDictLabel } from '@/utils/dict'
+<script lang="ts" name="SystemSmsTemplateForm" setup>
+import { DICT_TYPE, getDictLabel, getIntDictOptions } from '@/utils/dict'
 import * as SmsTemplateApi from '@/api/system/sms/smsTemplate'
 import * as SmsChannelApi from '@/api/system/sms/smsChannel'
 import { CommonStatusEnum } from '@/utils/constants'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/sms/template/SmsTemplateSendForm.vue

@@ -1,18 +1,18 @@
 <template>
-  <Dialog title="测试" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" title="测试">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="140px"
-      v-loading="formLoading"
     >
       <el-form-item label="模板内容" prop="content">
         <el-input
           v-model="formData.content"
-          type="textarea"
           placeholder="请输入模板内容"
           readonly
+          type="textarea"
         />
       </el-form-item>
       <el-form-item label="手机号" prop="mobile">
@@ -31,13 +31,14 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemSmsTemplateSendForm" setup>
 import * as SmsTemplateApi from '@/api/system/sms/smsTemplate'
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示

src/views/system/tenant/TenantForm.vue

@@ -1,17 +1,17 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="50%">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="50%">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="80px"
-      v-loading="formLoading"
     >
       <el-form-item label="租户名" prop="name">
         <el-input v-model="formData.name" placeholder="请输入租户名" />
       </el-form-item>
       <el-form-item label="租户套餐" prop="packageId">
-        <el-select v-model="formData.packageId" placeholder="请选择租户套餐" clearable>
+        <el-select v-model="formData.packageId" clearable placeholder="请选择租户套餐">
           <el-option
             v-for="item in packageList"
             :key="item.id"
@@ -33,25 +33,25 @@
         <el-input
           v-model="formData.password"
           placeholder="请输入用户密码"
-          type="password"
           show-password
+          type="password"
         />
       </el-form-item>
       <el-form-item label="账号额度" prop="accountCount">
         <el-input-number
           v-model="formData.accountCount"
-          placeholder="请输入账号额度"
-          controls-position="right"
           :min="0"
+          controls-position="right"
+          placeholder="请输入账号额度"
         />
       </el-form-item>
       <el-form-item label="过期时间" prop="expireTime">
         <el-date-picker
-          clearable
           v-model="formData.expireTime"
+          clearable
+          placeholder="请选择过期时间"
           type="date"
           value-format="x"
-          placeholder="请选择过期时间"
         />
       </el-form-item>
       <el-form-item label="绑定域名" prop="domain">
@@ -70,12 +70,12 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemTenantForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as TenantApi from '@/api/system/tenant'
 import { CommonStatusEnum } from '@/utils/constants'

src/views/system/tenantPackage/TenantPackageForm.vue

@@ -1,11 +1,11 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="80px"
-      v-loading="formLoading"
     >
       <el-form-item label="套餐名" prop="name">
         <el-input v-model="formData.name" placeholder="请输入套餐名" />
@@ -16,27 +16,27 @@
             全选/全不选:
             <el-switch
               v-model="treeNodeAll"
-              inline-prompt
               active-text="是"
               inactive-text="否"
+              inline-prompt
               @change="handleCheckedTreeNodeAll"
             />
             全部展开/折叠:
             <el-switch
               v-model="menuExpand"
-              inline-prompt
               active-text="展开"
               inactive-text="折叠"
+              inline-prompt
               @change="handleCheckedTreeExpand"
             />
           </template>
           <el-tree
             ref="treeRef"
+            :data="menuOptions"
+            :props="defaultProps"
+            empty-text="加载中，请稍候"
             node-key="id"
             show-checkbox
-            :props="defaultProps"
-            :data="menuOptions"
-            empty-text="加载中，请稍候"
           />
         </el-card>
       </el-form-item>
@@ -56,18 +56,19 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts" name="TenantPackageForm">
+<script lang="ts" name="SystemTenantPackageForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as TenantPackageApi from '@/api/system/tenantPackage'
 import * as MenuApi from '@/api/system/menu'
 import { ElTree } from 'element-plus'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/user/DeptTree.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="head-container">
-    <el-input v-model="deptName" placeholder="请输入部门名称" clearable class="mb-20px">
+    <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入部门名称">
       <template #prefix>
         <Icon icon="ep:search" />
       </template>
@@ -8,20 +8,20 @@
   </div>
   <div class="head-container">
     <el-tree
+      ref="treeRef"
       :data="deptList"
-      :props="defaultProps"
-      node-key="id"
       :expand-on-click-node="false"
       :filter-node-method="filterNode"
-      ref="treeRef"
+      :props="defaultProps"
       default-expand-all
       highlight-current
+      node-key="id"
       @node-click="handleNodeClick"
     />
   </div>
 </template>
 
-<script setup lang="ts" name="UserDeptTree">
+<script lang="ts" name="SystemUserDeptTree" setup>
 import { ElTree } from 'element-plus'
 import * as DeptApi from '@/api/system/dept'
 import { defaultProps, handleTree } from '@/utils/tree'

src/views/system/user/UserAssignRoleForm.vue

@@ -1,6 +1,6 @@
 <template>
-  <Dialog title="分配角色" v-model="dialogVisible">
-    <el-form ref="formRef" :model="formData" label-width="80px" v-loading="formLoading">
+  <Dialog v-model="dialogVisible" title="分配角色">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
       <el-form-item label="用户名称">
         <el-input v-model="formData.username" :disabled="true" />
       </el-form-item>
@@ -14,15 +14,16 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="SystemUserAssignRoleForm" setup>
 import * as PermissionApi from '@/api/system/permission'
 import * as UserApi from '@/api/system/user'
 import * as RoleApi from '@/api/system/role'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/user/UserForm.vue

@@ -1,11 +1,11 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="80px"
-      v-loading="formLoading"
     >
       <el-row>
         <el-col :span="12">
@@ -16,11 +16,11 @@
         <el-col :span="12">
           <el-form-item label="归属部门" prop="deptId">
             <el-tree-select
-              node-key="id"
               v-model="formData.deptId"
               :data="deptList"
               :props="defaultProps"
               check-strictly
+              node-key="id"
               placeholder="请选择归属部门"
             />
           </el-form-item>
@@ -29,12 +29,12 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="手机号码" prop="mobile">
-            <el-input v-model="formData.mobile" placeholder="请输入手机号码" maxlength="11" />
+            <el-input v-model="formData.mobile" maxlength="11" placeholder="请输入手机号码" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="邮箱" prop="email">
-            <el-input v-model="formData.email" placeholder="请输入邮箱" maxlength="50" />
+            <el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -49,8 +49,8 @@
             <el-input
               v-model="formData.password"
               placeholder="请输入用户密码"
-              type="password"
               show-password
+              type="password"
             />
           </el-form-item>
         </el-col>
@@ -84,24 +84,25 @@
       <el-row>
         <el-col :span="24">
           <el-form-item label="备注">
-            <el-input v-model="formData.remark" type="textarea" placeholder="请输入内容" />
+            <el-input v-model="formData.remark" placeholder="请输入内容" type="textarea" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script lang="ts" setup>
+<script lang="ts" name="SystemUserForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as PostApi from '@/api/system/post'
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/user/UserImportForm.vue

@@ -1,31 +1,32 @@
 <template>
-  <Dialog title="用户导入" v-model="dialogVisible" width="400">
+  <Dialog v-model="dialogVisible" title="用户导入" width="400">
     <el-upload
       ref="uploadRef"
-      :action="importUrl + '?updateSupport=' + updateSupport"
-      :headers="uploadHeaders"
       v-model:file-list="fileList"
-      drag
-      accept=".xlsx, .xls"
-      :limit="1"
-      :on-success="submitFormSuccess"
-      :on-exceed="handleExceed"
-      :on-error="submitFormError"
+      :action="importUrl + '?updateSupport=' + updateSupport"
       :auto-upload="false"
       :disabled="formLoading"
+      :headers="uploadHeaders"
+      :limit="1"
+      :on-error="submitFormError"
+      :on-exceed="handleExceed"
+      :on-success="submitFormSuccess"
+      accept=".xlsx, .xls"
+      drag
     >
       <Icon icon="ep:upload" />
       <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
       <template #tip>
         <div class="el-upload__tip text-center">
           <div class="el-upload__tip">
-            <el-checkbox v-model="updateSupport" /> 是否更新已经存在的用户数据
+            <el-checkbox v-model="updateSupport" />
+            是否更新已经存在的用户数据
           </div>
           <span>仅允许导入 xls、xlsx 格式文件。</span>
           <el-link
-            type="primary"
             :underline="false"
             style="font-size: 12px; vertical-align: baseline"
+            type="primary"
             @click="importTemplate"
           >
             下载模板
@@ -34,15 +35,16 @@
       </template>
     </el-upload>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script lang="ts" setup>
+<script lang="ts" name="SystemUserImportForm" setup>
 import * as UserApi from '@/api/system/user'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import download from '@/utils/download'
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示