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/brand/BrandForm.vue

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

src/views/mall/product/brand/index.vue

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

src/views/mall/product/category/CategoryForm.vue

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

src/views/mall/product/category/index.vue

@@ -80,12 +80,15 @@
   <!-- 表单弹窗：添加/修改 -->
   <CategoryForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="ProductCategory">
+<script lang="ts" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { handleTree } from '@/utils/tree'
 import { dateFormatter } from '@/utils/formatTime'
 import * as ProductCategoryApi from '@/api/mall/product/category'
 import CategoryForm from './CategoryForm.vue'
+
+defineOptions({ name: 'ProductCategory' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/mall/product/property/PropertyForm.vue

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

src/views/mall/product/property/index.vue

@@ -99,11 +99,13 @@
   <!-- 表单弹窗：添加/修改 -->
   <PropertyForm ref="formRef" @success="getList" />
 </template>
-<script lang="ts" name="ProductProperty" setup>
+<script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import * as PropertyApi from '@/api/mall/product/property'
 import PropertyForm from './PropertyForm.vue'
 
+defineOptions({ name: 'ProductProperty' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/mall/product/property/value/ValueForm.vue

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

src/views/mall/product/property/value/index.vue

@@ -88,10 +88,13 @@
   <!-- 表单弹窗：添加/修改 -->
   <ValueForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="ProductPropertyValue">
+<script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import * as PropertyApi from '@/api/mall/product/property'
 import ValueForm from './ValueForm.vue'
+
+defineOptions({ name: 'ProductPropertyValue' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const { params } = useRoute() // 查询参数

src/views/mall/product/spu/addForm.vue

@@ -36,7 +36,7 @@
     </el-form>
   </ContentWrap>
 </template>
-<script lang="ts" name="ProductSpuForm" setup>
+<script lang="ts" setup>
 import { cloneDeep } from 'lodash-es'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { BasicInfoForm, DescriptionForm, OtherSettingsForm } from './components'
@@ -44,6 +44,8 @@ import { BasicInfoForm, DescriptionForm, OtherSettingsForm } from './components'
 import * as ProductSpuApi from '@/api/mall/product/spu'
 import { convertToInteger, formatToFraction } from '@/utils'
 
+defineOptions({ name: 'ProductSpuForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const { push, currentRoute } = useRouter() // 路由

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'

src/views/mall/product/spu/index.vue

@@ -229,7 +229,7 @@
     />
   </ContentWrap>
 </template>
-<script lang="ts" name="ProductSpu" setup>
+<script lang="ts" setup>
 import { TabsPaneContext } from 'element-plus'
 import { cloneDeep } from 'lodash-es'
 import { createImageViewer } from '@/components/ImageViewer'
@@ -241,6 +241,8 @@ import download from '@/utils/download'
 import * as ProductSpuApi from '@/api/mall/product/spu'
 import * as ProductCategoryApi from '@/api/mall/product/category'
 
+defineOptions({ name: 'ProductSpu' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const { currentRoute, push } = useRouter() // 路由跳转

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) // 列表的总页数