Skip to content

修改chooseNumbers在forced不为false时通过filterOk后可以取消 #2670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

修改chooseNumbers在forced不为false时通过filterOk后可以取消 #2670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99cb71c
Update player.js
Benllic Jun 8, 2025
4b97851
Update player.js
Benllic Jun 8, 2025
fa004f1
Update content.js
Benllic Jun 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions noname/library/element/content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ export const Content = {
thisNum = item.min || 0;
event.numbers.splice(index, 1, thisNum);
}
if (event.terminal) {
var actual = event.terminal - event.numbers.reduce((sum, num) => sum + num, 0) + thisNum;
if (event.optionSum) {
var actual = event.optionSum - event.numbers.reduce((sum, num) => sum + num, 0) + thisNum;
}
for (var num = item.min || 0; num <= Math.min(actual || max, max); num += item.base || 1) {
var option = document.createElement("option");
Expand Down Expand Up @@ -218,7 +218,11 @@ export const Content = {
optionUpdate(event.dialog.content.querySelector(`[id = 'select${index}']`));
}
if (event.filterOk(event)) {
ui.create.confirm("o");
if (event.forced) {
ui.create.confirm("o");
} else {
ui.create.confirm("oc");
}
} else {
if (!event.forced) {
ui.create.confirm("c");
Expand Down Expand Up @@ -246,7 +250,11 @@ export const Content = {
_status.imchoosing = false;
};
if (event.filterOk(event)) {
ui.create.confirm("o");
if (event.forced) {
ui.create.confirm("o");
} else {
ui.create.confirm("oc");
}
} else {
if (!event.forced) {
ui.create.confirm("c");
Expand Down
28 changes: 17 additions & 11 deletions noname/library/element/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6220,7 +6220,7 @@ export class Player extends HTMLDivElement {
if (typeof argument == "string") {
get.evtprompt(next, argument);
} else if (typeof argument == "number") {
next.terminal = argument;
next.optionSum = argument;
} else if (typeof argument == "boolean") {
next.forced = argument;
} else if (typeof argument == "object" && Array.isArray(argument)) {
Expand All @@ -6232,20 +6232,26 @@ export class Player extends HTMLDivElement {
next.resolve();
}
if (!next.filterSelect) {
next.filterSelect = function (num, index, event) {
if (event.terminal) {
return num + event.numbers.reduce((sum, num) => sum + num, 0) - (event.numbers[index] || 0) <= event.terminal;
if (next.optionSum) {
next.filterSelect = function (num, index, event) {
return num + event.numbers.reduce((sum, num) => sum + num, 0) - (event.numbers[index] || 0) <= event.optionSum;
}
return true;
};
} else {
next.filterSelect = function () {
return true;
}
}
}
if (!next.filterOk) {
next.filterOk = function (event) {
if (event.terminal) {
return event.numbers.reduce((sum, num) => sum + num, 0) <= event.terminal;
if (next.optionSum) {
next.filterOk = function (num, index, event) {
return event.numbers.reduce((sum, num) => sum + num, 0) <= event.optionSum;
}
return true;
};
} else {
next.filterOk = function () {
return true;
}
}
}
if (!next.forced) {
next.forced = false;
Expand Down