nite/sub2clash
1
0
Fork 0
mirror of https://github.com/nitezs/sub2clash.git synced 2024-12-23 15:04:41 -05:00
Code Projects Activity

🐛 Cannot parse custom rules

Browse Source
This commit is contained in:
Nite07 2024-05-21 15:00:19 +08:00
parent 036907fba4
commit 98bca0a7ac
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/static/index.js
View File

@ -111,17 +111,16 @@ function generateURI() {
queryParams.push(`ruleProvider=${encodeURIComponent(providers.join(","))}`); queryParams.push(`ruleProvider=${encodeURIComponent(providers.join(","))}`);
let ruleList = []; let ruleList = [];
for (let i = 0; i < rules.length / 3; i++) { for (let i = 0; i < rules.length / 2; i++) {
if (rules[i * 3].value.trim() !== "") { if (rules[i * 2].value.trim() !== "") {
let rule = rules[i * 3].value; let rule = rules[i * 2].value;
let prepend = rules[i * 3 + 1].value; let prepend = rules[i * 2 + 1].value;
let group = rules[i * 3 + 2].value;
// 是否存在空值 // 是否存在空值
if (rule.trim() === "" || prepend.trim() === "" || group.trim() === "") { if (rule.trim() === "" || prepend.trim() === "") {
// alert("Rule 中存在空值，请检查后重试！"); // alert("Rule 中存在空值，请检查后重试！");
return ""; return "";
} }
ruleList.push(`[${rule},${prepend},${group}]`); ruleList.push(`[${rule},${prepend}]`);
} }
} }
queryParams.push(`rule=${encodeURIComponent(ruleList.join(","))}`); queryParams.push(`rule=${encodeURIComponent(ruleList.join(","))}`);
@ -310,13 +309,12 @@ function parseAndFillRuleProviderParams(ruleProviderParams) {
function parseAndFillRuleParams(ruleParams) { function parseAndFillRuleParams(ruleParams) {
const ruleGroup = document.getElementById("ruleGroup"); const ruleGroup = document.getElementById("ruleGroup");
let matches; let matches;
const regex = /\[(.*?),(.*?),(.*?)\]/g; const regex = /\[(.*?),(.*?)\]/g;
const str = decodeURIComponent(ruleParams); const str = decodeURIComponent(ruleParams);
while ((matches = regex.exec(str)) !== null) { while ((matches = regex.exec(str)) !== null) {
const div = createRule(); const div = createRule();
div.children[0].value = matches[1]; div.children[0].value = matches[1];
div.children[1].value = matches[2]; div.children[1].value = matches[2];
div.children[2].value = matches[3];
ruleGroup.appendChild(div); ruleGroup.appendChild(div);
} }
} }
@ -366,7 +364,6 @@ function createRule() {
div.innerHTML = ` div.innerHTML = `
<input type="text" class="form-control" name="rule" placeholder="Rule"> <input type="text" class="form-control" name="rule" placeholder="Rule">
<input type="text" class="form-control" name="rule" placeholder="Prepend"> <input type="text" class="form-control" name="rule" placeholder="Prepend">
<input type="text" class="form-control" name="rule" placeholder="Group">
<button type="button" class="btn btn-danger" onclick="removeElement(this)">删除</button> <button type="button" class="btn btn-danger" onclick="removeElement(this)">删除</button>
`; `;
return div; return div;