dekun/crypto_monitor
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: entry model sub-select linkage via DOM options and event delegation

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
dekun
2026-07-06 19:08:11 +08:00
parent ff1bcd69d2
commit 81f7a7c451
4 changed files with 244 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/common/static/order_entry_model.js
+214 -146
View File
@@ -1,146 +1,214 @@
(function (global) {
function categoriesData() {
return global.ORDER_ENTRY_MODEL_CATEGORIES || [];
}
function codeToCategoryMap() {
return global.ORDER_ENTRY_MODEL_CODE_TO_CATEGORY || {};
}
function tradeStyleForCode(code) {
var map = global.ORDER_ENTRY_MODEL_TRADE_STYLE || {};
return map[code] || "trend";
}
function findOption(catKey, code) {
var cats = categoriesData();
for (var i = 0; i < cats.length; i++) {
if (cats[i].key !== catKey) continue;
var opts = cats[i].options || [];
for (var j = 0; j < opts.length; j++) {
if (opts[j].code === code) return opts[j];
}
}
return null;
}
function rebuildEntryModelSubSelect(preserveCode) {
var catSel = document.getElementById("order-entry-category");
var modelSel = document.getElementById("order-entry-model");
if (!catSel || !modelSel) return;
var catKey = catSel.value;
var cats = categoriesData();
var cat = null;
for (var i = 0; i < cats.length; i++) {
if (cats[i].key === catKey) {
cat = cats[i];
break;
}
}
modelSel.innerHTML = "";
var placeholder = document.createElement("option");
placeholder.value = "";
placeholder.textContent = "类型";
modelSel.appendChild(placeholder);
if (!cat || !cat.options || !cat.options.length) {
modelSel.disabled = true;
modelSel.value = "";
syncOrderEntryModelTradeStyle();
return;
}
modelSel.disabled = false;
var pick = preserveCode || "";
for (var k = 0; k < cat.options.length; k++) {
var o = cat.options[k];
var opt = document.createElement("option");
opt.value = o.code;
opt.textContent = o.label;
if (o.trade_style) opt.setAttribute("data-trade-style", o.trade_style);
if (o.help) opt.title = o.help;
modelSel.appendChild(opt);
}
if (pick && findOption(catKey, pick)) {
modelSel.value = pick;
} else if (cat.options.length === 1) {
modelSel.value = cat.options[0].code;
} else {
modelSel.value = "";
}
syncOrderEntryModelTradeStyle();
}
function syncOrderEntryModelTradeStyle() {
var modelSel = document.getElementById("order-entry-model");
var hidden = document.getElementById("order-trade-style-hidden");
var hint = document.getElementById("order-trade-style-hint");
if (!modelSel || !hidden) return;
var labels = { trend: "趋势单", swing: "波段单" };
var code = modelSel.value || "";
var ts = tradeStyleForCode(code);
hidden.value = ts;
if (hint) hint.textContent = labels[ts] || ts;
}
function initOrderEntryModelSelect(root) {
var scope = root && root.querySelector ? root : document;
var catSel =
scope === document
? document.getElementById("order-entry-category")
: scope.querySelector("#order-entry-category");
var modelSel =
scope === document
? document.getElementById("order-entry-model")
: scope.querySelector("#order-entry-model");
if (!catSel || !modelSel) return;
if (catSel.dataset.entryModelWired !== "1") {
catSel.dataset.entryModelWired = "1";
catSel.addEventListener("change", function () {
rebuildEntryModelSubSelect("");
});
}
if (modelSel.dataset.entryModelWired !== "1") {
modelSel.dataset.entryModelWired = "1";
modelSel.addEventListener("change", syncOrderEntryModelTradeStyle);
}
var presetCode = modelSel.getAttribute("data-preset-code") || modelSel.value || "";
if (presetCode) {
var catMap = codeToCategoryMap();
var catKey = catMap[presetCode];
if (catKey) {
catSel.value = catKey;
rebuildEntryModelSubSelect(presetCode);
return;
}
}
rebuildEntryModelSubSelect("");
}
global.paintOrderLeverageHint = function (leverage) {
var hidden = document.getElementById("order-leverage");
var hint = document.getElementById("order-leverage-hint");
if (!hidden && !hint) return;
var lev = parseInt(leverage, 10);
if (!Number.isFinite(lev) || lev <= 0) {
if (hint) hint.textContent = "杠杆 —";
if (hidden) hidden.value = "";
return;
}
if (hidden) hidden.value = String(lev);
if (hint) hint.textContent = "杠杆 " + lev + "x";
};
global.initOrderEntryModelSelect = initOrderEntryModelSelect;
global.syncOrderEntryModelTradeStyle = syncOrderEntryModelTradeStyle;
global.rebuildEntryModelSubSelect = rebuildEntryModelSubSelect;
document.addEventListener("DOMContentLoaded", function () {
initOrderEntryModelSelect();
});
})(typeof window !== "undefined" ? window : globalThis);
(function (global) {
var delegated = false;
function queryInScope(scope, id) {
if (scope && scope.querySelector) return scope.querySelector("#" + id);
return document.getElementById(id);
}
function categoriesData() {
return global.ORDER_ENTRY_MODEL_CATEGORIES || [];
}
function codeToCategoryMap() {
return global.ORDER_ENTRY_MODEL_CODE_TO_CATEGORY || {};
}
function tradeStyleForCode(code, modelSel) {
if (modelSel && code) {
var opt = modelSel.querySelector('option[value="' + code.replace(/"/g, '\\"') + '"]');
if (opt) {
var ds = opt.getAttribute("data-trade-style");
if (ds === "swing" || ds === "trend") return ds;
}
}
var map = global.ORDER_ENTRY_MODEL_TRADE_STYLE || {};
return map[code] || "trend";
}
function findOption(catKey, code) {
var cats = categoriesData();
for (var i = 0; i < cats.length; i++) {
if (cats[i].key !== catKey) continue;
var opts = cats[i].options || [];
for (var j = 0; j < opts.length; j++) {
if (opts[j].code === code) return opts[j];
}
}
return null;
}
function filterDomSubOptions(modelSel, catKey, preserveCode) {
var tagged = modelSel.querySelectorAll("option[data-entry-category]");
if (!tagged.length) return false;
var any = false;
for (var i = 0; i < tagged.length; i++) {
var opt = tagged[i];
var show = !!catKey && opt.getAttribute("data-entry-category") === catKey;
opt.hidden = !show;
opt.disabled = !show;
if (show) any = true;
}
modelSel.disabled = !any;
if (!any) {
modelSel.value = "";
return true;
}
var pick = preserveCode || "";
if (pick) {
var picked = modelSel.querySelector('option[value="' + pick.replace(/"/g, '\\"') + '"]:not([disabled])');
if (picked) {
modelSel.value = pick;
return true;
}
}
var visible = [];
for (var k = 0; k < tagged.length; k++) {
if (!tagged[k].disabled) visible.push(tagged[k]);
}
if (visible.length === 1) modelSel.value = visible[0].value;
else modelSel.value = "";
return true;
}
function rebuildFromCategories(modelSel, catKey, preserveCode) {
var cats = categoriesData();
var cat = null;
for (var i = 0; i < cats.length; i++) {
if (cats[i].key === catKey) {
cat = cats[i];
break;
}
}
modelSel.innerHTML = "";
var placeholder = document.createElement("option");
placeholder.value = "";
placeholder.textContent = "类型";
modelSel.appendChild(placeholder);
if (!cat || !cat.options || !cat.options.length) {
modelSel.disabled = true;
modelSel.value = "";
return;
}
modelSel.disabled = false;
var pick = preserveCode || "";
for (var k = 0; k < cat.options.length; k++) {
var o = cat.options[k];
var opt = document.createElement("option");
opt.value = o.code;
opt.textContent = o.label;
if (o.trade_style) opt.setAttribute("data-trade-style", o.trade_style);
lib/instance/templates/embed_shell.html
+1 -1
View File
@@ -127,7 +127,7 @@ const ORDER_ENTRY_MODEL_TRADE_STYLE = {{ entry_model_trade_style_map | tojson }}
const ORDER_ENTRY_MODEL_CATEGORIES = {{ entry_model_categories | tojson }};
const ORDER_ENTRY_MODEL_CODE_TO_CATEGORY = {{ entry_model_code_to_category | tojson }};
</script>
<script src="/static/order_entry_model.js?v=4"></script>
<script src="/static/order_entry_model.js?v=5"></script>
<script src="/static/manual_order_rr_preview.js?v=5"></script>
<script src="/static/symbol_live_price.js?v=2"></script>
<script src="/static/strategy_roll.js?v=6"></script>
lib/instance/templates/index.html
+1 -1
View File
@@ -559,7 +559,7 @@ const ORDER_ENTRY_MODEL_TRADE_STYLE = {{ entry_model_trade_style_map | tojson }}
const ORDER_ENTRY_MODEL_CATEGORIES = {{ entry_model_categories | tojson }};
const ORDER_ENTRY_MODEL_CODE_TO_CATEGORY = {{ entry_model_code_to_category | tojson }};
</script>
<script src="/static/order_entry_model.js?v=4"></script>
<script src="/static/order_entry_model.js?v=5"></script>
<script src="/static/manual_order_rr_preview.js?v=5"></script>
<script src="/static/symbol_live_price.js?v=2"></script>
<script src="/static/strategy_roll.js?v=6"></script>
lib/instance/templates/order_entry_model_fields.html
+28 -23
View File
@@ -1,23 +1,28 @@
{# 趋势户：两级开仓类型 → 自动 trade_style；日内户：仍选手动 trend/swing #}
{% macro order_entry_type_fields() -%}
{% if order_entry_profile == 'trend_div' %}
<div class="order-entry-model-row">
<select id="order-entry-category" class="order-entry-category" required title="反转 / 顺势 / 波段" aria-label="开仓性质">
<option value="">性质</option>
{% for cat in entry_model_categories %}
<option value="{{ cat.key }}">{{ cat.label }}</option>
{% endfor %}
</select>
<select name="entry_model" id="order-entry-model" class="order-entry-model-sub" required disabled title="启动A/B、大分歧A/B、小分歧" aria-label="开仓类型">
<option value="">类型</option>
</select>
<input type="hidden" name="trade_style" id="order-trade-style-hidden" value="trend">
<span id="order-trade-style-hint" class="order-trade-style-hint" title="由开仓类型自动设定">趋势单</span>
</div>
{% else %}
<select name="trade_style" required>
<option value="trend">趋势单</option>
<option value="swing">波段单</option>
</select>
{% endif %}
{%- endmacro %}
{# 趋势户：两级开仓类型 → 自动 trade_style；日内户：仍选手动 trend/swing #}
{% macro order_entry_type_fields() -%}
{% if order_entry_profile == 'trend_div' %}
<div class="order-entry-model-row">
<select id="order-entry-category" class="order-entry-category" required title="反转 / 顺势 / 波段" aria-label="开仓性质">
<option value="">性质</option>
{% for cat in entry_model_categories %}
<option value="{{ cat.key }}">{{ cat.label }}</option>
{% endfor %}
</select>
<select name="entry_model" id="order-entry-model" class="order-entry-model-sub" required disabled title="启动A/B、大分歧A/B、小分歧" aria-label="开仓类型">
<option value="">类型</option>
{% for cat in entry_model_categories %}
{% for opt in cat.options %}