From 2b26521fe4c0ae819e49e3f224f0f5184c666cf8 Mon Sep 17 00:00:00 2001
From: duanshengchao <519970194@qq.com>
Date: Fri, 16 May 2025 18:42:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B1=9E=E6=80=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8A=A0=E8=BD=BD=E6=95=B0=E6=8D=AE=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/attributeSelector.cpp   | 6 ++++--
 source/attributeTableModel.cpp | 2 +-
 source/dbBrowser.cpp           | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/source/attributeSelector.cpp b/source/attributeSelector.cpp
index 309f666..b994aaf 100644
--- a/source/attributeSelector.cpp
+++ b/source/attributeSelector.cpp
@@ -22,7 +22,7 @@ AttributeSelector::AttributeSelector(const QString& connection, QWidget *parent)
     }
 
     m_isFirstShow = true;
-    QRegularExpression regExp("[A-Za-z0-9_]+");
+    QRegularExpression regExp("[A-Za-z0-9_$]+");
     QRegularExpressionValidator* validator = new QRegularExpressionValidator(regExp, this);
     ui->lineEdit_attributeType->setValidator(validator);
     ui->lineEdit_attributeType->installEventFilter(this);
@@ -37,9 +37,11 @@ AttributeSelector::AttributeSelector(const QString& connection, QWidget *parent)
     ModelAttributeGroup attributeGroup(-1, -1, "" ,"");
     m_attributeView = new AttributeView(attributeGroup, ui->attributeViewContainer, connection);
     m_attributeView->setEditable(false);//不可编辑
-    ui->layoutTableView->addWidget(m_attributeView);
     connect(m_attributeView->model(), &AttributeTableModel::showMessage, this, &AttributeSelector::onShowMessage);
     connect(m_attributeView->model(), &AttributeTableModel::syncDataStatus, this, &AttributeSelector::onSyncDataStatus);
+    if(m_attributeView->model())
+        m_attributeView->model()->refresh();
+    ui->layoutTableView->addWidget(m_attributeView);
 
     connect(ui->btnSearch, &QPushButton::clicked, this, &AttributeSelector::onBtnClicked_search);
     connect(ui->btnRefresh, &QPushButton::clicked, this, &AttributeSelector::onBtnClicked_refreshData);
diff --git a/source/attributeTableModel.cpp b/source/attributeTableModel.cpp
index 7d0f52e..2b53552 100644
--- a/source/attributeTableModel.cpp
+++ b/source/attributeTableModel.cpp
@@ -18,7 +18,7 @@ AttributeTableModel::AttributeTableModel(const ModelAttributeGroup& modelAttribu
 
     getDataTypesFromDB();
     iniDisplayField();
-    refresh();
+    //refresh(); 改为外部执行刷新，因为刷新时会通过信号同步页码等信息，放在构造函数中信号还未绑定，造成第一次打开为同步
 }
 
 AttributeTableModel::~AttributeTableModel()
diff --git a/source/dbBrowser.cpp b/source/dbBrowser.cpp
index d02147b..9599f05 100644
--- a/source/dbBrowser.cpp
+++ b/source/dbBrowser.cpp
@@ -73,6 +73,8 @@ void DatabaseBrowser::addTab_attribute(const QString& connection, ModelAttribute
     connect(view->model(), &AttributeTableModel::syncDataStatus, this, &DatabaseBrowser::onSyncDataStatus);
     connect(view->delegate(), &AttributeTableDelegate::showMessage, this, &DatabaseBrowser::onShowMessage);
     index = ui->tabWidget->addTab(view, QIcon(":/img/images/icon_hierarchy.png"), tabText);
+    if(view->model())
+        view->model()->refresh();
     //添加自定义按钮
     /*QPushButton* closeBtn = new QPushButton("");
     closeBtn->setProperty("index", index);