From 67b41ece637570fa49360a7ecb79b9f02e28b5c7 Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Wed, 28 Sep 2022 15:00:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=B7=BB=E5=8A=A01X5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SignalSourceDialog.vue         |  3 +-
 .../SpecialVideoGridSettingDialog.vue         | 30 ++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/components/SignalSourceDialog.vue b/src/components/SignalSourceDialog.vue
index 3ffc847..d76a34a 100644
--- a/src/components/SignalSourceDialog.vue
+++ b/src/components/SignalSourceDialog.vue
@@ -150,7 +150,7 @@
                   emit-value
                   map-options
                   v-model="item_data.rotation"
-                  :options="[0, 90, 270]"
+                  :options="[0, 90, 180, 270]"
                   :label="$t('multimedia rotation')"
                   :hint="$t('please select multimedia rotation')"
                   @update:model-value="onSelected"
@@ -646,7 +646,6 @@ export default defineComponent({
           setMediaUrlLabel(item_data.window_type);
         }
 
-        console.log(item_data);
         show_dialog.value = true;
       },
       resetData() {
diff --git a/src/components/SpecialVideoGridSettingDialog.vue b/src/components/SpecialVideoGridSettingDialog.vue
index f47411b..920619a 100644
--- a/src/components/SpecialVideoGridSettingDialog.vue
+++ b/src/components/SpecialVideoGridSettingDialog.vue
@@ -111,10 +111,31 @@ export default defineComponent({
     let loading = ref(false);
     let layout = ref("1X3");
 
-    const select_options = ["1X3", "1X4", "1X6", "3X1", "4X1", "6X1"];
-    const row_values = [1, 1, 1, 3, 4, 6];
-    const col_values = [3, 4, 6, 1, 1, 1];
-    const rotation_options = ref(["0", "90", "180"]);
+    const row_values: number[] = [];
+    const col_values: number[] = [];
+    const select_options: string[] = [];
+
+    // 生成布局选项
+    {
+      const target_row_col_values = [3, 4, 5, 6];
+      for (let i = 0; i < target_row_col_values.length; ++i) {
+        row_values.push(1);
+        col_values.push(target_row_col_values[i]);
+        select_options.push(row_values[i] + "X" + col_values[i]);
+      }
+
+      for (let i = 0; i < target_row_col_values.length; ++i) {
+        row_values.push(target_row_col_values[i]);
+        col_values.push(1);
+        select_options.push(
+          row_values[target_row_col_values.length + i] +
+            "X" +
+            col_values[target_row_col_values.length + i]
+        );
+      }
+    }
+
+    const rotation_options = ref(["0", "90", "180", "270"]);
     const rotation = ref("0");
 
     rotation.value =
@@ -175,6 +196,7 @@ export default defineComponent({
               case "0":
               case "90":
               case "180":
+              case "270":
                 GlobalData.getInstance()
                   .getCurrentClient()
                   ?.setSpecialVideoLayoutRotation(rotation.value ?? "0");