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/mall/trade/delivery/express/ExpressForm.vue

@@ -38,10 +38,13 @@
     </template>
   </Dialog>
 </template>
-<script setup lang="ts" name="ExpressForm">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as DeliveryExpressApi from '@/api/mall/trade/delivery/express'
+
+defineOptions({ name: 'ExpressForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/mall/trade/delivery/express/index.vue

@@ -99,12 +99,15 @@
   <!-- 表单弹窗：添加/修改 -->
   <ExpressForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="Express">
+<script lang="ts" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as DeliveryExpressApi from '@/api/mall/trade/delivery/express'
 import ExpressForm from './ExpressForm.vue'
+
+defineOptions({ name: 'Express' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const total = ref(0) // 列表的总页数

src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue

@@ -137,7 +137,7 @@
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as DeliveryExpressTemplateApi from '@/api/mall/trade/delivery/expressTemplate'
 import { defaultProps } from '@/utils/tree'

src/views/mall/trade/delivery/expressTemplate/index.vue

@@ -92,12 +92,14 @@
   <!-- 表单弹窗：添加/修改 -->
   <ExpressTemplateForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="DeliveryExpressTemplate">
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as DeliveryExpressTemplateApi from '@/api/mall/trade/delivery/expressTemplate'
 import ExpressTemplateForm from './ExpressTemplateForm.vue'
 
+defineOptions({ name: 'DeliveryExpressTemplate' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const total = ref(0) // 列表的总页数