Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

 Conflicts:

	src/views/infra/build/index.vue

	src/views/mall/product/spu/components/DescriptionForm.vue

	src/views/mall/product/spu/components/OtherSettingsForm.vue

	src/views/mall/product/spu/components/ProductPropertyAddForm.vue

	src/views/mall/product/spu/components/SkuList.vue

src/views/system/area/AreaForm.vue

@@ -20,9 +20,11 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemAreaForm" setup>
+<script lang="ts" setup>
 import * as AreaApi from '@/api/system/area'
 
+defineOptions({ name: 'SystemAreaForm' })
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示

src/views/system/area/index.vue

@@ -30,11 +30,13 @@
   <!-- 表单弹窗：添加/修改 -->
   <AreaForm ref="formRef" />
 </template>
-<script setup lang="tsx" name="SystemArea">
+<script setup lang="tsx">
 import type { Column } from 'element-plus'
 import AreaForm from './AreaForm.vue'
 import * as AreaApi from '@/api/system/area'
 
+defineOptions({ name: 'SystemArea' })
+
 // 表格的 column 字段
 const columns: Column[] = [
   {

src/views/system/dept/DeptForm.vue

@@ -57,13 +57,15 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemDeptForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 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'
 
+defineOptions({ name: 'SystemDeptForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/dept/index.vue

@@ -103,13 +103,16 @@
   <!-- 表单弹窗：添加/修改 -->
   <DeptForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="SystemDept">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import { handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import DeptForm from './DeptForm.vue'
 import * as UserApi from '@/api/system/user'
+
+defineOptions({ name: 'SystemDept' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/system/dict/DictTypeForm.vue

@@ -38,11 +38,13 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemDictTypeForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as DictTypeApi from '@/api/system/dict/dict.type'
 import { CommonStatusEnum } from '@/utils/constants'
 
+defineOptions({ name: 'SystemDictTypeForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

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

@@ -57,11 +57,13 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemDictDataForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as DictDataApi from '@/api/system/dict/dict.data'
 import { CommonStatusEnum } from '@/utils/constants'
 
+defineOptions({ name: 'SystemDictDataForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

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

@@ -115,13 +115,16 @@
   <!-- 表单弹窗：添加/修改 -->
   <DictDataForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="SystemDictData">
+<script lang="ts" setup>
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as DictDataApi from '@/api/system/dict/dict.data'
 import * as DictTypeApi from '@/api/system/dict/dict.type'
 import DictDataForm from './DictDataForm.vue'
+
+defineOptions({ name: 'SystemDictData' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const route = useRoute() // 路由

src/views/system/dict/index.vue

@@ -140,13 +140,15 @@
   <DictTypeForm ref="formRef" @success="getList" />
 </template>
 
-<script lang="ts" name="SystemDictType" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as DictTypeApi from '@/api/system/dict/dict.type'
 import DictTypeForm from './DictTypeForm.vue'
 import download from '@/utils/download'
 
+defineOptions({ name: 'SystemDictType' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/system/errorCode/ErrorCodeForm.vue

@@ -26,9 +26,11 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemErrorCodeForm" setup>
+<script lang="ts" setup>
 import * as ErrorCodeApi from '@/api/system/errorCode'
 
+defineOptions({ name: 'SystemErrorCodeForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/errorCode/index.vue

@@ -137,12 +137,15 @@
   <ErrorCodeForm ref="formRef" @success="getList" />
 </template>
 
-<script setup lang="ts" name="SystemErrorCode">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ErrorCodeApi from '@/api/system/errorCode'
 import ErrorCodeForm from './ErrorCodeForm.vue'
+
+defineOptions({ name: 'SystemErrorCode' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/system/loginlog/LoginLogDetail.vue

@@ -25,11 +25,13 @@
     </el-descriptions>
   </Dialog>
 </template>
-<script lang="ts" name="SystemLoginLogDetail" setup>
+<script lang="ts" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as LoginLogApi from '@/api/system/loginLog'
 
+defineOptions({ name: 'SystemLoginLogDetail' })
+
 const dialogVisible = ref(false) // 弹窗的是否展示
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref() // 详情数据

src/views/system/loginlog/index.vue

@@ -104,12 +104,15 @@
   <!-- 表单弹窗：详情 -->
   <LoginLogDetail ref="detailRef" />
 </template>
-<script setup lang="ts" name="SystemLoginLog">
+<script lang="ts" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as LoginLogApi from '@/api/system/loginLog'
 import LoginLogDetail from './LoginLogDetail.vue'
+
+defineOptions({ name: 'SystemLoginLog' })
+
 const message = useMessage() // 消息弹窗
 
 const loading = ref(true) // 列表的加载中

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

@@ -3,10 +3,12 @@
     <Descriptions :data="detailData" :schema="allSchemas.detailSchema" />
   </Dialog>
 </template>
-<script lang="ts" name="SystemMailAccountDetail" setup>
+<script lang="ts" setup>
 import * as MailAccountApi from '@/api/system/mail/account'
 import { allSchemas } from './account.data'
 
+defineOptions({ name: 'SystemMailAccountDetail' })
+
 const dialogVisible = ref(false) // 弹窗的是否展示
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref() // 详情数据

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

@@ -7,10 +7,12 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemMailAccountForm" setup>
+<script lang="ts" setup>
 import * as MailAccountApi from '@/api/system/mail/account'
 import { allSchemas, rules } from './account.data'
 
+defineOptions({ name: 'SystemMailAccountForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

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

@@ -64,12 +64,14 @@
   <!-- 详情弹窗 -->
   <MailAccountDetail ref="detailRef" />
 </template>
-<script setup lang="ts" name="SystemMailAccount">
+<script lang="ts" setup>
 import { allSchemas } from './account.data'
 import * as MailAccountApi from '@/api/system/mail/account'
 import MailAccountForm from './MailAccountForm.vue'
 import MailAccountDetail from './MailAccountDetail.vue'
 
+defineOptions({ name: 'SystemMailAccount' })
+
 // tableObject：表格的属性对象，可获得分页大小、条数等属性
 // tableMethods：表格的操作对象，可进行获得分页、删除记录等操作
 // 详细可见：https://doc.iocoder.cn/vue3/crud-schema/

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

@@ -8,10 +8,12 @@
     </Descriptions>
   </Dialog>
 </template>
-<script lang="ts" name="SystemMailLogDetail" setup>
+<script lang="ts" setup>
 import * as MailLogApi from '@/api/system/mail/log'
 import { allSchemas } from './log.data'
 
+defineOptions({ name: 'SystemMailLogDetail' })
+
 const dialogVisible = ref(false) // 弹窗的是否展示
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref() // 详情数据

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

@@ -34,11 +34,13 @@
   <!-- 表单弹窗：详情 -->
   <mail-log-detail ref="detailRef" />
 </template>
-<script setup lang="ts" name="SystemMailLog">
+<script lang="ts" setup>
 import { allSchemas } from './log.data'
 import * as MailLogApi from '@/api/system/mail/log'
 import MailLogDetail from './MailLogDetail.vue'
 
+defineOptions({ name: 'SystemMailLog' })
+
 // tableObject：表格的属性对象，可获得分页大小、条数等属性
 // tableMethods：表格的操作对象，可进行获得分页、删除记录等操作
 // 详细可见：https://doc.iocoder.cn/vue3/crud-schema/

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

@@ -13,10 +13,12 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemMailTemplateForm" setup>
+<script lang="ts" setup>
 import * as MailTemplateApi from '@/api/system/mail/template'
 import { allSchemas, rules } from './template.data'
 
+defineOptions({ name: 'SystemMailTemplateForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

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

@@ -31,9 +31,11 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemMailTemplateSendForm" setup>
+<script lang="ts" setup>
 import * as MailTemplateApi from '@/api/system/mail/template'
 
+defineOptions({ name: 'SystemMailTemplateSendForm' })
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示

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

@@ -65,12 +65,14 @@
   <!-- 表单弹窗：发送测试 -->
   <MailTemplateSendForm ref="sendFormRef" />
 </template>
-<script setup lang="ts" name="SystemMailTemplate">
+<script lang="ts" setup>
 import { allSchemas } from './template.data'
 import * as MailTemplateApi from '@/api/system/mail/template'
 import MailTemplateForm from './MailTemplateForm.vue'
 import MailTemplateSendForm from './MailTemplateSendForm.vue'
 
+defineOptions({ name: 'SystemMailTemplate' })
+
 // tableObject：表格的属性对象，可获得分页大小、条数等属性
 // tableMethods：表格的操作对象，可进行获得分页、删除记录等操作
 // 详细可见：https://doc.iocoder.cn/vue3/crud-schema/

src/views/system/menu/MenuForm.vue

@@ -112,13 +112,15 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemMenuForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as MenuApi from '@/api/system/menu'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { CommonStatusEnum, SystemMenuTypeEnum } from '@/utils/constants'
 import { defaultProps, handleTree } from '@/utils/tree'
 
+defineOptions({ name: 'SystemMenuForm' })
+
 const { wsCache } = useCache()
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

src/views/system/menu/index.vue

@@ -123,12 +123,15 @@
   <!-- 表单弹窗：添加/修改 -->
   <MenuForm ref="formRef" @success="getList" />
 </template>
-<script lang="ts" name="SystemMenu" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { handleTree } from '@/utils/tree'
 import * as MenuApi from '@/api/system/menu'
 import MenuForm from './MenuForm.vue'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+defineOptions({ name: 'SystemMenu' })
+
 const { wsCache } = useCache()
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

src/views/system/notice/NoticeForm.vue

@@ -43,11 +43,13 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemNoticeForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as NoticeApi from '@/api/system/notice'
 
+defineOptions({ name: 'SystemNoticeForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/notice/index.vue

@@ -102,11 +102,14 @@
   <!-- 表单弹窗：添加/修改 -->
   <NoticeForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="tsx" name="SystemNotice">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as NoticeApi from '@/api/system/notice'
 import NoticeForm from './NoticeForm.vue'
+
+defineOptions({ name: 'SystemNotice' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

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

@@ -40,11 +40,13 @@
     </el-descriptions>
   </Dialog>
 </template>
-<script lang="ts" name="SystemNotifyMessageDetail" setup>
+<script lang="ts" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
 
+defineOptions({ name: 'SystemNotifyMessageDetail' })
+
 const dialogVisible = ref(false) // 弹窗的是否展示
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref() // 详情数据

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

@@ -153,12 +153,14 @@
   <!-- 表单弹窗：详情 -->
   <NotifyMessageDetail ref="detailRef" />
 </template>
-<script setup lang="ts" name="SystemNotifyMessage">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
 import NotifyMessageDetail from './NotifyMessageDetail.vue'
 
+defineOptions({ name: 'SystemNotifyMessage' })
+
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数据

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

@@ -22,11 +22,13 @@
     </el-descriptions>
   </Dialog>
 </template>
-<script lang="ts" name="MyNotifyMessageDetailDetail" setup>
+<script lang="ts" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
 
+defineOptions({ name: 'MyNotifyMessageDetailDetail' })
+
 const dialogVisible = ref(false) // 弹窗的是否展示
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref() // 详情数据

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

@@ -115,11 +115,14 @@
   <MyNotifyMessageDetail ref="detailRef" />
 </template>
 
-<script setup lang="ts" name="SystemMyNotify">
+<script lang="ts" setup>
 import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
 import MyNotifyMessageDetail from './MyNotifyMessageDetail.vue'
+
+defineOptions({ name: 'SystemMyNotify' })
+
 const message = useMessage() // 消息
 
 const loading = ref(true) // 列表的加载中

src/views/system/notify/template/NotifyTemplateForm.vue

@@ -50,7 +50,7 @@
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as NotifyTemplateApi from '@/api/system/notify/template'
 import { CommonStatusEnum } from '@/utils/constants'

src/views/system/notify/template/NotifyTemplateSendForm.vue

@@ -43,9 +43,12 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemNotifyTemplateSendForm" setup>
+<script lang="ts" setup>
 import * as UserApi from '@/api/system/user'
 import * as NotifyTemplateApi from '@/api/system/notify/template'
+
+defineOptions({ name: 'SystemNotifyTemplateSendForm' })
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示

src/views/system/notify/template/index.vue

@@ -155,12 +155,15 @@
   <!-- 表单弹窗：测试发送 -->
   <NotifyTemplateSendForm ref="sendFormRef" />
 </template>
-<script setup lang="ts" name="NotifySmsTemplate">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as NotifyTemplateApi from '@/api/system/notify/template'
 import NotifyTemplateForm from './NotifyTemplateForm.vue'
 import NotifyTemplateSendForm from './NotifyTemplateSendForm.vue'
+
+defineOptions({ name: 'NotifySmsTemplate' })
+
 const message = useMessage() // 消息弹窗
 
 const loading = ref(false) // 列表的加载中

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

@@ -48,7 +48,7 @@
           style="width: 500px"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_OAUTH2_GRANT_TYPE)"
+            v-for="dict in getDictOptions(DICT_TYPE.SYSTEM_OAUTH2_GRANT_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -143,11 +143,13 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemOAuth2ClientForm" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+<script lang="ts" setup>
+import { DICT_TYPE, getDictOptions, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as ClientApi from '@/api/system/oauth2/client'
 
+defineOptions({ name: 'SystemOAuth2ClientForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

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

@@ -119,11 +119,14 @@
   <!-- 表单弹窗：添加/修改 -->
   <ClientForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="SystemOAuth2Client">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as ClientApi from '@/api/system/oauth2/client'
 import ClientForm from './ClientForm.vue'
+
+defineOptions({ name: 'SystemOAuth2Client' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/system/oauth2/token/index.vue

@@ -98,10 +98,13 @@
   </ContentWrap>
 </template>
 
-<script setup lang="ts" name="SystemTokenClient">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as OAuth2AccessTokenApi from '@/api/system/oauth2/token'
+
+defineOptions({ name: 'SystemTokenClient' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/system/operatelog/OperateLogDetail.vue

@@ -57,10 +57,12 @@
     </el-descriptions>
   </Dialog>
 </template>
-<script lang="ts" name="SystemOperateLogDetail" setup>
+<script lang="ts" setup>
 import { formatDate } from '@/utils/formatTime'
 import * as OperateLogApi from '@/api/system/operatelog'
 
+defineOptions({ name: 'SystemOperateLogDetail' })
+
 const dialogVisible = ref(false) // 弹窗的是否展示
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref() // 详情数据

src/views/system/operatelog/index.vue

@@ -135,12 +135,15 @@
   <!-- 表单弹窗：详情 -->
   <OperateLogDetail ref="detailRef" />
 </template>
-<script setup lang="ts" name="SystemOperateLog">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as OperateLogApi from '@/api/system/operatelog'
 import OperateLogDetail from './OperateLogDetail.vue'
+
+defineOptions({ name: 'SystemOperateLog' })
+
 const message = useMessage() // 消息弹窗
 
 const loading = ref(true) // 列表的加载中

src/views/system/post/PostForm.vue

@@ -36,11 +36,13 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemPostForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as PostApi from '@/api/system/post'
 
+defineOptions({ name: 'SystemPostForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/post/index.vue

@@ -111,12 +111,15 @@
   <!-- 表单弹窗：添加/修改 -->
   <PostForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="tsx" name="SystemPost">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as PostApi from '@/api/system/post'
 import PostForm from './PostForm.vue'
+
+defineOptions({ name: 'SystemPost' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/system/role/RoleAssignMenuForm.vue

@@ -44,12 +44,14 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemRoleAssignMenuForm" setup>
+<script lang="ts" 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'
 
+defineOptions({ name: 'SystemRoleAssignMenuForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/role/RoleDataPermissionForm.vue

@@ -62,7 +62,7 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemRoleDataPermissionForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { defaultProps, handleTree } from '@/utils/tree'
 import { SystemDataScopeEnum } from '@/utils/constants'
@@ -70,6 +70,8 @@ import * as RoleApi from '@/api/system/role'
 import * as DeptApi from '@/api/system/dept'
 import * as PermissionApi from '@/api/system/permission'
 
+defineOptions({ name: 'SystemRoleDataPermissionForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/role/RoleForm.vue

@@ -36,11 +36,13 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemRoleForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as RoleApi from '@/api/system/role'
 
+defineOptions({ name: 'SystemRoleForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/role/index.vue

@@ -160,7 +160,7 @@
   <!-- 表单弹窗：数据权限 -->
   <RoleDataPermissionForm ref="dataPermissionFormRef" @success="getList" />
 </template>
-<script lang="ts" name="SystemRole" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
@@ -169,6 +169,8 @@ import RoleForm from './RoleForm.vue'
 import RoleAssignMenuForm from './RoleAssignMenuForm.vue'
 import RoleDataPermissionForm from './RoleDataPermissionForm.vue'
 
+defineOptions({ name: 'SystemRole' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/system/sensitiveWord/SensitiveWordForm.vue

@@ -43,11 +43,13 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemSensitiveWordForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as SensitiveWordApi from '@/api/system/sensitiveWord'
 import { CommonStatusEnum } from '@/utils/constants'
 
+defineOptions({ name: 'SystemSensitiveWordForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/sensitiveWord/SensitiveWordTestForm.vue

@@ -29,9 +29,11 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemSensitiveWordTestForm" setup>
+<script lang="ts" setup>
 import * as SensitiveWordApi from '@/api/system/sensitiveWord'
 
+defineOptions({ name: 'SystemSensitiveWordTestForm' })
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示

src/views/system/sensitiveWord/index.vue

@@ -152,7 +152,7 @@
   <!-- 表单弹窗：测试敏感词 -->
   <SensitiveWordTestForm ref="testFormRef" />
 </template>
-<script lang="ts" name="SystemSensitiveWordHao" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
@@ -160,6 +160,8 @@ import * as SensitiveWordApi from '@/api/system/sensitiveWord'
 import SensitiveWordForm from './SensitiveWordForm.vue'
 import SensitiveWordTestForm from './SensitiveWordTestForm.vue'
 
+defineOptions({ name: 'SystemSensitiveWord' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

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

@@ -50,11 +50,13 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemSmsChannelForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
 import * as SmsChannelApi from '@/api/system/sms/smsChannel'
 import { CommonStatusEnum } from '@/utils/constants'
 
+defineOptions({ name: 'SystemSmsChannelForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -109,7 +111,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = unref(formRef)?.formModel as SmsChannelApi.SmsChannelVO
+    const data = formData.value as unknown as SmsChannelApi.SmsChannelVO
     if (formType.value === 'create') {
       await SmsChannelApi.createSmsChannel(data)
       message.success(t('common.createSuccess'))

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

@@ -129,11 +129,14 @@
   <!-- 表单弹窗：添加/修改 -->
   <SmsChannelForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="SystemSmsChannel">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as SmsChannelApi from '@/api/system/sms/smsChannel'
 import SmsChannelForm from './SmsChannelForm.vue'
+
+defineOptions({ name: 'SystemSmsChannel' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

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

@@ -59,12 +59,14 @@
     </el-descriptions>
   </Dialog>
 </template>
-<script lang="ts" name="SystemSmsLogDetail" setup>
+<script lang="ts" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as SmsLogApi from '@/api/system/sms/smsLog'
 import * as SmsChannelApi from '@/api/system/sms/smsChannel'
 
+defineOptions({ name: 'SystemSmsLogDetail' })
+
 const dialogVisible = ref(false) // 弹窗的是否展示
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref() // 详情数据

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

@@ -184,13 +184,16 @@
   <!-- 表单弹窗：详情 -->
   <SmsLogDetail ref="detailRef" />
 </template>
-<script setup lang="ts" name="SystemSmsLog">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions, getDictLabel } from '@/utils/dict'
 import { dateFormatter, formatDate } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as SmsChannelApi from '@/api/system/sms/smsChannel'
 import * as SmsLogApi from '@/api/system/sms/smsLog'
 import SmsLogDetail from './SmsLogDetail.vue'
+
+defineOptions({ name: 'SystemSmsLog' })
+
 const message = useMessage() // 消息弹窗
 
 const loading = ref(false) // 列表的加载中

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

@@ -63,12 +63,14 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemSmsTemplateForm" setup>
+<script lang="ts" 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'
 
+defineOptions({ name: 'SystemSmsTemplateForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

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

@@ -36,9 +36,11 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemSmsTemplateSendForm" setup>
+<script lang="ts" setup>
 import * as SmsTemplateApi from '@/api/system/sms/smsTemplate'
 
+defineOptions({ name: 'SystemSmsTemplateSendForm' })
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示

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

@@ -211,7 +211,7 @@
   <!-- 表单弹窗：测试发送 -->
   <SmsTemplateSendForm ref="sendFormRef" />
 </template>
-<script setup lang="ts" name="SystemSmsTemplate">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions, getDictLabel } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as SmsTemplateApi from '@/api/system/sms/smsTemplate'
@@ -219,6 +219,9 @@ import * as SmsChannelApi from '@/api/system/sms/smsChannel'
 import download from '@/utils/download'
 import SmsTemplateForm from './SmsTemplateForm.vue'
 import SmsTemplateSendForm from './SmsTemplateSendForm.vue'
+
+defineOptions({ name: 'SystemSmsTemplate' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/system/tenant/TenantForm.vue

@@ -75,12 +75,14 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemTenantForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as TenantApi from '@/api/system/tenant'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as TenantPackageApi from '@/api/system/tenantPackage'
 
+defineOptions({ name: 'SystemTenantForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示

src/views/system/tenant/index.vue

@@ -171,13 +171,16 @@
   <!-- 表单弹窗：添加/修改 -->
   <TenantForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="SystemTenant">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as TenantApi from '@/api/system/tenant'
 import * as TenantPackageApi from '@/api/system/tenantPackage'
 import TenantForm from './TenantForm.vue'
+
+defineOptions({ name: 'SystemTenant' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/system/tenantPackage/TenantPackageForm.vue

@@ -61,7 +61,7 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemTenantPackageForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import { defaultProps, handleTree } from '@/utils/tree'
@@ -69,6 +69,8 @@ import * as TenantPackageApi from '@/api/system/tenantPackage'
 import * as MenuApi from '@/api/system/menu'
 import { ElTree } from 'element-plus'
 
+defineOptions({ name: 'SystemTenantPackageForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/tenantPackage/index.vue

@@ -106,11 +106,14 @@
   <!-- 表单弹窗：添加/修改 -->
   <TenantPackageForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="SystemTenantPackage">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as TenantPackageApi from '@/api/system/tenantPackage'
 import TenantPackageForm from './TenantPackageForm.vue'
+
+defineOptions({ name: 'SystemTenantPackage' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/system/user/DeptTree.vue

@@ -21,11 +21,13 @@
   </div>
 </template>
 
-<script lang="ts" name="SystemUserDeptTree" setup>
+<script lang="ts" setup>
 import { ElTree } from 'element-plus'
 import * as DeptApi from '@/api/system/dept'
 import { defaultProps, handleTree } from '@/utils/tree'
 
+defineOptions({ name: 'SystemUserDeptTree' })
+
 const deptName = ref('')
 const deptList = ref<Tree[]>([]) // 树形结构
 const treeRef = ref<InstanceType<typeof ElTree>>()

src/views/system/user/UserAssignRoleForm.vue

@@ -19,11 +19,13 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemUserAssignRoleForm" setup>
+<script lang="ts" setup>
 import * as PermissionApi from '@/api/system/permission'
 import * as UserApi from '@/api/system/user'
 import * as RoleApi from '@/api/system/role'
 
+defineOptions({ name: 'SystemUserAssignRoleForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/user/UserForm.vue

@@ -95,7 +95,7 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemUserForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import { defaultProps, handleTree } from '@/utils/tree'
@@ -103,6 +103,8 @@ import * as PostApi from '@/api/system/post'
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
 
+defineOptions({ name: 'SystemUserForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/user/UserImportForm.vue

@@ -40,11 +40,13 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemUserImportForm" setup>
+<script lang="ts" setup>
 import * as UserApi from '@/api/system/user'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import download from '@/utils/download'
 
+defineOptions({ name: 'SystemUserImportForm' })
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示

src/views/system/user/index.vue

@@ -198,7 +198,7 @@
   <!-- 分配角色 -->
   <UserAssignRoleForm ref="assignRoleFormRef" @success="getList" />
 </template>
-<script setup lang="ts" name="SystemUser">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { checkPermi } from '@/utils/permission'
 import { dateFormatter } from '@/utils/formatTime'
@@ -209,6 +209,9 @@ import UserForm from './UserForm.vue'
 import UserImportForm from './UserImportForm.vue'
 import UserAssignRoleForm from './UserAssignRoleForm.vue'
 import DeptTree from './DeptTree.vue'
+
+defineOptions({ name: 'SystemUser' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化