|
78 | 78 | </el-popover> |
79 | 79 | <el-popover placement="bottom" style="margin-left: 10px"> |
80 | 80 | <el-row> |
81 | | - <el-checkbox v-model="form.tpl.surge.doh" label="Surge.DoH"></el-checkbox> |
| 81 | + <el-checkbox v-model="form.tpl.clash.doh" label="Clash.DoH"></el-checkbox> |
82 | 82 | </el-row> |
83 | 83 | <el-row> |
84 | | - <el-checkbox v-model="form.tpl.clash.doh" label="Clash.DoH"></el-checkbox> |
| 84 | + <el-checkbox v-model="form.tpl.provider.expand" label="provider模式"></el-checkbox> |
85 | 85 | </el-row> |
86 | 86 | <el-row> |
87 | | - <el-checkbox v-model="form.insert" label="网易云"></el-checkbox> |
| 87 | + <el-checkbox v-model="form.tpl.surge.doh" label="Surge.DoH"></el-checkbox> |
88 | 88 | </el-row> |
89 | 89 | <el-button slot="reference">定制功能</el-button> |
90 | 90 | </el-popover> |
@@ -210,11 +210,16 @@ export default { |
210 | 210 | ClashR: "clashr", |
211 | 211 | Surge2: "surge&ver=2", |
212 | 212 | }, |
213 | | - backendOptions: [{ value: "http://127.0.0.1:25500/sub?" }], |
| 213 | + backendOptions: [{ value: "http://127.0.0.1:25500/sub?" }, {value: "https://sub.085404.xyz/sub?"}], |
214 | 214 | remoteConfig: [ |
215 | 215 | { |
216 | 216 | label: "universal", |
217 | 217 | options: [ |
| 218 | + { |
| 219 | + label: "sun2ot", |
| 220 | + value: |
| 221 | + "https://raw.githubusercontent.com/sun2ot/ClashRules/main/config/test.ini" |
| 222 | + }, |
218 | 223 | { |
219 | 224 | label: "No-Urltest", |
220 | 225 | value: |
@@ -310,7 +315,10 @@ export default { |
310 | 315 | doh: false // dns 查询是否使用 DoH |
311 | 316 | }, |
312 | 317 | clash: { |
313 | | - doh: false |
| 318 | + doh: true |
| 319 | + }, |
| 320 | + provider: { |
| 321 | + expand: true // 是否将规则列表以provider形式附加到配置文件中 |
314 | 322 | } |
315 | 323 | } |
316 | 324 | }, |
@@ -451,7 +459,11 @@ export default { |
451 | 459 |
|
452 | 460 | if (this.form.clientType === "clash") { |
453 | 461 | if (this.form.tpl.clash.doh === true) { |
454 | | - this.customSubUrl += "&clash.doh=true"; |
| 462 | + this.customSubUrl += "&clash.dns=1"; |
| 463 | + } |
| 464 | + if (this.form.tpl.expand === true) { |
| 465 | + // urlencode 中, expand=false 表示 provider 模式 |
| 466 | + this.customSubUrl += "&expand=false"; |
455 | 467 | } |
456 | 468 |
|
457 | 469 | this.customSubUrl += "&new_name=" + this.form.new_name.toString(); |
@@ -625,6 +637,7 @@ export default { |
625 | 637 | this.form.udp = params.get("udp") === "true"; |
626 | 638 | this.form.tpl.surge.doh = params.get("surge.doh") === "true"; |
627 | 639 | this.form.tpl.clash.doh = params.get("clash.doh") === "true"; |
| 640 | + this.form.tpl.expand = params.get("expand") === "true"; |
628 | 641 | this.form.new_name = params.get("new_name") === "true"; |
629 | 642 |
|
630 | 643 | // Hide the configuration dialog |
|
0 commit comments