diff --git a/crypto_monitor_binance/templates/index.html b/crypto_monitor_binance/templates/index.html
index 29b02ca..3953607 100644
--- a/crypto_monitor_binance/templates/index.html
+++ b/crypto_monitor_binance/templates/index.html
@@ -834,7 +834,7 @@
 <script src="/static/ai_review_render.js?v=2"></script>
 <script src="/static/form_submit_guard.js?v=2"></script>
 <script src="/static/manual_order_rr_preview.js?v=4"></script>
-<script src="/static/strategy_roll.js?v=2"></script>
+<script src="/static/strategy_roll.js?v=3"></script>
 <script>
 const JOURNAL_ENTRY_REASON_OPTIONS = {{ entry_reason_options | tojson }};
 const JOURNAL_ENTRY_REASON_OTHER = {{ entry_reason_other_value | tojson }};
diff --git a/crypto_monitor_gate/templates/index.html b/crypto_monitor_gate/templates/index.html
index cdb2424..413c38c 100644
--- a/crypto_monitor_gate/templates/index.html
+++ b/crypto_monitor_gate/templates/index.html
@@ -801,7 +801,7 @@
 <script src="/static/ai_review_render.js?v=2"></script>
 <script src="/static/form_submit_guard.js?v=2"></script>
 <script src="/static/manual_order_rr_preview.js?v=4"></script>
-<script src="/static/strategy_roll.js?v=2"></script>
+<script src="/static/strategy_roll.js?v=3"></script>
 <script>
 const JOURNAL_ENTRY_REASON_OPTIONS = {{ entry_reason_options | tojson }};
 const JOURNAL_ENTRY_REASON_OTHER = {{ entry_reason_other_value | tojson }};
diff --git a/crypto_monitor_gate_bot/templates/index.html b/crypto_monitor_gate_bot/templates/index.html
index cdb2424..413c38c 100644
--- a/crypto_monitor_gate_bot/templates/index.html
+++ b/crypto_monitor_gate_bot/templates/index.html
@@ -801,7 +801,7 @@
 <script src="/static/ai_review_render.js?v=2"></script>
 <script src="/static/form_submit_guard.js?v=2"></script>
 <script src="/static/manual_order_rr_preview.js?v=4"></script>
-<script src="/static/strategy_roll.js?v=2"></script>
+<script src="/static/strategy_roll.js?v=3"></script>
 <script>
 const JOURNAL_ENTRY_REASON_OPTIONS = {{ entry_reason_options | tojson }};
 const JOURNAL_ENTRY_REASON_OTHER = {{ entry_reason_other_value | tojson }};
diff --git a/crypto_monitor_okx/templates/index.html b/crypto_monitor_okx/templates/index.html
index b83eb3f..dc08391 100644
--- a/crypto_monitor_okx/templates/index.html
+++ b/crypto_monitor_okx/templates/index.html
@@ -830,7 +830,7 @@
 <script src="/static/ai_review_render.js?v=2"></script>
 <script src="/static/form_submit_guard.js?v=2"></script>
 <script src="/static/manual_order_rr_preview.js?v=4"></script>
-<script src="/static/strategy_roll.js?v=2"></script>
+<script src="/static/strategy_roll.js?v=3"></script>
 <script>
 const JOURNAL_ENTRY_REASON_OPTIONS = {{ entry_reason_options | tojson }};
 const JOURNAL_ENTRY_REASON_OTHER = {{ entry_reason_other_value | tojson }};
diff --git a/embed_templates/embed_shell.html b/embed_templates/embed_shell.html
index 4d4c67c..ddc2849 100644
--- a/embed_templates/embed_shell.html
+++ b/embed_templates/embed_shell.html
@@ -114,7 +114,7 @@
 <script src="/static/ai_review_render.js?v=2"></script>
 <script src="/static/form_submit_guard.js?v=2"></script>
 <script src="/static/manual_order_rr_preview.js?v=4"></script>
-<script src="/static/strategy_roll.js?v=2"></script>
+<script src="/static/strategy_roll.js?v=3"></script>
 <script src="/static/key_monitor_form.js?v=1"></script>
 {% include 'embed_boot_scripts.html' %}
 <script src="/static/instance_embed.js?v=4"></script>
diff --git a/static/instance_theme.css b/static/instance_theme.css
index c4dbed6..98f60da 100644
--- a/static/instance_theme.css
+++ b/static/instance_theme.css
@@ -1305,10 +1305,6 @@ html[data-theme="light"] .detail-actions {
   align-items: center;
 }
 
-.roll-field[hidden] {
-  display: none !important;
-}
-
 #strategy-roll-panel .roll-risk-banner {
   margin-bottom: 8px;
   color: #8fc8ff;
diff --git a/static/strategy_roll.js b/static/strategy_roll.js
index 47b38ae..c4c8d02 100644
--- a/static/strategy_roll.js
+++ b/static/strategy_roll.js
@@ -1,6 +1,35 @@
 (function () {
   "use strict";
 
+  function syncRollFormMode(form, mode) {
+    if (!form) return;
+    const m = mode || "market";
+    form.setAttribute("data-add-mode", m);
+    const showFib = m === "fib_618" || m === "fib_786";
+    const showBreakout = m === "breakout";
+    const fibWrap = form.querySelector(".roll-field-fib");
+    const breakoutWrap = form.querySelector(".roll-field-breakout");
+    const fibUpper = form.querySelector("#roll-fib-upper");
+    const fibLower = form.querySelector("#roll-fib-lower");
+    const breakoutInput = form.querySelector("#roll-breakout");
+
+    function tuneInput(inp, active, required) {
+      if (!inp) return;
+      inp.disabled = !active;
+      inp.required = !!required && active;
+      inp.tabIndex = active ? 0 : -1;
+      if (!active) inp.value = "";
+    }
+
+    if (fibWrap) fibWrap.setAttribute("aria-hidden", showFib ? "false" : "true");
+    if (breakoutWrap) breakoutWrap.setAttribute("aria-hidden", showBreakout ? "false" : "true");
+    tuneInput(fibUpper, showFib, showFib);
+    tuneInput(fibLower, showFib, showFib);
+    tuneInput(breakoutInput, showBreakout, showBreakout);
+  }
+
+  window.syncRollFormMode = syncRollFormMode;
+
   const form = document.getElementById("roll-form");
   if (!form) return;
 
@@ -13,11 +42,6 @@
   const previewBox = document.getElementById("roll-preview-box");
   const previewText = document.getElementById("roll-preview-text");
   const countdownEl = document.getElementById("roll-countdown");
-  const fibWrap = form.querySelector(".roll-field-fib");
-  const breakoutWrap = form.querySelector(".roll-field-breakout");
-  const fibUpper = document.getElementById("roll-fib-upper");
-  const fibLower = document.getElementById("roll-fib-lower");
-  const breakoutInput = document.getElementById("roll-breakout");
 
   let countdownTimer = null;
   let previewOk = false;
@@ -40,24 +64,8 @@
       "当前风险：" + rp + "%（来自监控单 #" + (opt.getAttribute("data-monitor-id") || "?") + "）";
   }
 
-  function setFieldGroup(wrap, inputs, visible, required) {
-    if (!wrap) return;
-    wrap.hidden = !visible;
-    inputs.forEach(function (inp) {
-      if (!inp) return;
-      inp.disabled = !visible;
-      inp.required = !!required && visible;
-      if (!visible) inp.value = "";
-    });
-  }
-
   function syncFieldVisibility() {
-    const mode = modeSel.value || "market";
-    form.setAttribute("data-add-mode", mode);
-    const showFib = mode === "fib_618" || mode === "fib_786";
-    const showBreakout = mode === "breakout";
-    setFieldGroup(fibWrap, [fibUpper, fibLower], showFib, showFib);
-    setFieldGroup(breakoutWrap, [breakoutInput], showBreakout, showBreakout);
+    syncRollFormMode(form, modeSel.value || "market");
     resetPreview();
   }
 
diff --git a/strategy_templates/strategy_roll_panel.html b/strategy_templates/strategy_roll_panel.html
index 791e3e7..3d52d7f 100644
--- a/strategy_templates/strategy_roll_panel.html
+++ b/strategy_templates/strategy_roll_panel.html
@@ -30,18 +30,18 @@
             {% endfor %}
         </select>
         <input type="hidden" name="direction" id="roll-direction" value="long">
-        <select name="add_mode" id="roll-add-mode" onchange="var f=document.getElementById('roll-form');if(f){f.setAttribute('data-add-mode',this.value);}">
+        <select name="add_mode" id="roll-add-mode" onchange="var f=document.getElementById('roll-form');if(f){f.setAttribute('data-add-mode',this.value);if(window.syncRollFormMode)syncRollFormMode(f,this.value);}">
             <option value="market">市价加仓</option>
             <option value="fib_618">斐波 0.618</option>
             <option value="fib_786">斐波 0.786</option>
             <option value="breakout">突破加仓</option>
         </select>
-        <span class="roll-field roll-field-fib" hidden>
-            <input name="fib_upper" id="roll-fib-upper" step="any" placeholder="上沿 H" disabled>
-            <input name="fib_lower" id="roll-fib-lower" step="any" placeholder="下沿 L" disabled>
+        <span class="roll-field roll-field-fib">
+            <input name="fib_upper" id="roll-fib-upper" step="any" placeholder="上沿 H">
+            <input name="fib_lower" id="roll-fib-lower" step="any" placeholder="下沿 L">
         </span>
-        <span class="roll-field roll-field-breakout" hidden>
-            <input name="breakthrough_price" id="roll-breakout" step="any" placeholder="突破价" disabled>
+        <span class="roll-field roll-field-breakout">
+            <input name="breakthrough_price" id="roll-breakout" step="any" placeholder="突破价">
         </span>
         <input name="new_stop_loss" id="roll-stop-loss" type="number" min="0" step="any" placeholder="新止损价" required>
         <button type="button" id="roll-preview-btn" {% if roll_trend_active %}disabled{% endif %}>预览</button>
@@ -101,4 +101,4 @@
     </table>
     </div>
 </div>
-<script src="/static/strategy_roll.js?v=2"></script>
+<script src="/static/strategy_roll.js?v=3"></script>