crabatool 1.0.417 → 1.0.419

package/package.json

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

package/tool/client.js

@@ -88,8 +88,12 @@
     $app.gspxCacheList = {}; // 重置缓存
     $app.closeLoadingForm();
     $app.closeAlert();
+    $app.closeModals();
 
     var activeForm = mainPanel.get_activeForm();
+    if (!activeForm) {
+      activeForm = $app.getMainForm();
+    }
     if (!activeForm._firstAction) {
       var action = activeForm._firstAction = activeForm.get_action();
       action._parentAction = action.get_parent(); // 弹窗是动态获取的没有手动关联过

package/tool/compress.js

@@ -56,22 +56,28 @@ function updateCrabaVersion() {
 
   var crabaJs = path.join(_tempJsPath, 'craba.min.js');
   var content = fs.readFileSync(crabaJs);
+  console.log('crabaVersion:', pkg.version);
   if (content.indexOf('var crabaVersion =') < 0) {
     var vString = '\r\nvar crabaVersion = "' + pkg.version + '";var crabaDate = "' + pkg.updateTime + '";console.log("版本:" + crabaVersion + "  日期:" + crabaDate);';
     content = content + vString;
     fs.writeFileSync(crabaJs, content, 'utf8');
+  } else {
+    console.log('crabaVersion:', 0);
   }
 }
 
 function updateAgencyVersion() {
   var pkg = utils.readPackage(_pkgPath);
-
   crabaJs = path.join(_tempJsPath, 'agency.js');
+  console.log('更新agencyVersion', crabaJs);
   content = fs.readFileSync(crabaJs);
   if (content.indexOf('var agencyVersion=') < 0) {
     vString = '\r\nvar agencyVersion="' + pkg.version + '";';
     content = content + vString;
     fs.writeFileSync(crabaJs, content, 'utf8');
+    console.log('agencyVersion:', pkg.version);
+  } else {
+    console.log('agencyVersion', 0);
   }
 }