From dd179a9f1dbbf51fabd6475e7fa61ed54aa31ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com>
Date: Sat, 3 Aug 2024 14:44:34 +0800
Subject: [PATCH] =?UTF-8?q?Update:=20=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/modules/mixly-modules/common/app.js            |  2 +-
 .../modules/mixly-modules/electron/arduino-shell.js   | 11 ++++++-----
 common/templates/html/lib-manager-div.html            |  8 ++++++--
 mixly-sw/templete/setting-div.html                    |  8 ++++++--
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/common/modules/mixly-modules/common/app.js b/common/modules/mixly-modules/common/app.js
index 3c30d841..25893d52 100644
--- a/common/modules/mixly-modules/common/app.js
+++ b/common/modules/mixly-modules/common/app.js
@@ -219,7 +219,7 @@ class App extends Component {
             },
             callback: () => BU.initBurn(),
             scopeType: Nav.Scope.LEFT,
-            weight: 4
+            weight: 3
         });
 
         this.#nav_.register({
diff --git a/common/modules/mixly-modules/electron/arduino-shell.js b/common/modules/mixly-modules/electron/arduino-shell.js
index d523e720..dd2f25cf 100644
--- a/common/modules/mixly-modules/electron/arduino-shell.js
+++ b/common/modules/mixly-modules/electron/arduino-shell.js
@@ -329,10 +329,12 @@ ArduShell.upload = (boardType, port) => {
     }
     ArduShell.runCmd(layerNum, 'upload', cmdStr,
         function () {
-            mainStatusBarTabs.add('serial', port);
-            mainStatusBarTabs.changeTo(port);
-            const statusBarSerial = mainStatusBarTabs.getStatusBarById(port);
-            statusBarSerial.open();
+            setTimeout(() => {
+                mainStatusBarTabs.add('serial', port);
+                mainStatusBarTabs.changeTo(port);
+                const statusBarSerial = mainStatusBarTabs.getStatusBarById(port);
+                statusBarSerial.open();
+            }, 1000);
         }
     );
 }
@@ -492,7 +494,6 @@ ArduShell.runCmd = (layerNum, type, cmd, sucFunc) => {
         layer.close(layerNum);
         let message = '';
         if (info.code) {
-            
             message = (type === 'compile' ? Msg.Lang['shell.compileFailed'] : Msg.Lang['shell.uploadFailed']);
             statusBarTerminal.addValue("==" + message + "==\n");
         } else {
diff --git a/common/templates/html/lib-manager-div.html b/common/templates/html/lib-manager-div.html
index fd64dd0b..5dee14df 100644
--- a/common/templates/html/lib-manager-div.html
+++ b/common/templates/html/lib-manager-div.html
@@ -27,6 +27,10 @@
             border-left-width: 10px;
         }
 
+        #libs-menu-options > li > a {
+            cursor: pointer;
+        }
+
         #libs-menu-body {
             position: absolute;
             right: 0px;
@@ -148,10 +152,10 @@
                 lay-filter="libs-menu-filter"
             >
                 <li class="layui-nav-item layui-this" lay-id="import">
-                    <a m-id="0" href="javascript:;">{{d.importBoard}}</a>
+                    <a m-id="0">{{d.importBoard}}</a>
                 </li>
                 <li class="layui-nav-item" lay-id="delete">
-                    <a m-id="1" href="javascript:;">{{d.delBoard}}</a>
+                    <a m-id="1">{{d.delBoard}}</a>
                 </li>
             </ul>
         </div>
diff --git a/mixly-sw/templete/setting-div.html b/mixly-sw/templete/setting-div.html
index bfc517f3..c5821362 100644
--- a/mixly-sw/templete/setting-div.html
+++ b/mixly-sw/templete/setting-div.html
@@ -17,6 +17,10 @@
         border-left-width: 10px;
     }
 
+    #setting-menu-options > li > a {
+        cursor: pointer;
+    }
+
     #setting-menu-body {
         position: absolute;
         right: 0px;
@@ -170,7 +174,7 @@
             <ul id="setting-menu-options" class="layui-nav layui-nav-tree layui-bg-cyan layui-inline"
                 lay-filter="setting-menu-filter">
                 <li class="layui-nav-item layui-this" lay-id="0">
-                    <a m-id="0" href="javascript:;">{{ d.personalise }}</a>
+                    <a m-id="0">{{ d.personalise }}</a>
                 </li>
                 {{# if(d.env === 'electron'){ }}
                 <li class="layui-nav-item" lay-id="1">
@@ -179,7 +183,7 @@
                 {{# } }}
                 {{# if(d.env === 'web-socket'){ }}
                 <li class="layui-nav-item" lay-id="2">
-                    <a m-id="2" href="javascript:;">{{ d.checkForUpdates }}</a>
+                    <a m-id="2">{{ d.checkForUpdates }}</a>
                 </li>
                 {{# } }}
             </ul>