File tree Expand file tree Collapse file tree 2 files changed +32
-2
lines changed Expand file tree Collapse file tree 2 files changed +32
-2
lines changed Original file line number Diff line number Diff line change @@ -216,13 +216,15 @@ export default {
216216 } else if ( type === 'focus' ) {
217217 this . _focus ( )
218218 } else if ( type === 'elementInfo' ) {
219- let windowRect = this . $refs . terminalWindow . getBoundingClientRect ( )
219+ let windowEle = this . $refs . terminalWindow
220+ let windowRect = windowEle . getBoundingClientRect ( )
220221 let containerRect = this . $refs . terminalContainer . getBoundingClientRect ( )
222+ let hasScroll = windowEle . scrollHeight > windowEle . clientHeight || windowEle . offsetHeight > windowEle . clientHeight
221223 return {
222224 pos : this . _getPosition ( ) , // 窗口所在位置
223225 screenWidth : containerRect . width , // 窗口整体宽度
224226 screenHeight : containerRect . height , // 窗口整体高度
225- clientWidth : windowRect . width - 40 , // 可显示内容范围高度,减去padding值
227+ clientWidth : hasScroll ? ( windowRect . width - 48 ) : ( windowRect . width - 40 ) , // 可显示内容范围高度,减去padding值,如果有滚动条去掉滚动条宽度
226228 clientHeight : windowRect . height , // 可显示内容范围高度
227229 charWidth : {
228230 en : this . byteLen . en , // 单个英文字符宽度
Original file line number Diff line number Diff line change 8585 background-color : # 2ec971 ;
8686}
8787
88+ .t-window ::-webkit-scrollbar {
89+ width : 8px ;
90+ height : 8px ;
91+ }
92+
93+ .t-window ::-webkit-scrollbar-button {
94+ width : 0 ;
95+ height : 0 ;
96+ display : none;
97+ }
98+
99+ .t-window ::-webkit-scrollbar-thumb {
100+ border-radius : 6px ;
101+ border-style : dashed;
102+ border-color : transparent;
103+ border-width : 2px ;
104+ background-color : rgba (157 , 165 , 183 , 0.4 );
105+ background-clip : padding-box;
106+ }
107+
108+ .t-window ::-webkit-scrollbar-thumb : hover {
109+ background : rgba (157 , 165 , 183 , 0.7 );
110+ }
111+
112+ .t-window ::-webkit-scrollbar-track {
113+ border-radius : 6px ;
114+ }
115+
88116.t-window , .t-ask-input , .t-window p , .t-window div {
89117 font-size : 13px ;
90118 font-family : Monaco, Menlo, Consolas, monospace;
You can’t perform that action at this time.
0 commit comments