From ee0dd21bc100972cbcde54584dd92918828ffd75 Mon Sep 17 00:00:00 2001 From: fangxiang Date: Thu, 19 May 2022 11:35:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=E6=BA=90=E6=97=B6=E7=82=B9=E5=87=BB=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B6=85=E9=93=BE=E6=8E=A5=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=B7=E6=96=B0=E7=9A=84BUG=20=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E6=97=B6=E9=92=9F=E9=85=8D=E7=BD=AE=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ClockSignalSourceDialog.vue | 43 +++++++++++++++++++--- src/components/FileManageDialog.vue | 14 ++++++- src/components/PlaylistDialog.vue | 1 - src/components/SignalSourceDialog.vue | 14 ++++++- src/entities/ClockWindowParamEntity.ts | 2 +- src/i18n/zh-CN/index.ts | 5 +++ 6 files changed, 69 insertions(+), 10 deletions(-) diff --git a/src/components/ClockSignalSourceDialog.vue b/src/components/ClockSignalSourceDialog.vue index ba1e052..0363575 100644 --- a/src/components/ClockSignalSourceDialog.vue +++ b/src/components/ClockSignalSourceDialog.vue @@ -118,6 +118,7 @@ @@ -133,6 +134,9 @@ + + {{ $t("only normal clock support") }} @@ -145,12 +149,16 @@ + + {{ $t("only normal clock support") }} @@ -162,12 +170,16 @@ + + {{ $t("only normal clock support") }} @@ -180,13 +192,17 @@ - + {{ $t( "the current property is only valid for single-line displays" @@ -204,10 +220,15 @@ + > + + {{ $t("only normal clock support time hiding") }} + + > + + {{ $t("only normal clock support") }} + + > + + {{ + $t("only normal clock support multiple lines") + }} +
- + {{ $t("select file") }} {{ $t("click") }}{{ $t("select file") }} @@ -757,6 +760,15 @@ export default defineComponent({ } }; + watch( + () => filters.value, + () => { + if ($store.state.advanced_debug && filters.value.length != 0) { + filters.value = []; + } + } + ); + return { show_dialog, loading, diff --git a/src/components/PlaylistDialog.vue b/src/components/PlaylistDialog.vue index 13ef29a..fca8a5e 100644 --- a/src/components/PlaylistDialog.vue +++ b/src/components/PlaylistDialog.vue @@ -148,7 +148,6 @@ export default defineComponent({ GlobalData.getInstance().applicationConfig?.application_data_dir ?? "" ).replace(/\\/g, "/"); - console.log(playlist); const temp_play_list = []; try { const temp_parse = JSON.parse(playlist); diff --git a/src/components/SignalSourceDialog.vue b/src/components/SignalSourceDialog.vue index 782b5d1..b9e2837 100644 --- a/src/components/SignalSourceDialog.vue +++ b/src/components/SignalSourceDialog.vue @@ -160,11 +160,16 @@ : showPlaylistDialog('.mp4;.avi;.ts;') " v-model="item_data.media_url" - :readonly="media_url_label.startsWith($t('file path'))" + :readonly=" + media_url_label.startsWith($t('file path')) || + media_url_label.startsWith($t('clock')) + " :label="media_url_label" :hint=" media_url_label.startsWith($t('file path')) ? $t('dbclick select file') + : media_url_label.startsWith($t('clock')) + ? $t('dbclick config clock') : $t('please input') + media_url_label.substr(0, media_url_label.length - 1) " @@ -391,6 +396,9 @@ export default defineComponent({ case "EwindowType::Rtsp": media_url_label.value = $t.t("RTSP url") + ":"; break; + case "EwindowType::Clock": + media_url_label.value = $t.t("clock setting") + ":"; + break; default: media_url_label.value = $t.t("file path") + ":"; break; @@ -500,7 +508,9 @@ export default defineComponent({ const result = await clock_dialog.value.showDialogAsync( item_data.media_url ); - item_data.media_url = decodeURI(result); + if (result) { + item_data.media_url = decodeURI(result); + } }, async showPlaylistDialog(filter: string) { if (item_data.window_type != "EwindowType::Multimedia") { diff --git a/src/entities/ClockWindowParamEntity.ts b/src/entities/ClockWindowParamEntity.ts index f5db8e2..f7b685a 100644 --- a/src/entities/ClockWindowParamEntity.ts +++ b/src/entities/ClockWindowParamEntity.ts @@ -7,7 +7,7 @@ export default class ClockWindowParamEntity { font_color = "#000000"; background_color = "#000000"; background_transparent = true; - + type = 0; date_format = "yyyy/MM/dd"; time_format = "hh:mm:ss"; show_date = true; diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index a1c1f40..6f9653f 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -530,4 +530,9 @@ export default { "second mark color": "秒标", "the current property is only valid for single-line displays": "当前属性只对单行显示有效", + "dbclick config clock": "双击配置时钟", + "clock setting": "时钟设置", + "only normal clock support time hiding": "只有普通时钟支持时间隐藏", + "only normal clock support multiple lines": "只有普通时钟支持换行", + "only normal clock support": "只有普通时钟支持", };