diff --git a/package.json b/package.json index 6fdca229b841011f2fd950283fb912dcf398376c..73b4d7db12028b6744dccaab9cdf39e09a572bed 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "codemirror": "^6.0.1", "dayjs": "1.11.9", "echarts": "^5.5.1", - "element-plus": "2.8.0", + "element-plus": "^2.8.3", "highlight.js": "11.10.0", "js-yaml": "^4.1.0", "marked": "4.3", diff --git a/src/assets/styles/main.scss b/src/assets/styles/main.scss index d570ceb1febc1291f3af9f1b2784a69a95fe71a2..30b5ed186e0b3915fc3ea5fc1fba8f2015905b1a 100644 --- a/src/assets/styles/main.scss +++ b/src/assets/styles/main.scss @@ -1,3 +1,8 @@ @import './codePreview.scss'; @import './message.scss'; @import './theme.scss'; + +// 全局重写tooltip样式 +.el-popper { + max-width: 376px !important; +} \ No newline at end of file diff --git a/src/assets/styles/theme.scss b/src/assets/styles/theme.scss index 16898472218b1853be6586a7c629447c051b5396..c4b4467e785c0952b5d6481905540574942e90b7 100644 --- a/src/assets/styles/theme.scss +++ b/src/assets/styles/theme.scss @@ -21,31 +21,21 @@ body[theme='dark'] { --flow-bg-color: #343a43; --o-bash-box-shadow: 0 4px 16px 0 rgba(255, 255, 255, 0.1); // 工作流开始节点结束背景渐变色 - --flow-startEnd-bg: linear-gradient( - rgba(132, 149, 253, 0.3), - rgba(104, 113, 129, 0.15), - rgba(52, 58, 67, 0) - ); - --flow-system-bg: linear-gradient( - rgba(113, 225, 229, 0.3), - rgba(97, 119, 121, 0.15), - rgba(52, 58, 67, 0) - ); - --flow-apos-apollo-bg: linear-gradient( - rgba(137, 212, 255, 0.3), - rgba(103, 111, 130, 0.15), - rgba(52, 58, 67, 0) - ); - --flow-euler-copilot-tune-bg: linear-gradient( - rgba(156, 237, 203, 0.3), - rgba(101, 125, 110, 0.15), - rgba(52, 58, 67, 0) - ); - --flow-other-node-bg: linear-gradient( - rgba(252, 154, 186, 0.3), - rgba(117, 99, 110, 0.15), - rgba(52, 58, 67, 0) - ); + --flow-startEnd-bg: linear-gradient(rgba(132, 149, 253, 0.3), + rgba(104, 113, 129, 0.15), + rgba(52, 58, 67, 0)); + --flow-system-bg: linear-gradient(rgba(113, 225, 229, 0.3), + rgba(97, 119, 121, 0.15), + rgba(52, 58, 67, 0)); + --flow-apos-apollo-bg: linear-gradient(rgba(137, 212, 255, 0.3), + rgba(103, 111, 130, 0.15), + rgba(52, 58, 67, 0)); + --flow-euler-copilot-tune-bg: linear-gradient(rgba(156, 237, 203, 0.3), + rgba(101, 125, 110, 0.15), + rgba(52, 58, 67, 0)); + --flow-other-node-bg: linear-gradient(rgba(252, 154, 186, 0.3), + rgba(117, 99, 110, 0.15), + rgba(52, 58, 67, 0)); --flow-node-default-over-color: #25303e; --flow-node-boder-default-over: #314265; --flow-node-success-over-color: #1f312a; @@ -57,21 +47,17 @@ body[theme='dark'] { --o-think-header-text: #e4e8ee; --el-drawer-bg-color: #000000; --el-bg-color: #1f2329; - --question-bg: linear-gradient( - 0deg, - rgb(47, 57, 66), - rgb(32, 35, 37) 33.232%, - rgb(41, 43, 55) 85.699% - ); + --question-bg: linear-gradient(0deg, + rgb(47, 57, 66), + rgb(32, 35, 37) 33.232%, + rgb(41, 43, 55) 85.699%); --el-collapse-header-bg: rgb(42, 47, 55); --el-collapse-border: rgb(62, 69, 81, 0.5); --el-collapse-content-bg: rgb(42, 47, 55, 0.5); --applist-hover: #313741; - --flow-running-bg: linear-gradient( - 127.95deg, - rgb(39, 39, 76) -1.967%, - rgba(28, 57, 81, 0.929) 98.202% - ); + --flow-running-bg: linear-gradient(127.95deg, + rgb(39, 39, 76) -1.967%, + rgba(28, 57, 81, 0.929) 98.202%); // 这里是不同种类的debug图标 --flow-debug-default: url('../../assets/svgs/dark_debug.svg'); --flow-debug-hover: url('../../assets/svgs/dark_debug_hover.svg'); @@ -106,31 +92,21 @@ body[theme='light'] { --flow-bg-color: #fdfeff; --o-bash-box-shadow: 0 4px 16px 0 rgba(0, 0, 0, 0.1); // 工作流开始节点结束背景渐变色 - --flow-startEnd-bg: linear-gradient( - rgba(133, 148, 253, 0.3), - rgba(210, 231, 252, 0.15), - rgba(255, 255, 255, 0) - ); - --flow-system-bg: linear-gradient( - rgba(156, 237, 203, 0.3), - rgba(240, 253, 244, 0.15), - rgba(255, 255, 255, 0) - ); - --flow-apos-apollo-bg: linear-gradient( - rgba(137, 212, 255, 0.3), - rgba(230, 237, 255, 0.15), - rgba(255, 255, 255, 0) - ); - --flow-euler-copilot-tune-bg: linear-gradient( - rgba(156, 237, 203, 0.3), - rgba(240, 253, 248, 0.15), - rgba(255, 255, 255, 0) - ); - --flow-other-node-bg: linear-gradient( - rgba(252, 154, 186, 0.3), - rgba(253, 240, 248, 0.15), - rgba(255, 255, 255, 0) - ); + --flow-startEnd-bg: linear-gradient(rgba(133, 148, 253, 0.3), + rgba(210, 231, 252, 0.15), + rgba(255, 255, 255, 0)); + --flow-system-bg: linear-gradient(rgba(156, 237, 203, 0.3), + rgba(240, 253, 244, 0.15), + rgba(255, 255, 255, 0)); + --flow-apos-apollo-bg: linear-gradient(rgba(137, 212, 255, 0.3), + rgba(230, 237, 255, 0.15), + rgba(255, 255, 255, 0)); + --flow-euler-copilot-tune-bg: linear-gradient(rgba(156, 237, 203, 0.3), + rgba(240, 253, 248, 0.15), + rgba(255, 255, 255, 0)); + --flow-other-node-bg: linear-gradient(rgba(252, 154, 186, 0.3), + rgba(253, 240, 248, 0.15), + rgba(255, 255, 255, 0)); --flow-node-boder-default-over: #c7d6f5; --flow-node-success-over-color: #e6f6e9; --flow-node-error-over-color: #f8e7e7; @@ -142,19 +118,12 @@ body[theme='light'] { --el-collapse-header-bg: rgb(244, 246, 250); --el-collapse-border: rgb(223, 229, 239); --el-collapse-content-bg: rgb(244, 246, 250, 0.5); - --question-bg: linear-gradient( - 270deg, - rgb(227, 242, 255), - rgb(195, 227, 255) 33.232%, - rgb(197, 203, 249) 85.699% - ); + --question-bg: linear-gradient(177.93deg, rgba(255, 255, 255, 0) -40.031%, rgba(255, 255, 255, 0.35) 1.263%, rgba(255, 255, 255)36.178%), linear-gradient(270deg, rgb(227, 242, 255, 0.5), rgb(195, 227, 255, 0.5) 33.232%, rgb(197, 203, 249, 0.5) 85.699%); --question-shadow: rgba(221, 225, 240, 0.5); --applist-hover: #f3f4f6; - --flow-running-bg: linear-gradient( - 127.95deg, - rgba(109, 117, 250, 0.2) -1.967%, - rgba(90, 179, 255, 0.2) 98.202% - ); + --flow-running-bg: linear-gradient(127.95deg, + rgba(109, 117, 250, 0.2) -1.967%, + rgba(90, 179, 255, 0.2) 98.202%); // 这里是不同种类的debug图标 --flow-debug-default: url('../../assets/svgs/light_debug.svg'); --flow-debug-hover: url('../../assets/svgs/light_debug_hover.svg'); @@ -167,13 +136,15 @@ body[theme='light'] { } body { + // 这里替换下拉框的选中颜色,无论亮暗都是一致 .el-select-dropdown__item.is-selected { background-color: #6395fd !important; font-weight: normal !important; } + // 悬浮优先级高于选中 .el-select-dropdown__item:hover { background-color: #7aa5ff !important; } -} +} \ No newline at end of file diff --git a/src/assets/svgs/against_active.svg b/src/assets/svgs/against_active.svg index 585e786f83a40ae67fa6e57dd4be488bc12f45dd..db629ff0870d5c52d9a38a9b0c9db4d405e73eac 100644 --- a/src/assets/svgs/against_active.svg +++ b/src/assets/svgs/against_active.svg @@ -5,11 +5,5 @@ - - - - - - - + diff --git a/src/assets/svgs/dark_against.svg b/src/assets/svgs/dark_against.svg index 26f7835ef840d68d5f40c8334b57558189a0f47b..2518b9f01148193a8fd8487a6b5a165eb877085b 100644 --- a/src/assets/svgs/dark_against.svg +++ b/src/assets/svgs/dark_against.svg @@ -5,10 +5,10 @@ - - - + + + - + diff --git a/src/assets/svgs/dark_copy.svg b/src/assets/svgs/dark_copy.svg index d125b6a9e9a0a0a545129ff9ad365e7fab8ff6a1..6094fe8a311f71a9db82bbf212576a6bf0b7c6c7 100644 --- a/src/assets/svgs/dark_copy.svg +++ b/src/assets/svgs/dark_copy.svg @@ -3,9 +3,9 @@ Created with Pixso. - + - + diff --git a/src/assets/svgs/dark_support.svg b/src/assets/svgs/dark_support.svg index c4a96c4bc7357e598cef2f5abce811f29cbabefe..5d83eab48ffe357320fe7004900f8e7cc78237dd 100644 --- a/src/assets/svgs/dark_support.svg +++ b/src/assets/svgs/dark_support.svg @@ -3,9 +3,9 @@ Created with Pixso. - + - + diff --git a/src/assets/svgs/light_against.svg b/src/assets/svgs/light_against.svg index 1f257ac8e47d215b85022c8d96d6c20cec24c050..d16f1b34a1b13b8abe46b2773027ce1b9666ec85 100644 --- a/src/assets/svgs/light_against.svg +++ b/src/assets/svgs/light_against.svg @@ -5,10 +5,10 @@ - - - + + + - + diff --git a/src/assets/svgs/light_copy.svg b/src/assets/svgs/light_copy.svg index 41a377ccc9d43f20f0f2298e47766cf16081cac9..dc8a520b8b58d087523148609bf33cdb4086004c 100644 --- a/src/assets/svgs/light_copy.svg +++ b/src/assets/svgs/light_copy.svg @@ -3,9 +3,9 @@ Created with Pixso. - + - + diff --git a/src/assets/svgs/light_support.svg b/src/assets/svgs/light_support.svg index 38780af188add51af38b616636aaba4b6b243608..aca4cda1fe17577bbd1b4e04897ccfe91b323e3f 100644 --- a/src/assets/svgs/light_support.svg +++ b/src/assets/svgs/light_support.svg @@ -3,9 +3,9 @@ Created with Pixso. - + - + diff --git a/src/assets/svgs/support_active.svg b/src/assets/svgs/support_active.svg index d7d13d7e7f58b1b844e521d27e9953b783fe0120..581e2f4f001118d863cc6b3f29efe51746c175ae 100644 --- a/src/assets/svgs/support_active.svg +++ b/src/assets/svgs/support_active.svg @@ -3,11 +3,9 @@ Created with Pixso. - - - + + - - - + + diff --git a/src/components/dialoguePanel/DialoguePanel.vue b/src/components/dialoguePanel/DialoguePanel.vue index 8b2cc4fec03d2d78fe99dcea47ac53f574584bcd..9969fc15beda7dde800e5fc1b091aaa53fe4dc17 100644 --- a/src/components/dialoguePanel/DialoguePanel.vue +++ b/src/components/dialoguePanel/DialoguePanel.vue @@ -433,7 +433,6 @@ const searchAppName = (appId) => { } return ''; }; - { {{ Number(props.metadata?.timeCost).toFixed(2) }} {{ currentSelected! + 1 }} {{ `/${content?.length}` }} @@ -621,42 +620,41 @@ const searchAppName = (appId) => { effect="light" ref="tooltip" > - - - - - - - - + + + + - - + + + { effect="light" ref="tooltip" > - - - - - - - + + - - + + + + @@ -869,7 +866,7 @@ const searchAppName = (appId) => { .against-button { height: 16px; width: auto; - margin-left: 16px; + margin-left: 12px; color: var(--o-text-color-secondary); svg { @@ -1100,7 +1097,7 @@ const searchAppName = (appId) => { margin-right: 8px; border-radius: 4px; font-size: 12px; - line-height: 18px; + line-height: 16px; color: var(--o-text-color-tertiary) !important; letter-spacing: 0px; } @@ -1114,6 +1111,12 @@ const searchAppName = (appId) => { margin: 0; cursor: pointer; } + .ml-8 { + margin-left: 8px; + } + .mr-8 { + margin-right: 8px; + } .pagenation-cur { font-size: 12px; @@ -1157,13 +1160,14 @@ const searchAppName = (appId) => { font-size: 12px; .button-icon { - width: 20px; - height: 20px; + width: 24px; + height: 24px; + margin-left: 4px; } .copy { - width: 20px; - height: 20px; + width: 24px; + height: 24px; } .copy:hover { @@ -1183,10 +1187,6 @@ const searchAppName = (appId) => { width: 16px; height: 16px; } - - .simg { - margin-left: 16px; - } } } } diff --git a/src/components/sessionCard/SessionCard.vue b/src/components/sessionCard/SessionCard.vue index eef5d41372f09086b9875aee6b5cc8b48f0ea73f..388fbf590fe9f8d1882a432ccdf1d1fbe1fafef0 100644 --- a/src/components/sessionCard/SessionCard.vue +++ b/src/components/sessionCard/SessionCard.vue @@ -268,6 +268,9 @@ const deleteOne = (name: string, list: string[]) => { .conversation-card { width: calc(100% - 18px); + &:last-child .conversation-card-item { + margin-bottom: 0px; + } &-item { margin-bottom: 8px; display: flex; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index bf3ed148208d868263c3961169471c8650dbec6d..d34d87a42da281e943203fc9d01c35952ddb015d 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -113,7 +113,8 @@ export default { delete_content1: 'This chat', delete_content2: 'will be deleted.', ok: 'OK', - chat_history_limit: 'You can view up to 200 of your most recent chats.', + chat_history_limit1: 'You can view up to', + chat_history_limit2: 'of your most recent chats.', time_filter_today: 'Today', time_filter_last_7_days: 'Last 7 days', time_filter_last_30_days: 'Last 30 days', diff --git a/src/i18n/lang/zh-cn.ts b/src/i18n/lang/zh-cn.ts index 19671c8233a97385ea45322df8192b9e03b666a8..59edb44ef8995f8ad02efd001f8677abb82a8a6d 100644 --- a/src/i18n/lang/zh-cn.ts +++ b/src/i18n/lang/zh-cn.ts @@ -115,7 +115,8 @@ export default { delete_content1: '确定删除', delete_content2: '吗?', ok: '确定', - chat_history_limit: '仅展示最近200条对话', + chat_history_limit1: '仅展示最近', + chat_history_limit2: '条对话', time_filter_today: '今天', time_filter_last_7_days: '最近7天', time_filter_last_30_days: '最近30天', diff --git a/src/views/dialogue/components/DialogueAside.vue b/src/views/dialogue/components/DialogueAside.vue index ee47544d2daf1ca1f3c2bc14f4beffd6790897c1..5eb8e93cf738bb63229b7f94c6a02b3044d79a90 100644 --- a/src/views/dialogue/components/DialogueAside.vue +++ b/src/views/dialogue/components/DialogueAside.vue @@ -1,4 +1,5 @@