diff --git a/src/assets/styles/base/index.scss b/src/assets/styles/base/index.scss index 4dbcb7afe3ce35a3ced158ec0bd07915a5ecbf1c..795e3f627bbf9797f5040b7afc586efd5604ab78 100644 --- a/src/assets/styles/base/index.scss +++ b/src/assets/styles/base/index.scss @@ -26,4 +26,23 @@ div{ // 全局 div 默认光标 cursor: default !important; +} +textarea::-webkit-input-placeholder { + color: var(--o-think-header-text); + font-size: 14px; +} +input::-moz-placeholder, +textarea::-moz-placeholder { /* Mozilla Firefox 19+ */ + color: var(--o-think-header-text); + font-size: 14px; +} +input:-moz-placeholder, +textarea:-moz-placeholder { /* Mozilla Firefox 4 to 18 */ + color: var(--o-think-header-text); + font-size: 14px; +} +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { /* Internet Explorer 10-11 */ + color: var(--o-think-header-text); + font-size: 14px; } \ No newline at end of file diff --git a/src/assets/styles/variables/theme.scss b/src/assets/styles/variables/theme.scss index 472438eee345aebfa7b32a48a479dc4712fdfa3d..e760f795345c8762bb8bc1bce4724fd4d35cfc05 100644 --- a/src/assets/styles/variables/theme.scss +++ b/src/assets/styles/variables/theme.scss @@ -4,7 +4,7 @@ body[theme='dark'] { rgba(109, 117, 250, 0.5), rgba(90, 179, 255, 0.5) ); - --o-text-disable: #626D7C; + --o-text-disable: #626d7c; --o-main-bg-color: #131415; --o-bg-image: url('../../assets/svgs/dark_background.svg'); --no-work-flow: url('../../assets/images/dark_no_flow.png'); @@ -94,16 +94,16 @@ body[theme='dark'] { } body[theme='light'] { - --o-text-disable: #BFC7D7; + --o-text-disable: #bfc7d7; --o-checkbox-bg-color_checked: #6395fd !important; --o-func-base-primary: 99, 149, 253; --o-checkbox-bg-color_checked: #6395fd !important; --o-checkbox-border-color_checked: #6395fd !important; - --o-content-bg:linear-gradient( - to right, - rgba(109, 117, 250, 0.2), - rgba(90, 179, 255, 0.2) - ); + --o-content-bg: linear-gradient( + to right, + rgba(109, 117, 250, 0.2), + rgba(90, 179, 255, 0.2) + ); --o-main-bg-color: #f1f8ff; --o-bg-image: url('../../assets/svgs/light_background.webp'); --no-work-flow: url('../../assets/images/light_no_flow.png'); @@ -212,8 +212,28 @@ body { } --o-border-radius-small: 4px; - .el-popper[role=tooltip].is-light .el-popper__arrow::before { + .el-popper[role='tooltip'].is-light .el-popper__arrow::before { background: var(--o-bg-color-base); border: 1px solid var(--o-tooltip-border-color); -} + + .el-popper { + background: var(--o-bg-color-base) !important; + .el-popper__arrow { + background: var(--o-bg-color-base) !important; + border-right-color: var(--o-bg-color-base) !important; + } + } + } + .el-popper[role='tooltip'].is-dark .el-popper__arrow::before { + background: var(--o-bg-color-base); + border: 1px solid var(--o-tooltip-border-color); + + .el-popper { + background: var(--o-bg-color-base) !important; + .el-popper__arrow { + background: var(--o-bg-color-base) !important; + border-right-color: var(--o-bg-color-base) !important; + } + } + } } diff --git a/src/components/commonFooter/CommonFooter.vue b/src/components/commonFooter/CommonFooter.vue index d1b9946d534f796b9e1afab6d41a0b8c37c19d6f..527eb53a372eb681a3b5da62bb6f11eab9ead125 100644 --- a/src/components/commonFooter/CommonFooter.vue +++ b/src/components/commonFooter/CommonFooter.vue @@ -12,9 +12,10 @@ const policy = ref(''); * 读取协议 */ const readAgreement = async () => { - const language = localStorage.getItem('localeLang'); + const localLang = localStorage.getItem('copilot_language'); + const locale = (localLang && JSON.parse(localLang).language) || 'zh_cn'; const response = - language === 'en' + locale === 'en' ? await import('src/conf/agreement-en.md?raw') : await import('src/conf/agreement.md?raw'); agreement.value = marked.parse(response.default) as string; @@ -22,9 +23,10 @@ const readAgreement = async () => { }; const readPolicy = async () => { - const language = localStorage.getItem('localeLang'); + const localLang = localStorage.getItem('copilot_language'); + const locale = (localLang && JSON.parse(localLang).language) || 'zh_cn'; const response = - language === 'en' + locale === 'en' ? await import('src/conf/policy-en.md?raw') : await import('src/conf/policy.md?raw'); policy.value = marked.parse(response.default) as string; diff --git a/src/components/dialoguePanel/DialoguePanel.scss b/src/components/dialoguePanel/DialoguePanel.scss index 5b2e1a13fefce13c5ae3a9bd7e747ddb7d646549..2ff42f9a88c857a1a57c70344f0945cf3ab9e13d 100644 --- a/src/components/dialoguePanel/DialoguePanel.scss +++ b/src/components/dialoguePanel/DialoguePanel.scss @@ -557,7 +557,7 @@ border: 24px; } .dialogue-panel__user-time { - margin-top: 16px; + margin-top: 24px; height: 20px; line-height: 20px; } @@ -573,7 +573,7 @@ border: 24px; } .dialogue-panel__user-time { - margin-top: 16px; + margin-top: 24px; height: 20px; line-height: 20px; } diff --git a/src/components/dialoguePanel/DialoguePanel.vue b/src/components/dialoguePanel/DialoguePanel.vue index f98b716f8062ee438effd5f83d20127b13cc8078..0d9e83a8a9d71faed0a1b222c8a73737d9f9f405 100644 --- a/src/components/dialoguePanel/DialoguePanel.vue +++ b/src/components/dialoguePanel/DialoguePanel.vue @@ -7,7 +7,6 @@ import { useSessionStore, useChangeThemeStore, echartsObj } from '@/store'; import { useHistorySessionStore } from 'src/store'; import AgainstPopover from 'src/views/dialogue/components/AgainstPopover.vue'; import dayjs from 'dayjs'; -import './DialoguePanel.scss' import xss from 'xss'; import { errorMsg, successMsg } from 'src/components/Message'; import ReportPopover from 'src/views/dialogue/components/ReportPopover.vue'; @@ -484,11 +483,11 @@ const selectQuestion = (item: Suggestion) => { const popperSize = () => { if (language.value == 'en') { - size.width = 418; + size.width = 420; size.height = 496; return size; } else { - size.width = 328; + size.width = 330; size.height = 416; return size } @@ -787,3 +786,6 @@ const chatWithParams = async () => { + diff --git a/src/views/createapp/components/CustomControl.vue b/src/views/createapp/components/CustomControl.vue index 1c213759b1d2154835d3fa04d786951134882cf5..06fd8ba0e929d8472b80a4c6f2d811fc4c17a01a 100644 --- a/src/views/createapp/components/CustomControl.vue +++ b/src/views/createapp/components/CustomControl.vue @@ -199,6 +199,6 @@ watch( outline: unset !important; } .controlScaleNumber{ - font-size: 16px; + font-size: 12px; } diff --git a/src/views/createapp/components/workFlow.vue b/src/views/createapp/components/workFlow.vue index d65f1dfcf81d08d2aa207045dd6acf030645559b..dff72018c11bdd82cd6563af454b1d19c1332f72 100644 --- a/src/views/createapp/components/workFlow.vue +++ b/src/views/createapp/components/workFlow.vue @@ -3,7 +3,7 @@ import '../../styles/workFlowArrange.scss'; import { onMounted, ref, watch, onUnmounted } from 'vue'; import { IconSuccess, IconError } from '@computing/opendesign-icons'; import { useI18n } from 'vue-i18n'; -import { ElTooltip, ElMessage } from 'element-plus'; +import { ElMessage } from 'element-plus'; import { VueFlow, useVueFlow } from '@vue-flow/core'; import { Background } from '@vue-flow/background'; import { MiniMap } from '@vue-flow/minimap'; @@ -716,7 +716,7 @@ defineExpose({