xb/vs-p
0
0
Fork 0
Code Issues Activity

现在合并和git获取的显示一致

Browse Source
This commit is contained in:
xubing
2025-11-27 20:32:35 +08:00
parent d0ea028e3e
commit 2970f64587
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
out/panels/views/ConfigView.js
View File

@@ -33,9 +33,6 @@ class ConfigView extends BaseView_1.BaseView {
<tr> <tr>
<td> <td>
<span class="editable">📁 ${folder.displayName}</span> <span class="editable">📁 ${folder.displayName}</span>
<div style="font-size: 12px; color: var(--vscode-descriptionForeground); margin-top: 4px;">
包含 ${folder.fileCount} 个文件
</div>
</td> </td>
<td> <td>
<span class="clickable" onclick="openTheModuleFolder('${folder.id}', 'merged')">${folder.folderName}</span> <span class="clickable" onclick="openTheModuleFolder('${folder.id}', 'merged')">${folder.folderName}</span>
@@ -205,13 +202,11 @@ class ConfigView extends BaseView_1.BaseView {
/* 合并弹窗样式 */ /* 合并弹窗样式 */
.merge-dialog-content { .merge-dialog-content {
display: flex;
gap: 15px;
margin: 15px 0; margin: 15px 0;
} }
.merge-input-section { .merge-input-section {
flex: 1; margin-bottom: 15px;
} }
.merge-input-label { .merge-input-label {
@@ -533,7 +528,7 @@ class ConfigView extends BaseView_1.BaseView {
overlay.id = 'mergeModal'; overlay.id = 'mergeModal';
overlay.innerHTML = \` overlay.innerHTML = \`
<div class="modal-dialog" style="width: 500px;"> <div class="modal-dialog" style="width: 450px;">
<div class="modal-title">合并配置文件</div> <div class="modal-title">合并配置文件</div>
<div class="merge-dialog-content"> <div class="merge-dialog-content">
<div class="merge-input-section"> <div class="merge-input-section">

2
out/panels/views/ConfigView.js.map
View File

File diff suppressed because one or more lines are too long

9
src/panels/views/ConfigView.ts
View File

@@ -101,9 +101,6 @@ export class ConfigView extends BaseView {
<tr> <tr>
<td> <td>
<span class="editable">📁 ${folder.displayName}</span> <span class="editable">📁 ${folder.displayName}</span>
<div style="font-size: 12px; color: var(--vscode-descriptionForeground); margin-top: 4px;">
包含 ${folder.fileCount} 个文件
</div>
</td> </td>
<td> <td>
<span class="clickable" onclick="openTheModuleFolder('${folder.id}', 'merged')">${folder.folderName}</span> <span class="clickable" onclick="openTheModuleFolder('${folder.id}', 'merged')">${folder.folderName}</span>
@@ -277,13 +274,11 @@ export class ConfigView extends BaseView {
/* 合并弹窗样式 */ /* 合并弹窗样式 */
.merge-dialog-content { .merge-dialog-content {
display: flex;
gap: 15px;
margin: 15px 0; margin: 15px 0;
} }
.merge-input-section { .merge-input-section {
flex: 1; margin-bottom: 15px;
} }
.merge-input-label { .merge-input-label {
@@ -605,7 +600,7 @@ export class ConfigView extends BaseView {
overlay.id = 'mergeModal'; overlay.id = 'mergeModal';
overlay.innerHTML = \` overlay.innerHTML = \`
<div class="modal-dialog" style="width: 500px;"> <div class="modal-dialog" style="width: 450px;">
<div class="modal-title">合并配置文件</div> <div class="modal-title">合并配置文件</div>
<div class="merge-dialog-content"> <div class="merge-dialog-content">
<div class="merge-input-section"> <div class="merge-input-section">