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/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/