diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7534851dc9cbed17b88bfff6966b656a6460b30a..3b9ac07a6deb13c85c2c710d130d1cc91d0181a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@
 
 - 自定义主题组件识别颜色主题插件，支持插件主题切换
 
+### Fixed
+
+- 表格行编辑输入框、应用切换器样式适配主题
+
 ## [0.7.41-alpha.31] - 2025-10-11
 
 ### Added
diff --git a/src/control/grid/grid/grid.scss b/src/control/grid/grid/grid.scss
index 5d4712e8773e29c9fb99b6c50a1ce5c1929c2db3..de00f0466dc26d4ee95721b476d2faaa10c3ba46 100644
--- a/src/control/grid/grid/grid.scss
+++ b/src/control/grid/grid/grid.scss
@@ -232,7 +232,7 @@ $control-grid-footer: (
         }
 
         .el-input__wrapper, .el-textarea__inner, .el-date-editor {
-          --el-input-bg-color: #{getCssVar(color, white)};
+          --el-input-bg-color: #{getCssVar(color, bg, 1)};
         }
       }
     }
diff --git a/src/panel-component/app-switch/app-switch.scss b/src/panel-component/app-switch/app-switch.scss
index 073d294cd9363cc0253db0001bec90a9bcc76dd4..dd1fcda8ab7fc859eedb6d03772b1c05a5251ec3 100644
--- a/src/panel-component/app-switch/app-switch.scss
+++ b/src/panel-component/app-switch/app-switch.scss
@@ -39,6 +39,7 @@ $app-switch: (
         white-space: nowrap;
 
         @include when('active') {
+            color: getCssVar(color, primary, active, text) !important;
             background-color: getCssVar(color, primary, active) !important;
         }
     }