From dca4010f1bf2b7840670ee4f69b54e63ee7794cb Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Wed, 28 Sep 2022 09:24:54 +0800
Subject: [PATCH] =?UTF-8?q?special=5Fvideo=20=E8=A7=86=E9=A2=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=8B=E8=BD=AC=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                          |  2 +-
 src/components/SignalSourceDialog.vue | 55 ++++++++++++---------------
 src/components/SignalSourceTree.vue   |  8 +++-
 src/entities/SignalSourceEntity.ts    |  2 +
 src/i18n/en-US/index.ts               |  2 +
 src/i18n/zh-CN/index.ts               |  2 +
 6 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index eb5dfd3..ad14d50 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "media_player_client",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "A Quasar Framework app",
   "productName": "MediaPlayerClient",
   "author": "fangxiang <fangxiang@cloudview.work>",
diff --git a/src/components/SignalSourceDialog.vue b/src/components/SignalSourceDialog.vue
index cf363a3..3ffc847 100644
--- a/src/components/SignalSourceDialog.vue
+++ b/src/components/SignalSourceDialog.vue
@@ -104,12 +104,6 @@
                     (val) =>
                       (val && val.length > 0) || $t('Please type something'),
                   ]"
-                  @keydown="
-                    (evt) => {
-                      if (evt.keyCode == 13) {
-                      }
-                    }
-                  "
                 >
                   <template v-if="item_data.name" v-slot:append>
                     <q-icon
@@ -136,12 +130,30 @@
                   :label="$t('signal source type')"
                   :hint="$t('please select signal source type')"
                   @update:model-value="onSelected"
-                  @keydown="
-                    (evt) => {
-                      if (evt.keyCode == 13) {
-                      }
-                    }
-                  "
+                >
+                </q-select>
+              </q-item-section>
+            </q-item>
+            <q-item
+              v-if="
+                $store.state.isSpecialVideo() &&
+                item_data.window_type == 'EwindowType::Multimedia'
+              "
+            >
+              <q-item-section>
+                <q-select
+                  :loading="loading"
+                  :disable="loading"
+                  filled
+                  option-value="value"
+                  option-label="label"
+                  emit-value
+                  map-options
+                  v-model="item_data.rotation"
+                  :options="[0, 90, 270]"
+                  :label="$t('multimedia rotation')"
+                  :hint="$t('please select multimedia rotation')"
+                  @update:model-value="onSelected"
                 >
                 </q-select>
               </q-item-section>
@@ -204,12 +216,6 @@
                               media_url_label.length - 1
                             )),
                   ]"
-                  @keydown="
-                    (evt) => {
-                      if (evt.keyCode == 13) {
-                      }
-                    }
-                  "
                 >
                   <template v-if="item_data.media_url" v-slot:append>
                     <q-icon
@@ -233,12 +239,6 @@
                   :label="$t('user name')"
                   :hint="$t('please input user name')"
                   lazy-rules
-                  @keydown="
-                    (evt) => {
-                      if (evt.keyCode == 13) {
-                      }
-                    }
-                  "
                 >
                   <template v-if="item_data.user_name" v-slot:append>
                     <q-icon
@@ -262,12 +262,6 @@
                   :label="$t('password')"
                   :hint="$t('please input password')"
                   lazy-rules
-                  @keydown="
-                    (evt) => {
-                      if (evt.keyCode == 13) {
-                      }
-                    }
-                  "
                 >
                   <template v-if="item_data.password" v-slot:append>
                     <q-icon
@@ -652,6 +646,7 @@ export default defineComponent({
           setMediaUrlLabel(item_data.window_type);
         }
 
+        console.log(item_data);
         show_dialog.value = true;
       },
       resetData() {
diff --git a/src/components/SignalSourceTree.vue b/src/components/SignalSourceTree.vue
index 07bfee3..d15cb00 100644
--- a/src/components/SignalSourceTree.vue
+++ b/src/components/SignalSourceTree.vue
@@ -128,7 +128,9 @@
                 v-ripple
                 v-close-popup
                 v-if="
-                  prop.node.item_data && !prop.node.item_data.system_default
+                  prop.node.item_data &&
+                  prop.node.item_data.uuid &&
+                  !prop.node.item_data.system_default
                 "
                 @click="
                   () =>
@@ -150,7 +152,9 @@
                 v-ripple
                 v-close-popup
                 v-if="
-                  prop.node.item_data && !prop.node.item_data.system_default
+                  prop.node.item_data &&
+                  prop.node.item_data.uuid &&
+                  !prop.node.item_data.system_default
                 "
                 @click="
                   (evt) => deleteItem(evt, prop.node.is_group, prop.node.uuid)
diff --git a/src/entities/SignalSourceEntity.ts b/src/entities/SignalSourceEntity.ts
index 3daeef5..2653e9a 100644
--- a/src/entities/SignalSourceEntity.ts
+++ b/src/entities/SignalSourceEntity.ts
@@ -8,6 +8,7 @@ export class SignalSourceEntity extends BaseEntity {
   password: string = "";
   ext_data: string = "";
   group_uuid = "";
+  rotation = 0;
   system_default: boolean = false;
   local_file_flag: boolean = false;
   note: string = "";
@@ -29,6 +30,7 @@ export class SignalSourceEntity extends BaseEntity {
     dest.system_default = src.system_default;
     dest.local_file_flag = src.local_file_flag;
     dest.note = src.note;
+    dest.rotation = src.rotation;
   }
 }
 
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 0409196..efac7d4 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -360,4 +360,6 @@ export default {
     "Are You Sure to Restore Factory Settings? The Configuration Parameters, Signal, Signal Loop, Mode And Mode Plan Will Be Deleted!",
   layout: "Layout",
   rotation: "Rotation",
+  "multimedia rotation": "Multimedia Rotation",
+  "please select multimedia rotation": "Please Select Multimedia Rotation",
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index e42cc2c..9547101 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -636,4 +636,6 @@ export default {
     "确定复位吗？ 系统配置、信号源、轮询、模式、语言数据将被删除！",
   layout: "布局",
   rotation: "旋转",
+  "multimedia rotation": "媒体旋转",
+  "please select multimedia rotation": "请选择旋转值",
 };