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

# Conflicts:
#	src/views/mall/promotion/rewardActivity/RewardForm.vue

src/views/ai/model/apiKey/ApiKeyForm.vue

@@ -31,7 +31,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/ai/model/chatModel/ChatModelForm.vue

@@ -41,7 +41,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/ai/model/chatRole/ChatRoleForm.vue

@@ -37,7 +37,7 @@
           <el-radio
             v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -51,7 +51,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -69,7 +69,7 @@ import { getIntDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
 import { ChatRoleApi, ChatRoleVO } from '@/api/ai/model/chatRole'
 import { CommonStatusEnum } from '@/utils/constants'
 import { ChatModelApi, ChatModelVO } from '@/api/ai/model/chatModel'
-import {FormRules} from "element-plus";
+import { FormRules } from 'element-plus'
 
 /** AI 聊天角色 表单 */
 defineOptions({ name: 'ChatRoleForm' })

src/views/ai/music/index/mode/index.vue

@@ -1,20 +1,14 @@
 <template>
   <ContentWrap class="w-300px h-full mb-[0!important]">
     <el-radio-group v-model="generateMode" class="mb-15px">
-      <el-radio-button label="desc">
-        描述模式
-      </el-radio-button>
-      <el-radio-button label="lyric">
-        歌词模式
-      </el-radio-button>
+      <el-radio-button value="desc"> 描述模式 </el-radio-button>
+      <el-radio-button value="lyric"> 歌词模式 </el-radio-button>
     </el-radio-group>
 
     <!-- 描述模式/歌词模式 切换 -->
-    <component :is="generateMode === 'desc' ? desc : lyric" ref="modeRef"/>
+    <component :is="generateMode === 'desc' ? desc : lyric" ref="modeRef" />
 
-    <el-button type="primary" round class="w-full" @click="generateMusic">
-      创作音乐
-    </el-button>
+    <el-button type="primary" round class="w-full" @click="generateMusic"> 创作音乐 </el-button>
   </ContentWrap>
 </template>
 
@@ -34,8 +28,8 @@ const modeRef = ref<Nullable<{ formData: Recordable }>>(null)
  *@Description: 根据信息生成音乐
  *@MethodAuthor: xiaohong
  *@Date: 2024-06-27 16:40:16
-*/
-function generateMusic () {
-  emits('generate-music', {formData: unref(modeRef)?.formData})
+ */
+function generateMusic() {
+  emits('generate-music', { formData: unref(modeRef)?.formData })
 }
 </script>