fix: fix system and app proxy is hide

the system and app proxy must show on the control center

PMS: BUG-350619

Author: ut003640

dcc-network/operation/netitemmodel.cpp

@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #include "netitemmodel.h"
 
-#include "netitem.h"
-
 namespace dde {
 namespace network {
 enum NetModelRole {
@@ -42,9 +40,18 @@ protected Q_SLOTS:
         onAddObject(child);
     }
 
-    void AboutToRemoveObject(const NetItem *, int pos) { beginRemoveRows(QModelIndex(), pos, pos); }
+    void AboutToRemoveObject(const NetItem *parentItem, int pos)
+    {
+        if (!parentItem)
+            return;
+
+        beginRemoveRows(QModelIndex(), pos, pos);
+    }
 
-    void removeObject(const NetItem *child) { endRemoveRows(); }
+    void removeObject(const NetItem *child)
+    {
+        endRemoveRows();
+    }
 
 protected:
     NetItem *m_root;
@@ -198,7 +205,13 @@ QHash<int, QByteArray> NetItemModel::roleNames() const
 bool NetItemModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
 {
     NetItem *leftItem = static_cast<NetItem *>(source_left.internalPointer());
+    if (!leftItem)
+        return false;
+
     NetItem *rightItem = static_cast<NetItem *>(source_right.internalPointer());
+    if (!rightItem)
+        return false;
+
     if (leftItem->itemType() != rightItem->itemType())
         return leftItem->itemType() < rightItem->itemType();
     switch (leftItem->itemType()) {

dcc-network/operation/netitemmodel.h

@@ -6,6 +6,8 @@
 
 #include <QSortFilterProxyModel>
 
+#include "netitem.h"
+
 namespace dde {
 namespace network {
 class NetItem;
@@ -28,6 +30,9 @@ class NetItemModel : public QSortFilterProxyModel
 
 protected:
     bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
+
+private:
+    mutable QMap<NetType::NetItemType, int> m_rowMap;
 };
 } // namespace network
 } // namespace dde

dcc-network/qml/PageSystemProxy.qml

@@ -44,7 +44,7 @@ DccObject {
         id: devCheck
         D.Switch {
             checked: netItem.isEnabled
-            enabled: netItem.enabledable
+            enabled: true
             onClicked: {
                 dccData.exec(netItem.isEnabled ? NetManager.DisabledDevice : NetManager.EnabledDevice, netItem.id, {})
             }
@@ -70,7 +70,7 @@ DccObject {
                 pageType: DccObject.Editor
                 page: D.Switch {
                     checked: root.method !== NetType.None
-                    enabled: netItem.enabledable
+                    enabled: true
                     onClicked: {
                         if (checked) {
                             root.method = netItem.lastMethod

net-view/operation/nettype.h

@@ -103,12 +103,12 @@ class NetType
         Net_AirplaneTips = 0x01000000,
         Net_VPNTips = 0x02000000,
         Net_VPNChildren = 0x04000000,
-
+        Net_SysProxyAlwaysShow = 0x08000000,
         //
         Net_DockFlags = Net_Device | Net_VPN | Net_SysProxy | Net_Airplane | Net_AirplaneTips | Net_VPNTips | Net_tipsLinkEnabled | Net_UseSecretAgent | Net_CheckPortal | Net_8021xToControlCenterUnderConnect | Net_autoUpdateHiddenConfig,
         Net_LockFlags = Net_Device | Net_VPN | Net_SysProxy | Net_Airplane | Net_AirplaneTips | Net_VPNTips | Net_UseSecretAgent | Net_CheckPortal | Net_8021xSendNotifyUnderConnect,
         Net_GreeterFlags = Net_Device | Net_Airplane | Net_AirplaneTips | Net_ServiceNM | Net_AutoAddConnection | Net_UseSecretAgent | Net_CheckPortal | Net_8021xSendNotifyUnderConnect,
-        Net_DccFlags = Net_Device | Net_VPN | Net_VPNChildren | Net_SysProxy | Net_Hotspot | Net_Airplane | Net_DSL | Net_Details,
+        Net_DccFlags = Net_Device | Net_VPN | Net_VPNChildren | Net_SysProxy | Net_Hotspot | Net_Airplane | Net_DSL | Net_Details | Net_SysProxyAlwaysShow,
         //
         Net_8021xMask = 0x00000F00,
     };

net-view/operation/private/netmanagerthreadprivate.cpp

@@ -462,11 +462,12 @@ void NetManagerThreadPrivate::doInit()
         item->updatemethod(NetType::ProxyMethod(method));
         item->item()->moveToThread(m_parentThread);
         Q_EMIT itemAdded("Root", item);
-        onSystemProxyExistChanged(networkController->proxyController()->systemProxyExist());
         onSystemAutoProxyChanged(networkController->proxyController()->autoProxy());
         onSystemManualProxyChanged();
-
-        connect(networkController->proxyController(), &ProxyController::systemProxyExistChanged, this, &NetManagerThreadPrivate::onSystemProxyExistChanged);
+        if(!m_flags.testFlags(NetType::NetManagerFlag::Net_SysProxyAlwaysShow)) {
+            onSystemProxyExistChanged(networkController->proxyController()->systemProxyExist());
+            connect(networkController->proxyController(), &ProxyController::systemProxyExistChanged, this, &NetManagerThreadPrivate::onSystemProxyExistChanged);
+        }
         connect(networkController->proxyController(), &ProxyController::proxyMethodChanged, this, &NetManagerThreadPrivate::onSystemProxyMethodChanged);
         connect(networkController->proxyController(), &ProxyController::autoProxyChanged, this, &NetManagerThreadPrivate::onSystemAutoProxyChanged);
         connect(networkController->proxyController(), &ProxyController::proxyChanged, this, &NetManagerThreadPrivate::onSystemManualProxyChanged);