diff --git a/daemon/src/entity/instance/instance.ts b/daemon/src/entity/instance/instance.ts index 0c2e5c4f..1c3f0ec2 100755 --- a/daemon/src/entity/instance/instance.ts +++ b/daemon/src/entity/instance/instance.ts @@ -91,7 +91,7 @@ export default class Instance extends EventEmitter { this.forceExec(new FunctionDispatcher()); } - if (cfg?.enableRcon !== this.config.enableRcon) { + if (cfg?.enableRcon != null && cfg?.enableRcon !== this.config.enableRcon) { if (this.status() != Instance.STATUS_STOP) throw new Error($t("运行中状态无法启用或关闭 RCON 协议")); configureEntityParams(this.config, cfg, "enableRcon", Boolean); diff --git a/frontend/components.d.ts b/frontend/components.d.ts index 1bf5f4bc..4fd3b92d 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -65,6 +65,8 @@ declare module 'vue' { ATypographyTitle: typeof import('ant-design-vue/es')['TypographyTitle'] AUpload: typeof import('ant-design-vue/es')['Upload'] BetweenMenus: typeof import('./src/components/BetweenMenus.vue')['default'] + BgWarp: typeof import('./src/components/BgWarp.vue')['default'] + BgWrap: typeof import('./src/components/BgWrap.vue')['default'] CardError: typeof import('./src/components/CardError.vue')['default'] CardOperator: typeof import('./src/components/CardOperator.vue')['default'] CardPanel: typeof import('./src/components/CardPanel.vue')['default'] diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 72fec879..572972a8 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -9,10 +9,13 @@ import { Button, Select, Input, Table } from "ant-design-vue"; import MyselfInfoDialog from "./components/MyselfInfoDialog.vue"; import { closeAppLoading } from "./tools/dom"; import { useLayoutConfigStore } from "./stores/useLayoutConfig"; +import BgWrap from "./components/BgWrap.vue"; const { isDarkTheme } = useAppConfigStore(); const { getSettingsConfig, hasBgImage } = useLayoutConfigStore(); +const GLOBAL_COMPONENTS = [InputDialogProvider, MyselfInfoDialog]; + function setBackground(url: string) { const body = document.querySelector("body"); if (body) { @@ -46,14 +49,15 @@ onMounted(async () => { + + - + - - + diff --git a/frontend/src/components/BgWrap.vue b/frontend/src/components/BgWrap.vue new file mode 100644 index 00000000..90f517b5 --- /dev/null +++ b/frontend/src/components/BgWrap.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/frontend/src/widgets/instance/BaseInfo.vue b/frontend/src/widgets/instance/BaseInfo.vue index c5134d53..cc0dd775 100644 --- a/frontend/src/widgets/instance/BaseInfo.vue +++ b/frontend/src/widgets/instance/BaseInfo.vue @@ -61,18 +61,25 @@ onMounted(async () => { {{ t("TXT_CODE_68831be6") }}{{ instanceTypeText }} - {{ t("TXT_CODE_e70a8e24") }} - - - {{ statusText }} - - - - {{ statusText }} - - - {{ statusText }} - + + + {{ t("TXT_CODE_e70a8e24") }} + + + {{ statusText }} + + + + {{ statusText }} + + + {{ statusText }} + + + + {{ t("TXT_CODE_ad30f3c5") }}{{ instanceInfo?.started }} + + {{ t("TXT_CODE_46f575ae") }}{{ parseTimestamp(instanceInfo?.config.lastDatetime) }} @@ -103,15 +110,18 @@ onMounted(async () => { {{ t("TXT_CODE_8b8e08a6") }}{{ parseTimestamp(instanceInfo?.config.createDatetime) }} - - {{ t("TXT_CODE_ad30f3c5") }}{{ instanceInfo?.started }} - {{ t("TXT_CODE_cec321b4") }}{{ instanceInfo?.config.oe.toUpperCase() }} {{ t("TXT_CODE_400a4210") }}{{ instanceInfo?.config.ie.toUpperCase() }} + + {{ t("实例ID:") }} + + {{ t("节点ID:") }} + +