Merge branch 'dev' of github.com:allanpk716/ChineseSubFinder into dev

ChineseSubFinder · Sep 2, 2022 · 72cc1c7 · 72cc1c7
2 parents 1e8bc13 + 7c0f1cf
commit 72cc1c7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/frontend/src/pages/settings/EmbySettings.vue b/frontend/src/pages/settings/EmbySettings.vue
@@ -20,7 +20,13 @@
               v-model="form.address_url"
               standout
               dense
-              :rules="[(val) => (form.enable && !!val) || '不能为空']"
+              :rules="[
+                (val) => (form.enable && !!val) || '不能为空',
+                (val) =>
+                  val.match(
+                    /^(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:/~\+#]*[\w\-\@?^=%&amp;/~\+#])?$/
+                  ) || '请输入正确的URL',
+              ]"
             />
           </q-item-section>
         </q-item>
@@ -56,7 +62,7 @@
 
         <q-separator spaced inset></q-separator>
 
-        <q-item :class="{disabled: form.auto_or_manual}" tag="label" v-ripple>
+        <q-item :class="{ disabled: form.auto_or_manual }" tag="label" v-ripple>
           <q-item-section>
             <q-item-label>自动匹配IMDB ID</q-item-label>
           </q-item-section>

diff --git a/frontend/src/pages/setup/EmbySetupForm.vue b/frontend/src/pages/setup/EmbySetupForm.vue
@@ -6,7 +6,18 @@
           <q-item-label>Emby的内网URL</q-item-label>
         </q-item-section>
         <q-item-section>
-          <q-input v-model="setupState.form.emby.url" standout dense :rules="[(val) => !!val || '不能为空']" />
+          <q-input
+            v-model="setupState.form.emby.url"
+            standout
+            dense
+            :rules="[
+              (val) => !!val || '不能为空',
+              (val) =>
+                val.match(
+                  /^(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:/~\+#]*[\w\-\@?^=%&amp;/~\+#])?$/
+                ) || '请输入正确的URL',
+            ]"
+          />
         </q-item-section>
       </q-item>
       <q-item>
@@ -39,8 +50,7 @@
         </q-item-section>
       </q-item>
 
-
-      <q-item :class="{disabled: setupState.form.emby.autoOrManual}" tag="label" v-ripple>
+      <q-item :class="{ disabled: setupState.form.emby.autoOrManual }" tag="label" v-ripple>
         <q-item-section>
           <q-item-label>自动匹配IMDB ID</q-item-label>
         </q-item-section>