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")
+ }}
+
-
selectFile(props.row)">
+ selectFile(props.row)"
+ >
{{ $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": "只有普通时钟支持",
};