opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-09-25 16:13:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Jerry Fan
2024-04-08 16:12:25 +08:00
parent 75517c74ca 49df07f76b
commit e3b6f52bd3
4 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chat2db-client/src/blocks/Tree/index.tsx
View File

@ -394,7 +394,7 @@ const TreeNode = memo((props: TreeNodeIProps) => {
zIndex: 1080, zIndex: 1080,
}} }}
> >
<Tooltip placement="right" color={window._AppThemePack.colorPrimary} title={treeNodeData.comment}> <Tooltip placement="right" color={window._AppThemePack?.colorPrimary} title={treeNodeData.comment}>
<div <div
className={classnames(styles.treeNode, { [styles.treeNodeFocus]: isFocus })} className={classnames(styles.treeNode, { [styles.treeNodeFocus]: isFocus })}
onClick={handelClickTreeNode} onClick={handelClickTreeNode}

2
chat2db-client/src/components/MonacoEditor/useMonacoTheme.ts
View File

@ -8,7 +8,7 @@ function useMonacoTheme() {
const [appTheme] = useTheme(); const [appTheme] = useTheme();
// 监听主题色变化切换编辑器主题色 // 监听主题色变化切换编辑器主题色
useEffect(() => { useEffect(() => {
const { colorPrimary, colorBgBase, colorTextBase } = window._AppThemePack; const { colorPrimary, colorBgBase, colorTextBase } = window._AppThemePack || {};
const colors = { const colors = {
'editor.lineHighlightBackground': colorPrimary + '14', // 当前行背景色 'editor.lineHighlightBackground': colorPrimary + '14', // 当前行背景色

5
chat2db-client/src/pages/login/index.tsx
View File

@ -8,7 +8,7 @@ import Iconfont from '@/components/Iconfont';
import i18n from '@/i18n'; import i18n from '@/i18n';
// import { useNavigate } from 'react-router-dom'; // import { useNavigate } from 'react-router-dom';
import { logoutClearSomeLocalStorage, navigate } from '@/utils'; import { logoutClearSomeLocalStorage, navigate } from '@/utils';
import { queryCurUser } from '@/store/user' import { queryCurUser } from '@/store/user';
interface IFormData { interface IFormData {
userName: string; userName: string;
@ -38,8 +38,9 @@ const Login: React.FC = () => {
<div className={styles.loginWelcome}>{i18n('login.text.welcome')}</div> <div className={styles.loginWelcome}>{i18n('login.text.welcome')}</div>
<Tooltip <Tooltip
placement="right" placement="right"
color={window._AppThemePack?.colorBgBase}
title={ title={
<div> <div style={{ color: window._AppThemePack?.colorText, opacity: 0.8, padding: '8px 4px' }}>
{i18n('login.text.tips')} {i18n('login.text.tips')}
</div> </div>
} }

57
chat2db-client/src/styles/global.less
View File

@ -26,35 +26,36 @@ input:-webkit-autofill {
caret-color: var(--color-text) !important; // 光标的颜色 caret-color: var(--color-text) !important; // 光标的颜色
} }
::-webkit-scrollbar {
width: 6px;
height: 6px;
}
::-webkit-scrollbar-thumb {
background-color: var(--color-fill);
border-radius: 2px;
}
::-webkit-scrollbar-button {
width: 0;
height: 0;
background: transparent;
}
::-webkit-scrollbar-track {
background: transparent;
width: 0px;
cursor: pointer;
}
::-webkit-scrollbar-corner {
background: transparent;
}
* { * {
scrollbar-width: 4px; // 宽度：auto（默认），thin（窄），none（隐藏） ::-webkit-scrollbar {
scrollbar-color: var(--color-fill) transparent; // 颜色：第一个颜色是滑块颜色，第二个颜色是轨道颜色 cursor: pointer;
width: 4px;
height: 4px;
background-color: transparent;
}
::-webkit-scrollbar-thumb {
cursor: pointer;
background-color: transparent;
border-radius: 2px;
// transition: background-color 500ms ${token.motionEaseOut};
&:hover {
background-color: var(--color-text);
}
}
::-webkit-scrollbar-corner {
display: none;
width: 0;
height: 0;
}
&:hover {
::-webkit-scrollbar-thumb {
background-color: var(--color-fill);
}
}
} }
html, html,