diff --git a/web_app/src/components/Header.tsx b/web_app/src/components/Header.tsx index 1f4985a..1941465 100644 --- a/web_app/src/components/Header.tsx +++ b/web_app/src/components/Header.tsx @@ -28,7 +28,7 @@ const Header = () => { enableFileManager, enableManualInpainting, enableUploadMask, - shouldShowPromptInput, + model, setFile, setCustomFile, ] = useStore((state) => [ @@ -38,7 +38,7 @@ const Header = () => { state.serverConfig.enableFileManager, state.settings.enableManualInpainting, state.settings.enableUploadMask, - state.showPromptInput(), + state.settings.model, state.setFile, state.setCustomFile, ]) @@ -145,18 +145,22 @@ const Header = () => { )} - - - + {file && !model.need_prompt ? ( + + + + ) : ( + <> + )} - {shouldShowPromptInput ? : <>} + {model.need_prompt ? : <>}
{/* */} diff --git a/web_app/src/components/Settings.tsx b/web_app/src/components/Settings.tsx index 64ff906..e6a7324 100644 --- a/web_app/src/components/Settings.tsx +++ b/web_app/src/components/Settings.tsx @@ -433,9 +433,9 @@ export function SettingsDialog() { <> )} */} - {/*
- -
*/} +
+ +
diff --git a/web_app/src/components/SidePanel.tsx b/web_app/src/components/SidePanel.tsx index d78fbf9..0a708ff 100644 --- a/web_app/src/components/SidePanel.tsx +++ b/web_app/src/components/SidePanel.tsx @@ -1,5 +1,5 @@ import { FormEvent, useState } from "react" -import { useToggle } from "react-use" +import { useToggle, useWindowSize } from "react-use" import { useStore } from "@/lib/states" import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover" import { Switch } from "./ui/switch" @@ -24,7 +24,14 @@ import { import { Separator } from "./ui/separator" import { useHotkeys } from "react-hotkeys-hook" import { ScrollArea } from "./ui/scroll-area" -import { Sheet, SheetContent, SheetHeader } from "./ui/sheet" +import { + Sheet, + SheetContent, + SheetDescription, + SheetHeader, + SheetTitle, + SheetTrigger, +} from "./ui/sheet" const SidePanel = () => { const [settings, updateSettings, showSidePanel] = useStore((state) => [ @@ -41,6 +48,8 @@ const SidePanel = () => { toggleOpen() }) + const windowSize = useWindowSize() + if (!showSidePanel) { return null } @@ -65,14 +74,14 @@ const SidePanel = () => { return (
- {/* */} + { - const sampler = value as SDSampler - updateSettings({ sdSampler: sampler }) - }} - > - - - - - - {Object.values(SDSampler).map((sampler) => ( - - {sampler as string} - - ))} - - - -
- -
- {/* 每次会从服务器返回更新该值 */} - -
- { - updateSettings({ seedFixed: value }) - }} - /> - { - updateSettings({ seed: val }) - }} - /> -
-
- + + Diffusion Paramers + + + +
+
+ + { + updateSettings({ showCroper: value }) + }} + />
- - Negative prompt - -