From d6db3e398ab5c4510067dac92b64c1210635e90d Mon Sep 17 00:00:00 2001 From: Minoricew <154642983+Minoricew@users.noreply.github.com> Date: Tue, 18 Nov 2025 01:00:30 +0800 Subject: [PATCH] =?UTF-8?q?[=F0=9F=9B=A0=EF=B8=8F=20Fix]=20Settings=20rend?= =?UTF-8?q?erer=20'auraDisable'=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/aura/ui/composables/settingsRenderer.js | 34 +++++++++++-------- .../behaviourCtrl/aikariStatus.js | 7 ++++ .../behaviourCtrl/settings/deviceInfoPost.js | 2 ++ 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/aura/ui/composables/settingsRenderer.js b/src/aura/ui/composables/settingsRenderer.js index 946ab76..8abbc05 100755 --- a/src/aura/ui/composables/settingsRenderer.js +++ b/src/aura/ui/composables/settingsRenderer.js @@ -366,6 +366,19 @@ const renderNormalSettingsItem = (entry, formEl) => { // createOnLeaveEvtListener(channel, evtListener); } + const updateDisableStatus = (entry) => { + const isDisabledRet = entry.auraDisable(); + setDisableStatus( + entryOperationArea, + isDisabledRet.value, + isDisabledRet.tooltip + ); + }; + + if (entry.auraDisable) { + updateDisableStatus(entry); + } + if (entry.aikariRequired) { if (!global.__HUGO_AURA__.aikariStats.connected) { setDisableStatus(entryOperationArea, true, "连接至 Aikari 以继续"); @@ -373,7 +386,11 @@ const renderNormalSettingsItem = (entry, formEl) => { const evtListener = (event) => { if (event.detail.connected) { - setDisableStatus(entryOperationArea, false); + try { + updateDisableStatus(entry); + } catch { + setDisableStatus(entryOperationArea, false); + } } else { setDisableStatus(entryOperationArea, true, "连接至 Aikari 以继续"); } @@ -385,19 +402,6 @@ const renderNormalSettingsItem = (entry, formEl) => { const isShow = entry.auraIf(); if (!isShow) entryContainerEl.classList.add("aura-settings-entry-hidden"); - const updateDisableStatus = () => { - const isDisabledRet = entry.auraDisable(); - setDisableStatus( - entryOperationArea, - global.__HUGO_AURA__.aikariStats.connected ? isDisabledRet.value : true, - isDisabledRet.tooltip - ); - }; - - if (entry.auraDisable) { - updateDisableStatus(); - } - if (entry.associateVal) { const evtListener = (event) => { if (!entry.associateVal.includes(event.detail.path.join("."))) return; @@ -408,7 +412,7 @@ const renderNormalSettingsItem = (entry, formEl) => { : cls.add("aura-settings-entry-hidden"); if (entry.auraDisable) { - updateDisableStatus(); + updateDisableStatus(entry); } }; const channel = entry.aikariRequired diff --git a/src/aura/ui/pages/configSubPages/behaviourCtrl/aikariStatus.js b/src/aura/ui/pages/configSubPages/behaviourCtrl/aikariStatus.js index 59c0f30..30d99c5 100644 --- a/src/aura/ui/pages/configSubPages/behaviourCtrl/aikariStatus.js +++ b/src/aura/ui/pages/configSubPages/behaviourCtrl/aikariStatus.js @@ -246,7 +246,14 @@ if (!global.__HUGO_AURA_UI_REACTIVES__.subConfig) { target: "uninstSvc" } ); if (ret.success) { + lifecycleStatus.svcRunning = false; lifecycleStatus.svcInstalled = false; + global.__HUGO_AURA__.aikariStats.connected = false; + global.__HUGO_AURA__.aikariStats.launched = false; + ipcRenderer.invoke( + `${IPC_METHOD_BASE}.updateAikariStatus`, + global.__HUGO_AURA__.aikariStats + ); global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.aikariStatus.updateToast( "success", "服务卸载成功", diff --git a/src/aura/ui/pages/configSubPages/behaviourCtrl/settings/deviceInfoPost.js b/src/aura/ui/pages/configSubPages/behaviourCtrl/settings/deviceInfoPost.js index f774d2c..d5d6464 100644 --- a/src/aura/ui/pages/configSubPages/behaviourCtrl/settings/deviceInfoPost.js +++ b/src/aura/ui/pages/configSubPages/behaviourCtrl/settings/deviceInfoPost.js @@ -89,6 +89,7 @@ const deviceInfoPostSettings = [ value: !global.__HUGO_AURA__.aikariRules.ssaFeatures.securityPolicies .freezeManagement.freezeDiskInfoPost.enabled, + tooltip: "启用冰冻状态篡改以继续", }; }, defaultValue: [], @@ -228,6 +229,7 @@ const deviceInfoPostSettings = [ value: !global.__HUGO_AURA__.aikariRules.deviceInfo.software .softwareReportPost.enabled, + tooltip: "启用软件信息上报覆写以继续", }; }, defaultValue: true,