From 9d7aa4e40eb164e65ce14168ee18b1652e5a7ef5 Mon Sep 17 00:00:00 2001 From: xream Date: Mon, 18 Dec 2023 01:22:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E8=BF=9C=E7=A8=8B=E8=AE=A2=E9=98=85?= =?UTF-8?q?(=E5=90=8E=E7=AB=AF=E7=89=88=E6=9C=AC=20>=202.14.130)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/locales/en.ts | 3 +++ src/locales/zh.ts | 3 +++ src/views/SubEditor.vue | 25 +++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6720f3436..841987c4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sub-store-front-end", - "version": "2.14.20", + "version": "2.14.21", "private": true, "scripts": { "dev": "vite --host", diff --git a/src/locales/en.ts b/src/locales/en.ts index d3fefd3ca..20b5a5a9a 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -188,6 +188,9 @@ export default { label: 'Icon', placeholder: 'The URL of the icon', }, + ignoreFailedRemoteSub: { + label: 'Ignore failed remote subscription(s)' + }, ua: { label: 'User-Agent', placeholder: diff --git a/src/locales/zh.ts b/src/locales/zh.ts index f7e533733..f9eb99097 100644 --- a/src/locales/zh.ts +++ b/src/locales/zh.ts @@ -188,6 +188,9 @@ export default { label: '图标链接', placeholder: '填入图标链接,不要使用 jpg', }, + ignoreFailedRemoteSub: { + label: '忽略失败的远程订阅' + }, ua: { label: 'User-Agent', placeholder: '下载订阅使用的 UA,不填使用默认', diff --git a/src/views/SubEditor.vue b/src/views/SubEditor.vue index e8a523eae..e66d88df1 100644 --- a/src/views/SubEditor.vue +++ b/src/views/SubEditor.vue @@ -150,6 +150,7 @@ + + + +
+ +
+
@@ -292,6 +303,7 @@ name: '', displayName: '', mergeSources: '', + ignoreFailedRemoteSub: false, icon: '', process: [ { @@ -327,6 +339,7 @@ const sourceData: any = toRaw(sub.value) || toRaw(collection.value); const newProcess = JSON.parse(JSON.stringify(sourceData.process)); form.mergeSources = sourceData.mergeSources; + form.ignoreFailedRemoteSub = sourceData.ignoreFailedRemoteSub; form.name = sourceData.name; form.displayName = sourceData.displayName || sourceData['display-name']; form.icon = sourceData.icon; @@ -608,6 +621,18 @@ } } + .ignore-failed-wrapper { + flex-direction: row; + justify-content: space-between; + :deep(.nut-form-item__label) { + width: auto; + } + .swtich-wrapper { + display: flex; + justify-content: end; + } + } + .include-subs-wrapper { flex-direction: column;