diff --git a/public/fonts/general/css/general-sans.css b/public/fonts/general/css/general-sans.css index ac2fb00..2507384 100644 --- a/public/fonts/general/css/general-sans.css +++ b/public/fonts/general/css/general-sans.css @@ -83,4 +83,11 @@ font-weight: 700; font-display: swap; font-style: normal; +} +@font-face { + font-family: 'MSemiBold'; + src:url('../fonts/MazzardL-SemiBold.otf') format('opentype'); + font-weight: 700; + font-display: swap; + font-style: normal; } \ No newline at end of file diff --git a/public/fonts/general/fonts/MazzardL-SemiBold.otf b/public/fonts/general/fonts/MazzardL-SemiBold.otf new file mode 100644 index 0000000..62dc20d Binary files /dev/null and b/public/fonts/general/fonts/MazzardL-SemiBold.otf differ diff --git a/src/assets/icons/c-text.svg b/src/assets/icons/c-text.svg index 285842d..62f8998 100644 --- a/src/assets/icons/c-text.svg +++ b/src/assets/icons/c-text.svg @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/src/components/Canvas/CanvasTest.vue b/src/components/Canvas/CanvasTest.vue index fa90539..fc9b37a 100644 --- a/src/components/Canvas/CanvasTest.vue +++ b/src/components/Canvas/CanvasTest.vue @@ -1,103 +1,31 @@ diff --git a/src/components/Canvas/FlowCanvas/components/header-tools.vue b/src/components/Canvas/FlowCanvas/components/header-tools.vue index 484d469..1f6ce89 100644 --- a/src/components/Canvas/FlowCanvas/components/header-tools.vue +++ b/src/components/Canvas/FlowCanvas/components/header-tools.vue @@ -83,7 +83,7 @@ align-items: center; justify-content: center; user-select: none; - gap: 1.4rem; + gap: 1.2rem; > .line { width: 0; height: 100%; @@ -102,7 +102,7 @@ border-radius: 0.4rem; &:not(.disabled).active, &:not(.disabled):hover { - background-color: #dfdfdf; + background-color: #ebebeb; } &.disabled { opacity: 0.5; diff --git a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue index 743e8d2..c7e8278 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue @@ -1,22 +1,26 @@ + + diff --git a/src/components/Canvas/tools/tools.ts b/src/components/Canvas/tools/tools.ts index b20aa42..a47d370 100644 --- a/src/components/Canvas/tools/tools.ts +++ b/src/components/Canvas/tools/tools.ts @@ -2,4 +2,17 @@ export const createId = (before: string = 'node') => { const time = Date.now().toString(36) const random = Math.random().toString(36).substring(2, 20) return `${before}_${time}${random}` +} + +/** 下载图片 */ +export const downloadImage = (url: string, name: string) => { + fetch(url) + .then((res) => res.blob()) + .then((blob) => { + const a = document.createElement('a') + a.href = URL.createObjectURL(blob) + a.target = '_blank' + a.download = name || 'image.png' + a.click() + }) } \ No newline at end of file diff --git a/src/views/home/components/Input.vue b/src/views/home/components/Input.vue index fb3366c..75e2379 100644 --- a/src/views/home/components/Input.vue +++ b/src/views/home/components/Input.vue @@ -779,7 +779,7 @@ width: 13rem; color: #fff; border-radius: 4.2rem; - font-family: 'Mazzard'; + font-family: 'MSemiBold'; font-weight: 600; font-size: 1.28rem; cursor: pointer;