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 diff --git a/launcher/webview/api.py b/launcher/webview/api.py index 859c14c..8bb62a3 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", @@ -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)}") 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 }} - - - + + +