crabatool 1.0.77 → 1.0.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.77",
+  "version": "1.0.80",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {

package/tool/install.js

@@ -13,7 +13,8 @@ class Install {
     // AppData
     var p1 = process.env.APPDATA;
     if (!p1) {
-      return console.log('本机没有APPDATA目录，本功能暂不支持mac');
+      //return console.log('本机没有APPDATA目录，本功能暂不支持mac');
+      p1 = path.join(process.env.HOME, "/Library/Application Support");
     }
     var JetBrains = path.join(p1, "JetBrains");
     if (fs.existsSync(JetBrains)) {
@@ -40,12 +41,19 @@ class Install {
     console.log('idea路径:' + ideaPath);
 
     // 第1步：gspx智能语法提示
-    var xsdFile = path.join(process.env.ProgramData, "idea/Craba.UI.xsd");
+    var xsdFile = path.join(ideaPath, "Craba.UI.xsd");
     utils.mkdirsSync(xsdFile);
     utils.downloadFile(config.SourceHost + "/setup/Craba.UI.xsd", xsdFile, true);
 
     var extFile = path.join(ideaPath, "options/javaeeExternalResources.xml");
-    utils.downloadFile(config.SourceHost + "/setup/idea/options/javaeeExternalResources.xml", extFile);
+    utils.downloadFile(config.SourceHost + "/setup/idea/options/javaeeExternalResources.xml", extFile, function() {
+      var xml = fs.readFileSync(extFile).toString();
+      var xmldata = JSON.parse(xmljs.xml2json(xml, { compact: true, spaces: 2 }));
+      xmldata.application.component.resource._attributes.location = xsdFile;
+      xml = xmljs.json2xml(xmldata, { compact: true, ignoreComment: true, spaces: 2 });
+      fs.writeFileSync(extFile, xml);
+    });
+
 
     // 第2步：创建页面模板
     var gspxPath = path.join(ideaPath, "fileTemplates/Craba.gspx");
@@ -69,6 +77,7 @@ class Install {
       utils.addSingleNode(xmldata, "/application/component/extensionMap", xn);
       add = true;
     } else {
+      if (!xn.mapping) xn.mapping = [];
       var child = xn.mapping.filter(data => { return data._attributes.ext == 'gspx'; });
       if (child.length == 0) add = true;
     }

package/tool/start.js

@@ -113,20 +113,20 @@ class Start {
 
   // 启动服务
   runServer() {
-    this.checkPath();
+    start.checkPath();
     require('../lib/server.js');
   }
 
   // 更新平台后启动服务
   update() {
-    this.checkPath();
+    start.checkPath();
     upgrade.updateCraba(start.runServer);
   }
 
   // 查看本地版本
   showLocalVersion(check) {
     if (check && !config.webPath) return;
-    this.checkPath();
+    start.checkPath();
     var localData = upgrade.getLocalVersion();
     console.log(`\r\n本地craba版本：[${localData.version}]\r\n本地craba日期：[${localData.date}]`);
   }
@@ -153,7 +153,7 @@ class Start {
 
   // 按配置对项目init.js和biz.js打包
   mergeInit() {
-    this.checkPath();
+    start.checkPath();
     if (config.modName && config.childModList && config.childModList.length > 0) {
       config.mergeinitjs = true; // 标记仅打包，不监视文件变动
       require('./ngptool.js');
@@ -164,13 +164,13 @@ class Start {
 
   // 校验项目js语法
   checkAllJs() {
-    this.checkPath();
+    start.checkPath();
     require('./checkjs.js').start();
   }
 
   // 对整个项目js打包
   compressAllJs() {
-    this.checkPath();
+    start.checkPath();
     console.log('待实现');
   }
 

package/tool/upgrade.js

@@ -171,7 +171,7 @@ class Upgrade {
     var dest = this.projectPath;
     var source = config.CachePath;
     var ignores = ["server", "www"];
-    console.log("拷贝文件中..");
+    //console.log("拷贝文件中..");
     utils.copyFiles(source, dest, ignores, utils.createDelegate(this, function(fileName) {
       utils.debug('拷贝文件', fileName);
       this.pb.render({ value: ++this.pb.value, text: fileName });