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/infra/codegen/EditTable.vue

@@ -19,11 +19,13 @@
     </el-form>
   </ContentWrap>
 </template>
-<script lang="ts" name="InfraCodegenEditTable" setup>
+<script lang="ts" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { BasicInfoForm, ColumInfoForm, GenerateInfoForm } from './components'
 import * as CodegenApi from '@/api/infra/codegen'
 
+defineOptions({ name: 'InfraCodegenEditTable' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const { push, currentRoute } = useRouter() // 路由

src/views/infra/codegen/ImportTable.vue

@@ -69,11 +69,13 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="InfraCodegenImportTable" setup>
+<script lang="ts" setup>
 import * as CodegenApi from '@/api/infra/codegen'
 import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig'
 import { ElTable } from 'element-plus'
 
+defineOptions({ name: 'InfraCodegenImportTable' })
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示

src/views/infra/codegen/PreviewCode.vue

@@ -54,7 +54,7 @@
     </div>
   </Dialog>
 </template>
-<script lang="ts" name="InfraCodegenPreviewCode" setup>
+<script lang="ts" setup>
 import { useClipboard } from '@vueuse/core'
 import { handleTree2 } from '@/utils/tree'
 import * as CodegenApi from '@/api/infra/codegen'
@@ -67,6 +67,8 @@ import javascript from 'highlight.js/lib/languages/javascript'
 import sql from 'highlight.js/lib/languages/sql'
 import typescript from 'highlight.js/lib/languages/typescript'
 
+defineOptions({ name: 'InfraCodegenPreviewCode' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/infra/codegen/components/BasicInfoForm.vue

@@ -40,10 +40,12 @@
     </el-row>
   </el-form>
 </template>
-<script lang="ts" name="InfraCodegenBasicInfoForm" setup>
+<script lang="ts" setup>
 import * as CodegenApi from '@/api/infra/codegen'
 import { PropType } from 'vue'
 
+defineOptions({ name: 'InfraCodegenBasicInfoForm' })
+
 const props = defineProps({
   table: {
     type: Object as PropType<Nullable<CodegenApi.CodegenTableVO>>,

src/views/infra/codegen/components/ColumInfoForm.vue

@@ -112,11 +112,13 @@
     </el-table-column>
   </el-table>
 </template>
-<script lang="ts" name="InfraCodegenColumInfoForm" setup>
+<script lang="ts" setup>
 import { PropType } from 'vue'
 import * as CodegenApi from '@/api/infra/codegen'
 import * as DictDataApi from '@/api/system/dict/dict.type'
 
+defineOptions({ name: 'InfraCodegenColumInfoForm' })
+
 const props = defineProps({
   columns: {
     type: Array as unknown as PropType<CodegenApi.CodegenColumnVO[]>,

src/views/infra/codegen/components/GenerateInfoForm.vue

@@ -291,13 +291,15 @@
     </el-row>
   </el-form>
 </template>
-<script lang="ts" name="InfraCodegenGenerateInfoForm" setup>
+<script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { handleTree } from '@/utils/tree'
 import * as CodegenApi from '@/api/infra/codegen'
 import * as MenuApi from '@/api/system/menu'
 import { PropType } from 'vue'
 
+defineOptions({ name: 'InfraCodegenGenerateInfoForm' })
+
 const message = useMessage() // 消息弹窗
 const props = defineProps({
   table: {

src/views/infra/codegen/index.vue

@@ -149,7 +149,7 @@
   <!-- 弹窗：预览代码 -->
   <PreviewCode ref="previewRef" />
 </template>
-<script lang="ts" name="InfraCodegen" setup>
+<script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as CodegenApi from '@/api/infra/codegen'
@@ -157,6 +157,8 @@ import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig'
 import ImportTable from './ImportTable.vue'
 import PreviewCode from './PreviewCode.vue'
 
+defineOptions({ name: 'InfraCodegen' })
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const { push } = useRouter() // 路由跳转