Skip to content

Commit

Permalink
2.22.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Dooy committed Nov 14, 2024
1 parent c1325cb commit 17ea3b7
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 15 deletions.
4 changes: 4 additions & 0 deletions changlog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

# 计划

# 2.22.1
- 😄 新增:超链定位tab 定位到可灵 https://vercel.ddaiai.com//#/video/index?tab=kling
- 😄 新增:手机可使用 音乐

# 2.21.10
- 😄 新增:claude-3-5-sonnet-all 模型
- 😄 新增:pika 3个视频效果
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.10",
"version": "2.22.1",
"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.10"
"version": "2.22.1"
},
"tauri": {
"allowlist": {
Expand Down
20 changes: 19 additions & 1 deletion src/views/luma/voInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,34 @@ import KlingInput from '../kling/kgInput.vue'
import PikaInput from './pikaInput.vue'
import { mlog } from '@/api';
import { gptServerStore } from '@/store';
import { ref } from 'vue';
import { useRoute } from 'vue-router';
const route = useRoute(); // 获取当前路由对象
const st= ref({tab:''});
const handleUpdateValue=(v:string)=>{
mlog("handleUpdateValue",v)
gptServerStore.setMyData({TAB_VIDEO:v})
}
const initLoad=()=>{
if(route.query.tab){
//st.value.tab=route.query.tab as string;
st.value.tab= 'luma'
let tt= (route.query.tab as string).toLocaleLowerCase();
if( ['luma','runway','pika','kling'].indexOf(tt)>-1 ){
st.value.tab=tt;
}
handleUpdateValue( st.value.tab )
}
else st.value.tab=( gptServerStore.myData.TAB_VIDEO?gptServerStore.myData.TAB_VIDEO:'Luma')
}
initLoad();
</script>

<template>
<n-tabs type="line" animated :default-value="gptServerStore.myData.TAB_VIDEO" @update:value="handleUpdateValue">
<n-tabs type="line" animated :default-value="st.tab" @update:value="handleUpdateValue">
<n-tab-pane name="" tab="">
</n-tab-pane>
<n-tab-pane name="luma" tab="Luma">
Expand Down
38 changes: 30 additions & 8 deletions src/views/mj/aiDrawInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,52 @@ import { SvgIcon } from '@/components/common'
import { onMounted, ref, watch } from 'vue';
import { gptServerStore } from '@/store';
import { mlog } from '@/api';
import { useRoute } from 'vue-router';
const route = useRoute(); // 获取当前路由对象
const $emit=defineEmits(['drawSent','close']);
const drawSent=(d:any )=> $emit('drawSent',d);
const {isMobile}= useBasicLayout()
const st= ref({drawType:'draw'});
const st= ref({drawType:'draw',tab:''});
onMounted(()=>{
//st.value.drawType='draw'
if(gptServerStore.myData.DRAW_TYPE) st.value.drawType=gptServerStore.myData.DRAW_TYPE
})
watch(()=>st.value.drawType, (n:string)=> {
mlog('st.value.drawType',n)
gptServerStore.setMyData({DRAW_TYPE:n})
} )
// watch(()=>st.value.drawType, (n:string)=> {
// mlog('st.value.drawType',n)
// gptServerStore.setMyData({DRAW_TYPE:n})
// } )
const handleUpdateValue=(v:string)=>{
//mlog("handleUpdateValue",v)
gptServerStore.setMyData({DRAW_TYPE:v})
}
const initLoad=()=>{
if(route.query.tab){
st.value.tab= 'midjourney'//route.query.tab as string;
let tt= (route.query.tab as string).toLocaleLowerCase();
if( ['dall.e','ideogram'].indexOf(tt)>-1 ){
st.value.tab=tt;
}
handleUpdateValue( st.value.tab )
}
else st.value.tab=( gptServerStore.myData.DRAW_TYPE?gptServerStore.myData.DRAW_TYPE:'midjourney')
}
initLoad();
</script>
<template>
<div class="overflow-y-auto bg-[#fafbfc] pt-2 dark:bg-[#18181c] h-full ">

<n-tabs type="line" animated default-value="draw" v-model:value="st.drawType">
<n-tabs type="line" animated :default-value="st.tab" @update:value="handleUpdateValue" >
<n-tab-pane name="start" tab="">

</n-tab-pane>
<n-tab-pane name="draw" tab="MidJourney" >
<n-tab-pane name="midjourney" tab="MidJourney" >
<!-- -->
<n-tabs type="segment" animated default-value="draw23" size="small">
<n-tab-pane name="draw23" :tab="$t('mjchat.draw')">
Expand All @@ -51,7 +73,7 @@ watch(()=>st.value.drawType, (n:string)=> {

</n-tab-pane>

<n-tab-pane name="dall3" tab="Dall.E">
<n-tab-pane name="dall.e" tab="Dall.E">
<div class="p-4"><aiDall /></div>
</n-tab-pane>

Expand Down
15 changes: 12 additions & 3 deletions src/views/mj/aiMobileMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { SvgIcon } from '@/components/common';
import { homeStore } from '@/store'
import { computed,watch ,ref } from 'vue'
import { router } from '@/router'
import { useRouter } from 'vue-router';
import aiDrawInput from './aiDrawInput.vue';
import {NDrawerContent,NDrawer} from "naive-ui";
Expand Down Expand Up @@ -31,10 +32,11 @@ watch(()=>homeStore.myData.act, (n:string)=>{
st.value.show=false;
}
});
const urouter = useRouter() //
</script>
<template>
<div class=" bg-gray-100 dark:bg-[#282832] h-[55px] flex justify-around items-center dark:text-white/70 " >
<div class="flex items-center justify-center flex-col" @click="homeStore.setMyData({act:'showChat'}) " :class="[ goHome =='Chat' ? 'active' : '']" >
<div class="flex items-center justify-center flex-col" @click="urouter.push('/chat') && homeStore.setMyData({act:'showChat'}) " :class="[ goHome =='Chat' ? 'active' : '']" >
<SvgIcon icon="ri:wechat-line" class="text-3xl"></SvgIcon>
<div class="text-[13px]">{{$t('mjtab.chat')}}</div>
</div>
Expand All @@ -53,10 +55,17 @@ watch(()=>homeStore.myData.act, (n:string)=>{
<SvgIcon icon="ic:outline-palette" class="text-3xl"></SvgIcon>
<div class="text-[13px]">{{$t('mjtab.draw')}}</div>
</div>
<div v-if="!isDisableMenu ( 'gallery')" class="flex items-center justify-center flex-col " @click="homeStore.setMyData({act:'gallery'})" >

<div v-if="!isDisableMenu ( 'music')" class="flex items-center justify-center flex-col " @click=" urouter.push('/music')" :class="[ goHome =='music' ? 'active' : '']" >
<SvgIcon icon="arcticons:wynk-music" class="text-3xl"></SvgIcon>
<div class="text-[13px]">{{ $t('suno.menu') }}</div>
</div>


<!-- <div v-if="!isDisableMenu ( 'gallery')" class="flex items-center justify-center flex-col " @click="homeStore.setMyData({act:'gallery'})" >
<SvgIcon icon="material-symbols:imagesmode-outline" class="text-3xl"></SvgIcon>
<div class="text-[13px]">{{$t('mjtab.gallery')}}</div>
</div>
</div> -->
</div>

<n-drawer v-model:show="st.show" class="!h-[90vh] !max-h-[660px]" placement="bottom" v-if="goHome=='draw'">
Expand Down
19 changes: 18 additions & 1 deletion src/views/suno/music.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,30 @@ import { NTabs,NTabPane} from "naive-ui"
import udioInput from './udioInput.vue';
import udioList from './udioList.vue';
import { gptServerStore } from '@/store';
import { useRoute } from 'vue-router';
const st= ref({menu:'suno'});
const route = useRoute(); // 获取当前路由对象
const st= ref({menu:'suno',tab:''});
const handleUpdateValue=(v:string)=>{
//mlog("handleUpdateValue",v)
gptServerStore.setMyData({TAB_MUSIC:v})
}
const initLoad=()=>{
if(route.query.tab){
st.value.tab= 'suno'
let tt= (route.query.tab as string).toLocaleLowerCase();
if( ['suno','udio'].indexOf(tt)>-1 ){
st.value.tab=tt;
}
handleUpdateValue( st.value.tab )
}
else st.value.tab=( gptServerStore.myData.TAB_MUSIC?gptServerStore.myData.TAB_MUSIC:'suno')
}
initLoad();
</script>

<template>
Expand Down

0 comments on commit 17ea3b7

Please sign in to comment.