Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3

# Conflicts:
#	src/components/DiyEditor/components/mobile/PromotionCombination/index.vue
#	src/views/ai/mindmap/manager/index.vue

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

@@ -180,17 +180,17 @@
     </el-table-column>
     <el-table-column align="center" label="销售价(元)" min-width="80">
       <template #default="{ row }">
-        {{ row.price }}
+        {{ formatToFraction(row.price) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="市场价(元)" min-width="80">
       <template #default="{ row }">
-        {{ row.marketPrice }}
+        {{ formatToFraction(row.marketPrice) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="成本价(元)" min-width="80">
       <template #default="{ row }">
-        {{ row.costPrice }}
+        {{ formatToFraction(row.costPrice) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="库存" min-width="80">
@@ -211,12 +211,12 @@
     <template v-if="formData!.subCommissionType">
       <el-table-column align="center" label="一级返佣(元)" min-width="80">
         <template #default="{ row }">
-          {{ row.firstBrokeragePrice }}
+          {{ formatToFraction(row.firstBrokeragePrice) }}
         </template>
       </el-table-column>
       <el-table-column align="center" label="二级返佣(元)" min-width="80">
         <template #default="{ row }">
-          {{ row.secondBrokeragePrice }}
+          {{ formatToFraction(row.secondBrokeragePrice) }}
         </template>
       </el-table-column>
     </template>
@@ -260,17 +260,17 @@
     </el-table-column>
     <el-table-column align="center" label="销售价(元)" min-width="80">
       <template #default="{ row }">
-        {{ row.price }}
+        {{ formatToFraction(row.price) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="市场价(元)" min-width="80">
       <template #default="{ row }">
-        {{ row.marketPrice }}
+        {{ formatToFraction(row.marketPrice) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="成本价(元)" min-width="80">
       <template #default="{ row }">
-        {{ row.costPrice }}
+        {{ formatToFraction(row.costPrice) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="库存" min-width="80">
@@ -284,7 +284,7 @@
 </template>
 <script lang="ts" setup>
 import { PropType, Ref } from 'vue'
-import { copyValueToTarget } from '@/utils'
+import { copyValueToTarget, formatToFraction } from '@/utils'
 import { propTypes } from '@/utils/propTypes'
 import { UploadImg } from '@/components/UploadFile'
 import type { Property, Sku, Spu } from '@/api/mall/product/spu'

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

@@ -19,19 +19,19 @@
         {{ value.name }}
       </el-tag>
       <el-select
+        v-show="inputVisible(index)"
         :id="`input${index}`"
         :ref="setInputRef"
-        v-show="inputVisible(index)"
         v-model="inputValue"
-        filterable
-        allow-create
-        default-first-option
         :reserve-keyword="false"
-        size="small"
+        allow-create
         class="!w-30"
+        default-first-option
+        filterable
+        size="small"
         @blur="handleInputConfirm(index, item.id)"
-        @keyup.enter="handleInputConfirm(index, item.id)"
         @change="handleInputConfirm(index, item.id)"
+        @keyup.enter="handleInputConfirm(index, item.id)"
       >
         <el-option
           v-for="item2 in attributeOptions"

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

@@ -12,12 +12,12 @@
       <el-form-item label="属性名称" prop="name">
         <el-select
           v-model="formData.name"
-          filterable
-          allow-create
-          default-first-option
           :reserve-keyword="false"
-          placeholder="请选择属性名称。如果不存在，可手动输入选择"
+          allow-create
           class="!w-360px"
+          default-first-option
+          filterable
+          placeholder="请选择属性名称。如果不存在，可手动输入选择"
         >
           <el-option
             v-for="item in attributeOptions"

src/views/mall/product/spu/form/SkuForm.vue

@@ -2,11 +2,11 @@
 <template>
   <el-form
     ref="formRef"
+    v-loading="formLoading"
     :disabled="isDetail"
     :model="formData"
     :rules="rules"
     label-width="120px"
-    v-loading="formLoading"
   >
     <el-form-item label="分销类型" props="subCommissionType">
       <el-radio-group