From 3d5054182bf607ac227d4b6514cbafffa7ce0fff Mon Sep 17 00:00:00 2001
From: Stille <stille@ioiox.com>
Date: Mon, 11 Jul 2022 13:16:52 +0800
Subject: [PATCH] support multi urls in text area

---
 src/views/home/HomeForm.vue | 75 +++++++++++--------------------------
 src/views/home/utils.js     |  3 +-
 2 files changed, 23 insertions(+), 55 deletions(-)

diff --git a/src/views/home/HomeForm.vue b/src/views/home/HomeForm.vue
index 78668e5..68caf05 100644
--- a/src/views/home/HomeForm.vue
+++ b/src/views/home/HomeForm.vue
@@ -2,29 +2,14 @@
   <div class="box">
     <form method="post" action="#">
       <div class="row gtr-uniform gtr-50">
-        <span v-for="(item, index) in inputs" :key="item" class="col-12 row">
-          <div
-            class="col-10 col-10-mobilep"
-            style="text-align: center; padding-top: 10px"
-          >
-            <input
-              type="text"
-              v-model.trim="item.inputValue"
-              :placeholder="item.placeholder"
-            />
-          </div>
-          <div
-            class="col-2 col-2-mobilep"
-            style="text-align: center; padding-top: 10px"
-          >
-            <input
-              type="button"
-              :value="item.buttonValue"
-              :class="item.buttonClass"
-              @click="addLinks(index)"
-            />
-          </div>
-        </span>
+        <div class="col-12">
+          <textarea
+            id="message"
+            v-model.trim="inputs.inputValue"
+            :placeholder="inputs.placeholder"
+            rows="3"
+          ></textarea>
+        </div>
         <div
           class="col-4 col-4-mobilep list"
           style="text-align: center; padding-top: 20px"
@@ -178,14 +163,12 @@ export default {
         { value: 'default', text: process.env.VUE_APP_BASE_API_URL },
         { value: 'manual', text: '自定义后端 API 地址' },
       ],
-      inputs: [
-        {
-          buttonClass: '',
-          buttonValue: '添加',
-          inputValue: '',
-          placeholder: '订阅地址',
-        },
-      ],
+      inputs: {
+        buttonClass: '',
+        inputValue: '',
+        placeholder:
+          '多订阅链接或节点请确保每行一条\n支持手动使用"|"分割多链接或节点',
+      },
       targetType: 'clash',
       targetTypes: [
         { value: 'clash', text: 'Clash' },
@@ -221,17 +204,6 @@ export default {
     resetDialog() {
       this.dialogVisible = false;
     },
-    addLinks(index) {
-      if (index == 0) {
-        this.inputs.push({
-          buttonClass: 'alt',
-          buttonValue: '移除',
-          placeholder: '订阅地址',
-        });
-      } else {
-        this.inputs.splice(index, 1);
-      }
-    },
     selectApi(event) {
       if (event.target.value == 'manual') {
         this.isManualApi = false;
@@ -243,18 +215,13 @@ export default {
       this.targetType = event.target.value;
     },
     checkUrls() {
-      this.urls = [];
-      for (const i in this.inputs) {
-        if (utils.regexCheck(this.inputs[i].inputValue)) {
-          this.urls.push(this.inputs[i].inputValue);
-          if (Number(i) + 1 == this.inputs.length) {
-            return true;
-          }
-        } else {
-          this.dialogMessage = '请填写正确的订阅地址';
-          this.dialogVisible = true;
-          return false;
-        }
+      if (this.inputs.inputValue == '') {
+        this.dialogMessage = '请填写正确的订阅地址';
+        this.dialogVisible = true;
+        return false;
+      } else {
+        this.urls = this.inputs.inputValue;
+        return true;
       }
     },
     checkApi() {
diff --git a/src/views/home/utils.js b/src/views/home/utils.js
index ada1a8e..359bc96 100644
--- a/src/views/home/utils.js
+++ b/src/views/home/utils.js
@@ -5,7 +5,8 @@ const getSubLink = function (
   isShowMoreConfig,
   moreConfig
 ) {
-  let link = links.join('|');
+  let linkLst = links.split('\n');
+  let link = linkLst.join('|');
   let finalUrl =
     apiUrl + '/sub?target=' + targetType + '&url=' + encodeURIComponent(link);
   if (isShowMoreConfig) {