fix: wrong index on xray pages (#2669 )

* test crash xray * fixed save config xray * reset file * fixed text port & reset file * fixed textFieldWithHeaderType.textField
fix: deleting volumes when cleaning the server (#2673 )
2026-06-03 00:51:55 +03:00 · 2026-06-01 12:22:54 +08:00 · 2026-06-01 11:54:34 +08:00
8 changed files with 36 additions and 15 deletions
--- a/client/server_scripts/remove_all_containers.sh
+++ b/client/server_scripts/remove_all_containers.sh
@@ -1,5 +1,6 @@
 sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker stop;\
 sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker rm -fv;\
 sudo docker images -a --format table | grep amnezia | awk '{print $3, $1 ":" $2}' | xargs sudo docker rmi;\
+sudo docker volume ls | grep amnezia | awk '{print $2}' | xargs sudo docker volume rm -f;\
 sudo docker network ls | grep amnezia-dns-net | awk '{print $1}' | xargs sudo docker network rm;\
 sudo rm -frd /opt/amnezia
--- a/client/ui/qml/Pages2/PageProtocolXrayFlowSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXrayFlowSettings.qml
@@ -112,7 +112,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
--- a/client/ui/qml/Pages2/PageProtocolXraySecuritySettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXraySecuritySettings.qml
@@ -279,7 +279,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
--- a/client/ui/qml/Pages2/PageProtocolXraySettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXraySettings.qml
@@ -17,6 +17,10 @@ import "../Components"
 PageType {
    id: root

+    enableTimer: false
+
+    property bool portDirty: false
+
    function formatTransport(value) {
        if (value === "raw") return "RAW (TCP)"
        if (value === "xhttp") return "XHTTP"
@@ -39,8 +43,8 @@ PageType {
        anchors.right: parent.right
        anchors.topMargin: 20 + PageController.safeAreaTopMargin

-        onFocusChanged: {
-            if (this.activeFocus) {
+        onActiveFocusChanged: {
+            if (backButton.enabled && backButton.activeFocus) {
                listView.positionViewAtBeginning()
            }
        }
@@ -60,8 +64,6 @@ PageType {
        delegate: ColumnLayout {
            width: listView.width

-            property alias focusItemId: textFieldWithHeaderType.textField
-
            spacing: 0

            Text {
@@ -107,13 +109,32 @@ PageType {
                Layout.rightMargin: 16
                enabled: listView.enabled
                headerText: qsTr("Port")
-                textField.text: port
+
+                Binding {
+                    target: textFieldWithHeaderType.textField
+                    property: "text"
+                    value: port
+                    when: !textFieldWithHeaderType.textField.activeFocus
+                    restoreMode: Binding.RestoreNone
+                }
+
                textField.maximumLength: 5
                textField.validator: IntValidator {
                    bottom: 1; top: 65535
                }
+                textField.onActiveFocusChanged: {
+                    if (textField.activeFocus && textField.text === "" && port !== "") {
+                        textField.text = port
+                    }
+                }
+                textField.onTextChanged: {
+                    root.portDirty = (textField.text !== port)
+                }
                textField.onEditingFinished: {
-                    if (textField.text !== port) port = textField.text
+                    if (textField.text !== port) {
+                        port = textField.text
+                    }
+                    root.portDirty = false
                }
                checkEmptyText: true
            }
@@ -172,9 +193,8 @@ PageType {
                Layout.leftMargin: 16
                Layout.rightMargin: 16
                visible: listView.enabled
-                         && (XrayConfigModel.hasUnsavedChanges
-                             || textFieldWithHeaderType.textField.text !== port)
-                enabled: visible && textFieldWithHeaderType.errorText === ""
+                         && (XrayConfigModel.hasUnsavedChanges || root.portDirty)
+                enabled: visible && textFieldWithHeaderType.textField.text !== ""
                text: qsTr("Save")
                onClicked: function() {
                    forceActiveFocus()
--- a/client/ui/qml/Pages2/PageProtocolXrayTransportSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXrayTransportSettings.qml
@@ -742,7 +742,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
--- a/client/ui/qml/Pages2/PageProtocolXrayXPaddingBytesSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXrayXPaddingBytesSettings.qml
@@ -95,7 +95,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
--- a/client/ui/qml/Pages2/PageProtocolXrayXPaddingSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXrayXPaddingSettings.qml
@@ -211,7 +211,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
--- a/client/ui/qml/Pages2/PageProtocolXrayXmuxSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXrayXmuxSettings.qml
@@ -208,7 +208,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
Author	SHA1	Message	Date
yp	a9861d18b7	fix: wrong index on xray pages (#2669 ) * test crash xray * fixed save config xray * reset file * fixed text port & reset file * fixed textFieldWithHeaderType.textField	2026-06-01 12:22:54 +08:00
lunardunno	c14138f031	fix: deleting volumes when cleaning the server (#2673 ) * Deleting volumes when cleaning the server * force the remove volumes	2026-06-01 11:54:34 +08:00