现在合并和git获取的显示一致
This commit is contained in:
@@ -33,9 +33,6 @@ class ConfigView extends BaseView_1.BaseView {
|
||||
<tr>
|
||||
<td>
|
||||
<span class="editable">📁 ${folder.displayName}</span>
|
||||
<div style="font-size: 12px; color: var(--vscode-descriptionForeground); margin-top: 4px;">
|
||||
包含 ${folder.fileCount} 个文件
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<span class="clickable" onclick="openTheModuleFolder('${folder.id}', 'merged')">${folder.folderName}</span>
|
||||
@@ -205,13 +202,11 @@ class ConfigView extends BaseView_1.BaseView {
|
||||
|
||||
/* 合并弹窗样式 */
|
||||
.merge-dialog-content {
|
||||
display: flex;
|
||||
gap: 15px;
|
||||
margin: 15px 0;
|
||||
}
|
||||
|
||||
.merge-input-section {
|
||||
flex: 1;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.merge-input-label {
|
||||
@@ -533,7 +528,7 @@ class ConfigView extends BaseView_1.BaseView {
|
||||
overlay.id = 'mergeModal';
|
||||
|
||||
overlay.innerHTML = \`
|
||||
<div class="modal-dialog" style="width: 500px;">
|
||||
<div class="modal-dialog" style="width: 450px;">
|
||||
<div class="modal-title">合并配置文件</div>
|
||||
<div class="merge-dialog-content">
|
||||
<div class="merge-input-section">
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user