From bbae749216085f70325966dfdcd591ab76ecad31 Mon Sep 17 00:00:00 2001 From: duanshengchao <519970194@qq.com> Date: Sun, 27 Apr 2025 10:28:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E6=96=87=E8=BE=93=E5=85=A5=E9=99=90?= =?UTF-8?q?=E5=88=B6=E5=8A=A0=E5=85=A5=E2=80=98=5F=E2=80=99=E7=9A=84?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/attributeSelector.h | 5 ++ resource/PowerModeler.qrc | 2 + .../images/icon_multiple-choice - 副本.png | Bin 0 -> 142 bytes resource/images/icon_multiple-choice.png | Bin 0 -> 332 bytes .../icon_multiple-choice_disable - 副本.png | Bin 0 -> 149 bytes .../images/icon_multiple-choice_disable.png | Bin 0 -> 391 bytes source/attributeSelector.cpp | 8 +++ source/attributeTableDelegate.cpp | 2 +- source/dbStructureView.cpp | 2 +- source/modelInfoEditDialog.cpp | 2 +- ui/attributeSelector.ui | 68 ++++++++++++++++-- ui/dbBrowser.ui | 59 +++++++++++++-- 12 files changed, 132 insertions(+), 16 deletions(-) create mode 100644 resource/images/icon_multiple-choice - 副本.png create mode 100644 resource/images/icon_multiple-choice.png create mode 100644 resource/images/icon_multiple-choice_disable - 副本.png create mode 100644 resource/images/icon_multiple-choice_disable.png diff --git a/include/attributeSelector.h b/include/attributeSelector.h index 88ceeea..5d002c8 100644 --- a/include/attributeSelector.h +++ b/include/attributeSelector.h @@ -12,6 +12,9 @@ QT_END_NAMESPACE class MainWindow; class AttributeView; +class AttributeTableModel; +class AttributeTableDelegate; + class AttributeSelector : public QWidget { Q_OBJECT @@ -30,6 +33,8 @@ private: Ui::AttributeSelector *ui; MainWindow* m_pMainWindow; AttributeView* m_attributeView; + AttributeTableModel* m_attributeTableModel; + AttributeTableDelegate* m_attributeTableDelegate; QString m_connection; }; diff --git a/resource/PowerModeler.qrc b/resource/PowerModeler.qrc index e418cfd..6ea746d 100644 --- a/resource/PowerModeler.qrc +++ b/resource/PowerModeler.qrc @@ -1,5 +1,7 @@ + images/icon_multiple-choice.png + images/icon_multiple-choice_disable.png images/icon_hierarchy_unchecked.png images/icon_hierarchy_disable.png images/icon_search_white.png diff --git a/resource/images/icon_multiple-choice - 副本.png b/resource/images/icon_multiple-choice - 副本.png new file mode 100644 index 0000000000000000000000000000000000000000..1a1b32d5d1e2cb467ac0dc013770f9794ac9ad7c GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%oCO|{#S9GG!XV7ZFl&wkP|(5C z#WAE}PI7|8xd--qHZ{7x{MF?4hz0WgSw7wMF#jL}$gONL*-#S{IK?l6XkN+ND01I=-96@`3PjW=4mvt}^(#=4gGSrvG; z_?Fx^y%?sypD{evHU4!SwRsU%j`W)&zYaMq(9f0#Q61z<=$Z1 z-y%UX_PQJ_+pKY8;={zJ*+pGE*m%6&SAue;ra(j!yM5AIjCl{OaF-(KSxegtSFgQu&X%Q~loCIC%eF8=@k literal 0 HcmV?d00001 diff --git a/resource/images/icon_multiple-choice_disable.png b/resource/images/icon_multiple-choice_disable.png new file mode 100644 index 0000000000000000000000000000000000000000..149c5c7ff55467329247651fee4666b2f6560966 GIT binary patch literal 391 zcmV;20eJq2P)IAtvt_nNX|*V0C*+&4B#<@ zFfs)JxFgy0*vu3}vWkEzjeGCMBqh;q)`98>sMffM>__5FY)%Zch)i0n&Je(TiiyZc z6eJ>-5zvLRRF-Ai08Rls=|1bIE7R}JTHgCHfI|RBI;w9D5s?D`Z{2NEAHc*E#ILl} zpMQ{iZ%6f^@uq3EilW#{v9c_8Q__3d`qRHk?|Kjr01mQs044yI-;!Zzo(w8oNjJUM zuI#tcizy=K-3v?d%>2RvxavDteVR-`{NYj60!Z>Y(T@K`nW%;;e6v0ffLmv&5W+~C lk+vyWH75_|&57FteFC#Z#0<0B6IcKM002ovPDHLkV1lWRslosN literal 0 HcmV?d00001 diff --git a/source/attributeSelector.cpp b/source/attributeSelector.cpp index 4afdb82..3e2d573 100644 --- a/source/attributeSelector.cpp +++ b/source/attributeSelector.cpp @@ -2,6 +2,8 @@ #include "ui_attributeSelector.h" #include "mainwindow.h" #include "attributeView.h" +#include "attributeTableModel.h" +#include "attributeTableDelegate.h" AttributeSelector::AttributeSelector(const QString& connection, QWidget *parent) : QWidget(parent) @@ -19,6 +21,12 @@ AttributeSelector::AttributeSelector(const QString& connection, QWidget *parent) m_attributeView = new AttributeView(attributeGroup, ui->attributeViewContainer, connection); ui->layoutTableView->addWidget(m_attributeView); + // m_attributeTableModel = new AttributeTableModel(attributeGroup, this, m_connection); + // m_tableView->setModel(m_attributeTableModel); + + // m_attributeTableDelegate = new AttributeTableDelegate(m_tableView, m_connection, m_tableView); + // m_tableView->setItemDelegate(m_attributeTableDelegate); + connect(ui->btnRefresh, &QPushButton::clicked, this, &AttributeSelector::onBtnClicked_refreshData); } diff --git a/source/attributeTableDelegate.cpp b/source/attributeTableDelegate.cpp index 3053066..90eb316 100644 --- a/source/attributeTableDelegate.cpp +++ b/source/attributeTableDelegate.cpp @@ -166,7 +166,7 @@ QWidget* AttributeTableDelegate::createEditor(QWidget *parent, const QStyleOptio { TextEditWidget* textEditor = new TextEditWidget(parent); textEditor->setPrompt(QString::fromWCharArray(L"类型必须为英文")); - textEditor->setRegularExpression("[A-Za-z0-9]"); + textEditor->setRegularExpression("[A-Za-z0-9_]"); connect(textEditor, &TextEditWidget::confirm, this, [=]{ /*QString strText = textEditor->editText(); int id = SqlQueryExecutor::instance().attributeTypeExistsInDB(m_connection, strText); diff --git a/source/dbStructureView.cpp b/source/dbStructureView.cpp index 8fda7bd..320fc73 100644 --- a/source/dbStructureView.cpp +++ b/source/dbStructureView.cpp @@ -324,7 +324,7 @@ void DBStructureView::showContextMenu(const QPoint& pos) removeNode(node); })->setEnabled(!isPublic); menu.addSeparator(); - menu.addAction(QString::fromWCharArray(L"清空数据"), []{}); + menu.addAction(QString::fromWCharArray(L"清空数据"), [this, node]{}); QPoint originPoint = this->mapToGlobal(QPoint(0,0)); menu.exec(originPoint + pos); } diff --git a/source/modelInfoEditDialog.cpp b/source/modelInfoEditDialog.cpp index cf52098..2c5513e 100644 --- a/source/modelInfoEditDialog.cpp +++ b/source/modelInfoEditDialog.cpp @@ -56,7 +56,7 @@ void ModelInfoEditDialog::initialize() ui->btnAddGroup->setVisible(false); m_pMaskLayer = new MaskLayer(this); //正则表达式，只能输入字母 - QRegularExpression regExp("[A-Za-z0-9]+"); + QRegularExpression regExp("[A-Za-z0-9_]+"); QRegularExpressionValidator* validator = new QRegularExpressionValidator(regExp, this); ui->lineEdit_modelType->setValidator(validator); diff --git a/ui/attributeSelector.ui b/ui/attributeSelector.ui index afd6571..b11c73a 100644 --- a/ui/attributeSelector.ui +++ b/ui/attributeSelector.ui @@ -6,8 +6,8 @@ 0 0 - 1111 - 481 + 1127 + 585 @@ -56,7 +56,7 @@ border-radius:3px; } - + 80 @@ -66,7 +66,7 @@ border-radius:3px; - + 20 @@ -76,13 +76,13 @@ border-radius:3px; - 属性名称： + 属性类别： - 420 + 600 5 61 26 @@ -114,6 +114,62 @@ background-color:rgb(67,160,249); :/img/images/icon_search_white.png:/img/images/icon_search_white.png + + + + 220 + 10 + 31 + 16 + + + + 模型： + + + + + + 255 + 5 + 113 + 25 + + + + + 所有模型 + + + + + + + 450 + 5 + 113 + 25 + + + + + 所有属性组 + + + + + + + 400 + 10 + 41 + 16 + + + + 属性组： + + diff --git a/ui/dbBrowser.ui b/ui/dbBrowser.ui index dcd2463..f7f58ad 100644 --- a/ui/dbBrowser.ui +++ b/ui/dbBrowser.ui @@ -116,13 +116,13 @@ QPushButton:pressed - 150 + 200 0 - 150 + 200 16777215 @@ -132,7 +132,7 @@ QPushButton:pressed - 10 + 36 5 21 21 @@ -177,7 +177,7 @@ QPushButton:pressed - 36 + 62 5 21 21 @@ -222,7 +222,7 @@ QPushButton:pressed - 62 + 88 5 21 21 @@ -264,7 +264,7 @@ QPushButton:pressed - 88 + 114 5 21 21 @@ -306,7 +306,7 @@ QPushButton:pressed - 114 + 140 5 21 21 @@ -345,6 +345,51 @@ QPushButton:pressed + + + false + + + + 10 + 5 + 21 + 21 + + + + + 21 + 21 + + + + + 21 + 21 + + + + 添加 + + + + + + + + + + :/img/images/icon_multiple-choice.png + :/img/images/icon_multiple-choice_disable.png:/img/images/icon_multiple-choice.png + + + + 16 + 16 + + +