crabatool 1.0.415 → 1.0.417

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.415",
+  "version": "1.0.417",
   "description": "crabatool",
   "main": "index.js",
   "bin": {

package/tool/client.js

@@ -34,38 +34,85 @@
 
   $addHandler(window, 'focus', function() {
     //$common.alert('浏览器被激活');
-    if (files.length > 0) {
-      // 更新了平台 全部刷新
-      var mainPanel = $common.getMainPanel();
-      if (!mainPanel || files.includes('js/craba.min.js') || files.includes('js/crabaEx.min.js') || files.includes('js/agency.js') || files.includes('skins/craba.min.css')) {
-        window.location.reload();
-        return;
-      }
+    if (files.length <= 0)
+      return;
 
-      var updateJs = false;
-      var loadedJs = $jsLoader._getLoadedScripts();
-      files.forEach(function(js) {
-        if (loadedJs.includes(js)) {
-          updateJs = true;
-        }
-      });
+    // 更新了平台 全部刷新
+    var mainPanel = $common.getMainPanel();
+    if (!mainPanel || files.includes('js/craba.min.js') || files.includes('js/crabaEx.min.js') || files.includes('js/agency.js')) {
+      window.location.reload();
+      return;
+    }
 
-      if (updateJs) {
-        window.location.reload();
-        return;
+    console.log('文件变动:', files);
+    $app.isHotRefresh = true;
+    $craba._mods.def = new Date().getTime(); // 重置版本号，防止浏览器缓存
+
+    var cssLinks = [];
+    var gspxLinks = [];
+    var jsLinks = [];
+    var loadedJs = $jsLoader._getLoadedScripts();
+    files.forEach(function(filePath) {
+      // 没有加载过的js，不需要刷新
+      var index = loadedJs.findIndex(function(ls) {
+        return ls.includes(filePath);
+      });
+      if (index > -1) {
+        Array.removeAt(loadedJs, index);
+        jsLinks.push(filePath);
+      } else if (filePath.includes('.css')) {
+        cssLinks.push(filePath);
+      } else if (filePath.includes('.gspx')) {
+        gspxLinks.push(filePath);
       }
+    });
 
-      //$typeCaches = {}; // 重置
-      $app.gspxCacheList = {}; // 重置缓存
-      $app.closeLoadingForm();
-      $app.closeAlert();
+    // 1. 热更新css
+    cssLinks.forEach(function(url) {
+      var style = $skin._checkStyle('null', url);
+      if (style) $removeNode(style); // 删除老的css
+    });
+    var cssCount = cssLinks.length;
+    // 加载新的css
+    $skin.loadCss(cssLinks);
+    // 仅有css，不用刷新页面
+    if (cssCount == files.length) {
+      delete $app.isHotRefresh;
+      files = [];
+      $common.showOk('css热更新成功');
+      return;
+    }
 
-      var activeForm = mainPanel.get_activeForm();
-      activeForm.refresh(activeForm.get_url());
+    // 3. 热更新gspx
+    //$typeCaches = {}; // 重置
+    $app.gspxCacheList = {}; // 重置缓存
+    $app.closeLoadingForm();
+    $app.closeAlert();
+
+    var activeForm = mainPanel.get_activeForm();
+    if (!activeForm._firstAction) {
+      var action = activeForm._firstAction = activeForm.get_action();
+      action._parentAction = action.get_parent(); // 弹窗是动态获取的没有手动关联过
+    }
 
-      $common.showOk('当前页面gspx热更新成功，js修改只能刷新浏览器');
+    // 先释放页面和action类型
+    activeForm.destroyContent();
 
-      files = []; // 重置
+    // 2. 热更新js
+    if (jsLinks.length > 0) {
+      $common.loadScript({
+        srcs: jsLinks,
+        loadedFun: function() {
+          delete $app.isHotRefresh;
+          activeForm.refresh(activeForm.get_url());
+          $common.showOk('js热更新成功');
+        }
+      });
+    } else {
+      delete $app.isHotRefresh;
+      activeForm.refresh(activeForm.get_url());
     }
+    files = []; // 重置
+    $common.showOk('gspx热更新成功');
   });
 })();

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