Merge branch 'develop' into boards

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({

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 {

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>

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>