diff --git a/src/boot/i18n.ts b/src/boot/i18n.ts index 9a7a085..a6e7113 100644 --- a/src/boot/i18n.ts +++ b/src/boot/i18n.ts @@ -27,6 +27,7 @@ Cookies.set("language", language, { (window).currnet_use_language = language; const i18n = createI18n({ + legacy: false, locale: language, messages, }); diff --git a/src/components/SignalSourceTree.vue b/src/components/SignalSourceTree.vue index 483af09..2fdf227 100644 --- a/src/components/SignalSourceTree.vue +++ b/src/components/SignalSourceTree.vue @@ -9,7 +9,7 @@ :draggable=" prop.node.uuid != '' && $store.state.power_state && - !prop.node.item_data.system_default + (!prop.node.item_data.system_default || !prop.node.is_group) " @dragstart="(evt) => onDragStart(evt, prop.node)" @dragover="(evt) => onDragOver(evt, prop.node)" @@ -319,6 +319,9 @@ export default defineComponent({ (item) => item && (item as any).uuid == uuid ); if (signal_source_group) { + if (signal_source_group.system_default) { + return; + } if ( signal_source_group.parent_uuid == node.item_data.uuid ) { @@ -340,6 +343,10 @@ export default defineComponent({ (item) => item && (item as any).uuid == uuid ); if (signal_source) { + if (signal_source.system_default) { + return; + } + if (signal_source.group_uuid == node.item_data.uuid) { return; } diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue index f4b43ea..f5d4d40 100644 --- a/src/components/SystemSettingDialog.vue +++ b/src/components/SystemSettingDialog.vue @@ -81,18 +81,12 @@ :label="$t('timing task')" :disable="loading" /> - + - +