update

example/example_en_US.ts

@@ -1968,7 +1968,7 @@ Some contents...</source>
     </message>
     <message>
         <location filename="qml/page/T_TableView.qml" line="177"/>
-        <location filename="qml/page/T_TableView.qml" line="509"/>
+        <location filename="qml/page/T_TableView.qml" line="510"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,67 +1988,67 @@ Some contents...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="358"/>
+        <location filename="qml/page/T_TableView.qml" line="359"/>
         <source>Age</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="433"/>
+        <location filename="qml/page/T_TableView.qml" line="434"/>
         <source>Clear All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="440"/>
+        <location filename="qml/page/T_TableView.qml" line="441"/>
         <source>Delete Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="463"/>
+        <location filename="qml/page/T_TableView.qml" line="464"/>
         <source>Add a row of Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="469"/>
+        <location filename="qml/page/T_TableView.qml" line="470"/>
         <source>Insert a Row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="476"/>
+        <location filename="qml/page/T_TableView.qml" line="477"/>
         <source>Focus not acquired: Please click any item in the form as the target for insertion!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="504"/>
+        <location filename="qml/page/T_TableView.qml" line="505"/>
         <source>Avatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="522"/>
+        <location filename="qml/page/T_TableView.qml" line="523"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="530"/>
+        <location filename="qml/page/T_TableView.qml" line="531"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="537"/>
+        <location filename="qml/page/T_TableView.qml" line="538"/>
         <source>Long String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="545"/>
+        <location filename="qml/page/T_TableView.qml" line="546"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="564"/>
+        <location filename="qml/page/T_TableView.qml" line="565"/>
         <source>&lt;Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="565"/>
+        <location filename="qml/page/T_TableView.qml" line="566"/>
         <source>Next&gt;</source>
         <translation type="unfinished"></translation>
     </message>

example/example_zh_CN.ts

@@ -2110,7 +2110,7 @@ Some contents...</source>
     </message>
     <message>
         <location filename="qml/page/T_TableView.qml" line="177"/>
-        <location filename="qml/page/T_TableView.qml" line="509"/>
+        <location filename="qml/page/T_TableView.qml" line="510"/>
         <source>Name</source>
         <translation type="unfinished">名称</translation>
     </message>
@@ -2130,67 +2130,67 @@ Some contents...</source>
         <translation type="unfinished">全选</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="358"/>
+        <location filename="qml/page/T_TableView.qml" line="359"/>
         <source>Age</source>
         <translation type="unfinished">年龄</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="433"/>
+        <location filename="qml/page/T_TableView.qml" line="434"/>
         <source>Clear All</source>
         <translation type="unfinished">清除所有</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="469"/>
+        <location filename="qml/page/T_TableView.qml" line="470"/>
         <source>Insert a Row</source>
         <translation type="unfinished">插入一行</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="476"/>
+        <location filename="qml/page/T_TableView.qml" line="477"/>
         <source>Focus not acquired: Please click any item in the form as the target for insertion!</source>
         <translation type="unfinished">焦点未获取：请点击表格中的任意一项，作为插入的靶点！</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="504"/>
+        <location filename="qml/page/T_TableView.qml" line="505"/>
         <source>Avatar</source>
         <translation type="unfinished">头像</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="522"/>
+        <location filename="qml/page/T_TableView.qml" line="523"/>
         <source>Address</source>
         <translation type="unfinished">地址</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="530"/>
+        <location filename="qml/page/T_TableView.qml" line="531"/>
         <source>Nickname</source>
         <translation type="unfinished">昵称</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="537"/>
+        <location filename="qml/page/T_TableView.qml" line="538"/>
         <source>Long String</source>
         <translation type="unfinished">长字符串</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="545"/>
+        <location filename="qml/page/T_TableView.qml" line="546"/>
         <source>Options</source>
         <translation type="unfinished">操作</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="564"/>
+        <location filename="qml/page/T_TableView.qml" line="565"/>
         <source>&lt;Previous</source>
         <translation type="unfinished">&lt;上一页</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="565"/>
+        <location filename="qml/page/T_TableView.qml" line="566"/>
         <source>Next&gt;</source>
         <translation type="unfinished">下一页&gt;</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="440"/>
+        <location filename="qml/page/T_TableView.qml" line="441"/>
         <source>Delete Selection</source>
         <translation type="unfinished">删除选中</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="463"/>
+        <location filename="qml/page/T_TableView.qml" line="464"/>
         <source>Add a row of Data</source>
         <translation type="unfinished">添加一行数据</translation>
     </message>

example/qml/page/T_TableView.qml

@@ -244,7 +244,7 @@ FluContentPage{
                     clickListener: function(){
                         root.selectedAll = !root.selectedAll
                         var checked = root.selectedAll
-                        itemModel.display = table_view.customItem(com_column_checbox,{"checked":checked})
+                        model.display = table_view.customItem(com_column_checbox,{"checked":checked})
                         for(var i =0;i< table_view.rows ;i++){
                             var rowData = table_view.getRow(i)
                             rowData.checkbox = table_view.customItem(com_checbox,{"checked":checked})
@@ -293,6 +293,7 @@ FluContentPage{
                 });
                 items = result
                 textbox.text= String(display)
+                selectAll()
             }
             onCommit: {
                 editTextChaged(textbox.text)

src/FluApp.cpp

@@ -1,6 +1,5 @@
 #include "FluApp.h"
 
-#include <QQmlEngine>
 #include <QGuiApplication>
 #include <QQuickItem>
 #include <QTimer>
@@ -32,7 +31,7 @@ void FluApp::init(QObject *target, QLocale locale) {
     }
 }
 
-[[maybe_unused]] QJsonArray FluApp::iconDatas(const QString &keyword) {
+[[maybe_unused]] QJsonArray FluApp::iconData(const QString &keyword) {
     QJsonArray arr;
     QMetaEnum enumType = Fluent_Icons::staticMetaObject.enumerator(Fluent_Icons::staticMetaObject.indexOfEnumerator("Fluent_IconType"));
     for (int i = 0; i <= enumType.keyCount() - 1; ++i) {

src/FluApp.h

@@ -36,7 +36,7 @@ SINGLETON(FluApp)
 
     Q_INVOKABLE void init(QObject *target, QLocale locale = QLocale::system());
 
-    [[maybe_unused]] Q_INVOKABLE static QJsonArray iconDatas(const QString &keyword = "");
+    [[maybe_unused]] Q_INVOKABLE static QJsonArray iconData(const QString &keyword = "");
 
 private:
     QQmlEngine *_engine{};

src/FluFrameless.cpp

@@ -35,16 +35,14 @@ static inline bool isCompositionEnabled() {
     return false;
 }
 
-static inline void setShadow(HWND hwnd){
+static inline void setShadow(HWND hwnd) {
-    const MARGINS shadow = { 1, 0, 0, 0 };
+    const MARGINS shadow = {1, 0, 0, 0};
-    typedef HRESULT (WINAPI* DwmExtendFrameIntoClientAreaPtr)(HWND hWnd, const MARGINS *pMarInset);
+    typedef HRESULT (WINAPI *DwmExtendFrameIntoClientAreaPtr)(HWND hWnd, const MARGINS *pMarInset);
     HMODULE module = LoadLibraryW(L"dwmapi.dll");
-    if (module)
+    if (module) {
-    {
         DwmExtendFrameIntoClientAreaPtr dwm_extendframe_into_client_area_;
-        dwm_extendframe_into_client_area_= reinterpret_cast<DwmExtendFrameIntoClientAreaPtr>(GetProcAddress(module, "DwmExtendFrameIntoClientArea"));
+        dwm_extendframe_into_client_area_ = reinterpret_cast<DwmExtendFrameIntoClientAreaPtr>(GetProcAddress(module, "DwmExtendFrameIntoClientArea"));
-        if (dwm_extendframe_into_client_area_)
+        if (dwm_extendframe_into_client_area_) {
-        {
             dwm_extendframe_into_client_area_(hwnd, &shadow);
         }
     }
@@ -108,21 +106,21 @@ void FluFrameless::componentComplete() {
     HWND hwnd = reinterpret_cast<HWND>(window()->winId());
     DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
     if (_fixSize) {
-        ::SetWindowLongPtr(hwnd, GWL_STYLE, style  | WS_CAPTION);
+        ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_CAPTION);
         for (int i = 0; i <= QGuiApplication::screens().count() - 1; ++i) {
             connect(QGuiApplication::screens().at(i), &QScreen::logicalDotsPerInchChanged, this, [=] {
                 SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_FRAMECHANGED);
             });
         }
     } else {
-        ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_MAXIMIZEBOX  | WS_CAPTION);
+        ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_MAXIMIZEBOX | WS_CAPTION);
     }
     SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
     connect(window(), &QQuickWindow::screenChanged, this, [hwnd] {
         ::SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOOWNERZORDER);
         ::RedrawWindow(hwnd, nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW);
     });
-    if(!window()->property("_hideShadow").toBool()){
+    if (!window()->property("_hideShadow").toBool()) {
         setShadow(hwnd);
     }
 #endif
@@ -175,12 +173,12 @@ void FluFrameless::componentComplete() {
             *result = static_cast<QT_NATIVE_EVENT_RESULT_TYPE>(hitTestResult);
             return true;
         }
-        if (!isMaximum){
+        if (!isMaximum) {
             clientRect->top = originalTop;
             clientRect->bottom = originalBottom;
             clientRect->left = originalLeft;
             clientRect->right = originalRight;
-        } else{
+        } else {
             clientRect->top = 0;
         }
         _setMaximizeHovered(false);
@@ -240,13 +238,13 @@ void FluFrameless::componentComplete() {
         *result = HTCLIENT;
         return true;
     } else if (uMsg == WM_NCPAINT) {
-        if(isCompositionEnabled()){
+        if (isCompositionEnabled()) {
             return false;
         }
         *result = FALSE;
         return true;
     } else if (uMsg == WM_NCACTIVATE) {
-        if(isCompositionEnabled()){
+        if (isCompositionEnabled()) {
             return false;
         }
         *result = TRUE;
@@ -362,27 +360,27 @@ void FluFrameless::_setMaximizeHovered(bool val) {
 
 void FluFrameless::_updateCursor(int edges) {
     switch (edges) {
-    case 0:
+        case 0:
-        window()->setCursor(Qt::ArrowCursor);
+            window()->setCursor(Qt::ArrowCursor);
-        break;
+            break;
-    case Qt::LeftEdge:
+        case Qt::LeftEdge:
-    case Qt::RightEdge:
+        case Qt::RightEdge:
-        window()->setCursor(Qt::SizeHorCursor);
+            window()->setCursor(Qt::SizeHorCursor);
-        break;
+            break;
-    case Qt::TopEdge:
+        case Qt::TopEdge:
-    case Qt::BottomEdge:
+        case Qt::BottomEdge:
-        window()->setCursor(Qt::SizeVerCursor);
+            window()->setCursor(Qt::SizeVerCursor);
-        break;
+            break;
-    case Qt::LeftEdge | Qt::TopEdge:
+        case Qt::LeftEdge | Qt::TopEdge:
-    case Qt::RightEdge | Qt::BottomEdge:
+        case Qt::RightEdge | Qt::BottomEdge:
-        window()->setCursor(Qt::SizeFDiagCursor);
+            window()->setCursor(Qt::SizeFDiagCursor);
-        break;
+            break;
-    case Qt::RightEdge | Qt::TopEdge:
+        case Qt::RightEdge | Qt::TopEdge:
-    case Qt::LeftEdge | Qt::BottomEdge:
+        case Qt::LeftEdge | Qt::BottomEdge:
-        window()->setCursor(Qt::SizeBDiagCursor);
+            window()->setCursor(Qt::SizeBDiagCursor);
-        break;
+            break;
-    default:
+        default:
-        break;
+            break;
     }
 }
 

src/FluTableModel.cpp

@@ -1,6 +1,6 @@
 #include "FluTableModel.h"
 
-FluTableModel::FluTableModel(QObject *parent) : QAbstractTableModel{parent}{
+FluTableModel::FluTableModel(QObject *parent) : QAbstractTableModel{parent} {
 
 }
 
@@ -14,20 +14,20 @@ int FluTableModel::columnCount(const QModelIndex &parent) const {
 
 QVariant FluTableModel::data(const QModelIndex &index, int role) const {
     switch (role) {
-    case FluTableModel::RowModel:
+        case FluTableModel::RowModel:
-        return QVariant::fromValue(_rows.at(index.row()));
+            return QVariant::fromValue(_rows.at(index.row()));
-    case FluTableModel::ColumnModel:
+        case FluTableModel::ColumnModel:
-        return QVariant::fromValue(_columnSource.at(index.column()));
+            return QVariant::fromValue(_columnSource.at(index.column()));
-    default:
+        default:
-        break;
+            break;
     }
     return {};
 }
 
 QHash<int, QByteArray> FluTableModel::roleNames() const {
     return {
-        {FluTableModel::RowModel,    "rowModel"},
+            {FluTableModel::RowModel,    "rowModel"},
-        {FluTableModel::ColumnModel, "columnModel"}
+            {FluTableModel::ColumnModel, "columnModel"}
     };
 }
 
@@ -41,33 +41,33 @@ QModelIndex FluTableModel::index(int row, int column, const QModelIndex &parent)
     return createIndex(row, column);
 }
 
-void FluTableModel::clear(){
+void FluTableModel::clear() {
     beginResetModel();
     this->_rows.clear();
     endResetModel();
 }
 
-QVariant FluTableModel::getRow(int rowIndex){
+QVariant FluTableModel::getRow(int rowIndex) {
     return _rows.at(rowIndex);
 }
 
-void FluTableModel::setRow(int rowIndex,QVariant row){
+void FluTableModel::setRow(int rowIndex, QVariant row) {
-    _rows.replace(rowIndex,row.toMap());
+    _rows.replace(rowIndex, row.toMap());
     Q_EMIT dataChanged(index(rowIndex, 0), index(rowIndex, columnCount() - 1));
 }
 
-void FluTableModel::insertRow(int rowIndex,QVariant row){
+void FluTableModel::insertRow(int rowIndex, QVariant row) {
     beginInsertRows(QModelIndex(), rowIndex, rowIndex);
-    _rows.insert(rowIndex,row.toMap());
+    _rows.insert(rowIndex, row.toMap());
     endInsertRows();
 }
 
-void FluTableModel::removeRow(int rowIndex,int rows){
+void FluTableModel::removeRow(int rowIndex, int rows) {
     beginRemoveRows(QModelIndex(), rowIndex, rowIndex + rows - 1);
     _rows = _rows.mid(0, rowIndex) + _rows.mid(rowIndex + rows);
     endRemoveRows();
 }
 
-void FluTableModel::appendRow(QVariant row){
+void FluTableModel::appendRow(QVariant row) {
-    insertRow(rowCount(),row);
+    insertRow(rowCount(), row);
 }

src/FluTableModel.h

@@ -7,10 +7,10 @@
 #include "stdafx.h"
 
 class FluTableModel : public QAbstractTableModel {
-    Q_OBJECT
+Q_OBJECT
-    Q_PROPERTY_AUTO(int, dataSourceSize)
+Q_PROPERTY_AUTO(int, dataSourceSize)
-    Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
+Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
-    Q_PROPERTY_AUTO(QList<QVariantMap>, rows)
+Q_PROPERTY_AUTO(QList<QVariantMap>, rows)
     Q_PROPERTY(int rowCount READ rowCount CONSTANT)
     QML_NAMED_ELEMENT(FluTableModel)
 public:
@@ -37,11 +37,11 @@ public:
 
     Q_INVOKABLE QVariant getRow(int rowIndex);
 
-    Q_INVOKABLE void setRow(int rowIndex,QVariant row);
+    Q_INVOKABLE void setRow(int rowIndex, QVariant row);
 
-    Q_INVOKABLE void insertRow(int rowIndex,QVariant row);
+    Q_INVOKABLE void insertRow(int rowIndex, QVariant row);
 
-    Q_INVOKABLE void removeRow(int rowIndex,int rows = 1);
+    Q_INVOKABLE void removeRow(int rowIndex, int rows = 1);
 
     Q_INVOKABLE void appendRow(QVariant row);
 

src/FluTableSortProxyModel.cpp

@@ -3,9 +3,8 @@
 #include <QJSValueList>
 
 FluTableSortProxyModel::FluTableSortProxyModel(QSortFilterProxyModel *parent) : QSortFilterProxyModel{parent} {
-    _model = nullptr;
     connect(this, &FluTableSortProxyModel::modelChanged, this, [=] {
-        setSourceModel(this->model());
+        setSourceModel(this->model().value<QAbstractTableModel *>());
     });
 }
 
@@ -59,19 +58,18 @@ bool FluTableSortProxyModel::lessThan(const QModelIndex &source_left, const QMod
 
 [[maybe_unused]] QVariant FluTableSortProxyModel::getRow(int rowIndex) {
     QVariant result;
-    QMetaObject::invokeMethod(_model, "getRow", Q_RETURN_ARG(QVariant, result), Q_ARG(int, mapToSource(index(rowIndex, 0)).row()));
+    QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "getRow", Q_RETURN_ARG(QVariant, result), Q_ARG(int, mapToSource(index(rowIndex, 0)).row()));
     return result;
 }
 
 [[maybe_unused]] void FluTableSortProxyModel::setRow(int rowIndex, const QVariant &val) {
-    QMetaObject::invokeMethod(_model, "setRow", Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(QVariant, val));
+    QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "setRow", Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(QVariant, val));
 }
 
 [[maybe_unused]] void FluTableSortProxyModel::insertRow(int rowIndex, const QVariant &val) {
-    QMetaObject::invokeMethod(_model, "insertRow", Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(QVariant, val));
+    QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "insertRow", Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(QVariant, val));
 }
 
 [[maybe_unused]] void FluTableSortProxyModel::removeRow(int rowIndex, int rows) {
-    QMetaObject::invokeMethod(_model, "removeRow", Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(int, rows));
+    QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "removeRow", Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(int, rows));
 }
-

src/FluTableSortProxyModel.h

@@ -8,7 +8,7 @@
 
 class FluTableSortProxyModel : public QSortFilterProxyModel {
 Q_OBJECT
-Q_PROPERTY_AUTO_P(QAbstractTableModel*, model)
+Q_PROPERTY_AUTO_P(QVariant, model)
     QML_NAMED_ELEMENT(FluTableSortProxyModel)
 public:
     explicit FluTableSortProxyModel(QSortFilterProxyModel *parent = nullptr);

src/FluTools.h

@@ -95,5 +95,5 @@ SINGLETON(FluTools)
 
     Q_INVOKABLE QString getWallpaperFilePath();
 
-    Q_INVOKABLE QColor imageMainColor(const QImage& image, double bright = 1);
+    Q_INVOKABLE QColor imageMainColor(const QImage &image, double bright = 1);
 };

src/FluTreeModel.cpp

@@ -264,12 +264,12 @@ void FluTreeModel::allCollapse() {
     endResetModel();
 }
 
-QVariant FluTreeModel::selectionModel(){
+QVariant FluTreeModel::selectionModel() {
     QList<FluTreeNode *> data;
-    foreach (auto item, _dataSource) {
+            foreach (auto item, _dataSource) {
-        if (item->checked()) {
+            if (item->checked()) {
-            data.append(item);
+                data.append(item);
+            }
         }
-    }
     return QVariant::fromValue(data);
 }

src/Qt5/imports/FluentUI/Controls/FluShadow.qml

@@ -4,7 +4,7 @@ import FluentUI 1.0
 
 Item {
     //高性能阴影！！！比DropShadow阴影性能高出数倍！！！
-    property color color: FluTheme.dark ? "#AAAAAA" : "#999999"
+    property color color: FluTheme.dark ? "#000000" : "#999999"
     property int elevation: 5
     property int radius: 4
     id:control

src/Qt5/imports/FluentUI/Controls/FluTableView.qml

@@ -9,7 +9,9 @@ Rectangle {
     readonly property alias rows: table_view.rows
     readonly property alias columns: table_view.columns
     readonly property alias current: d.current
-    readonly property alias sourceModel: table_model
+    property var sourceModel:FluTableModel {
+        columnSource: control.columnSource
+    }
     property var columnSource: []
     property var dataSource
     property color borderColor: FluTheme.dark ? Qt.rgba(37/255,37/255,37/255,1) : Qt.rgba(228/255,228/255,228/255,1)
@@ -29,7 +31,7 @@ Rectangle {
             var columns= []
             var headerRow = {}
             columnSource.forEach(function(item){
-                var column = Qt.createQmlObject('import Qt.labs.qmlmodels 1.0;TableModelColumn{}',table_model);
+                var column = Qt.createQmlObject('import Qt.labs.qmlmodels 1.0;TableModelColumn{}',sourceModel);
                 column.display = item.dataIndex
                 columns.push(column)
                 headerRow[item.dataIndex] = item.title
@@ -58,12 +60,8 @@ Rectangle {
         }
     }
     onDataSourceChanged: {
-        table_model.clear()
+        sourceModel.clear()
-        table_model.rows = dataSource
+        sourceModel.rows = dataSource
-    }
-    FluTableModel {
-        id:table_model
-        columnSource: control.columnSource
     }
     TableModel{
         id:header_column_model
@@ -75,7 +73,7 @@ Rectangle {
     }
     FluTableSortProxyModel{
         id:table_sort_model
-        model: table_model
+        model: control.sourceModel
     }
     Component{
         id:com_edit
@@ -191,6 +189,7 @@ Rectangle {
         id:com_table_delegate
         MouseArea{
             id:item_table_mouse
+            property var _model: model
             property bool isRowSelected: {
                 if(rowModel === null)
                     return false
@@ -283,6 +282,7 @@ Rectangle {
                 }
                 FluLoader{
                     id: item_table_loader
+                    property var model: item_table_mouse._model
                     property var display: rowModel[columnModel.dataIndex]
                     property var rowModel : model.rowModel
                     property var columnModel : model.columnModel
@@ -446,7 +446,7 @@ Rectangle {
             id:column_item_control
             readonly property real cellPadding: 8
             property bool canceled: false
-            property int columnIndex: column
+            property var _model: model
             readonly property var columnObject : control.columnSource[column]
             implicitWidth: {
                 return (item_column_loader.item && item_column_loader.item.implicitWidth) + (cellPadding * 2)
@@ -503,22 +503,23 @@ Rectangle {
             }
             FluLoader{
                 id:item_column_loader
-                property var itemModel: model
+                property var model: column_item_control._model
-                property var modelData: model.display
+                property var display: model.display
                 property var tableView: table_view
-                property var tableModel: table_model
+                property var sourceModel: control.sourceModel
+                 property bool isObject: typeof(display) == "object"
                 property var options:{
-                    if(typeof(modelData) == "object"){
+                    if(isObject){
-                        return modelData.options
+                        return display.options
                     }
                     return {}
                 }
-                property int column: column_item_control.columnIndex
+                property int column: model.column
                 width: parent.width
                 height: parent.height
                 sourceComponent: {
-                    if(typeof(modelData) == "object"){
+                    if(isObject){
-                        return modelData.comId
+                        return display.comId
                     }
                     return com_column_text
                 }
@@ -686,7 +687,7 @@ Rectangle {
         id:com_column_text
         FluText {
             id: column_text
-            text: modelData
+            text: String(display)
             anchors.fill: parent
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
@@ -835,7 +836,7 @@ Rectangle {
     function sort(callback=undefined){
         if(callback){
             table_sort_model.setComparator(function(left,right){
-                return callback(table_model.getRow(left),table_model.getRow(right))
+                return callback(sourceModel.getRow(left),sourceModel.getRow(right))
             })
         }else{
             table_sort_model.setComparator(undefined)
@@ -844,7 +845,7 @@ Rectangle {
     function filter(callback=undefined){
         if(callback){
             table_sort_model.setFilter(function(index){
-                return callback(table_model.getRow(index))
+                return callback(sourceModel.getRow(index))
             })
         }else{
             table_sort_model.setFilter(undefined)
@@ -868,7 +869,7 @@ Rectangle {
     }
     function insertRow(rowIndex,obj){
         if(rowIndex>=0 && rowIndex<table_view.rows){
-            table_view.model.insertRow(rowIndex,obj)
+            sourceModel.insertRow(rowIndex,obj)
         }
     }
     function currentIndex(){
@@ -876,8 +877,8 @@ Rectangle {
         if(!d.current){
             return index
         }
-        for (var i = 0; i <= table_model.rowCount-1; i++) {
+        for (var i = 0; i <= sourceModel.rowCount-1; i++) {
-            var sourceItem = table_model.getRow(i);
+            var sourceItem = sourceModel.getRow(i);
             if(sourceItem._key === d.current._key){
                 index = i
                 break
@@ -886,6 +887,6 @@ Rectangle {
         return index
     }
     function appendRow(obj){
-        table_model.appendRow(obj)
+        sourceModel.appendRow(obj)
     }
 }

src/Qt6/imports/FluentUI/Controls/FluShadow.qml

@@ -4,7 +4,7 @@ import FluentUI
 
 Item {
     //高性能阴影！！！比DropShadow阴影性能高出数倍！！！
-    property color color: FluTheme.dark ? "#AAAAAA" : "#999999"
+    property color color: FluTheme.dark ? "#000000" : "#999999"
     property int elevation: 5
     property int radius: 4
     id:control

src/Qt6/imports/FluentUI/Controls/FluTableView.qml

@@ -9,7 +9,9 @@ Rectangle {
     readonly property alias rows: table_view.rows
     readonly property alias columns: table_view.columns
     readonly property alias current: d.current
-    readonly property alias sourceModel: table_model
+    property var sourceModel:FluTableModel {
+        columnSource: control.columnSource
+    }
     property var columnSource: []
     property var dataSource
     property color borderColor: FluTheme.dark ? Qt.rgba(37/255,37/255,37/255,1) : Qt.rgba(228/255,228/255,228/255,1)
@@ -29,7 +31,7 @@ Rectangle {
             var columns= []
             var headerRow = {}
             columnSource.forEach(function(item){
-                var column = Qt.createQmlObject('import Qt.labs.qmlmodels 1.0;TableModelColumn{}',table_model);
+                var column = Qt.createQmlObject('import Qt.labs.qmlmodels 1.0;TableModelColumn{}',sourceModel);
                 column.display = item.dataIndex
                 columns.push(column)
                 headerRow[item.dataIndex] = item.title
@@ -58,12 +60,8 @@ Rectangle {
         }
     }
     onDataSourceChanged: {
-        table_model.clear()
+        sourceModel.clear()
-        table_model.rows = dataSource
+        sourceModel.rows = dataSource
-    }
-    FluTableModel {
-        id:table_model
-        columnSource: control.columnSource
     }
     TableModel{
         id:header_column_model
@@ -75,7 +73,7 @@ Rectangle {
     }
     FluTableSortProxyModel{
         id:table_sort_model
-        model: table_model
+        model: control.sourceModel
     }
     Component{
         id:com_edit
@@ -191,6 +189,7 @@ Rectangle {
         id:com_table_delegate
         MouseArea{
             id:item_table_mouse
+            property var _model: model
             property bool isRowSelected: {
                 if(rowModel === null)
                     return false
@@ -283,6 +282,7 @@ Rectangle {
                 }
                 FluLoader{
                     id: item_table_loader
+                    property var model: item_table_mouse._model
                     property var display: rowModel[columnModel.dataIndex]
                     property var rowModel : model.rowModel
                     property var columnModel : model.columnModel
@@ -446,7 +446,7 @@ Rectangle {
             id:column_item_control
             readonly property real cellPadding: 8
             property bool canceled: false
-            property int columnIndex: column
+            property var _model: model
             readonly property var columnObject : control.columnSource[column]
             implicitWidth: {
                 return (item_column_loader.item && item_column_loader.item.implicitWidth) + (cellPadding * 2)
@@ -503,22 +503,23 @@ Rectangle {
             }
             FluLoader{
                 id:item_column_loader
-                property var itemModel: model
+                property var model: column_item_control._model
-                property var modelData: model.display
+                property var display: model.display
                 property var tableView: table_view
-                property var tableModel: table_model
+                property var sourceModel: control.sourceModel
+                 property bool isObject: typeof(display) == "object"
                 property var options:{
-                    if(typeof(modelData) == "object"){
+                    if(isObject){
-                        return modelData.options
+                        return display.options
                     }
                     return {}
                 }
-                property int column: column_item_control.columnIndex
+                property int column: model.column
                 width: parent.width
                 height: parent.height
                 sourceComponent: {
-                    if(typeof(modelData) == "object"){
+                    if(isObject){
-                        return modelData.comId
+                        return display.comId
                     }
                     return com_column_text
                 }
@@ -686,7 +687,7 @@ Rectangle {
         id:com_column_text
         FluText {
             id: column_text
-            text: modelData
+            text: String(display)
             anchors.fill: parent
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
@@ -835,7 +836,7 @@ Rectangle {
     function sort(callback=undefined){
         if(callback){
             table_sort_model.setComparator(function(left,right){
-                return callback(table_model.getRow(left),table_model.getRow(right))
+                return callback(sourceModel.getRow(left),sourceModel.getRow(right))
             })
         }else{
             table_sort_model.setComparator(undefined)
@@ -844,7 +845,7 @@ Rectangle {
     function filter(callback=undefined){
         if(callback){
             table_sort_model.setFilter(function(index){
-                return callback(table_model.getRow(index))
+                return callback(sourceModel.getRow(index))
             })
         }else{
             table_sort_model.setFilter(undefined)
@@ -868,7 +869,7 @@ Rectangle {
     }
     function insertRow(rowIndex,obj){
         if(rowIndex>=0 && rowIndex<table_view.rows){
-            table_view.model.insertRow(rowIndex,obj)
+            sourceModel.insertRow(rowIndex,obj)
         }
     }
     function currentIndex(){
@@ -876,8 +877,8 @@ Rectangle {
         if(!d.current){
             return index
         }
-        for (var i = 0; i <= table_model.rowCount-1; i++) {
+        for (var i = 0; i <= sourceModel.rowCount-1; i++) {
-            var sourceItem = table_model.getRow(i);
+            var sourceItem = sourceModel.getRow(i);
             if(sourceItem._key === d.current._key){
                 index = i
                 break
@@ -886,6 +887,6 @@ Rectangle {
         return index
     }
     function appendRow(obj){
-        table_model.appendRow(obj)
+        sourceModel.appendRow(obj)
     }
 }