crabatool 1.0.808 → 1.0.811

package/index.js

@@ -113,6 +113,7 @@ async function checkFast(args) {
   if (args.includes('-updateSkin')) {
     start.bindAndCheckConfig('-skinPath');
     start.bindAndCheckConfig('-version');
+    start.bindBranchName(config.skinPath);
     require('./tool/ngpSkinUtils.js').update();
     return false;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.808",
+  "version": "1.0.811",
   "description": "crabatool",
   "main": "index.js",
   "bin": {

package/res/login.html

@@ -17,6 +17,8 @@
             var authorization = $common.getCookie('ngp-authorization');
             var ngp_route = $common.getCookie('ngp-route');
             if (authorization && ngp_route) {
+                createLoginBtn(); // 回到登录界面
+
                 $ms.router = {//设置请求路由
                     debugMs: JSON.parse($common.getCookie('debugMs')),
                     'ngp-authorization': 'jwt',
@@ -42,15 +44,14 @@
                 $common.loadScript(srcs, function() {
                     showMainPage();
                 });
-                return;
+            } else {
+                showLoginPage();
             }
-            showLoginPage();
         }
 
         function showMainPage() {
             $skin.loadCss(modeName + '/skins/craba.min.css,shell/skins/shell.css', 'login', function() {
                 $craba.run(modeName + '/Main.gspx', modeName);
-                createLoginBtn();
             });
         }
 

package/tool/start.js

@@ -366,12 +366,13 @@ class Start {
     upgrade.createProject(options);
   }
 
-  bindBranchName() {
+  bindBranchName(webPath) {
     if (config.branchName) {
       return true;
     }
 
-    var gitPath = utils.searchRootFolter('.git', config.webPath);
+    if (!webPath) webPath = config.webPath;
+    var gitPath = utils.searchRootFolter('.git', webPath);
     if (!gitPath) return;
 
     var headPath = utils.join(gitPath, 'HEAD');
@@ -383,8 +384,8 @@ class Start {
 
     // 情况1：取到分支名包含斜杠
     if (arr.length > 1) {
-      config.branchName = arr[arr.length - 1];
-      config.branchName = config.branchName.replace(/'/g, ''); // 分支名称
+      var bName = arr[arr.length - 1];
+      config.branchName = bName.replace(/'/g, ''); // 分支名称
       return;
     }
 
@@ -403,8 +404,8 @@ class Start {
       return;
     }
 
-    config.branchName = results[0].split(' ')[1];
-    config.branchName = config.branchName.replace(/'/g, ''); // 分支名称
+    var bName = results[0].split(' ')[1];
+    config.branchName = bName.replace(/'/g, ''); // 分支名称
   }
 }