From 6e235a28c1597751cb09e263747d8235cc372116 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Mon, 10 Mar 2025 00:04:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=9A=E6=9B=B4=E6=96=B0=E6=BA=90=E7=A0=81=E6=97=B6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=8C=87=E5=AE=9A=E4=B8=BA=E8=BF=9C=E7=A8=8B=E5=88=86?= =?UTF-8?q?=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/webview/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/webview/api.py b/launcher/webview/api.py index 859c14c..7b0f048 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -43,7 +43,7 @@ command_list = { "clone": lambda: f"git\\bin\\git -c lfs.concurrenttransfers=100 clone {build_base_url(mower_ng_git_url)} --branch slow", "set_remote": lambda: f"..\\git\\bin\\git remote set-url origin {build_base_url(mower_ng_git_url)}", "set_lfs": lambda: f"..\\git\\bin\\git config lfs.url {build_base_url(mower_ng_git_url)}/info/lfs", - "fetch": lambda: f"..\\git\\bin\\git fetch {build_base_url(mower_ng_git_url)} {config.conf.branch} --progress", + "fetch": lambda: f"..\\git\\bin\\git fetch origin {config.conf.branch} --progress", "switch": lambda: f"..\\git\\bin\\git -c lfs.concurrenttransfers=100 switch -f {config.conf.branch} --progress", "reset": lambda: f"..\\git\\bin\\git -c lfs.concurrenttransfers=200 reset --hard origin/{config.conf.branch}", "pip_tools_install": lambda: f"..\\python\\Scripts\\pip install --no-cache-dir -i {mirror_list[config.conf.mirror]} pip-tools --no-warn-script-location", From e4b93b94b104683da4b9e8a11afa584aebbcceeb Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Mon, 10 Mar 2025 00:59:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E5=90=AF=E5=8A=A8=E5=AE=9E=E4=BE=8B=E5=90=8E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=89=93=E5=BC=80=E7=BD=91=E9=A1=B5=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/webview/api.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/launcher/webview/api.py b/launcher/webview/api.py index 7b0f048..8bb62a3 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -279,7 +279,9 @@ class Api: ) return try: - self.run("cli", "mower-ng", {"command": command, "path": path}) + ret = self.run("cli", "mower-ng", {"command": command, "path": path}) + if command == "launch" and ret == "success": + self.run("cli", "mower-ng", {"command": "webui", "path": path}) except Exception as e: custom_event(LogType.error, f"{cli_command[command]} 失败 {repr(e)}") From e3c2627fc578c9a54a381c459b1244c6f14c42ce Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Mon, 10 Mar 2025 01:00:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=91=E5=B8=83v0.7.1=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/sys_config/config_dist.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/sys_config/config_dist.json b/launcher/sys_config/config_dist.json index 68e3715..499fad5 100644 --- a/launcher/sys_config/config_dist.json +++ b/launcher/sys_config/config_dist.json @@ -1,5 +1,5 @@ { - "version": "v0.7.0", + "version": "v0.7.1", "url": "ui/dist/index.html", "log_level": "INFO", "debug": false From 06fab427aae5ae9665add4956864a2a733a36192 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sat, 22 Mar 2025 20:39:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=201.?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=A8=8B=E5=BA=8F=E7=95=8C=E9=9D=A2=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E5=AF=B9=E9=BD=90=202.=E7=BC=96=E8=BE=91=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E5=90=8D=E7=A7=B0=E6=97=B6=E4=BF=9D=E6=8C=81=E8=A1=8C?= =?UTF-8?q?=E9=AB=98=E5=92=8C=E5=AE=9E=E4=BE=8B=E5=90=8D=E7=A7=B0=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E5=8F=98=203.=E4=BF=AE=E6=94=B9=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E5=90=8D=E7=A7=B0=E8=BE=93=E5=85=A5=E6=A1=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8F=AF=E6=B8=85=E9=99=A4=E9=80=89=E9=A1=B9=204.?= =?UTF-8?q?=E6=89=93=E5=BC=80=E9=85=8D=E7=BD=AE=E8=B7=AF=E5=BE=84=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=A7=BB=E5=88=B0=E5=8F=B3=E4=BE=A7=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=A4=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/main.js | 1 - ui/src/pages/Launch.vue | 32 ++++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/ui/src/main.js b/ui/src/main.js index 132098e..647f8a5 100644 --- a/ui/src/main.js +++ b/ui/src/main.js @@ -1,4 +1,3 @@ -import 'vfonts/Lato.css' import 'vfonts/FiraCode.css' import './styles/global.css' diff --git a/ui/src/pages/Launch.vue b/ui/src/pages/Launch.vue index 7300528..4a912e0 100644 --- a/ui/src/pages/Launch.vue +++ b/ui/src/pages/Launch.vue @@ -175,8 +175,8 @@ async function handle_migrate(key) { 显示日志 - - + + - + - {{ item.name }} + {{ item.name }} - - - + + +