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/product/spu/components/BasicInfoForm.vue

@@ -167,7 +167,7 @@
   <!-- 商品属性添加 Form 表单 -->
   <ProductPropertyAddForm ref="attributesAddFormRef" :propertyList="propertyList" />
 </template>
-<script lang="ts" name="ProductSpuBasicInfoForm" setup>
+<script lang="ts" setup>
 import { PropType } from 'vue'
 import { isArray } from '@/utils/is'
 import { copyValueToTarget } from '@/utils'
@@ -200,6 +200,8 @@ const imagePreview = (args) => {
 }
 // ====== end ======
 
+defineOptions({ name: 'ProductSpuBasicInfoForm' })
+
 const message = useMessage() // 消息弹窗
 
 const props = defineProps({

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

@@ -26,7 +26,8 @@
     </template>
   </Descriptions>
 </template>
-<script lang="ts" name="DescriptionForm" setup>
+<script lang="ts" setup>
+defineOptions({ name: 'DescriptionForm' })
 import type { Spu } from '@/api/mall/product/spu'
 import { Editor } from '@/components/Editor'
 import { PropType } from 'vue'

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

@@ -83,7 +83,8 @@
     </template>
   </Descriptions>
 </template>
-<script lang="ts" name="OtherSettingsForm" setup>
+<script lang="ts" setup>
+defineOptions({ name: 'OtherSettingsForm' })
 import type { Spu } from '@/api/mall/product/spu'
 import { PropType } from 'vue'
 import { propTypes } from '@/utils/propTypes'

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

@@ -40,10 +40,12 @@
   </el-col>
 </template>
 
-<script lang="ts" name="ProductAttributes" setup>
+<script lang="ts" setup>
 import { ElInput } from 'element-plus'
 import * as PropertyApi from '@/api/mall/product/property'
 
+defineOptions({ name: 'ProductAttributes' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const inputValue = ref('') // 输入框值

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

@@ -17,9 +17,9 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="ProductPropertyAddForm" setup>
+<script lang="ts" setup>
+defineOptions({ name: 'ProductPropertyForm' })
 import * as PropertyApi from '@/api/mall/product/property'
-
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

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

@@ -189,7 +189,8 @@
     </template>
   </el-table>
 </template>
-<script lang="ts" name="SkuList" setup>
+<script lang="ts" setup>
+defineOptions({ name: 'SkuList' })
 import { PropType, Ref } from 'vue'
 import { copyValueToTarget } from '@/utils'
 import { propTypes } from '@/utils/propTypes'