diff --git a/src/Admin/Native/PayChargeCards.php b/src/Admin/Native/PayChargeCards.php index 018b993c..6cd0a6d2 100644 --- a/src/Admin/Native/PayChargeCards.php +++ b/src/Admin/Native/PayChargeCards.php @@ -853,8 +853,13 @@ class PayChargeCards { * @param array $deps */ private function submessage_row(array $deps, string $content): void { - $hidden = $this->deps_visible($deps) ? '' : ' style="display:none;"'; - echo '
' . $content . '
'; // phpcs:ignore WordPress.Security.EscapeOutput -- 文案已转义。 + $dep_attr = ' data-dep="' . esc_attr((string) wp_json_encode($deps)) . '"'; + $hidden = $this->deps_visible($deps) ? '' : 'display:none;'; + // data-dep 与初始隐藏状态必须同时挂在 和内层提示块上,不能只依赖行: + // 提示块一旦脱离所在行(表格上下文里出现不被允许的节点时,HTML 解析器会把它 + // foster-parent 到 之前),只有 带状态会让四条提示永久铺开、 + // 且切换卡密类型/添加方式时求值结果无处落地。自带状态后两种结构都成立。 + echo ''; // phpcs:ignore WordPress.Security.EscapeOutput -- 文案已转义。 } /** @@ -1075,9 +1080,11 @@ class PayChargeCards { return els[0].value; } function evalDeps() { - document.querySelectorAll('.aksrt-cardpass-form tr[data-dep]').forEach(function (tr) { + // 选择器同时匹配行元素与提示块自身:提示块可能脱离所在行, + // 因此每层都各自带 data-dep 并各自落 display,谁在 DOM 里就管谁。 + document.querySelectorAll('.aksrt-cardpass-form [data-dep]').forEach(function (el) { try { - var deps = JSON.parse(tr.getAttribute('data-dep')); + var deps = JSON.parse(el.getAttribute('data-dep')); var show = deps.every(function (d) { var v = formVal(d.key); switch (d.op) { @@ -1089,7 +1096,7 @@ class PayChargeCards { } return true; }); - tr.style.display = show ? '' : 'none'; + el.style.display = show ? '' : 'none'; } catch (e) { /* noop */ } }); } diff --git a/tests/admin/charge-cards-dependency.test.cjs b/tests/admin/charge-cards-dependency.test.cjs index 95efacc7..23e1f304 100644 --- a/tests/admin/charge-cards-dependency.test.cjs +++ b/tests/admin/charge-cards-dependency.test.cjs @@ -120,17 +120,22 @@ function createForm() { addInput('only_pass_s', 'checkbox', '1', false); addInput('vip_exchange[time]', 'text', '', false); - const rows = addRows.map((row) => { + // 每个依赖行对应一个 ;提示行(submessage_row)还会把同一份 data-dep 与隐藏状态 + // 额外挂在
' . $content . '
内的提示块上,因此这里也为它建第二个元素(模拟提示块脱离行的情况)。 + const rows = []; + for (const row of addRows) { const json = JSON.stringify(row.deps); - return { label: row.label, deps: row.deps, el: { style: {}, getAttribute: (n) => (n === 'data-dep' ? json : null) } }; - }); + const makeEl = () => ({ style: {}, getAttribute: (n) => (n === 'data-dep' ? json : null) }); + rows.push({ label: row.label, deps: row.deps, el: makeEl() }); + if (HINTS.includes(row.label)) rows.push({ label: row.label, deps: row.deps, el: makeEl() }); + } const handlers = {}; const document = { readyState: 'loading', querySelectorAll(sel) { if (sel === '.aksrt-cardpass-form [name]') return inputs; - if (sel === '.aksrt-cardpass-form tr[data-dep]') return rows.map((row) => row.el); + if (sel === '.aksrt-cardpass-form [data-dep]') return rows.map((row) => row.el); return []; }, addEventListener(type, fn) { (handlers[type] = handlers[type] || []).push(fn); }, @@ -147,10 +152,14 @@ function createForm() { }); fire('DOMContentLoaded'); - const visible = () => rows.filter((row) => row.el.style.display !== 'none').map((row) => row.label); + const visible = () => [...new Set(rows.filter((row) => row.el.style.display !== 'none').map((row) => row.label))]; + /** 提示的「行 + 提示块」两层各自的显示状态,用于验证两层不会分叉。 */ + const hintLayers = () => rows + .filter((row) => HINTS.includes(row.label)) + .map((row) => row.label + ':' + (row.el.style.display === 'none' ? 'off' : 'on')); return { - setRadio, setChecked, visible, + setRadio, setChecked, visible, hintLayers, change() { fire('change', { target: { closest: () => ({}) } }); }, hintVisible: () => visible().filter((label) => HINTS.includes(label)), count: rows.length, @@ -194,6 +203,11 @@ test('两种行渲染都接入服务端预隐藏,避免首帧铺开', () => { assert.match(page, /private function field_row\([\s\S]*?\$hidden\s*=\s*\(\$deps && !\$this->deps_visible\(\$deps\)\)/); assert.match(page, /private function submessage_row\([\s\S]*?\$hidden\s*=\s*\$this->deps_visible\(\$deps\)/); assert.match(script, /document\.addEventListener\('DOMContentLoaded', evalDeps\)/); + // 提示块必须自带 data-dep 与初始隐藏状态:脱离所在行时(表格解析器把非法节点 + // foster-parent 到 之前)仍能被求值并保持隐藏。 + assert.match(page, /