+
+
+
diff --git a/web/src/views/Home.vue b/web/src/views/Home.vue
index 12d332e0..4f73d940 100644
--- a/web/src/views/Home.vue
+++ b/web/src/views/Home.vue
@@ -1,200 +1,225 @@
-
-
-
-
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+ -
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/src/views/ImageMj.vue b/web/src/views/ImageMj.vue
index 2f4aee9c..e1525ffd 100644
--- a/web/src/views/ImageMj.vue
+++ b/web/src/views/ImageMj.vue
@@ -600,8 +600,6 @@
-
-
@@ -616,19 +614,24 @@ import {checkSession} from "@/action/session";
import {useRouter} from "vue-router";
import {getSessionId} from "@/store/session";
import {copyObj, removeArrayItem} from "@/utils/libs";
-import LoginDialog from "@/components/LoginDialog.vue";
+import {useSharedStore} from "@/store/sharedata";
-const listBoxHeight = ref(window.innerHeight - 40)
-const paramBoxHeight = ref(window.innerHeight - 150)
-const showLoginDialog = ref(false)
+const listBoxHeight = ref(0)
+const paramBoxHeight = ref(0)
const loading = ref(true)
-const colWidth = ref(240)
+const colWidth = ref(220)
const previewURL = ref("")
+const store = useSharedStore();
+const resizeElement = function () {
+ listBoxHeight.value = window.innerHeight - 80
+ paramBoxHeight.value = window.innerHeight - 160
+};
+resizeElement()
window.onresize = () => {
- listBoxHeight.value = window.innerHeight - 40
- paramBoxHeight.value = window.innerHeight - 150
+ resizeElement()
}
+
const rates = [
{css: "square", value: "1:1", text: "1:1", img: "/images/mj/rate_1_1.png"},
{css: "size1-2", value: "1:2", text: "1:2", img: "/images/mj/rate_1_2.png"},
@@ -746,8 +749,8 @@ const connect = () => {
const message = String(reader.result)
if (message === "FINISH") {
page.value = 0
- fetchFinishJobs(page.value)
isOver.value = false
+ fetchFinishJobs(page.value)
}
fetchRunningJobs()
}
@@ -898,7 +901,7 @@ const beforeUpload = (key) => {
// 图片上传
const uploadImg = (file) => {
if (!isLogin.value) {
- showLoginDialog.value = true
+ store.setShowLoginDialog(true)
return
}
@@ -931,7 +934,7 @@ const uploadImg = (file) => {
const promptRef = ref(null)
const generate = () => {
if (!isLogin.value) {
- showLoginDialog.value = true
+ store.setShowLoginDialog(true)
return
}
@@ -993,6 +996,9 @@ const removeImage = (item) => {
).then(() => {
httpPost("/api/mj/remove", {id: item.id, img_url: item.img_url, user_id: userId.value}).then(() => {
ElMessage.success("任务删除成功")
+ page.value = 0
+ isOver.value = false
+ fetchFinishJobs()
}).catch(e => {
ElMessage.error("任务删除失败：" + e.message)
})
@@ -1009,6 +1015,9 @@ const publishImage = (item, action) => {
httpPost("/api/mj/publish", {id: item.id, action: action}).then(() => {
ElMessage.success(text + "成功")
item.publish = action
+ page.value = 0
+ isOver.value = false
+ fetchFinishJobs()
}).catch(e => {
ElMessage.error(text + "失败：" + e.message)
})
diff --git a/web/src/views/ImageSd.vue b/web/src/views/ImageSd.vue
index c3f8937f..fa433ad2 100644
--- a/web/src/views/ImageSd.vue
+++ b/web/src/views/ImageSd.vue
@@ -5,7 +5,7 @@
Stable Diffusion 创作中心
-
+
@@ -511,21 +509,25 @@ import Clipboard from "clipboard";
import {checkSession} from "@/action/session";
import {useRouter} from "vue-router";
import {getSessionId} from "@/store/session";
-import LoginDialog from "@/components/LoginDialog.vue";
+import {useSharedStore} from "@/store/sharedata";
-const listBoxHeight = ref(window.innerHeight - 40)
-const paramBoxHeight = ref(window.innerHeight - 150)
+const listBoxHeight = ref(0)
+// const paramBoxHeight = ref(0)
const fullImgHeight = ref(window.innerHeight - 60)
const showTaskDialog = ref(false)
const item = ref({})
-const showLoginDialog = ref(false)
const isLogin = ref(false)
const loading = ref(true)
-const colWidth = ref(240)
+const colWidth = ref(220)
+const store = useSharedStore();
+const resizeElement = function () {
+ listBoxHeight.value = window.innerHeight - 80
+ // paramBoxHeight.value = window.innerHeight - 200
+};
+resizeElement()
window.onresize = () => {
- listBoxHeight.value = window.innerHeight - 40
- paramBoxHeight.value = window.innerHeight - 150
+ resizeElement()
}
const samplers = ["Euler a", "DPM++ 2S a", "DPM++ 2M", "DPM++ SDE", "DPM++ 2M SDE", "UniPC", "Restart"]
const schedulers = ["Automatic", "Karras", "Exponential", "Uniform"]
@@ -600,8 +602,8 @@ const connect = () => {
const message = String(reader.result)
if (message === "FINISH") {
page.value = 0
- fetchFinishJobs()
isOver.value = false
+ fetchFinishJobs()
}
fetchRunningJobs()
}
@@ -726,7 +728,7 @@ const generate = () => {
}
if (!isLogin.value) {
- showLoginDialog.value = true
+ store.setShowLoginDialog(true)
return
}
@@ -765,6 +767,9 @@ const removeImage = (event, item) => {
).then(() => {
httpPost("/api/sd/remove", {id: item.id, img_url: item.img_url, user_id: userId.value}).then(() => {
ElMessage.success("任务删除成功")
+ page.value = 0
+ isOver.value = false
+ fetchFinishJobs()
}).catch(e => {
ElMessage.error("任务删除失败：" + e.message)
})
@@ -782,6 +787,9 @@ const publishImage = (event, item, action) => {
httpPost("/api/sd/publish", {id: item.id, action: action}).then(() => {
ElMessage.success(text + "成功")
item.publish = action
+ page.value = 0
+ isOver.value = false
+ fetchFinishJobs()
}).catch(e => {
ElMessage.error(text + "失败：" + e.message)
})
diff --git a/web/src/views/ImagesWall.vue b/web/src/views/ImagesWall.vue
index 696d563e..9076993b 100644
--- a/web/src/views/ImagesWall.vue
+++ b/web/src/views/ImagesWall.vue
@@ -310,8 +310,8 @@ const data = ref({
const loading = ref(true)
const isOver = ref(false)
const imgType = ref("mj") // 图片类别
-const listBoxHeight = window.innerHeight - 74
-const colWidth = ref(240)
+const listBoxHeight = window.innerHeight - 124
+const colWidth = ref(220)
const fullImgHeight = ref(window.innerHeight - 60)
const showTaskDialog = ref(false)
const item = ref({})
@@ -395,6 +395,7 @@ onUnmounted(() => {
})
const changeImgType = () => {
+ console.log(imgType.value)
document.getElementById('waterfall-box').scrollTo(0, 0)
page.value = 0
data.value = {
diff --git a/web/src/views/Invitation.vue b/web/src/views/Invitation.vue
index cb29d9b5..13542e40 100644
--- a/web/src/views/Invitation.vue
+++ b/web/src/views/Invitation.vue
@@ -84,8 +84,6 @@