crabatool 1.0.300 → 1.0.301

package/index.js

@@ -52,6 +52,16 @@ function checkFast(args) {
     return false;
   }
 
+  if (args.includes('-iconfont')) {
+    start.bindAndCheckConfig('-zipPath');
+    start.bindAndCheckConfig('-fontPath');
+    start.bindConfigByArgv('-prefix');
+    start.bindConfigByArgv('-fontName');
+
+    start.iconfont();
+    return false;
+  }
+
   // crabatool -update -webPath 项目路径 -version可选参数
   if (args.includes('-update')) {
     start.bindAndCheckConfig('-webPath');

package/lib/utils.js

@@ -287,7 +287,7 @@ class Utils {
         next(); // 继续处理
     }
 
-    // 清空整个目录，包括子目录和文件
+    // 删除文件夹，清空文件夹，删除目录，清空目录，清空整个目录，包括子目录和文件
     cleardirsSync(dirname) {
         if (!fs.existsSync(dirname)) return;
 
@@ -539,7 +539,9 @@ class Utils {
     unzip(zipPath, targetPath, cb, opts) {
         compressing.zip.uncompress(zipPath, targetPath, opts)
             .then(function done() {
-                if (cb) cb(); // 解压完成
+                if (cb) {
+                    cb(zipPath); // 解压完成
+                }
             })
             .catch(function err() {
                 console.log(arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.300",
+  "version": "1.0.301",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -17,6 +17,8 @@
     "upload": "node run.js -upload -version master -Debug true -host http://127.0.0.1:9998 -hidejspath true -targetPath F:\\CarpaNET_NEW",
     "crabaNgp": "node run.js -mergejs -hidejspath true -targetPath F:\\CarpaNET_NEW\\src\\Carpa.Web\\js\\crabaNgp -inNames initMs.js,businessControl.js -outName F:\\CarpaMS\\src\\js\\crabaNgp.js",
     "webPath": "node ./test/test.js -checkjs -webhooks 0 -webPath F:\\crabaevery\\www -modName crabaevery",
+    "biconfont": "node ./test/test.js -iconfont -zipPath F:\\crabaevery\\www\\biconfont -fontPath F:\\crabaevery\\www\\skins\\bicon -prefix .bicon- -fontName biconfont",
+    "aiconfont": "node ./test/test.js -iconfont -zipPath F:\\crabaevery\\www\\iconfont -fontPath F:\\CarpaNET_NEW\\src\\Carpa.Web\\skins -prefix .aicon- -fontName iconfont",
     "makeHash": "node run.js -makeHash -webPath ./test/ -modName craba  -files http://crabadoc.ca.com/js/utils/utils.js,F:/newcrabadoc/www/js/utils/utils.js,./test/test.js,./test/beefun.js,https://s5.vip.wpscdn.cn/web-libs/2t/js/userinfo-collect/1.0.3/vas2t-userinfo-collect.min.js?a=1 -outJson ./hash.json -hashName sha384",
     "makeHash2": "node run.js -makeHash -webPath ./test/ -modName craba -files ./test/  -exts .js -outJson ./hash2.json -hashName sha384"
   },

package/tool/iconfont.js

@@ -0,0 +1,130 @@
+var utils = require('../lib/utils.js');
+var config = require('../lib/config.js');
+var fs = require('fs');
+var path = require('path');
+
+module.exports.start = async function() {
+  if (!config.zipPath) {
+    console.log('缺少zipPath路径')
+    return;
+  }
+
+  var zipName = "";
+  var files = fs.readdirSync(config.zipPath);
+  for (var i = 0; i < files.length; i++) {
+    var fname = files[i];
+    var ext = path.extname(fname);
+    if (ext == '.zip') {
+      zipName = fname;
+      break;
+    }
+  }
+  if (!zipName) {
+    console.log('字体库文件不存在，操作无效。');
+    return;
+  }
+  var zipUrl = path.join(config.zipPath, zipName);
+
+  if (!fs.existsSync(zipUrl)) {
+    console.log(zipUrl + '文件不存在，操作无效。');
+    return;
+  }
+
+  if (!config.prefix) {
+    config.prefix = '.bicon-';
+  }
+  if (!config.fontName) {
+    config.fontName = 'biconfont';
+  }
+
+  zipLoaded(zipUrl);
+}
+
+function zipLoaded(zipUrl) {
+  if (!fs.existsSync(zipUrl)) {// 检查文件
+    console.log(":::服务不可用，拉取字体文件失败:::");
+    return;
+  }
+
+  utils.unzip(zipUrl, config.zipPath, zipOk);
+}
+
+function zipOk(zipUrl) {
+  var zipFolder = "";
+  var files = fs.readdirSync(config.zipPath);
+  for (var i = 0; i < files.length; i++) {
+    var fname = files[i];
+    var fname2 = path.join(config.zipPath, fname);
+    var stat = fs.statSync(fname2);
+    if (stat.isDirectory()) {
+      zipFolder = fname;
+      break;
+    }
+  }
+  var target = path.join(config.zipPath, zipFolder);
+
+
+  // 拷贝到bicon目录
+  utils.copyFiles(target, config.zipPath, null, utils.createDelegate(this, function(fileName) {
+    utils.debug('拷贝文件', fileName);
+  }));
+
+  // 删除解压后的文件夹
+  utils.cleardirsSync(target);
+  fs.unlinkSync(zipUrl);
+
+  var ignores = ["读我.txt", "font.zip", "iconfont.css", "demo_index.html", "demo.css", "iconfont.json", "iconfont.woff2", "iconfont.js"];
+  // 从bicon下面拷贝文件到skins\bicon下面
+  utils.copyFiles(config.zipPath, config.fontPath, ignores, utils.createDelegate(this, function(fileName) {
+    utils.debug('拷贝文件', fileName);
+  }));
+
+  // 读取zip里面的css
+  var cssPath = path.join(config.zipPath, 'iconfont.css');
+  var css = fs.readFileSync(cssPath).toString();
+
+  // 读取模板css
+  var css2 = `
+  @font-face {
+  font-family: "{fontName}";
+  src: url("iconfont.eot?t={t}");
+  src: url("iconfont.eot?t={t}#iefix") format('embedded-opentype'),
+    {url},
+    url("iconfont.woff?t={t}") format('woff'),
+    url("iconfont.ttf?t={t}") format('truetype'),
+    url("iconfont.svg?t={t}#{fontName}") format('svg');
+}
+
+.{fontName} {
+  font-family: "{fontName}" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+{css}`;
+
+  // 替换图标css集合
+  var index = css.indexOf(config.prefix);
+  if (index > -1) {
+    var content = css.substring(index);
+    css2 = css2.replace('{css}', content);
+  }
+
+  // 替换woff2的二进制流
+  var r = new RegExp(/url\('data:.*'\)/);
+  var r0 = css.match(r);
+  if (r0 && r0.length > 0) {
+    css2 = css2.replace('{url}', r0[0]);
+  }
+
+  // 替换时间戳
+  css2 = css2.replace(/\{t\}/ig, new Date().getTime());
+
+  // 替换时间戳
+  css2 = css2.replace(/\{fontName\}/ig, config.fontName);
+
+  // 将新内容写到bion/iconfont.css下面
+  fs.writeFileSync(path.join(config.fontPath, 'iconfont.css'), css2);
+}

package/tool/start.js

@@ -233,6 +233,11 @@ class Start {
     }
   }
 
+  // 校验项目js语法
+  iconfont() {
+    require('./iconfont.js').start();
+  }
+
   // 校验项目js语法
   checkAllJs() {
     start.checkWebPath(); // 兼容老平台