fix: [workspace]tree view issue

support expand file item in my-share view.

Log: fix tree view issue
Bug: https://pms.uniontech.com/bug-view-235073.html

src/plugins/filemanager/dfmplugin-myshares/fileinfo/sharefileinfo.cpp

@@ -25,8 +25,12 @@ ShareFileInfo::~ShareFileInfo()
 
 QString ShareFileInfo::displayOf(const DisPlayInfoType type) const
 {
-    if (DisPlayInfoType::kFileDisplayName == type)
-        return d->fileName();
+    if (DisPlayInfoType::kFileDisplayName == type) {
+        auto name = d->fileName();
+        if (name.isEmpty())
+            name = ProxyFileInfo::displayOf(type);
+        return name;
+    }
     return ProxyFileInfo::displayOf(type);
 }
 
@@ -56,12 +60,7 @@ QUrl ShareFileInfo::urlOf(const UrlInfoType type) const
 
 bool ShareFileInfo::isAttributes(const OptInfoType type) const
 {
-    switch (type) {
-    case FileIsType::kIsDir:
-        return true;
-    default:
-        return ProxyFileInfo::isAttributes(type);
-    }
+    return ProxyFileInfo::isAttributes(type);
 }
 
 bool ShareFileInfo::canAttributes(const CanableInfoType type) const

src/plugins/filemanager/dfmplugin-myshares/iterator/shareiterator.cpp

@@ -9,6 +9,8 @@
 
 #include <dfm-base/base/urlroute.h>
 #include <dfm-base/base/schemefactory.h>
+#include <dfm-base/utils/universalutils.h>
+#include <dfm-base/file/local/localdiriterator.h>
 
 #include <dfm-framework/event/event.h>
 
@@ -17,8 +19,10 @@ DFMBASE_USE_NAMESPACE
 
 ShareIterator::ShareIterator(const QUrl &url, const QStringList &nameFilters, QDir::Filters filters, QDirIterator::IteratorFlags flags)
     : AbstractDirIterator(url, nameFilters, filters, flags),
-      d(new ShareIteratorPrivate(this))
+      d(new ShareIteratorPrivate(this, url))
 {
+    if (!UniversalUtils::urlEquals(url, ShareUtils::rootUrl()))
+        d->proxy = new LocalDirIterator(ShareUtils::convertToLocalUrl(url), nameFilters, filters, flags);
 }
 
 ShareIterator::~ShareIterator()
@@ -27,24 +31,38 @@ ShareIterator::~ShareIterator()
 
 QUrl ShareIterator::next()
 {
+    if (d->proxy)
+        return ShareUtils::makeShareUrl(d->proxy->next().path());
+
     if (d->shares.isEmpty())
         return {};
+
     d->currentInfo = d->shares.takeFirst();
+
     return fileUrl();
 }
 
 bool ShareIterator::hasNext() const
 {
+    if (d->proxy)
+        return d->proxy->hasNext();
+
     return !d->shares.isEmpty();
 }
 
 QString ShareIterator::fileName() const
 {
+    if (d->proxy)
+        return d->proxy->fileName();
+
     return d->currentInfo.value(ShareInfoKeys::kName).toString();
 }
 
 QUrl ShareIterator::fileUrl() const
 {
+    if (d->proxy)
+        return ShareUtils::makeShareUrl(d->proxy->fileUrl().path());
+
     return ShareUtils::makeShareUrl(d->currentInfo.value(ShareInfoKeys::kPath).toString());
 }
 
@@ -55,13 +73,17 @@ const FileInfoPointer ShareIterator::fileInfo() const
 
 QUrl ShareIterator::url() const
 {
+    if (d->rootUrl.isValid())
+        return d->rootUrl;
+
     return ShareUtils::rootUrl();
 }
 
-ShareIteratorPrivate::ShareIteratorPrivate(ShareIterator *qq)
+ShareIteratorPrivate::ShareIteratorPrivate(ShareIterator *qq, const QUrl &url)
     : q(qq)
 {
     shares = dpfSlotChannel->push("dfmplugin_dirshare", "slot_Share_AllShareInfos").value<QList<QVariantMap>>();
+    rootUrl = url;
 }
 
 ShareIteratorPrivate::~ShareIteratorPrivate()

src/plugins/filemanager/dfmplugin-myshares/menu/mysharemenuscene.cpp

@@ -7,6 +7,7 @@
 #include "events/shareeventscaller.h"
 
 #include <dfm-base/dfm_menu_defines.h>
+#include <dfm-base/base/schemefactory.h>
 #include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
 
 #include <QMenu>
@@ -126,18 +127,24 @@ void MyShareMenuScenePrivate::createFileMenu(QMenu *parent)
     predicateAction[MySharesActionId::kOpenShareFolder] = act;
 
     if (selectFiles.count() == 1) {
-        act = parent->addAction(predicateName[MySharesActionId::kOpenShareInNewWin]);
-        act->setProperty(ActionPropertyKey::kActionID, MySharesActionId::kOpenShareInNewWin);
-        predicateAction[MySharesActionId::kOpenShareInNewWin] = act;
-
-        act = parent->addAction(predicateName[MySharesActionId::kOpenShareInNewTab]);
-        act->setProperty(ActionPropertyKey::kActionID, MySharesActionId::kOpenShareInNewTab);
-        predicateAction[MySharesActionId::kOpenShareInNewTab] = act;
-        parent->addSeparator();
-
-        act = parent->addAction(predicateName[MySharesActionId::kCancleSharing]);
-        act->setProperty(ActionPropertyKey::kActionID, MySharesActionId::kCancleSharing);
-        predicateAction[MySharesActionId::kCancleSharing] = act;
+        auto info = InfoFactory::create<FileInfo>(selectFiles.first());
+        if (info && info->isAttributes(OptInfoType::kIsDir)) {
+            act = parent->addAction(predicateName[MySharesActionId::kOpenShareInNewWin]);
+            act->setProperty(ActionPropertyKey::kActionID, MySharesActionId::kOpenShareInNewWin);
+            predicateAction[MySharesActionId::kOpenShareInNewWin] = act;
+
+            act = parent->addAction(predicateName[MySharesActionId::kOpenShareInNewTab]);
+            act->setProperty(ActionPropertyKey::kActionID, MySharesActionId::kOpenShareInNewTab);
+            predicateAction[MySharesActionId::kOpenShareInNewTab] = act;
+            parent->addSeparator();
+
+            bool shared = dpfSlotChannel->push("dfmplugin_dirshare", "slot_Share_IsPathShared", info->pathOf(PathInfoType::kAbsoluteFilePath)).toBool();
+            if (shared) {
+                act = parent->addAction(predicateName[MySharesActionId::kCancleSharing]);
+                act->setProperty(ActionPropertyKey::kActionID, MySharesActionId::kCancleSharing);
+                predicateAction[MySharesActionId::kCancleSharing] = act;
+            }
+        }
     }
     parent->addSeparator();
 

src/plugins/filemanager/dfmplugin-myshares/private/shareiterator_p.h

@@ -7,6 +7,12 @@
 
 #include "dfmplugin_myshares_global.h"
 
+#include <QUrl>
+
+namespace dfmbase {
+class LocalDirIterator;
+}
+
 namespace dfmplugin_myshares {
 
 class ShareIterator;
@@ -15,13 +21,17 @@ class ShareIteratorPrivate
     friend class ShareIterator;
 
 public:
-    explicit ShareIteratorPrivate(ShareIterator *qq);
+    explicit ShareIteratorPrivate(ShareIterator *qq, const QUrl &url);
     ~ShareIteratorPrivate();
 
 private:
+    dfmbase::LocalDirIterator *proxy { nullptr };
+
     ShareIterator *q { nullptr };
     ShareInfoList shares;
     ShareInfo currentInfo;
+
+    QUrl rootUrl;
 };
 
 }