Skip to content

Commit 92b8b5e

Browse files
committed
Merge remote-tracking branch 'bernard/dev' into dev
2 parents 8232ce4 + f624295 commit 92b8b5e

File tree

4 files changed

+326
-20
lines changed

4 files changed

+326
-20
lines changed

src/vue/setting/data.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export const envInfo = ref<any>({
2020
isInstalling: false,
2121
installProgress: [],
2222
showProgressLog: false,
23+
showForceCloseButton: false, // 控制强制关闭按钮的显示
2324

2425
version : "v2.0.1",
2526
path: "~/.env",

src/vue/setting/view/environment/index.less

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
color: var(--app-fg);
66

77
.body-box {
8-
width: 80%;
8+
width: 100%;
99
min-width: 800px;
1010

1111
.rt-config-box {
@@ -144,6 +144,12 @@
144144
.log-title {
145145
margin-bottom: 0;
146146
}
147+
148+
.log-actions {
149+
display: flex;
150+
gap: 8px;
151+
align-items: center;
152+
}
147153
}
148154

149155
.log-content {
@@ -165,6 +171,27 @@
165171
margin-bottom: 0;
166172
}
167173
}
174+
175+
.terminal-container {
176+
height: 400px;
177+
border: 1px solid #ddd;
178+
border-radius: 3px;
179+
overflow: hidden;
180+
background-color: #1e1e1e;
181+
182+
:deep(.xterm) {
183+
padding: 8px;
184+
height: 100%;
185+
}
186+
187+
:deep(.xterm-viewport) {
188+
overflow-y: auto;
189+
}
190+
191+
:deep(.xterm-screen) {
192+
height: 100%;
193+
}
194+
}
168195
}
169196

170197
:deep(.el-progress__text) {

0 commit comments

Comments
 (0)