Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: conversation time support hide #185

Merged
merged 1 commit into from
Apr 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/assets/css/code.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@

pre[class*='language-'],code[class*='language-']{text-align: left;white-space: pre;word-spacing: normal;word-break: normal;tab-size: 2;hyphens: none;color: #e5c07b;background: #272b33;text-shadow: 0 1px rgba(0, 0, 0, 0.3);line-height: 1.5;direction: ltr}code[class*='language-'] ::-moz-selection,code[class*='language-']::-moz-selection,pre[class*='language-'] ::-moz-selection{color: inherit;background: #3e4450;text-shadow: none}code[class*='language-'] ::selection,code[class*='language-']::selection,pre[class*='language-'] ::selection{color: inherit;background: #3e4450;text-shadow: none}pre[class*='language-']{overflow: auto;margin: 0.5em 0;padding: 1em;border-radius: 0.3em}:not(pre) > code[class*='language-']{padding: 0.2em 0.3em;white-space: normal;border-radius: 0.3em}@media print{code[class*='language-'],pre[class*='language-']{text-shadow: none}}.token.cdata,.token.comment,.token.prolog{color: #5b6270}.token.doctype,.token.entity,.token.punctuation{color: #aab1bf}.token.atrule,.token.attr-name,.token.boolean,.token.class-name,.token.constant,.token.number{color: #d19965}.token.keyword{color: #c578dd}.token.deleted,.token.important,.token.property,.token.symbol,.token.tag{color: #df6b75}.token.attr-value,.token.attr-value > .token.punctuation,.token.builtin,.token.char,.token.inserted,.token.regex,.token.selector,.token.string{color: #97c279}.token.function,.token.operator,.token.variable{color: #61afef}.token.url{color: #56b5c2}.token.attr-value > .token.punctuation.attr-equals,.token.special-attr > .token.attr-value > .token.value.css{color: #aab1bf}.language-css .token.selector{color: #df6b75}.language-css .token.property{color: #aab1bf}.language-css .token.function,.language-css .token.url > .token.function{color: #56b5c2}.language-css .token.url > .token.string.url{color: #97c279}.language-css .token.atrule .token.rule,.language-css .token.important{color: #c578dd}.language-javascript .token.operator{color: #c578dd}.language-javascript.token.template-string> .token.interpolation> .token.interpolation-punctuation.punctuation{color: #be5046}.language-json .token.operator{color: #aab1bf}.language-json .token.null.keyword{color: #d19965}.language-markdown .token.url,.language-markdown .token.url-reference.url > .token.string,.language-markdown .token.url > .token.operator{color: #aab1bf}.language-markdown .token.url > .token.content{color: #61afef}.language-markdown .token.url-reference.url,.language-markdown .token.url > .token.url{color: #56b5c2}.language-markdown .token.blockquote.punctuation,.language-markdown .token.hr.punctuation{color: #5b6270;font-style: italic}.language-markdown .token.code-snippet{color: #97c279}.language-markdown .token.bold .token.content{color: #d19965}.language-markdown .token.italic .token.content{color: #c578dd}.language-markdown .token.list.punctuation,.language-markdown .token.strike .token.content,.language-markdown .token.strike .token.punctuation,.language-markdown .token.title.important > .token.punctuation{color: #df6b75}.token.bold{font-weight: 700}.token.comment,.token.italic{font-style: italic}.token.entity{cursor: help}.token.namespace{opacity: 0.8}.token.token.cr:before,.token.token.lf:before,.token.token.space:before,.token.token.tab:not(:empty):before{color: hsla(220, 14%, 71%, 0.15);text-shadow: none}div.code-toolbar > .toolbar.toolbar > .toolbar-item{margin-right: 0.4em}div.code-toolbar > .toolbar.toolbar > .toolbar-item > a,div.code-toolbar > .toolbar.toolbar > .toolbar-item > button,div.code-toolbar > .toolbar.toolbar > .toolbar-item > span{padding: 0.1em 0.4em;color: #818896;border-radius: 0.3em;background: #393f4a}div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:focus,div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:hover,div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:focus,div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:hover,div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:focus,div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:hover{color: #aab1bf;background: #3e4450}.line-highlight.line-highlight{background: hsla(220, 100%, 80%, 0.04)}.line-highlight.line-highlight:before,.line-highlight.line-highlight[data-end]:after{padding: 0.1em 0.6em;color: #aab1bf;border-radius: 0.3em;background: #393f4a;box-shadow: 0 2px 0 0 rgba(0, 0, 0, 0.2)}pre[id].linkable-line-numbers.linkable-line-numbersspan.line-numbers-rows> span:hover:before{background-color: hsla(220, 100%, 80%, 0.04)}.command-line .command-line-prompt,.line-numbers.line-numbers .line-numbers-rows{border-right-color: hsla(220, 14%, 71%, 0.15)}.command-line .command-line-prompt > span:before,.line-numbers .line-numbers-rows > span:before{color: #626d82}.rainbow-braces .token.token.punctuation.brace-level-1,.rainbow-braces .token.token.punctuation.brace-level-5,.rainbow-braces .token.token.punctuation.brace-level-9{color: #df6b75}.rainbow-braces .token.token.punctuation.brace-level-10,.rainbow-braces .token.token.punctuation.brace-level-2,.rainbow-braces .token.token.punctuation.brace-level-6{color: #97c279}.rainbow-braces .token.token.punctuation.brace-level-11,.rainbow-braces .token.token.punctuation.brace-level-3,.rainbow-braces .token.token.punctuation.brace-level-7{color: #61afef}.rainbow-braces .token.token.punctuation.brace-level-12,.rainbow-braces .token.token.punctuation.brace-level-4,.rainbow-braces .token.token.punctuation.brace-level-8{color: #c578dd}pre.diff-highlight > code .token.token.deleted:not(.prefix),pre > code.diff-highlight .token.token.deleted:not(.prefix){background-color: hsla(353, 100%, 66%, 0.15)}pre.diff-highlight > code .token.token.deleted:not(.prefix) ::-moz-selection,pre.diff-highlight > code .token.token.deleted:not(.prefix)::-moz-selection,pre > code.diff-highlight .token.token.deleted:not(.prefix) ::-moz-selection,pre > code.diff-highlight .token.token.deleted:not(.prefix)::-moz-selection{background-color: hsla(353, 95%, 66%, 0.25)}pre.diff-highlight > code .token.token.deleted:not(.prefix) ::selection,pre.diff-highlight > code .token.token.deleted:not(.prefix)::selection,pre > code.diff-highlight .token.token.deleted:not(.prefix) ::selection,pre > code.diff-highlight .token.token.deleted:not(.prefix)::selection{background-color: hsla(353, 95%, 66%, 0.25)}pre.diff-highlight > code .token.token.inserted:not(.prefix),pre > code.diff-highlight .token.token.inserted:not(.prefix){background-color: hsla(137, 100%, 55%, 0.15)}pre.diff-highlight > code .token.token.inserted:not(.prefix) ::-moz-selection,pre.diff-highlight > code .token.token.inserted:not(.prefix)::-moz-selection,pre > code.diff-highlight .token.token.inserted:not(.prefix) ::-moz-selection,pre > code.diff-highlight .token.token.inserted:not(.prefix)::-moz-selection{background-color: hsla(135, 73%, 55%, 0.25)}pre.diff-highlight > code .token.token.inserted:not(.prefix) ::selection,pre.diff-highlight > code .token.token.inserted:not(.prefix)::selection,pre > code.diff-highlight .token.token.inserted:not(.prefix) ::selection,pre > code.diff-highlight .token.token.inserted:not(.prefix)::selection{background-color: hsla(135, 73%, 55%, 0.25)}.prism-previewer-gradient.prism-previewer-gradient div,.prism-previewer.prism-previewer:before{border-color: #252830}.prism-previewer-color.prism-previewer-color:before,.prism-previewer-easing.prism-previewer-easing:before,.prism-previewer-gradient.prism-previewer-gradient div{border-radius: 0.3em}.prism-previewer.prism-previewer:after{border-top-color: #252830}.prism-previewer-flipped.prism-previewer-flipped.after{border-bottom-color: #252830}.prism-previewer-angle.prism-previewer-angle:before,.prism-previewer-easing.prism-previewer-easing,.prism-previewer-time.prism-previewer-time:before{background: #30353f}.prism-previewer-angle.prism-previewer-angle circle,.prism-previewer-time.prism-previewer-time circle{stroke: #aab1bf;stroke-opacity: 1}.prism-previewer-easing.prism-previewer-easing circle,.prism-previewer-easing.prism-previewer-easing line,.prism-previewer-easing.prism-previewer-easing path{stroke: #aab1bf}.prism-previewer-easing.prism-previewer-easing circle{fill: transparent}
pre[class*='language-'],code[class*='language-']{text-align: left;white-space: pre;word-spacing: normal;word-break: normal;tab-size: 2;hyphens: none;color: #e5c07b;background: #272b33;text-shadow: 0 1px rgba(0, 0, 0, 0.3);line-height: 1.5;direction: ltr}code[class*='language-'] ::-moz-selection,code[class*='language-']::-moz-selection,pre[class*='language-'] ::-moz-selection{color: inherit;background: #b4d0f6;text-shadow: none}code[class*='language-'] ::selection,code[class*='language-']::selection,pre[class*='language-'] ::selection{color: inherit;background: #b4d0f6;text-shadow: none}pre[class*='language-']{overflow: auto;margin: 0.5em 0;padding: 1em;border-radius: 0.3em}:not(pre) > code[class*='language-']{padding: 0.2em 0.3em;white-space: normal;border-radius: 0.3em}@media print{code[class*='language-'],pre[class*='language-']{text-shadow: none}}.token.cdata,.token.comment,.token.prolog{color: #5b6270}.token.doctype,.token.entity,.token.punctuation{color: #aab1bf}.token.atrule,.token.attr-name,.token.boolean,.token.class-name,.token.constant,.token.number{color: #d19965}.token.keyword{color: #c578dd}.token.deleted,.token.important,.token.property,.token.symbol,.token.tag{color: #df6b75}.token.attr-value,.token.attr-value > .token.punctuation,.token.builtin,.token.char,.token.inserted,.token.regex,.token.selector,.token.string{color: #97c279}.token.function,.token.operator,.token.variable{color: #61afef}.token.url{color: #56b5c2}.token.attr-value > .token.punctuation.attr-equals,.token.special-attr > .token.attr-value > .token.value.css{color: #aab1bf}.language-css .token.selector{color: #df6b75}.language-css .token.property{color: #aab1bf}.language-css .token.function,.language-css .token.url > .token.function{color: #56b5c2}.language-css .token.url > .token.string.url{color: #97c279}.language-css .token.atrule .token.rule,.language-css .token.important{color: #c578dd}.language-javascript .token.operator{color: #c578dd}.language-javascript.token.template-string> .token.interpolation> .token.interpolation-punctuation.punctuation{color: #be5046}.language-json .token.operator{color: #aab1bf}.language-json .token.null.keyword{color: #d19965}.language-markdown .token.url,.language-markdown .token.url-reference.url > .token.string,.language-markdown .token.url > .token.operator{color: #aab1bf}.language-markdown .token.url > .token.content{color: #61afef}.language-markdown .token.url-reference.url,.language-markdown .token.url > .token.url{color: #56b5c2}.language-markdown .token.blockquote.punctuation,.language-markdown .token.hr.punctuation{color: #5b6270;font-style: italic}.language-markdown .token.code-snippet{color: #97c279}.language-markdown .token.bold .token.content{color: #d19965}.language-markdown .token.italic .token.content{color: #c578dd}.language-markdown .token.list.punctuation,.language-markdown .token.strike .token.content,.language-markdown .token.strike .token.punctuation,.language-markdown .token.title.important > .token.punctuation{color: #df6b75}.token.bold{font-weight: 700}.token.comment,.token.italic{font-style: italic}.token.entity{cursor: help}.token.namespace{opacity: 0.8}.token.token.cr:before,.token.token.lf:before,.token.token.space:before,.token.token.tab:not(:empty):before{color: hsla(220, 14%, 71%, 0.15);text-shadow: none}div.code-toolbar > .toolbar.toolbar > .toolbar-item{margin-right: 0.4em}div.code-toolbar > .toolbar.toolbar > .toolbar-item > a,div.code-toolbar > .toolbar.toolbar > .toolbar-item > button,div.code-toolbar > .toolbar.toolbar > .toolbar-item > span{padding: 0.1em 0.4em;color: #818896;border-radius: 0.3em;background: #393f4a}div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:focus,div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:hover,div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:focus,div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:hover,div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:focus,div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:hover{color: #aab1bf;background: #3e4450}.line-highlight.line-highlight{background: hsla(220, 100%, 80%, 0.04)}.line-highlight.line-highlight:before,.line-highlight.line-highlight[data-end]:after{padding: 0.1em 0.6em;color: #aab1bf;border-radius: 0.3em;background: #393f4a;box-shadow: 0 2px 0 0 rgba(0, 0, 0, 0.2)}pre[id].linkable-line-numbers.linkable-line-numbersspan.line-numbers-rows> span:hover:before{background-color: hsla(220, 100%, 80%, 0.04)}.command-line .command-line-prompt,.line-numbers.line-numbers .line-numbers-rows{border-right-color: hsla(220, 14%, 71%, 0.15)}.command-line .command-line-prompt > span:before,.line-numbers .line-numbers-rows > span:before{color: #626d82}.rainbow-braces .token.token.punctuation.brace-level-1,.rainbow-braces .token.token.punctuation.brace-level-5,.rainbow-braces .token.token.punctuation.brace-level-9{color: #df6b75}.rainbow-braces .token.token.punctuation.brace-level-10,.rainbow-braces .token.token.punctuation.brace-level-2,.rainbow-braces .token.token.punctuation.brace-level-6{color: #97c279}.rainbow-braces .token.token.punctuation.brace-level-11,.rainbow-braces .token.token.punctuation.brace-level-3,.rainbow-braces .token.token.punctuation.brace-level-7{color: #61afef}.rainbow-braces .token.token.punctuation.brace-level-12,.rainbow-braces .token.token.punctuation.brace-level-4,.rainbow-braces .token.token.punctuation.brace-level-8{color: #c578dd}pre.diff-highlight > code .token.token.deleted:not(.prefix),pre > code.diff-highlight .token.token.deleted:not(.prefix){background-color: hsla(353, 100%, 66%, 0.15)}pre.diff-highlight > code .token.token.deleted:not(.prefix) ::-moz-selection,pre.diff-highlight > code .token.token.deleted:not(.prefix)::-moz-selection,pre > code.diff-highlight .token.token.deleted:not(.prefix) ::-moz-selection,pre > code.diff-highlight .token.token.deleted:not(.prefix)::-moz-selection{background-color: hsla(353, 95%, 66%, 0.25)}pre.diff-highlight > code .token.token.deleted:not(.prefix) ::selection,pre.diff-highlight > code .token.token.deleted:not(.prefix)::selection,pre > code.diff-highlight .token.token.deleted:not(.prefix) ::selection,pre > code.diff-highlight .token.token.deleted:not(.prefix)::selection{background-color: hsla(353, 95%, 66%, 0.25)}pre.diff-highlight > code .token.token.inserted:not(.prefix),pre > code.diff-highlight .token.token.inserted:not(.prefix){background-color: hsla(137, 100%, 55%, 0.15)}pre.diff-highlight > code .token.token.inserted:not(.prefix) ::-moz-selection,pre.diff-highlight > code .token.token.inserted:not(.prefix)::-moz-selection,pre > code.diff-highlight .token.token.inserted:not(.prefix) ::-moz-selection,pre > code.diff-highlight .token.token.inserted:not(.prefix)::-moz-selection{background-color: hsla(135, 73%, 55%, 0.25)}pre.diff-highlight > code .token.token.inserted:not(.prefix) ::selection,pre.diff-highlight > code .token.token.inserted:not(.prefix)::selection,pre > code.diff-highlight .token.token.inserted:not(.prefix) ::selection,pre > code.diff-highlight .token.token.inserted:not(.prefix)::selection{background-color: hsla(135, 73%, 55%, 0.25)}.prism-previewer-gradient.prism-previewer-gradient div,.prism-previewer.prism-previewer:before{border-color: #252830}.prism-previewer-color.prism-previewer-color:before,.prism-previewer-easing.prism-previewer-easing:before,.prism-previewer-gradient.prism-previewer-gradient div{border-radius: 0.3em}.prism-previewer.prism-previewer:after{border-top-color: #252830}.prism-previewer-flipped.prism-previewer-flipped.after{border-bottom-color: #252830}.prism-previewer-angle.prism-previewer-angle:before,.prism-previewer-easing.prism-previewer-easing,.prism-previewer-time.prism-previewer-time:before{background: #30353f}.prism-previewer-angle.prism-previewer-angle circle,.prism-previewer-time.prism-previewer-time circle{stroke: #aab1bf;stroke-opacity: 1}.prism-previewer-easing.prism-previewer-easing circle,.prism-previewer-easing.prism-previewer-easing line,.prism-previewer-easing.prism-previewer-easing path{stroke: #aab1bf}.prism-previewer-easing.prism-previewer-easing circle{fill: transparent}
3 changes: 2 additions & 1 deletion src/components/Session/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { listen } from '@tauri-apps/api/event'

const { sessionDataList, currentSession } = storeToRefs(useSessionStore())
const { showTime } = storeToRefs(useSettingsStore())

const sessionElement = ref<HTMLDivElement | null>(null)
const isAutoScroll = ref(true)
Expand Down Expand Up @@ -74,7 +75,7 @@ watch([currentSession, sessionDataList], () => {
class="relative flex w-[calc(100%-8rem)] flex-col gap-2"
:class="item.is_ask && 'items-end'"
>
<span class="text-xs text-[var(--color-text-2)]">
<span class="text-xs text-[var(--color-text-2)]" v-if="showTime">
{{ getLocalTime(item.time!) }}
</span>

Expand Down
14 changes: 11 additions & 3 deletions src/components/Settings/components/General.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
const settingsStore = useSettingsStore()
const { toggleTheme } = settingsStore
const { themeMode, autoStart, isRememberPosition, proxy } =
const { themeMode, autoStart, isRememberPosition, proxy, showTime } =
storeToRefs(settingsStore)

const relaunch = () => {
Expand Down Expand Up @@ -46,10 +46,15 @@ const relaunch = () => {
<a-switch v-model="isRememberPosition" type="round" />
</li>

<li>
<i>显示对话时间:</i>
<a-switch v-model="showTime" type="round" />
</li>

<li>
<i>开启代理:</i>
<a-switch v-model="proxy.bypass" type="round"></a-switch>
<!-- TODO: 提示文字可以在url改变后在出现,默认不出现 -->

<span class="text-sm text-[var(--color-text-3)]">
代理信息变化后,请点击<span
class="mark cursor-pointer"
Expand All @@ -64,7 +69,10 @@ const relaunch = () => {
<a-input v-model="proxy.url" placeholder="代理地址"></a-input>
</li>

<div class="flex justify-end text-sm text-[var(--color-text-3)]">
<div
class="flex justify-end text-sm text-[var(--color-text-3)]"
v-show="proxy.bypass"
>
示例:https://chatgpt.proxy.com<span class="mark">/api</span>
</div>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Settings/components/Modal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ watch(

<li>
<a-tooltip content="双击重置为默认值" mini position="right">
<i @dblclick="modalParams.temperature = 0.6">采样温度:</i>
<i @dblclick="modalParams.temperature = 0.6">思维发散程度:</i>
</a-tooltip>
<a-slider
v-model="modalParams.temperature"
Expand All @@ -66,7 +66,7 @@ watch(

<li>
<a-tooltip content="双击重置为默认值" mini position="right">
<i @dblclick="modalParams.max_tokens = 2000">最大长度:</i>
<i @dblclick="modalParams.max_tokens = 2000">返回最大长度:</i>
</a-tooltip>
<a-slider
v-model="modalParams.max_tokens"
Expand Down
7 changes: 6 additions & 1 deletion src/stores/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ export const useSettingsStore = defineStore(
// 单位
const tokenUnit = ref<TokenUnit>('TK')

// 显示对话时间
const showTime = ref(false)

// 绑定快捷键
const registerKey = async () => {
await unregisterAll()
Expand Down Expand Up @@ -137,6 +140,7 @@ export const useSettingsStore = defineStore(
modalParams,
isTokenUsage,
tokenUnit,
showTime,
toggleTheme
}
},
Expand All @@ -153,7 +157,8 @@ export const useSettingsStore = defineStore(
'proxy',
'modalParams',
'isTokenUsage',
'tokenUnit'
'tokenUnit',
'showTime'
]
}
}
Expand Down