diff --git a/launcher/webview/__init__.py b/launcher/webview/__init__.py
index 1129706..f450a28 100644
--- a/launcher/webview/__init__.py
+++ b/launcher/webview/__init__.py
@@ -9,5 +9,5 @@ window = None
def start_webview():
global window
window = webview.create_window(f"mower-ng launcher {sys_config.get('version')}", sys_config.get('url'),
- js_api=Api())
+ js_api=Api(), width=850, height=600)
webview.start(debug=sys_config.get('debug'))
diff --git a/ui/src/App.vue b/ui/src/App.vue
index 06d73a2..cffa4df 100644
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -89,6 +89,7 @@ provide('new_version', new_version)
class="container"
v-model:value="conf.page"
@update:value="set_page"
+ justify-content="center"
>
@@ -96,15 +97,17 @@ provide('new_version', new_version)
-
- 设置
- 新
-
+
+ 设置
+ 新
+
- 帮助文档
+
+ 帮助文档
+
@@ -117,4 +120,17 @@ provide('new_version', new_version)
width: 100vw;
height: 100vh;
}
+.suffix-container {
+ margin: 0 4px 6px 4px;
+}
+.tab-content {
+ position: relative;
+}
+.tag {
+ margin-left: 4px;
+ position: absolute;
+ top: 50%;
+ left: 100%;
+ transform: translateY(-50%);
+}
diff --git a/ui/src/components/LogComponent.vue b/ui/src/components/LogComponent.vue
index 7fc5d72..47d1339 100644
--- a/ui/src/components/LogComponent.vue
+++ b/ui/src/components/LogComponent.vue
@@ -5,27 +5,44 @@ import hljs from 'highlight.js/lib/core'
const log = inject('log')
const log_ele = inject('log_ele')
+const chinesePattern = {
+ className: 'chinese',
+ begin: /[\u4e00-\u9fa5]+/
+}
+
hljs.registerLanguage('naive-log', () => ({
contains: [
{
className: 'info',
- begin: /\[信息\]/,
- end: /$/
+ begin: /^\[信息\]/,
+ end: /$/,
+ returnBegin: true,
+ returnEnd: true,
+ contains: [chinesePattern]
},
{
className: 'error',
- begin: /\[错误\]/,
- end: /$/
+ begin: /^\[错误\]/,
+ end: /$/,
+ returnBegin: true,
+ returnEnd: true,
+ contains: [chinesePattern]
},
{
className: 'execute_command',
- begin: /\[执行命令\]/,
- end: /$/
+ begin: /^\[执行命令\]/,
+ end: /$/,
+ returnBegin: true,
+ returnEnd: true,
+ contains: [chinesePattern]
},
{
className: 'command_out',
- begin: /\[命令输出\]/,
- end: /$/
+ begin: /^\[命令输出\]/,
+ end: /$/,
+ returnBegin: true,
+ returnEnd: true,
+ contains: [chinesePattern]
}
]
}))
@@ -54,22 +71,3 @@ hljs.registerLanguage('naive-log', () => ({
user-select: text;
}
-
-
diff --git a/ui/src/main.js b/ui/src/main.js
index e8343a7..132098e 100644
--- a/ui/src/main.js
+++ b/ui/src/main.js
@@ -1,5 +1,6 @@
import 'vfonts/Lato.css'
import 'vfonts/FiraCode.css'
+import './styles/global.css'
import { createApp } from 'vue'
import { createPinia } from 'pinia'
diff --git a/ui/src/pages/Settings.vue b/ui/src/pages/Settings.vue
index cd21d17..120ff2c 100644
--- a/ui/src/pages/Settings.vue
+++ b/ui/src/pages/Settings.vue
@@ -1,5 +1,6 @@