From 806d655a815370dfc2da186a96015d47f9bd464a Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Sat, 28 May 2022 15:43:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=B7=BB=E5=8A=A0.webm;.flv;?=
 =?UTF-8?q?.mkv;.wmv=E5=90=8E=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileManageDialog.vue   | 17 +++++++++--------
 src/components/SignalSourceDialog.vue |  2 +-
 src/pad/ContentWall.vue               | 16 ++++++++++++----
 src/pages/WallPage.vue                | 16 ++++++++++++----
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/components/FileManageDialog.vue b/src/components/FileManageDialog.vue
index 9cb6ed9..6d80dcc 100644
--- a/src/components/FileManageDialog.vue
+++ b/src/components/FileManageDialog.vue
@@ -760,14 +760,15 @@ export default defineComponent({
       }
     };
 
-    watch(
-      () => filters.value,
-      () => {
-        if ($store.state.advanced_debug && filters.value.length != 0) {
-          filters.value = [];
-        }
-      }
-    );
+    // 后缀名限制
+    // watch(
+    //   () => filters.value,
+    //   () => {
+    //     if ($store.state.advanced_debug && filters.value.length != 0) {
+    //       filters.value = [];
+    //     }
+    //   }
+    // );
 
     return {
       show_dialog,
diff --git a/src/components/SignalSourceDialog.vue b/src/components/SignalSourceDialog.vue
index 078394c..0790df3 100644
--- a/src/components/SignalSourceDialog.vue
+++ b/src/components/SignalSourceDialog.vue
@@ -159,7 +159,7 @@
                       ? showClockDialog()
                       : item_data.window_type == 'EwindowType::Weather'
                       ? showWeatherDialog()
-                      : showPlaylistDialog('.mp4;.avi;.ts;')
+                      : showPlaylistDialog('.mp4;.avi;.ts;.webm;.flv;.mkv;.wmv')
                   "
                   v-model="item_data.media_url"
                   :readonly="
diff --git a/src/pad/ContentWall.vue b/src/pad/ContentWall.vue
index 8d396b4..45d615b 100644
--- a/src/pad/ContentWall.vue
+++ b/src/pad/ContentWall.vue
@@ -994,7 +994,7 @@ export default defineComponent({
           if (old_signal_source) {
             const obj = await file_manage_dialog.value.showDialogAsync(
               "select",
-              ".mp4;.avi;.ts;.jpg;.png;"
+              ".mp4;.avi;.ts;.webm;.flv;.mkv;.wmv;.jpg;.png;"
             );
             if (obj) {
               interface __I {
@@ -1008,7 +1008,11 @@ export default defineComponent({
                 if (
                   file.name.endsWith("mp4") ||
                   file.name.endsWith("avi") ||
-                  file.name.endsWith("ts")
+                  file.name.endsWith("ts") ||
+                  file.name.endsWith("webm") ||
+                  file.name.endsWith("flv") ||
+                  file.name.endsWith("mkv") ||
+                  file.name.endsWith("wmv")
                 ) {
                   entity.window_type = "EwindowType::Multimedia";
                   entity.media_url = JSON.stringify([full_path]);
@@ -1098,7 +1102,7 @@ export default defineComponent({
 
         const obj = await file_manage_dialog.value.showDialogAsync(
           "select",
-          ".mp4;.avi;.ts;.jpg;.png;"
+          ".mp4;.avi;.ts;.webm;.flv;.mkv;.wmv;.jpg;.png;"
         );
 
         if (obj) {
@@ -1113,7 +1117,11 @@ export default defineComponent({
             if (
               file.name.endsWith("mp4") ||
               file.name.endsWith("avi") ||
-              file.name.endsWith("ts")
+              file.name.endsWith("ts") ||
+              file.name.endsWith("webm") ||
+              file.name.endsWith("flv") ||
+              file.name.endsWith("mkv") ||
+              file.name.endsWith("wmv")
             ) {
               entity.window_type = "EwindowType::Multimedia";
               entity.media_url = JSON.stringify([full_path]);
diff --git a/src/pages/WallPage.vue b/src/pages/WallPage.vue
index 3dba422..73a11d6 100644
--- a/src/pages/WallPage.vue
+++ b/src/pages/WallPage.vue
@@ -1093,7 +1093,7 @@ export default defineComponent({
 
         const obj = await file_manage_dialog.value.showDialogAsync(
           "select",
-          ".mp4;.avi;.ts;.jpg;.png;"
+          ".mp4;.avi;.ts;.webm;.flv;.mkv;.wmv;.jpg;.png;"
         );
         if (obj) {
           interface __I {
@@ -1107,7 +1107,11 @@ export default defineComponent({
             if (
               file.name.endsWith("mp4") ||
               file.name.endsWith("avi") ||
-              file.name.endsWith("ts")
+              file.name.endsWith("ts") ||
+              file.name.endsWith("webm") ||
+              file.name.endsWith("flv") ||
+              file.name.endsWith("mkv") ||
+              file.name.endsWith("wmv")
             ) {
               entity.window_type = "EwindowType::Multimedia";
               entity.media_url = JSON.stringify([full_path]);
@@ -1175,7 +1179,7 @@ export default defineComponent({
           if (old_signal_source) {
             const obj = await file_manage_dialog.value.showDialogAsync(
               "select",
-              ".mp4;.avi;.ts;.jpg;.png;"
+              ".mp4;.avi;.ts;.webm;.flv;.mkv;.wmv;.jpg;.png;"
             );
             if (obj) {
               interface __I {
@@ -1189,7 +1193,11 @@ export default defineComponent({
                 if (
                   file.name.endsWith("mp4") ||
                   file.name.endsWith("avi") ||
-                  file.name.endsWith("ts")
+                  file.name.endsWith("ts") ||
+                  file.name.endsWith("webm") ||
+                  file.name.endsWith("flv") ||
+                  file.name.endsWith("mkv") ||
+                  file.name.endsWith("wmv")
                 ) {
                   entity.window_type = "EwindowType::Multimedia";
                   entity.media_url = JSON.stringify([full_path]);