crabatool 1.0.418 → 1.0.420

package/package.json

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

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);
   }
 }
 
@@ -81,11 +87,13 @@ 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', 'crabaEx.js', 'crabaFC.js', 'crabaMS.js'];
+  inNames = ['type.js', 'craba.js', 'common.js', 'es6.js', 'controls.js', 'required.js', 'drag.js', 'listView.js', 'crabaEx.js', 'crabaFC.js', 'crabaMS.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', 'biz.js'];
+  //inNames = ['grid.js', 'controlsEx.js', 'biz.js'];
+  inNames = ['grid.js', 'controlsEx.js', 'biz.js', 'workflow.js', 'dress.js', 'htmlEditor.js', 'print.js', 'treeView.js'];
   compressCrabaJs(inNames, 'crabaEx.min.js');
 
   // 其他独立的大组件

package/tool/crabapublish.js

@@ -13,6 +13,7 @@ var _pkgPath = path.join(_jsPath, 'package.json');
 var pkg = utils.readPackage(_pkgPath);
 
 module.exports.upload = function() {
+  console.log('开始打包zip和上传');
   doUploadPkg(config.version, _pkgPath, doZipCraba); // 先上传package版本信息文件，然后上传craba.zip资源包，再然后调用自动化测试
 }
 
@@ -66,7 +67,10 @@ function doUploadCraba(version) {
   formData.append('my_file', fs.createReadStream(_zipName));
   var headers = formData.getHeaders();
 
-  //utils.postWeebhooks(new Date().toString() + " " + config.modName + '打包完成，上传资源' + pkg.version + '到' + version);
+  var text = new Date().toString() + " " + config.modName + '打包完成，上传资源' + pkg.version + '到' + version;
+  console.log(text);
+  
+  //utils.postWeebhooks(text);
 
   axios({
     method: 'POST',
@@ -79,7 +83,7 @@ function doUploadCraba(version) {
       token: 'wssf2021' // 临时授权码
     }
   }).then(function(response) {
-    //console.log(response.data);
+    console.log(response.data);
     if (version) doAutoTest();
   }).catch(function(err) {
     utils.postWeebhooks(config.modName + '上传资源失败');