From 419a572e8006c7533e8dee6a6addafddd57d6659 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Thu, 27 Jul 2023 19:32:27 +0800
Subject: [PATCH] Merge branch 'master' of
 https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

---
 src/views/mall/product/spu/addForm.vue                        | 4 +++-
 src/views/mall/product/spu/components/BasicInfoForm.vue       | 4 +++-
 src/views/mall/product/spu/components/DescriptionForm.vue     | 3 ++-
 src/views/mall/product/spu/components/OtherSettingsForm.vue   | 3 ++-
 .../mall/product/spu/components/ProductPropertyAddForm.vue    | 4 ++--
 src/views/mall/product/spu/components/SkuList.vue             | 3 ++-
 src/views/mall/product/spu/index.vue                          | 4 +++-
 .../trade/delivery/expressTemplate/ExpressTemplateForm.vue    | 2 +-
 src/views/mall/trade/delivery/expressTemplate/index.vue       | 4 +++-
 9 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/views/mall/product/spu/addForm.vue b/src/views/mall/product/spu/addForm.vue
index 7d91d857..f016a4c9 100644
--- a/src/views/mall/product/spu/addForm.vue
+++ b/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() // 路由
diff --git a/src/views/mall/product/spu/components/BasicInfoForm.vue b/src/views/mall/product/spu/components/BasicInfoForm.vue
index 7b122151..c86745be 100644
--- a/src/views/mall/product/spu/components/BasicInfoForm.vue
+++ b/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({
diff --git a/src/views/mall/product/spu/components/DescriptionForm.vue b/src/views/mall/product/spu/components/DescriptionForm.vue
index c272b239..40325195 100644
--- a/src/views/mall/product/spu/components/DescriptionForm.vue
+++ b/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'
diff --git a/src/views/mall/product/spu/components/OtherSettingsForm.vue b/src/views/mall/product/spu/components/OtherSettingsForm.vue
index 98f35727..e340d1ee 100644
--- a/src/views/mall/product/spu/components/OtherSettingsForm.vue
+++ b/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'
diff --git a/src/views/mall/product/spu/components/ProductPropertyAddForm.vue b/src/views/mall/product/spu/components/ProductPropertyAddForm.vue
index 978ebe71..9c5781a3 100644
--- a/src/views/mall/product/spu/components/ProductPropertyAddForm.vue
+++ b/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() // 消息弹窗
 
diff --git a/src/views/mall/product/spu/components/SkuList.vue b/src/views/mall/product/spu/components/SkuList.vue
index 6aa26a2b..52242a6d 100644
--- a/src/views/mall/product/spu/components/SkuList.vue
+++ b/src/views/mall/product/spu/components/SkuList.vue
@@ -191,7 +191,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'
diff --git a/src/views/mall/product/spu/index.vue b/src/views/mall/product/spu/index.vue
index 8ffaab23..7dfd484b 100644
--- a/src/views/mall/product/spu/index.vue
+++ b/src/views/mall/product/spu/index.vue
@@ -222,7 +222,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'
@@ -234,6 +234,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() // 路由跳转
diff --git a/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue b/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
index 6c9ff296..7a2233a7 100644
--- a/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
+++ b/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'
diff --git a/src/views/mall/trade/delivery/expressTemplate/index.vue b/src/views/mall/trade/delivery/expressTemplate/index.vue
index 9acb5db9..5a4cb7bb 100644
--- a/src/views/mall/trade/delivery/expressTemplate/index.vue
+++ b/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) // 列表的总页数