diff --git a/web/package-lock.json b/web/package-lock.json index 4b3bfc65..652fb19a 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -24,14 +24,16 @@ "markdown-it-mathjax": "^2.0.0", "markmap-common": "^0.16.0", "markmap-lib": "^0.16.1", + "markmap-toolbar": "^0.17.0", "markmap-view": "^0.16.0", "md-editor-v3": "^2.2.1", + "mitt": "^3.0.1", "pinia": "^2.1.4", "qrcode": "^1.5.3", "qs": "^6.11.1", "sortablejs": "^1.15.0", "three": "^0.128.0", - "v3-waterfall": "^1.2.1", + "v3-waterfall": "^1.3.3", "vant": "^4.5.0", "vue": "^3.2.13", "vue-router": "^4.0.15" @@ -8335,6 +8337,18 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/markmap-toolbar": { + "version": "0.17.0", + "resolved": "https://registry.npmmirror.com/markmap-toolbar/-/markmap-toolbar-0.17.0.tgz", + "integrity": "sha512-zRkg+pYtjDefJ4lSG0KownAN3eqkJcrTei+HbobBWsWTsc7qdUMn2Ewd97SFHCkGoo1nrG0aW7dzDP6lHWuDkw==", + "dependencies": { + "@babel/runtime": "^7.22.6", + "@gera2ld/jsx-dom": "^2.2.2" + }, + "peerDependencies": { + "markmap-common": "*" + } + }, "node_modules/markmap-view": { "version": "0.16.0", "resolved": "https://registry.npmmirror.com/markmap-view/-/markmap-view-0.16.0.tgz", @@ -8592,6 +8606,11 @@ "node": ">=8" } }, + "node_modules/mitt": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz", + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" + }, "node_modules/mkdirp": { "version": "0.5.6", "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz", @@ -11513,9 +11532,9 @@ } }, "node_modules/v3-waterfall": { - "version": "1.2.1", - "resolved": "https://registry.npmmirror.com/v3-waterfall/-/v3-waterfall-1.2.1.tgz", - "integrity": "sha512-zjfT1FuHupsAahvS4mr3Yb8k2SHB8srW6st+/cBXwrsyhbCcj8Qhb1QtNUuEIx/tbpLQrMpxtJunZXkaKBfAEA==" + "version": "1.3.3", + "resolved": "https://registry.npmmirror.com/v3-waterfall/-/v3-waterfall-1.3.3.tgz", + "integrity": "sha512-jUmp0xpHGkEcUxaYKGRtI5b2NvogxI/UrfoCLmpTi0UbQndDdqjwufxJvWwiJjwZQyOIPpnq9ZOFtkBwxchq3Q==" }, "node_modules/v8-compile-cache": { "version": "2.3.0", @@ -19059,6 +19078,15 @@ } } }, + "markmap-toolbar": { + "version": "0.17.0", + "resolved": "https://registry.npmmirror.com/markmap-toolbar/-/markmap-toolbar-0.17.0.tgz", + "integrity": "sha512-zRkg+pYtjDefJ4lSG0KownAN3eqkJcrTei+HbobBWsWTsc7qdUMn2Ewd97SFHCkGoo1nrG0aW7dzDP6lHWuDkw==", + "requires": { + "@babel/runtime": "^7.22.6", + "@gera2ld/jsx-dom": "^2.2.2" + } + }, "markmap-view": { "version": "0.16.0", "resolved": "https://registry.npmmirror.com/markmap-view/-/markmap-view-0.16.0.tgz", @@ -19264,6 +19292,11 @@ "yallist": "^4.0.0" } }, + "mitt": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz", + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" + }, "mkdirp": { "version": "0.5.6", "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz", @@ -21507,9 +21540,9 @@ "dev": true }, "v3-waterfall": { - "version": "1.2.1", - "resolved": "https://registry.npmmirror.com/v3-waterfall/-/v3-waterfall-1.2.1.tgz", - "integrity": "sha512-zjfT1FuHupsAahvS4mr3Yb8k2SHB8srW6st+/cBXwrsyhbCcj8Qhb1QtNUuEIx/tbpLQrMpxtJunZXkaKBfAEA==" + "version": "1.3.3", + "resolved": "https://registry.npmmirror.com/v3-waterfall/-/v3-waterfall-1.3.3.tgz", + "integrity": "sha512-jUmp0xpHGkEcUxaYKGRtI5b2NvogxI/UrfoCLmpTi0UbQndDdqjwufxJvWwiJjwZQyOIPpnq9ZOFtkBwxchq3Q==" }, "v8-compile-cache": { "version": "2.3.0", diff --git a/web/package.json b/web/package.json index 0ab1234f..dcd7ab6a 100644 --- a/web/package.json +++ b/web/package.json @@ -14,7 +14,7 @@ "compressorjs": "^1.2.1", "core-js": "^3.8.3", "echarts": "^5.5.0", - "element-plus": "^2.3.0", + "element-plus": "^2.4.0", "good-storage": "^1.1.1", "highlight.js": "^11.7.0", "json-bigint": "^1.0.0", diff --git a/web/src/App.vue b/web/src/App.vue index c57704ea..8349037d 100644 --- a/web/src/App.vue +++ b/web/src/App.vue @@ -1,12 +1,11 @@ diff --git a/web/src/views/ImageMj.vue b/web/src/views/ImageMj.vue index 2f4aee9c..b29d087e 100644 --- a/web/src/views/ImageMj.vue +++ b/web/src/views/ImageMj.vue @@ -618,17 +618,22 @@ import {getSessionId} from "@/store/session"; import {copyObj, removeArrayItem} from "@/utils/libs"; import LoginDialog from "@/components/LoginDialog.vue"; -const listBoxHeight = ref(window.innerHeight - 40) -const paramBoxHeight = ref(window.innerHeight - 150) +const listBoxHeight = ref(0) +const paramBoxHeight = ref(0) const showLoginDialog = ref(false) const loading = ref(true) const colWidth = ref(240) const previewURL = ref("") +const resizeElement = function () { + listBoxHeight.value = window.innerHeight - 80 + paramBoxHeight.value = window.innerHeight - 190 +}; +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"}, diff --git a/web/src/views/ImageSd.vue b/web/src/views/ImageSd.vue index c3f8937f..86b274d6 100644 --- a/web/src/views/ImageSd.vue +++ b/web/src/views/ImageSd.vue @@ -2,10 +2,10 @@
-
+

Stable Diffusion 创作中心

-
+
@@ -513,8 +513,8 @@ import {useRouter} from "vue-router"; import {getSessionId} from "@/store/session"; import LoginDialog from "@/components/LoginDialog.vue"; -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({}) @@ -523,9 +523,13 @@ const isLogin = ref(false) const loading = ref(true) const colWidth = ref(240) +const resizeElement = function () { + listBoxHeight.value = window.innerHeight - 80 + paramBoxHeight.value = window.innerHeight - 110 +}; +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"] diff --git a/web/src/views/ImagesWall.vue b/web/src/views/ImagesWall.vue index 05d3f443..318bf189 100644 --- a/web/src/views/ImagesWall.vue +++ b/web/src/views/ImagesWall.vue @@ -310,7 +310,7 @@ const data = ref({ const loading = ref(true) const isOver = ref(false) const imgType = ref("mj") // 图片类别 -const listBoxHeight = window.innerHeight - 74 +const listBoxHeight = window.innerHeight - 124 const colWidth = ref(240) const fullImgHeight = ref(window.innerHeight - 60) const showTaskDialog = ref(false) @@ -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..1e95c218 100644 --- a/web/src/views/Invitation.vue +++ b/web/src/views/Invitation.vue @@ -163,7 +163,7 @@ const initData = () => { display: flex; justify-content: center; background-color: #282c34; - height 100vh + height 100% overflow-x hidden overflow-y visible @@ -176,6 +176,7 @@ const initData = () => { h2 { color #ffffff; + text-align center } .share-box { diff --git a/web/src/views/MarkMap.vue b/web/src/views/MarkMap.vue index 37382a0c..c9877666 100644 --- a/web/src/views/MarkMap.vue +++ b/web/src/views/MarkMap.vue @@ -2,10 +2,10 @@
-
+

思维导图创作中心

-
+
你的需求? @@ -69,9 +69,8 @@
-
+
-

思维导图

@@ -108,7 +107,7 @@ import {Download} from "@element-plus/icons-vue"; import {Toolbar} from 'markmap-toolbar'; const leftBoxHeight = ref(window.innerHeight - 105) -const rightBoxHeight = ref(window.innerHeight - 85) +const rightBoxHeight = ref(window.innerHeight - 115) const prompt = ref("") const text = ref(`# Geek-AI 助手 diff --git a/web/src/views/Member.vue b/web/src/views/Member.vue index e586d5e9..d25e5481 100644 --- a/web/src/views/Member.vue +++ b/web/src/views/Member.vue @@ -1,9 +1,6 @@