diff --git a/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListItemBase.cpp b/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListItemBase.cpp index 1f841c61..46ed3c7f 100644 --- a/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListItemBase.cpp +++ b/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListItemBase.cpp @@ -6,42 +6,3 @@ QuickListItemBase::QuickListItemBase(QObject* parent) } QuickListItemBase::~QuickListItemBase() { } - -bool QuickListItemBase::isChecked() const -{ - return m_isChecked; -} - -void QuickListItemBase::set_isChecked(bool newIsChecked) -{ - if (m_isChecked == newIsChecked) - return; - m_isChecked = newIsChecked; - emit isCheckedChanged(); -} - -bool QuickListItemBase::isSelected() const -{ - return m_isSelected; -} - -void QuickListItemBase::set_isSelected(bool newIsSelected) -{ - if (m_isSelected == newIsSelected) - return; - m_isSelected = newIsSelected; - emit isSelectedChanged(); -} - -bool QuickListItemBase::isAlternate() const -{ - return m_isAlternate; -} - -void QuickListItemBase::set_isAlternate(bool newIsAlternate) -{ - if (m_isAlternate == newIsAlternate) - return; - m_isAlternate = newIsAlternate; - emit isAlternateChanged(); -} diff --git a/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListItemBase.h b/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListItemBase.h index ef70211f..14232776 100644 --- a/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListItemBase.h +++ b/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListItemBase.h @@ -6,17 +6,10 @@ class TAO_API QuickListItemBase : public QObject { Q_OBJECT - Q_PROPERTY(bool isChecked READ isChecked WRITE set_isChecked NOTIFY isCheckedChanged) - Q_PROPERTY(bool isSelected READ isSelected WRITE set_isSelected NOTIFY isSelectedChanged) - Q_PROPERTY(bool isAlternate READ isAlternate WRITE set_isAlternate NOTIFY isAlternateChanged FINAL) - // AUTO_PROPERTY_V2(bool, isChecked, false) - // AUTO_PROPERTY_V2(bool, isSelected, false) - // AUTO_PROPERTY_V2(bool, isAlternate, false) - // signals: - // void isCheckedChanged(bool); - // void isSelectedChanged(bool); - // void isAlternateChanged(bool); + AUTO_PROPERTY(bool, isChecked, false) + AUTO_PROPERTY(bool, isSelected, false) + AUTO_PROPERTY(bool, isAlternate, false) public: explicit QuickListItemBase(QObject* parent = nullptr); @@ -41,25 +34,5 @@ class TAO_API QuickListItemBase : public QObject Q_UNUSED(key) return true; } - - bool isChecked() const; - void set_isChecked(bool newIsChecked); - - bool isSelected() const; - void set_isSelected(bool newIsSelected); - - bool isAlternate() const; - void set_isAlternate(bool newIsAlternate); - -signals: - void isCheckedChanged(); - - void isSelectedChanged(); - - void isAlternateChanged(); - -private: - bool m_isChecked = false; - bool m_isSelected = false; - bool m_isAlternate = false; + }; diff --git a/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListModel.cpp b/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListModel.cpp index a543c158..6866b8dd 100644 --- a/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListModel.cpp +++ b/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListModel.cpp @@ -54,7 +54,7 @@ void QuickListModel::check(int row, bool checked) } updateCheckedCount(); } -void QuickListModel::setAllChecked(bool allChecked) +void QuickListModel::updateAllChecked(bool allChecked) { for (const auto& obj : mDatas) { @@ -338,94 +338,3 @@ void QuickListModel::updateCalcInfo() updateAlternate(); emit signalUpdateCalcCount(); } - -int QuickListModel::visibledCount() const -{ - return m_visibledCount; -} - -void QuickListModel::set_visibledCount(int newVisibleCount) -{ - if (m_visibledCount == newVisibleCount) - return; - m_visibledCount = newVisibleCount; - emit visibledCountChanged(); -} - -int QuickListModel::selectedCount() const -{ - return m_selectedCount; -} - -void QuickListModel::set_selectedCount(int newSelectedCount) -{ - if (m_selectedCount == newSelectedCount) - return; - m_selectedCount = newSelectedCount; - emit selectedCountChanged(); -} - -int QuickListModel::checkedCount() const -{ - return m_checkedCount; -} - -void QuickListModel::set_checkedCount(int newCheckedCount) -{ - if (m_checkedCount == newCheckedCount) - return; - m_checkedCount = newCheckedCount; - emit checkedCountChanged(); -} - -QStringList QuickListModel::headerRoles() const -{ - return m_headerRoles; -} - -void QuickListModel::set_headerRoles(const QStringList& newHeaderRoles) -{ - if (m_headerRoles == newHeaderRoles) - return; - m_headerRoles = newHeaderRoles; - emit headerRolesChanged(); -} - -Qt::SortOrder QuickListModel::sortOrder() const -{ - return m_sortOrder; -} - -void QuickListModel::set_sortOrder(Qt::SortOrder newSortOrder) -{ - if (m_sortOrder == newSortOrder) - return; - m_sortOrder = newSortOrder; - emit sortOrderChanged(); -} - -QString QuickListModel::sortRole() const -{ - return m_sortRole; -} - -void QuickListModel::set_sortRole(const QString& newSortRole) -{ - if (m_sortRole == newSortRole) - return; - m_sortRole = newSortRole; - emit sortRoleChanged(); -} - -QStringList QuickListModel::noSortRoles() const -{ - return m_noSortRoles; -} - -void QuickListModel::set_noSortRoles(const QStringList& newNoSortRoles) -{ - if (m_noSortRoles == newNoSortRoles) - return; - m_noSortRoles = newNoSortRoles; - emit noSortRolesChanged(); -} diff --git a/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListModel.h b/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListModel.h index 184e357d..d58057cf 100644 --- a/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListModel.h +++ b/3rdparty/TaoCommon/src/TaoCommon/QuickModel/QuickListModel.h @@ -10,33 +10,18 @@ class TAO_API QuickListModel : public QuickModelBase { private: Q_OBJECT - Q_PROPERTY(bool allChecked READ allChecked WRITE setAllChecked NOTIFY allCheckedChanged) - - Q_PROPERTY(int visibledCount READ visibledCount WRITE set_visibledCount NOTIFY visibledCountChanged FINAL) - Q_PROPERTY(int selectedCount READ selectedCount WRITE set_selectedCount NOTIFY selectedCountChanged FINAL) - Q_PROPERTY(int checkedCount READ checkedCount WRITE set_checkedCount NOTIFY checkedCountChanged FINAL) - - Q_PROPERTY(QStringList headerRoles READ headerRoles WRITE set_headerRoles NOTIFY headerRolesChanged FINAL) - Q_PROPERTY(Qt::SortOrder sortOrder READ sortOrder WRITE set_sortOrder NOTIFY sortOrderChanged FINAL) - Q_PROPERTY(QString sortRole READ sortRole WRITE set_sortRole NOTIFY sortRoleChanged FINAL) - Q_PROPERTY(QStringList noSortRoles READ noSortRoles WRITE set_noSortRoles NOTIFY noSortRolesChanged FINAL) - - // AUTO_PROPERTY_V2(int, visibledCount, 0) - // AUTO_PROPERTY_V2(int, selectedCount, 0) - // AUTO_PROPERTY_V2(int, checkedCount, 0) - - // AUTO_PROPERTY_V2(QStringList, headerRoles, {}) - // AUTO_PROPERTY_V2(Qt::SortOrder, sortOrder, Qt::AscendingOrder) - // AUTO_PROPERTY_V2(QString, sortRole, {}) - // AUTO_PROPERTY_V2(QStringList, noSortRoles, {}) - // signals: - // void visibledCountChanged(int); - // void selectedCountChanged(int); - // void checkedCountChanged(int); - // void headerRolesChanged(const QStringList&); - // void sortOrderChanged(Qt::SortOrder); - // void sortRoleChanged(const QString&); - // void noSortRolesChanged(const QStringList&); + + AUTO_PROPERTY(bool, allChecked, false) + + AUTO_PROPERTY(int, visibledCount, 0) + AUTO_PROPERTY(int, selectedCount, 0) + AUTO_PROPERTY(int, checkedCount, 0) + + AUTO_PROPERTY(QStringList, headerRoles, {}) + AUTO_PROPERTY(Qt::SortOrder, sortOrder, Qt::AscendingOrder) + AUTO_PROPERTY(QString, sortRole, {}) + AUTO_PROPERTY(QStringList, noSortRoles, {}) + public: using Super = QuickModelBase; @@ -47,10 +32,7 @@ class TAO_API QuickListModel : public QuickModelBase return Super::data(row); } //[begin] check - bool allChecked() const - { - return mAllChecked; - } + Q_INVOKABLE void updateAllChecked(bool checked); Q_INVOKABLE void check(int row, bool checked); //[end] check @@ -107,33 +89,10 @@ class TAO_API QuickListModel : public QuickModelBase { emit scrollTo(index); } - int visibledCount() const; - void set_visibledCount(int newVisibleCount); - - int selectedCount() const; - void set_selectedCount(int newSelectedCount); - - int checkedCount() const; - void set_checkedCount(int newCheckedCount); - - QStringList headerRoles() const; - void set_headerRoles(const QStringList& newHeaderRoles); - - Qt::SortOrder sortOrder() const; - void set_sortOrder(Qt::SortOrder newSortOrder); - - QString sortRole() const; - void set_sortRole(const QString& newSortRole); - - QStringList noSortRoles() const; - void set_noSortRoles(const QStringList& newNoSortRoles); - -public slots: - void setAllChecked(bool allChecked); + signals: void scrollTo(int index); - void allCheckedChanged(bool allChecked); void selectedAction(); @@ -141,19 +100,6 @@ public slots: void beginSearch(); void endSearch(); - void visibledCountChanged(); - - void selectedCountChanged(); - - void checkedCountChanged(); - - void headerRolesChanged(); - - void sortOrderChanged(); - - void sortRoleChanged(); - - void noSortRolesChanged(); protected slots: void onSearch(); @@ -168,19 +114,7 @@ protected slots: protected: bool mAllChecked = false; bool mIsPressed = false; - int m_visibledCount = 0; - - int m_selectedCount = 0; - - int m_checkedCount = 0; - - QStringList m_headerRoles; - - Qt::SortOrder m_sortOrder = Qt::AscendingOrder; - - QString m_sortRole; - QStringList m_noSortRoles; int mLastPressedRow = -1; QMap mSortCallbacksAscend; diff --git a/examples/TaoQuickShow/Src/DeviceAddTable/DeviceAddItem.cpp b/examples/TaoQuickShow/Src/DeviceAddTable/DeviceAddItem.cpp index f7f1bfe3..0ef3cebd 100644 --- a/examples/TaoQuickShow/Src/DeviceAddTable/DeviceAddItem.cpp +++ b/examples/TaoQuickShow/Src/DeviceAddTable/DeviceAddItem.cpp @@ -26,56 +26,4 @@ bool DeviceAddItem::match(const QString& key) return true; } return false; -} - -bool DeviceAddItem::online() const -{ - return m_online; -} - -void DeviceAddItem::set_online(bool newOnline) -{ - if (m_online == newOnline) - return; - m_online = newOnline; - emit onlineChanged(); -} - -QString DeviceAddItem::modelString() const -{ - return m_modelString; -} - -void DeviceAddItem::set_modelString(const QString& newModelString) -{ - if (m_modelString == newModelString) - return; - m_modelString = newModelString; - emit modelStringChanged(); -} - -QString DeviceAddItem::address() const -{ - return m_address; -} - -void DeviceAddItem::set_address(const QString& newAddress) -{ - if (m_address == newAddress) - return; - m_address = newAddress; - emit addressChanged(); -} - -QString DeviceAddItem::name() const -{ - return m_name; -} - -void DeviceAddItem::set_name(const QString& newName) -{ - if (m_name == newName) - return; - m_name = newName; - emit nameChanged(); -} +} \ No newline at end of file diff --git a/examples/TaoQuickShow/Src/DeviceAddTable/DeviceAddItem.h b/examples/TaoQuickShow/Src/DeviceAddTable/DeviceAddItem.h index e1c8f010..9d1a104d 100644 --- a/examples/TaoQuickShow/Src/DeviceAddTable/DeviceAddItem.h +++ b/examples/TaoQuickShow/Src/DeviceAddTable/DeviceAddItem.h @@ -7,19 +7,10 @@ class DeviceAddItem : public QuickListItemBase { Q_OBJECT - Q_PROPERTY(QString name READ name WRITE set_name NOTIFY nameChanged FINAL) - Q_PROPERTY(QString address READ address WRITE set_address NOTIFY addressChanged FINAL) - Q_PROPERTY(QString modelString READ modelString WRITE set_modelString NOTIFY modelStringChanged FINAL) - Q_PROPERTY(bool online READ online WRITE set_online NOTIFY onlineChanged FINAL) - // AUTO_PROPERTY_V2(QString, name, "") - // AUTO_PROPERTY_V2(QString, address, "") - // AUTO_PROPERTY_V2(QString, modelString, "") - // AUTO_PROPERTY_V2(bool, online, false) - // signals: - // void nameChanged(const QString&); - // void addressChanged(const QString&); - // void modelStringChanged(const QString&); - // void onlineChanged(bool); + AUTO_PROPERTY(QString, name, "") + AUTO_PROPERTY(QString, address, "") + AUTO_PROPERTY(QString, modelString, "") + AUTO_PROPERTY(bool, online, false) public: explicit DeviceAddItem(QObject* parent = nullptr); @@ -31,31 +22,6 @@ class DeviceAddItem : public QuickListItemBase return m_ipv4Address; } - bool online() const; - void set_online(bool newOnline); - - QString modelString() const; - void set_modelString(const QString& newModelString); - - QString address() const; - void set_address(const QString& newAddress); - - QString name() const; - void set_name(const QString& newName); - -signals: - void onlineChanged(); - - void modelStringChanged(); - - void addressChanged(); - - void nameChanged(); - private: quint32 m_ipv4Address = 0; - bool m_online; - QString m_modelString; - QString m_address; - QString m_name; }; diff --git a/examples/TaoQuickShow/TaoQuickShow.vcxproj b/examples/TaoQuickShow/TaoQuickShow.vcxproj index 120c5bc4..d5e5dce1 100644 --- a/examples/TaoQuickShow/TaoQuickShow.vcxproj +++ b/examples/TaoQuickShow/TaoQuickShow.vcxproj @@ -135,6 +135,9 @@ TaoCommon_NO_LIB;TaoQuickShowPath="qrc:/";TaoQuickImportPath="qrc:/";USE_VISUAL_STUDIO;%(PreprocessorDefinitions) /utf-8 %(AdditionalOptions) + + msvc + @@ -142,6 +145,9 @@ TaoCommon_NO_LIB;TaoQuickShowPath="qrc:/";TaoQuickImportPath="qrc:/";USE_VISUAL_STUDIO;%(PreprocessorDefinitions) /utf-8 %(AdditionalOptions) + + msvc + diff --git a/src/TaoQuick/Qml/CusTable/CusTableHeader.qml b/src/TaoQuick/Qml/CusTable/CusTableHeader.qml index 09165225..d3b44d61 100644 --- a/src/TaoQuick/Qml/CusTable/CusTableHeader.qml +++ b/src/TaoQuick/Qml/CusTable/CusTableHeader.qml @@ -68,7 +68,7 @@ Item { property bool notify: true onCheckedChanged: { if (notify) { - dataObj.setAllChecked(checked) + dataObj.updateAllChecked(checked) } } Component.onCompleted: {