crabatool 1.0.457 → 1.0.458

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.457",
+  "version": "1.0.458",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -13,7 +13,7 @@
     "mergeinitjs": "node ./test/test.js -mergeinitjs",
     "export": "node ./test/test.js -exportgspx -webPath F:/Beefun/srcs",
     "checkjs": "node ./test/test.js -checkjs",
-    "mergeFiles": "node ./test/test.js -mergeFiles -modName shell -webPath F:/shell-gerrit/web/src/main/resources/static/shell/ -targetPath F:/shell-gerrit/web/src/main/resources/static/shell/ -inNames js/crabaNgp.js,skins/craba.min.css,skins/blueSky/skin.css,skins/shell.css,pages/RetailHome.gspx,pages/RetailHome.js,basics/Company.gspx,basics/Company.js,basics/PicUploadForm.gspx,basics/PicUploadForm.js,js/innerNotice.js,Main.gspx,Main.js,js/init.js,js/timingCollector.js,js/help.plug.js -outName F:/shell-gerrit/web/src/main/resources/static/shell/shell.res.js",
+    "mergeFiles": "node ./test/test.js -mergeFiles -modName shell -webPath F:/shell-gerrit/web/src/main/resources/static/shell/ -targetPath F:/shell-gerrit/web/src/main/resources/static/shell/ -inNames skins/craba.min.css,skins/blueSky/skin.css,skins/shell.css,pages/RetailHome.gspx,pages/RetailHome.js,basics/Company.gspx,basics/Company.js,basics/PicUploadForm.gspx,basics/PicUploadForm.js,js/innerNotice.js,Main.gspx,Main.js,js/init.js,js/timingCollector.js,js/help.plug.js -outName F:/shell-gerrit/web/src/main/resources/static/shell/shell.res.js",
     "mergeJxcFiles": "node ./test/test.js -mergeFiles -modName jxc -webPath F:/jxc/jxc-web/src/main/resources/static/jxc/ -targetPath F:/jxc/jxc-web/src/main/resources/static/jxc/ -inNames skins/blueSky/skin.css,js/wpsSettings.js,baseinfo/js/qiniu.min.js,baseinfo/js/baseinfo.constant.js,baseinfo/js/grid.ext.js,finance/js/finance.constant.js,baseinfo/js/lockScreen.js -initJs F:/jxc/jxc-web/src/main/resources/static/jxc/js/init.js",
     "mergeSaleFiles": "node ./test/test.js -mergeFiles -modName sale -webPath F:/sale/web/src/main/resources/static/sale/ -targetPath F:/sale/web/src/main/resources/static/sale/ -inNames skins/style/ColorSelectCss.css,skins/blueSky/skin.css,js/jquery.min.js,analysiscloud/js/wpsSettings.js,shopsale/js/payway.js,shopsale/js/billposter.js,eshoporder/eshopsaleorder/RetailHomeData.gspx,eshoporder/eshopsaleorder/RetailHomeData.js -initJs F:/sale/web/src/main/resources/static/sale/js/init.js",
     "checkiconfont": "node ./test/test.js -checkiconfont -webPath F:/crabaevery/www -modName crabaevery -reportHost http://127.0.0.1:9998 -ignoreFiles biconfont/iconfont.js,iconfont/iconfont.js -cssFiles skins/retail/skin.css",

package/tool/compress.js

@@ -265,12 +265,39 @@ function compressCss(inNames, targetCss) {
   return content;
 }
 
+function removeXMLComments(xml) {
+  return xml.replace(/<!--[\s\S]*?-->/g, '');
+}
+
+function safeXmlMinify(xml) {
+  return xml
+    .replace('xmlns="Craba.UI"', 'xmlns="urn:Craba.UI"')
+    .replace(/>\s+</g, '><')       // 移除标签间空白
+    .replace(/\s+/g, ' ')           // 压缩多余空白
+    .replace(/\s?=\s?/g, '=')       // 移除等号周围空白
+    .replace(/(\w)="([^"]*)"(\w)/g, '$1="$2" $3') // 属性间加空格
+    .replace(/(\/>)</g, '$1 <');    // 自闭合标签后加空格
+}
+
 function compressGspx(filePath) {
   if (!fs.existsSync(filePath)) {
     return '';
   }
   const xmlMinifier = require('xml-minifier');
   let xml = fs.readFileSync(filePath, 'utf8');
-  let minified = xmlMinifier.minify(xml);
+  xml = removeXMLComments(xml); // 手动替换注释，xml-minifier的removeComments没有生效的
+  xml = safeXmlMinify(xml);
+  return xml.trim();
+  
+  /*
+  let minified = xmlMinifier.minify(xml, {
+    collapseWhitespace: true,   // 折叠空白
+    removeComments: true,       // 移除注释
+    removeEmptyAttributes: false,// 移除空属性
+    removeEmptyTags: false,     // 保留空标签
+    preserveAttributeSpaces: true, // 保留属性之间的空白【关键】
+    trim: true                  // 修剪文本
+  });
   return minified;
+  */
 }