From beaadfbf85c5b3efd21bfe17ae28b9b8941f1fbe Mon Sep 17 00:00:00 2001
From: taynpg <taynpg@163.com>
Date: Wed, 18 Jun 2025 17:22:15 +0800
Subject: [PATCH] fix: drag bug.

---
 Gui/Control/FileControl.cpp    |  2 +-
 Gui/Control/cusTableWidget.cpp | 75 ++++++----------------------------
 Gui/Control/cusTableWidget.h   |  2 -
 Gui/Form/Transform.cpp         |  4 +-
 Gui/frelayGUI.cpp              |  1 +
 5 files changed, 17 insertions(+), 67 deletions(-)

diff --git a/Gui/Control/FileControl.cpp b/Gui/Control/FileControl.cpp
index 4c97307..9a0ef5d 100644
--- a/Gui/Control/FileControl.cpp
+++ b/Gui/Control/FileControl.cpp
@@ -66,7 +66,7 @@ void FileManager::InitControl()
     ui->tableWidget->viewport()->setAcceptDrops(true);
     ui->tableWidget->setDropIndicatorShown(true);
     ui->tableWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    ui->tableWidget->setDragDropMode(QAbstractItemView::NoDragDrop);
+    ui->tableWidget->setDragDropMode(QAbstractItemView::DragDrop);
 
     connect(ui->btnHome, &QPushButton::clicked, this, &FileManager::evtHome);
     connect(ui->btnVisit, &QPushButton::clicked, this, &FileManager::evtFile);
diff --git a/Gui/Control/cusTableWidget.cpp b/Gui/Control/cusTableWidget.cpp
index 4599cee..303af9e 100644
--- a/Gui/Control/cusTableWidget.cpp
+++ b/Gui/Control/cusTableWidget.cpp
@@ -6,6 +6,7 @@
 #include <QDrag>
 #include <QMimeData>
 #include <QPainter>
+
 #include "FileControl.h"
 
 CustomTableWidget::CustomTableWidget(QWidget* parent) : QTableWidget(parent)
@@ -43,11 +44,19 @@ void CustomTableWidget::setRemoteIDCall(const std::function<QString()>& call)
 
 void CustomTableWidget::dropEvent(QDropEvent* event)
 {
-    if (!event->mimeData()->hasFormat("application/x-custom-data")) {
+    if (!event->mimeData()->hasFormat("application/x-qabstractitemmodeldatalist")) {
         event->ignore();
         return;
     }
-    QTableWidget::dropEvent(event);
+    QByteArray encoded = event->mimeData()->data("application/x-qabstractitemmodeldatalist");
+    QDataStream stream(&encoded, QIODevice::ReadOnly);
+
+    QList<QTableWidgetItem*> draggedItems;
+    while (!stream.atEnd()) {
+        int row, col;
+        QMap<int, QVariant> roleData;
+        stream >> row >> col >> roleData;
+    }
 }
 
 void CustomTableWidget::dragEnterEvent(QDragEnterEvent* event)
@@ -57,67 +66,9 @@ void CustomTableWidget::dragEnterEvent(QDragEnterEvent* event)
         event->ignore();
         return;
     }
-    if (event->mimeData()->hasFormat("application/x-custom-data")) {
+    if (event->mimeData()->hasFormat("application/x-qabstractitemmodeldatalist")) {
         event->acceptProposedAction();
-        auto dirinfo = infoUnpack<DirFileInfoVec>(event->mimeData()->data("application/x-custom-data"));
-        QVector<TransTask> tasks;
-        // generate task
-        for (const auto& df : dirinfo.vec) {
-            TransTask task;
-            task.isUpload = isRemote_;
-            task.localId = oidCall_();
-            task.remoteId = ridCall_();
-            if (isRemote_) {
-                task.remotePath = basePathCall_();
-                task.localPath = Util::Join(dirinfo.root, df.name);
-            }
-            else {
-                task.remotePath = Util::Join(dirinfo.root, df.name);
-                task.localPath = basePathCall_();
-            }
-            tasks.push_back(task);
-        }
-        emit sigTasks(tasks);
     } else {
         event->ignore();
     }
-}
-
-void CustomTableWidget::mouseMoveEvent(QMouseEvent* event)
-{
-    if (!(event->buttons() & Qt::LeftButton)) {
-        return;
-    }
-    if ((event->pos() - startPos_).manhattanLength() < QApplication::startDragDistance()) {
-        return;
-    }
-
-    QDrag* drag = new QDrag(this);
-    QMimeData* mimeData = new QMimeData;
-
-    DirFileInfoVec v;
-    v.root = basePathCall_();
-    foreach (QTableWidgetItem* item, selectedItems()) {
-        if (item->column() == 1) {
-            DirFileInfo df;
-            df.name = item->text();
-            v.vec.push_back(df);
-        }
-    }
-    mimeData->setData("application/x-custom-data", infoPack<DirFileInfoVec>(v));
-    drag->setMimeData(mimeData);
-    QPixmap pixmap(100, 50);
-    pixmap.fill(Qt::lightGray);
-    QPainter painter(&pixmap);
-    painter.drawText(pixmap.rect(), Qt::AlignCenter, QString("%1 ITEM").arg(v.vec.size()));
-    drag->setPixmap(pixmap);
-    drag->exec(Qt::CopyAction | Qt::MoveAction);
-}
-
-void CustomTableWidget::mousePressEvent(QMouseEvent* event)
-{
-    QTableWidget::mousePressEvent(event);
-    if (event->button() == Qt::LeftButton) {
-        startPos_ = event->pos();
-    }
-}
+}
\ No newline at end of file
diff --git a/Gui/Control/cusTableWidget.h b/Gui/Control/cusTableWidget.h
index ffa2de9..5947b78 100644
--- a/Gui/Control/cusTableWidget.h
+++ b/Gui/Control/cusTableWidget.h
@@ -24,8 +24,6 @@ public:
 protected:
     void dropEvent(QDropEvent* event) override;
     void dragEnterEvent(QDragEnterEvent* event);
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void mousePressEvent(QMouseEvent* event) override;
 
 protected:
     bool isRemote_{false};
diff --git a/Gui/Form/Transform.cpp b/Gui/Form/Transform.cpp
index aa1e0d2..cadf531 100644
--- a/Gui/Form/Transform.cpp
+++ b/Gui/Form/Transform.cpp
@@ -102,8 +102,8 @@ void TransForm::handleUI(const TransTask& task)
 void TransForm::showEvent(QShowEvent* event)
 {
     QDialog::showEvent(event);
-    workTh_ = new TranFromTh(this);
-    fileTrans_->moveToThread(workTh_);
+    workTh_ = new TranFromTh(this, this);
+    //fileTrans_->moveToThread(workTh_);
     connect(workTh_, &QThread::finished, fileTrans_, &QObject::deleteLater);
     workTh_->start();
 }
diff --git a/Gui/frelayGUI.cpp b/Gui/frelayGUI.cpp
index 59ddc67..7642e63 100644
--- a/Gui/frelayGUI.cpp
+++ b/Gui/frelayGUI.cpp
@@ -36,6 +36,7 @@ void frelayGUI::InitControl()
 
     compare_ = new Compare(this);
     transform_ = new TransForm(this);
+    transform_->SetClientCore(clientCore_);
 
     connecter_ = new Connecter(this);
     connecter_->SetClientCore(clientCore_);