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/components/Canvas/FlowCanvas/components/header-tools.vue b/src/components/Canvas/FlowCanvas/components/header-tools.vue index 72c0d5b..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%; diff --git a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue index b22471f..c7e8278 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue @@ -12,7 +12,7 @@ @@ -183,7 +183,7 @@ height: 30px; border-radius: 4px; border: none; - background-color: #ff7a51; + background-color: #ED8936; color: #fff; font-size: 12px; display: flex; diff --git a/src/components/Canvas/FlowCanvas/components/tools/pixel-ratio-selection.vue b/src/components/Canvas/FlowCanvas/components/tools/pixel-ratio-selection.vue index c182c83..fe6fad2 100644 --- a/src/components/Canvas/FlowCanvas/components/tools/pixel-ratio-selection.vue +++ b/src/components/Canvas/FlowCanvas/components/tools/pixel-ratio-selection.vue @@ -19,7 +19,8 @@ modelValue: { type: String }, list: { type: Array, - default: () => ['1:1', '4:3', '3:4', '16:9'] + default: () => ['1:1', '4:3'] + // default: () => ['1:1', '4:3', '3:4', '16:9'] } }) const data = reactive({}) @@ -47,10 +48,10 @@ font-size: 12px; color: #7c7c7c; height: 21px; - flex: 1; display: flex; align-items: center; justify-content: center; + padding: 0 8px; &.active { border-radius: 4px; background-color: #fff; @@ -58,7 +59,7 @@ &::before { content: ''; border-radius: 1px; - border: 1px solid #7c7c7c; + border: 1.2px solid #7c7c7c; width: calc(var(--w) / max(var(--w), var(--h)) * 10px); height: calc(var(--h) / max(var(--w), var(--h)) * 10px); margin-right: 4px; diff --git a/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue b/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue index b4396e0..27a6907 100644 --- a/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue +++ b/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue @@ -74,8 +74,11 @@ justify-content: center; box-shadow: 0px 0.75px 0px 0px rgba(0, 0, 0, 0.02); min-width: 39px; - height: 13px; + // height: 13px; border-radius: 2.3px; + width: 56px; + text-align: center; + line-height: 18px; background-color: #fff; font-size: 6px; color: #000; diff --git a/src/lang/en.ts b/src/lang/en.ts index 02f547c..4159d6b 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -126,9 +126,9 @@ export default { chooseStyle: 'Choose Style', setting: 'Setting', settingOptions: { - creativity: 'Creativity', - diversity: 'Diversity', - relevance: 'Relevance' + first: 'Image strength', + second: 'Region strength', + third: 'Style strength' }, confirm: 'Confirm', styleTitle: 'Settings', diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts index 0d28b64..335ac53 100644 --- a/src/lang/zh-cn.ts +++ b/src/lang/zh-cn.ts @@ -120,9 +120,9 @@ export default { chooseStyle: '选择风格', setting: 'Setting', settingOptions: { - creativity: '创意度', - diversity: '多样性', - relevance: '相关度' + first: '图像强度', + second: '区域强度', + third: '风格强度' }, confirm: '确认', styleTitle: '设置', diff --git a/src/views/home/agent/components/Agent.vue b/src/views/home/agent/components/Agent.vue index 13df84a..cfacb7b 100644 --- a/src/views/home/agent/components/Agent.vue +++ b/src/views/home/agent/components/Agent.vue @@ -490,7 +490,7 @@ // width: 39%; // width: 63.4rem; // flex: 1; - width: 634px; + width: 67.4rem; margin-right: 2.7rem; background-color: #fff; border-radius: 2rem; @@ -516,9 +516,9 @@ row-gap: 2.4rem; .assist-input-wrapper { width: 100%; - height: 14.4rem; + // height: 14.4rem; min-height: 14.4rem !important; - max-height: 14.4rem !important; + max-height: 18.1rem !important; } } .input-wrapper { diff --git a/src/views/home/agent/components/versionTree/index.vue b/src/views/home/agent/components/versionTree/index.vue index 9276a0c..1bfa479 100644 --- a/src/views/home/agent/components/versionTree/index.vue +++ b/src/views/home/agent/components/versionTree/index.vue @@ -132,7 +132,7 @@ const {} = toRefs(data) :with-header="false" >
- Version Tree: Retro Sofa Sketch + Version Tree
@@ -219,7 +219,7 @@ const {} = toRefs(data) display: flex; align-items: center; justify-content: center; - border-radius: 8px; + border-radius: .8rem; border: 1.5px solid #D9D9D9; color: rgba(0, 0, 0, 0.6); > .versionExport{ diff --git a/src/views/home/agent/index.vue b/src/views/home/agent/index.vue index 7abaefc..910a793 100644 --- a/src/views/home/agent/index.vue +++ b/src/views/home/agent/index.vue @@ -31,7 +31,7 @@ const route = useRoute() const projectStore = useProjectStore() - const agentTitle = ref('Retro Sofa Sketch') + const agentTitle = ref('Conversation') const previewType = ref<'sketch' | 'report'>('sketch') const VersionTreeIndexRef = ref() const agentRef = ref() @@ -66,6 +66,9 @@ if (res) agentRef.value.setChatInfo(res) let data = res?.project || res if (data?.latestNodeId) data.nodeId = data.latestNodeId + if (data) { + agentTitle.value = data.name + } projectStore.setProject({ ...data }) diff --git a/src/views/home/components/Input.vue b/src/views/home/components/Input.vue index 1671223..c0c3d20 100644 --- a/src/views/home/components/Input.vue +++ b/src/views/home/components/Input.vue @@ -521,9 +521,9 @@ const settingPopupVisible = ref(false) const settingOptions = ref([ - { label: 'Input.settingOptions.creativity', value: 50 }, - { label: 'Input.settingOptions.diversity', value: 50 }, - { label: 'Input.settingOptions.relevance', value: 50 } + { label: 'Input.settingOptions.first', value: 50 }, + { label: 'Input.settingOptions.second', value: 50 }, + { label: 'Input.settingOptions.third', value: 50 } ]) const openStylePopup = () => { @@ -627,6 +627,9 @@ margin: 0 auto; padding: 0; position: relative; + .animate-container { + overflow-y: hidden; + } &:not(.agent) .animate-container { box-shadow: 0px 0.5rem 1.4rem 0px #0000001a; @@ -661,6 +664,16 @@ line-height: 1.5; white-space: pre-wrap; word-wrap: break-word; + &::-webkit-scrollbar { + width: 0; + display: none; + } + &::-webkit-scrollbar-thumb { + display: none; + } + &::-webkit-scrollbar-track { + display: none; + } // 占位符 &:empty::before { @@ -779,7 +792,7 @@ width: 13rem; color: #fff; border-radius: 4.2rem; - font-family: 'Mazzard'; + font-family: 'MSemiBold'; font-weight: 600; font-size: 1.28rem; cursor: pointer;