fix(ela): 对象树退回标准 QTreeWidget(复选框清晰) + 行内边距收紧

ElaTreeView 是 ElaWidgetTools 自绘控件(非 Qt 原生), light 下复选框对比度不足、选中渲染有局限。
- 对象树 ElaTreeView+QStandardItemModel → 标准 QTreeWidget+QTreeWidgetItem:
  复选框/展开箭头由 Fusion 原生绘制, 明暗都清晰; 行为(TM 勾选/点击)不变
- 全局 QTreeView::item padding 8px→4px: 行间距过大修正
This commit is contained in:
gaozheng 2026-06-10 12:00:20 +08:00
parent 464911dc57
commit cfd39e5be8
3 changed files with 23 additions and 33 deletions

View File

@ -74,7 +74,7 @@ QTreeWidget, QListWidget, QTreeView, QListView {
outline: none;
}
QTreeWidget::item, QListWidget::item, QTreeView::item, QListView::item {
padding: 8px 8px;
padding: 4px 8px;
border-radius: 6px;
margin: 1px 4px;
}

View File

@ -1,15 +1,11 @@
#include "panels/ObjectTreePanel.hpp"
#include <QLabel>
#include <QModelIndex>
#include <QSignalBlocker>
#include <QStandardItem>
#include <QStandardItemModel>
#include <QTreeView>
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include <QVBoxLayout>
#include <ElaTreeView.h>
#include "Theme.hpp"
#include "dto/NavDto.hpp"
@ -19,16 +15,15 @@ namespace {
// TM 节点把 tmObjectId 存在该角色GS/项目根节点为空。
constexpr int kRoleTmId = Qt::UserRole + 2;
void addNodes(QStandardItem* parent, const std::vector<data::dto::StructTreeNode>& nodes) {
void addNodes(QTreeWidgetItem* parent, const std::vector<data::dto::StructTreeNode>& nodes) {
for (const auto& n : nodes) {
auto* item = new QStandardItem(QString::fromStdString(n.node.name));
item->setEditable(false);
auto* item = new QTreeWidgetItem(parent);
item->setText(0, QString::fromStdString(n.node.name));
if (n.isTm) {
item->setData(QString::fromStdString(n.node.id), kRoleTmId);
item->setCheckable(true);
item->setCheckState(Qt::Unchecked); // 真实数据渲染下一轮接入,默认不勾
item->setData(0, kRoleTmId, QString::fromStdString(n.node.id));
item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
item->setCheckState(0, Qt::Unchecked); // 真实数据渲染下一轮接入,默认不勾
}
parent->appendRow(item);
addNodes(item, n.children);
}
}
@ -39,11 +34,10 @@ ObjectTreePanel::ObjectTreePanel(QWidget* parent) : QWidget(parent) {
lay->setContentsMargins(0, 0, 0, 0);
lay->setSpacing(0);
tree_ = new ElaTreeView(this); // Fluent 树视图(自绘展开/折叠指示,随主题)
// Qt 原生标准树:复选框/展开箭头由 Fusion 绘制(明暗都清晰);配色取自全局主题 QSS。
tree_ = new QTreeWidget(this);
tree_->setHeaderHidden(true);
tree_->setIndentation(14); // 默认缩进偏大,收紧更紧凑协调
model_ = new QStandardItemModel(tree_);
tree_->setModel(model_);
tree_->setIndentation(14); // 收紧缩进
lay->addWidget(tree_, 1);
hint_ = new QLabel(QStringLiteral("正在加载对象…"), this);
@ -52,22 +46,20 @@ ObjectTreePanel::ObjectTreePanel(QWidget* parent) : QWidget(parent) {
hint_->setVisible(false);
lay->addWidget(hint_);
// 单击 TM → tmClicked按 index 取 tmId
QObject::connect(tree_, &QTreeView::clicked, this, [this](const QModelIndex& idx) {
const QString tmId = idx.data(kRoleTmId).toString();
QObject::connect(tree_, &QTreeWidget::itemClicked, this, [this](QTreeWidgetItem* item, int) {
const QString tmId = item->data(0, kRoleTmId).toString();
if (!tmId.isEmpty()) emit tmClicked(tmId);
});
// 勾选变化 → tmCheckToggled。
QObject::connect(model_, &QStandardItemModel::itemChanged, this, [this](QStandardItem* item) {
const QString tmId = item->data(kRoleTmId).toString();
if (!tmId.isEmpty()) emit tmCheckToggled(tmId, item->checkState() == Qt::Checked);
QObject::connect(tree_, &QTreeWidget::itemChanged, this, [this](QTreeWidgetItem* item, int) {
const QString tmId = item->data(0, kRoleTmId).toString();
if (!tmId.isEmpty()) emit tmCheckToggled(tmId, item->checkState(0) == Qt::Checked);
});
}
void ObjectTreePanel::setStructure(const QString& projectName,
const std::vector<data::StructNode>& nodes) {
const QSignalBlocker block(model_); // 重建触发 itemChanged先屏蔽
model_->clear();
const QSignalBlocker block(tree_); // 重建触发 itemChanged先屏蔽
tree_->clear();
const auto roots = data::dto::buildStructTree(nodes);
if (roots.empty()) {
showMessage(projectName.isEmpty() ? QStringLiteral("(暂无项目)")
@ -76,12 +68,12 @@ void ObjectTreePanel::setStructure(const QString& projectName,
}
hint_->setVisible(false);
tree_->setVisible(true);
addNodes(model_->invisibleRootItem(), roots); // 结构已含项目根节点,直接渲染
addNodes(tree_->invisibleRootItem(), roots); // 结构已含项目根节点,直接渲染
tree_->expandAll();
}
void ObjectTreePanel::showMessage(const QString& message) {
model_->clear();
tree_->clear();
tree_->setVisible(false);
hint_->setText(message);
hint_->setVisible(true);

View File

@ -3,8 +3,7 @@
#include <vector>
#include "repo/RepoTypes.hpp"
class QTreeView;
class QStandardItemModel;
class QTreeWidget;
class QLabel;
namespace geopro::app {
@ -25,8 +24,7 @@ signals:
void tmCheckToggled(const QString& tmObjectId, bool checked);
private:
QTreeView* tree_ = nullptr; // ElaTreeView(继承 QTreeView)
QStandardItemModel* model_ = nullptr; // 标准 model(Qt 自带)
QTreeWidget* tree_ = nullptr; // Qt 原生标准树(复选框/箭头由 Fusion 绘制,清晰可控)
QLabel* hint_ = nullptr;
};