crabatool 1.0.416 → 1.0.418

package/lib/utils.js

@@ -535,7 +535,7 @@ class Utils {
             var content = fs.readFileSync(htmlPath).toString();
             content = content.replaceAll('${modName}', config.modName);
 
-            res.setHeader('Content-Type', 'text/html; charset=utf-8'); // 当做文本输出，才能显示到iframe中
+            res.setHeader('Content-Type', 'text/html; charset=utf-8'); // 当做文本输出，才能显示到浏览器
             res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
             res.setHeader('Pragma', 'no-cache');
             res.setHeader('Expires', '0');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.416",
+  "version": "1.0.418",
   "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

@@ -81,16 +81,20 @@ function doCompress() {
   compressCrabaJs(inNames, 'agency.js', updateAgencyVersion);
 
   // craba.min.js
-  inNames = ['type.js', 'craba.js', 'common.js', 'es6.js', 'controls.js', 'required.js', 'drag.js', 'listView.js', 'crabaEx.js', 'crabaFC.js', 'crabaMS.js', 'biz.js'];
+  inNames = ['type.js', 'craba.js', 'common.js', 'es6.js', 'controls.js', 'required.js', 'drag.js', 'crabaEx.js', 'crabaFC.js', 'crabaMS.js'];
   compressCrabaJs(inNames, 'craba.min.js', updateCrabaVersion);
 
   // crabaEx.min.js
-  inNames = ['grid.js', 'controlsEx.js', 'treeView.js', 'print.js', 'workflow.js', '../../Carpa.Dress/Dress.js', 'htmlEditor.js'];
+  inNames = ['grid.js', 'controlsEx.js', 'biz.js'];
   compressCrabaJs(inNames, 'crabaEx.min.js');
 
-  // workflow流程图
-  //inNames = ['workflow.js'];
-  //compressCrabaJs(inNames, 'workflow.js');
+  // 其他独立的大组件
+  compressCrabaJs(['listView.js'], 'listView.js');
+  compressCrabaJs(['workflow.js'], 'workflow.js');
+  compressCrabaJs(['dress.js'], 'dress.js');
+  compressCrabaJs(['htmlEditor.js'], 'htmlEditor.js');
+  compressCrabaJs(['print.js'], 'print.js');
+  compressCrabaJs(['treeView.js'], 'treeView.js');
 
 
   // echarts