From 10d7396fc9460da8848b92b9ea7547bf5069e4a3 Mon Sep 17 00:00:00 2001
From: xream <xream@icloud.com>
Date: Fri, 12 Jan 2024 03:52:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=8C=E6=AD=A5=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=96=87=E4=BB=B6(=E5=90=8E=E7=AB=AF=20>=202?=
 =?UTF-8?q?.14.144)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                         |  2 +-
 src/components/ArtifactPanel.vue     | 22 +++++++++++++++++++---
 src/components/ArtifactsListItem.vue |  8 ++++++--
 src/locales/en.ts                    |  7 ++++---
 src/locales/zh.ts                    |  7 ++++---
 src/types/store/artifacts.d.ts       |  2 +-
 6 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index e0109acac..f4cb0de04 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sub-store-front-end",
-  "version": "2.14.35",
+  "version": "2.14.36",
   "private": true,
   "scripts": {
     "dev": "vite --host",
diff --git a/src/components/ArtifactPanel.vue b/src/components/ArtifactPanel.vue
index 46710bffd..6ab88a575 100644
--- a/src/components/ArtifactPanel.vue
+++ b/src/components/ArtifactPanel.vue
@@ -86,7 +86,7 @@
         ></nut-cascader>
 
       </nut-form-item>
-      <nut-form-item :label="$t(`syncPage.addArtForm.platform.label`)">
+      <nut-form-item v-if="sourceInput && ['subscription', 'collection'].includes(editPanelData.type) " :label="$t(`syncPage.addArtForm.platform.label`)">
         <nut-radiogroup
           direction="horizontal"
           v-model="editPanelData.platform"
@@ -142,7 +142,7 @@
     name: '',
     displayName: '',
     source: '',
-    type: 'subscription',
+    type: 'file',
     platform: 'Surge',
   });
 
@@ -163,6 +163,12 @@
           collection.name,
       };
     });
+    const filesNameList = useSubsStore().files.map(file => {
+      return {
+        name: file.name,
+        displayName: file.displayName || file['display-name'] || file.name,
+      };
+    });
 
     const options = [];
     if (subsNameList.length > 0) {
@@ -186,6 +192,16 @@
         })),
       });
     }
+    if (filesNameList.length > 0) {
+      options.push({
+        value: 'file',
+        text: t('specificWord.file'),
+        children: filesNameList.map(item => ({
+          value: item.name,
+          text: item.displayName,
+        })),
+      });
+    }
     return options;
   });
 
@@ -210,7 +226,7 @@
 
   const onClickNameInput = () => {
     if (isEditMode.value) {
-      Toast.warn('同步订阅配置的名称不支持修改', { duration: 1000 });
+      Toast.warn('同步配置的名称不支持修改', { duration: 1000 });
     }
   };
   const submit = () => {
diff --git a/src/components/ArtifactsListItem.vue b/src/components/ArtifactsListItem.vue
index 9629b3038..cbe3a6cc5 100644
--- a/src/components/ArtifactsListItem.vue
+++ b/src/components/ArtifactsListItem.vue
@@ -1,9 +1,9 @@
 <template>
   <nut-swipe class="sub-item-swipe" ref="swipe" :disabled="$props.disabled">
     <div class="sub-item-wrapper" :style="{'padding': isSimpleMode ? '9px' : '16px' }" @click.stop="previewSource">
-      <div class="sub-img-wrappers">
+      <a class="sub-img-wrappers" :href="artifact.url" target="_blank">
         <nut-avatar class="sub-item-customer-icon"  :size="isSimpleMode ? '36' : '48'" :url="icon" bg-color=""></nut-avatar>
-      </div>
+      </a>
       <div class="sub-item-content">
         <div class="sub-item-title-wrapper">
           <h3 class="sub-item-title">
@@ -175,6 +175,8 @@ const sourceSub = computed(() => {
       return subsStore.getOneCollection(name);
     case 'subscription':
       return subsStore.getOneSub(name);
+    case 'file':
+      return subsStore.getOneFile(name);
   }
 });
 
@@ -209,6 +211,8 @@ const transferText = (type: string) => {
         return t('specificWord.singleSub');
       case 'collection':
         return t('specificWord.collectionSub');
+      case 'file':
+        return t('specificWord.file');
     }
   };
 
diff --git a/src/locales/en.ts b/src/locales/en.ts
index f70c55a14..c22f486c5 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -3,6 +3,7 @@ export default {
   specificWord: {
     singleSub: 'Single',
     collectionSub: 'Collection',
+    file: 'File',
   },
   globalNotify: {
     refresh: {
@@ -22,7 +23,7 @@ export default {
     pagesTitle: {
       sub: 'Management',
       file: 'File',
-      sync: 'Sync Subscription',
+      sync: 'Sync',
       my: 'My Profile',
       subEditor: 'Subscription Editor',
       fileEditor: 'File Editor',
@@ -33,9 +34,9 @@ export default {
       notFound: '404 Not Found',
       askWhat: {
         sync: {
-          title: 'What is Sync Subscription?',
+          title: 'What is Sync?',
           content:
-            'Upload your subscriptions to a private Gist, which can be accessed at any time on devices that do not run the Sub Store (e.g. routers, etc.).',
+            'Upload your subscriptions/files to a private Gist, which can be accessed at any time on devices that do not run the Sub Store (e.g. routers, etc.).',
         },
         subEditor: {
           title: 'Download no subscription?',
diff --git a/src/locales/zh.ts b/src/locales/zh.ts
index 50fbe82e0..2bdc761f5 100644
--- a/src/locales/zh.ts
+++ b/src/locales/zh.ts
@@ -3,6 +3,7 @@ export default {
   specificWord: {
     singleSub: '单条订阅',
     collectionSub: '组合订阅',
+    file: '文件',
   },
   globalNotify: {
     refresh: {
@@ -22,7 +23,7 @@ export default {
     pagesTitle: {
       sub: '订阅管理',
       file: '文件管理',
-      sync: '同步订阅',
+      sync: '同步',
       my: '我的',
       subEditor: '订阅编辑',
       fileEditor: '文件编辑',
@@ -33,9 +34,9 @@ export default {
       notFound: '地址未找到',
       askWhat: {
         sync: {
-          title: '什么是同步订阅？',
+          title: '什么是同步？',
           content:
-            '将您的订阅信息上传到私有 Gist，在无法运行 Sub Store 的设备（例如路由器等）上也可以随时访问。',
+            '将订阅/文件上传到私有 Gist，在无法运行 Sub Store 的设备（例如路由器等）上也可以随时访问。',
         },
         subEditor: {
           title: '下载不了订阅？',
diff --git a/src/types/store/artifacts.d.ts b/src/types/store/artifacts.d.ts
index 7536ad9c2..a7ed1cd6e 100644
--- a/src/types/store/artifacts.d.ts
+++ b/src/types/store/artifacts.d.ts
@@ -12,7 +12,7 @@ type ArtifactsPlatform =
   | 'ClashMeta'
   | 'V2Ray';
 
-type ArtifactType = 'collection' | 'subscription';
+type ArtifactType = 'collection' | 'subscription' | 'file';
 
 interface Artifact {
   name: string;