From a4b79f2b8ff5e6bbde74f827ee3396cb33b82f9f Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Thu, 23 Mar 2023 16:02:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#10702=E3=80=8110703=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=BD=91=E7=BB=9C=E7=BB=84=E4=BB=B6=E3=80=81=E6=B5=81?=
 =?UTF-8?q?=E5=AA=92=E4=BD=93=E6=9C=8D=E5=8A=A1=E5=9F=9F=E5=90=8D=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/link/Type/Detail/index.vue    | 21 ++++----------
 src/views/link/Type/data.ts             | 27 ++++++++++++++----
 src/views/media/Stream/Detail/index.vue | 37 +++++++++++++------------
 src/views/media/Stream/index.vue        |  2 +-
 4 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/src/views/link/Type/Detail/index.vue b/src/views/link/Type/Detail/index.vue
index d1887f34..0be2e4a6 100644
--- a/src/views/link/Type/Detail/index.vue
+++ b/src/views/link/Type/Detail/index.vue
@@ -103,18 +103,6 @@
                                     :key="cluster.id"
                                     :show-arrow="!formData.shareCluster"
                                 >
-                                    <!-- <j-collapse-panel
-                                    :key="cluster.id"
-                                    :header="
-                                        cluster.serverId
-                                            ? cluster.serverId
-                                            : !formData.shareCluster
-                                            ? `#${index + 1}.配置信息`
-                                            : ''
-                                    "
-                                    collapsible="header"
-                                    :show-arrow="!formData.shareCluster"
-                                > -->
                                     <template #header v-if="!shareCluster">
                                         <div class="collapse-header">
                                             {{
@@ -1136,10 +1124,6 @@ const filterConfigByType = (data: any, type: string) => {
     });
 };
 
-const changeheader = (value: string) => {
-    console.log(22, value);
-};
-
 const getPortOptions = (portOptions: object, index = 0) => {
     if (!portOptions) return;
     const type = formData.value.type;
@@ -1224,6 +1208,10 @@ const saveData = async () => {
         });
     });
 
+    if (!formRef2Data?.cluster) {
+        return onlyMessage('请新增或完善配置', 'error');
+    }
+
     const { configuration } = formRef2Data?.cluster[0];
     const params = shareCluster.value
         ? { ...formData.value, configuration }
@@ -1418,5 +1406,6 @@ watch(
     background: #ffffff;
     border: 1px solid #e50012;
     border-radius: 2px;
+    cursor: pointer;
 }
 </style>
diff --git a/src/views/link/Type/data.ts b/src/views/link/Type/data.ts
index 50c04a1f..46420ab7 100644
--- a/src/views/link/Type/data.ts
+++ b/src/views/link/Type/data.ts
@@ -113,6 +113,19 @@ export const Validator = {
     regOnlyNumber: new RegExp(/^\d+$/),
 };
 
+const validateAddress = (_rule: any, value: string): Promise<any> =>
+    new Promise(async (resolve, reject) => {
+        if (
+            Validator.regIpv4.test(value) ||
+            Validator.regIPv6.test(value) ||
+            Validator.regDomain.test(value)
+        ) {
+            return resolve('');
+        } else {
+            return reject('请输入正确的IP地址或者域名');
+        }
+    });
+
 export const Rules = {
     name: [
         {
@@ -160,10 +173,14 @@ export const Rules = {
             message: '请输入公网地址',
         },
         {
-            pattern:
-                Validator.regIpv4 || Validator.regIPv6 || Validator.regDomain,
-            message: '请输入正确格式的域名或ip',
+            validator: validateAddress,
+            message: '请输入正确的IP地址或者域名',
         },
+        // {
+        //     pattern:
+        //         Validator.regIpv4 || Validator.regIPv6 || Validator.regDomain,
+        //     message: '请输入正确格式的域名或ip',
+        // },
     ],
     publicPort: [
         {
@@ -181,9 +198,7 @@ export const Rules = {
             message: '请输入远程地址',
         },
         {
-            pattern:
-                Validator.regIpv4 || Validator.regIPv6 || Validator.regDomain,
-
+            validator: validateAddress,
             message: '请输入正确格式的域名或ip',
         },
     ],
diff --git a/src/views/media/Stream/Detail/index.vue b/src/views/media/Stream/Detail/index.vue
index e6d033ec..ba13c1dd 100644
--- a/src/views/media/Stream/Detail/index.vue
+++ b/src/views/media/Stream/Detail/index.vue
@@ -76,10 +76,7 @@
                                     message: '请输入API Host',
                                 },
                                 {
-                                    pattern:
-                                        Validator.regIpv4 ||
-                                        Validator.regIPv6 ||
-                                        Validator.regDomain,
+                                    validator: validateAddress,
                                     message: '请输入正确的IP地址或者域名',
                                 },
                             ]"
@@ -133,10 +130,7 @@
                                     message: '请输入RTP IP',
                                 },
                                 {
-                                    pattern:
-                                        Validator.regIpv4 ||
-                                        Validator.regIPv6 ||
-                                        Validator.regDomain,
+                                    validator: validateAddress,
                                     message: '请输入正确的IP地址或者域名',
                                 },
                             ]"
@@ -197,15 +191,8 @@
                                 style="width: 100%"
                                 :min="1"
                                 :max="
-                                    Number(
-                                        formData.configuration
-                                            .dynamicRtpPortRange1,
-                                    ) < 65535
-                                        ? Number(
-                                              formData.configuration
-                                                  .dynamicRtpPortRange1,
-                                          )
-                                        : 65535
+                                    formData.configuration
+                                        .dynamicRtpPortRange1 || 65535
                                 "
                                 :precision="0"
                                 placeholder="起始端口"
@@ -231,7 +218,8 @@
                             <j-input-number
                                 style="width: 100%"
                                 :min="
-                                    formData.configuration.dynamicRtpPortRange0
+                                    formData.configuration
+                                        .dynamicRtpPortRange0 || 1
                                 "
                                 :max="65535"
                                 :precision="0"
@@ -305,6 +293,19 @@ const Validator = {
     regOnlyNumber: new RegExp(/^\d+$/),
 };
 
+const validateAddress = (_rule: any, value: string): Promise<any> =>
+    new Promise(async (resolve, reject) => {
+        if (
+            Validator.regIpv4.test(value) ||
+            Validator.regIPv6.test(value) ||
+            Validator.regDomain.test(value)
+        ) {
+            return resolve('');
+        } else {
+            return reject('请输入正确的IP地址或者域名');
+        }
+    });
+
 const formData = ref<FormDataType>({
     name: '',
     provider: undefined,
diff --git a/src/views/media/Stream/index.vue b/src/views/media/Stream/index.vue
index a06204d0..b8e5dcf1 100644
--- a/src/views/media/Stream/index.vue
+++ b/src/views/media/Stream/index.vue
@@ -38,7 +38,7 @@
                         :status="slotProps.state.value"
                         :statusText="slotProps.state.text"
                         :statusNames="{
-                            enabled: 'success',
+                            enabled: 'processing',
                             disabled: 'error',
                         }"
                     >