Skip to content

Commit

Permalink
2.21.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Dooy committed Oct 11, 2024
1 parent 0ec8513 commit 1c8c6b8
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 8 deletions.
3 changes: 3 additions & 0 deletions changlog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# 功能升级日志

# 计划
# 2.21.4
- 😄 新增:runway图片增加首尾帧选择

# 2.21.3
- 🐞 修复:回复数最多只有4096太少导致有时无法正常输出 #516
- 😄 优化:支持实时语音对话服务中的设置
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chatgpt-web-midjourney-proxy",
"version": "2.21.3",
"version": "2.21.4",
"private": false,
"description": "ChatGPT Web Midjourney Proxy",
"author": "Dooy <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "ChatGPT-MJ",
"version": "2.21.3"
"version": "2.21.4"
},
"tauri": {
"allowlist": {
Expand Down
26 changes: 20 additions & 6 deletions src/views/luma/runwayInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
import { mlog, upImg } from '@/api';
import { runwayFeed, runwayFetch, runwayUpload } from '@/api/runway';
import { gptServerStore, homeStore } from '@/store';
import { useMessage,NInput,NButton, NTag,NSelect,NPopover } from 'naive-ui';
import { useMessage,NInput,NButton, NTag,NSelect,NPopover,NSwitch } from 'naive-ui';
import { computed, onMounted, ref, watch } from 'vue';
import { SvgIcon } from '@/components/common';
import { t } from '@/locales';
import { RunwayTask } from '@/api/runwayStore';
const fsRef= ref() ;
const runway= ref<{image_prompt?:string,seed:number,text_prompt:string}>({image_prompt:'',seed:1675247627,text_prompt:''});
const st= ref({isDo:false,uploading:false, version:'gen2',time:5});
const st= ref({isDo:false,uploading:false, version:'gen2',time:5,image_as_end_frame:false});
const ms = useMessage();
const exRunway= ref<RunwayTask>()
async function selectFile(input:any){
Expand Down Expand Up @@ -93,6 +93,7 @@ const generate= async ()=>{
"enhance_prompt": true,
"width": 1280,
"height": 768,
"image_as_end_frame": false,
"assetGroupName": "Generative Video",
"init_image": runway.value.image_prompt,
"resolution": '720p'// runway.value.image_prompt,
Expand Down Expand Up @@ -138,6 +139,8 @@ const generate= async ()=>{
delete gen3.options.extended_from_task_id;
delete gen3_trubo.options.extended_from_task_id;
}
gen3.options.image_as_end_frame=st.value.image_as_end_frame
gen3_trubo.options.image_as_end_frame=st.value.image_as_end_frame
gen3.options.exploreMode= st.value.version=='europa'
let sobj:any = gen3;
Expand Down Expand Up @@ -247,7 +250,7 @@ watch(()=>homeStore.myData.act, (n)=>{

<div class="pt-1">
<div class="flex justify-between items-end">
<div>
<div class=" relative">
<input type="file" @change="selectFile" ref="fsRef" style="display: none" accept="image/jpeg, image/jpg, image/png, image/gif"/>

<!-- <div v-if="st.version=='europa'"
Expand All @@ -263,10 +266,21 @@ watch(()=>homeStore.myData.act, (n)=>{
<div class="text-center" v-else >{{ $t('video.selectimg') }}</div>

</div>

<div class=" absolute bottom-[-5px] right-[-15px]" v-if="runway.image_prompt&&st.version!='gen2'">
<NSwitch v-model:value="st.image_as_end_frame" size="small">
<template #checked>尾帧</template>
<template #unchecked>首帧</template>
</NSwitch>
</div>
</div>
<div class="text-right">
<div class="pb-1 text-right">
<NTag v-if="runway.text_prompt!='' || runway.image_prompt!='' || exRunway" type="success" size="small" round ><span class="cursor-pointer" @click="clearInput()" >{{$t('video.clear')}}</span></NTag>
<div class="text-right ">
<div class="pb-1 flex justify-between items-center">



<NTag v-if="runway.text_prompt!='' || runway.image_prompt!='' || exRunway" type="success" size="small" round ><span class="cursor-pointer" @click="clearInput()" >{{$t('video.clear')}}</span></NTag>

</div>
<NButton :loading="st.isDo" type="primary" :disabled="!canPost" @click="generate()"><SvgIcon icon="ri:video-add-line" /> {{$t('video.generate')}}</NButton>
</div>
Expand Down

0 comments on commit 1c8c6b8

Please sign in to comment.