大改了一波

components.d.ts

@@ -8,7 +8,6 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
@@ -20,7 +19,6 @@ declare module 'vue' {
     ElOption: typeof import('element-plus/es')['ElOption']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
-    ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']

src/views/home/compositions/useManyValues.ts

@@ -48,6 +48,13 @@ export const useManyValues = () => {
   deformed,bad anatomy,disfigured,poorly drawn face,lowres,mutated,extra limb,ugly,poorly drawn hands,missing limb,floating limbs,
   disconnected limbs,malformed hands,out of focus,long neck,long body,gape,`;
 
+  const llms = {
+    tyqw_online: {'api': 'tyqw', 'name':'线上通义千问'},
+    baichuan: {'api': 'langchain', 'name':'本地baichuan2-7b'},
+    qwen_local: {'api': 'langchain', 'name':'本地Qwen-7B-Chat'},
+    chatgpt: {'api': 'gpt', 'name':'chatgpt'},
+  };
+
   const horizontal_data = {
     task_id: "20240209114425596",
     chatgpt_prompt: `生成一个50字的小故事`,
@@ -60,7 +67,7 @@ export const useManyValues = () => {
   const vertical_data = {
     task_id: "20240220181602687",
     chatgpt_prompt: `生成一个50字的科幻小故事，阿凡达系列`,
-    chatgpt_answer: ``,
+    chatgpt_answer: `在奇幻的熊猫王国，阿宝——不再是功夫大师，而化身为西游世界里的神秘旅者。一日，阿宝巧遇唐僧师徒四人，他们正被一只诡异黑影困扰，经书被盗，疑云密布。画面中，阿宝手持九齿钉耙，取代八戒成为护法，勇闯妖洞。峰回路转，黑影竟是被封印的悟空分身，误入歧途。阿宝凭借智慧与武力，解开误会，反转剧情，助悟空分身归于本体，携手抵御真正邪魔，恢复取经历程的和平景象。`,
     chatgpt_answer_roles: [],
     adapt_result_json: [],
     final_video: ``,
@@ -181,7 +188,7 @@ export const useManyValues = () => {
       gender: 'Male',
       label: '男，台湾腔',
     },
-  ]
+  ];
 
   const voices_en = [
     {
@@ -189,7 +196,7 @@ export const useManyValues = () => {
       gender: 'Male',
       label: '男，美式磁性',
     },
-  ]
+  ];
 
   const bgm = [
     {
@@ -224,12 +231,36 @@ export const useManyValues = () => {
       value: '大自然',
       label: '大自然',
     },
-  ]
+  ];
+
+  const role_attribute_options = [
+    {
+      value: '人',
+      label: '人',
+    },
+    {
+      value: '动物',
+      label: '动物',
+    },
+    {
+      value: '物品',
+      label: '物品',
+    },
+    {
+      value: '其他生物',
+      label: '其他生物',
+    },
+    {
+      value: '未知',
+      label: '未知',
+    },
+  ];
   
   return {
     screen: screen,
     sd_prompt_prefix: sd_prompt_prefix,
     sd_negative_prompt_prefix: sd_negative_prompt_prefix,
+    llms: llms,
     horizontal_data: horizontal_data,
     vertical_data: vertical_data,
     if_need_subtitle: if_need_subtitle,
@@ -239,5 +270,6 @@ export const useManyValues = () => {
     voices_en: voices_en,
     bgm: bgm,
     bgm_volume_marks: bgm_volume_marks,
+    role_attribute_options: role_attribute_options,
   }
 }

src/views/home/index_en.vue

@@ -52,8 +52,8 @@ const bgm_volume = ref(0.3)
 const pwdCheckDialogVisible = ref(false);
 const pwdCheckValue = ref("")
 const sub_font_color = ref("#FFFF00")
-const sub_font_size = ref(30)
-const sub_position = ref(0.2)
+const sub_font_size = ref(25)
+const sub_position = ref(0.4)
 
 
 onMounted(() => {
@@ -122,7 +122,9 @@ const onAdaptRoles = async () => {
         keywords = keywords.replace(/。/g, '').replace(/、/g, ',')
         form.chatgpt_answer_roles.push({
           "角色": one_role.trim(),
-          "角色关键词": keywords.trim()+",dressed"
+          "角色关键词": keywords.trim()+",dressed",
+          "角色英文关键词": "",
+          "属性": "",
         });
       }
     }
@@ -645,7 +647,7 @@ const onPwdCheckDialog = () => {
       </el-form-item>
       <el-form-item>
         <span style="margin: 0 20px">背景音量：</span>
-        <el-slider v-model="bgm_volume" show-input step="0.1" :min="0" :max="2" :marks="default_data.bgm_volume_marks" style="width: 600px" />
+        <el-slider v-model="bgm_volume" show-input :step="0.1" :min="0" :max="2" :marks="default_data.bgm_volume_marks" style="width: 600px" />
       </el-form-item>
       <el-form-item>
         <span style="margin: 20px 20px">字幕：</span>
@@ -656,7 +658,7 @@ const onPwdCheckDialog = () => {
           <span style="margin-left:30px;">字体大小：</span>
           <el-input-number v-model="sub_font_size" :min="1" :max="50" controls-position="right" />
           <span style="margin-left:30px;">在屏幕上的位置：</span>
-          <el-slider v-model="sub_position" step="0.1" :min="0" :max="1" show-input vertical height="100px" />
+          <el-slider v-model="sub_position" :step="0.1" :min="0" :max="1" show-input vertical height="100px" />
         </div>
       </el-form-item>
       <el-form-item>
@@ -677,7 +679,7 @@ const onPwdCheckDialog = () => {
     >
       <el-form :model="form">
         <el-form-item label="密码">
-          <el-input v-model="pwdCheckValue" autocomplete="off" type="password" show-password />
+          <el-input v-model="pwdCheckValue" autocomplete="off" type="password" show-password @keyup.enter="onPwdCheckDialog()" />
         </el-form-item>
       </el-form>
       <template #footer>

typings/types/wm/lib.wm.api.d.ts

@@ -24,6 +24,8 @@ declare namespace Wm {
   interface RolesItem {
     "角色": string,
     "角色关键词": string,
+    "角色英文关键词": string,
+    "属性": string,
   }
 
   interface UploadResult {