feat: 忽略失败的远程选择支持开启通知(后端 >= 2.19.31)

Author: xream

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store-front-end",
-  "version": "2.15.16",
+  "version": "2.15.17",
   "private": true,
   "scripts": {
     "dev": "vite --host",

src/locales/en.ts

@@ -114,6 +114,9 @@ export default {
     },
     ignoreFailedRemoteFile: {
       label: "Ignore failed remote file(s)",
+      quiet: 'Enabled (without notification)',
+      disabled: 'Disabled',
+      enabled : 'Enabled (with notification)'
     },
     download: {
       label: "Enable download (filename: display name)",
@@ -320,6 +323,9 @@ export default {
         },
         ignoreFailedRemoteSub: {
           label: "Ignore failed remote subscription(s)",
+          quiet: 'Enabled (without notification)',
+          disabled: 'Disabled',
+          enabled : 'Enabled (with notification)'
         },
         ua: {
           label: "User-Agent",

src/locales/zh.ts

@@ -138,7 +138,10 @@ export default {
       remote: '远程',
     },
     ignoreFailedRemoteFile: {
-      label: '忽略失败的远程文件'
+      label: '忽略失败的远程文件',
+      quiet: '启用(无通知)',
+      disabled: '禁用',
+      enabled : '启用(有通知)'
     },
     download: {
       label: '启用下载(文件名为显示名称)'
@@ -337,7 +340,10 @@ export default {
           placeholder: '可点击左侧或顶部图标, 从图标库填入图标链接，不要使用 jpg',
         },
         ignoreFailedRemoteSub: {
-          label: '忽略失败的远程订阅'
+          label: '忽略失败的远程订阅',
+          quiet: '启用(无通知)',
+          disabled: '禁用',
+          enabled : '启用(有通知)'
         },
         ua: {
           label: 'User-Agent',

src/views/FileEditor.vue

@@ -310,8 +310,22 @@
               prop="ignoreFailedRemoteFile"
               class="ignore-failed-wrapper"
             >
-              <div class="switch-wrapper">
+              <!-- <div class="switch-wrapper">
                 <nut-switch v-model="form.ignoreFailedRemoteFile" />
+              </div> -->
+              <div class="radio-wrapper">
+                <nut-radiogroup direction="horizontal" v-model="form.ignoreFailedRemoteFile">
+                  <nut-radio shape="button" label="disabled">
+                    {{ $t(`filePage.ignoreFailedRemoteFile.disabled`) }}
+                  </nut-radio>
+                  <nut-radio shape="button" label="quiet">
+                    {{ $t(`filePage.ignoreFailedRemoteFile.quiet`) }}
+                  </nut-radio>
+                  <nut-radio shape="button" label="enabled">
+                    {{ $t(`filePage.ignoreFailedRemoteFile.enabled`) }}
+                  </nut-radio>
+                
+                </nut-radiogroup>
               </div>
             </nut-form-item>
           </template>
@@ -526,7 +540,13 @@ watchEffect(() => {
     form.mergeSources = sourceData.mergeSources;
     form.content = sourceData.content;
     cmStore.setEditCode("FileEditer", sourceData.content);
-    form.ignoreFailedRemoteFile = sourceData.ignoreFailedRemoteFile;
+    let ignoreFailedRemoteFile = sourceData.ignoreFailedRemoteFile;
+    if (ignoreFailedRemoteFile === true) {
+      ignoreFailedRemoteFile = 'quiet';
+    } else if (ignoreFailedRemoteFile === false || ignoreFailedRemoteFile == null) {
+      ignoreFailedRemoteFile = 'disabled';
+    }
+    form.ignoreFailedRemoteFile = ignoreFailedRemoteFile;
     form.download = sourceData.download;
     const newProcess = JSON.parse(JSON.stringify(sourceData.process));
     form.process = newProcess;
@@ -635,6 +655,9 @@ const compare = () => {
     Toast.loading("生成中...", { id: "compare", cover: true, duration: 1500 });
     const data: any = JSON.parse(JSON.stringify(toRaw(form)));
     data.process = actionsToProcess(data.process, actionsList, ignoreList);
+    if (data.ignoreFailedRemoteFile === "disabled"){
+      data.ignoreFailedRemoteFile = false;
+    }
 
     // 过滤掉预览开关关闭的操作
     actionsChecked.forEach((item) => {
@@ -696,6 +719,9 @@ const submit = () => {
     const data: any = JSON.parse(JSON.stringify(toRaw(form)));
     data["display-name"] = data.displayName;
     data.process = actionsToProcess(data.process, actionsList, ignoreList);
+    if (data.ignoreFailedRemoteFile === "disabled"){
+      data.ignoreFailedRemoteFile = false;
+    }
 
     let res = null;
 

src/views/SubEditor.vue

@@ -388,8 +388,22 @@
           prop="ignoreFailedRemoteSub"
           class="ignore-failed-wrapper"
         >
-          <div class="switch-wrapper">
+          <!-- <div class="switch-wrapper">
             <nut-switch v-model="form.ignoreFailedRemoteSub" />
+          </div> -->
+          <div class="radio-wrapper">
+            <nut-radiogroup direction="horizontal" v-model="form.ignoreFailedRemoteSub">
+              <nut-radio shape="button" label="disabled">
+                {{ $t(`editorPage.subConfig.basic.ignoreFailedRemoteSub.disabled`) }}
+              </nut-radio>
+              <nut-radio shape="button" label="quiet">
+                {{ $t(`editorPage.subConfig.basic.ignoreFailedRemoteSub.quiet`) }}
+              </nut-radio>
+              <nut-radio shape="button" label="enabled">
+                {{ $t(`editorPage.subConfig.basic.ignoreFailedRemoteSub.enabled`) }}
+              </nut-radio>
+            
+            </nut-radiogroup>
           </div>
         </nut-form-item>
       </nut-form>
@@ -639,7 +653,13 @@ watchEffect(() => {
   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;
+  let ignoreFailedRemoteSub = sourceData.ignoreFailedRemoteSub;
+  if (ignoreFailedRemoteSub === true) {
+    ignoreFailedRemoteSub = 'quiet';
+  } else if (ignoreFailedRemoteSub === false || ignoreFailedRemoteSub == null) {
+    ignoreFailedRemoteSub = 'disabled';
+  }
+  form.ignoreFailedRemoteSub = ignoreFailedRemoteSub;
   form.passThroughUA = sourceData.passThroughUA;
   form.name = sourceData.name;
   form.displayName = sourceData.displayName || sourceData["display-name"];
@@ -799,6 +819,9 @@ const compare = () => {
     });
     const data: any = JSON.parse(JSON.stringify(toRaw(form)));
     data.process = actionsToProcess(data.process, actionsList, ignoreList);
+    if (data.ignoreFailedRemoteSub === "disabled"){
+      data.ignoreFailedRemoteSub = false;
+    }
     data.tag = [
       ...new Set(
         (data.tag || "")
@@ -901,6 +924,9 @@ const submit = () => {
     ];
     data["display-name"] = data.displayName;
     data.process = actionsToProcess(data.process, actionsList, ignoreList);
+    if (data.ignoreFailedRemoteSub === "disabled"){
+      data.ignoreFailedRemoteSub = false;
+    }
 
     console.log('submit.....\n', data);