crabatool 1.0.390 → 1.0.393

package/apis/homeai.js

@@ -20,6 +20,7 @@ var funcList = {
   '修改菜单': '_modifyMenuItem',
   '表生页': '_doExcel',
   '文生页': '_createPage',
+  'AI报表': '_createPage',
   '新建页面': '_createPage',
   '新建弹窗': '_createPage',
   '修改页面': '_createPage'
@@ -30,6 +31,7 @@ class homeai {
     return path.join(req.app.webPath, 'data/menus.json');
   }
 
+
   async execute(req, res) {
     var body = utils.getReqBody(req);
     var text = body.text;
@@ -75,7 +77,7 @@ class homeai {
       menus.push(item);
     } else {
       // a1之后新建a2,a3
-      var targetItem = menus.filter(function(item) {
+      var targetItem = menus.filter(function (item) {
         return item.text == firstText;
       })[0];
 
@@ -133,7 +135,7 @@ class homeai {
     for (var i = 0; i < items.length; i++) {
       var itext = items[i];
 
-      menus = menus.filter(function(item) {
+      menus = menus.filter(function (item) {
         return item.text != itext;
       });
       // 先不管子菜单了
@@ -169,7 +171,7 @@ class homeai {
       return;
     }
 
-    menus.forEach(function(item) {
+    menus.forEach(function (item) {
       if (item.text == items[0]) {
         item.text = items[1];
       }
@@ -205,7 +207,7 @@ class homeai {
     }
 
     var that = this;
-    this._postAI('excelToPage', data, function(resdata, error) {
+    this._postAI('excelToPage', data, function (resdata, error) {
       if (resdata !== false && resdata.code == 200) {
         that._saveExcelData(itemText, resdata.data, req, res);
       } else {
@@ -235,7 +237,7 @@ class homeai {
     var menus = this._getMenus(req);
 
     // 找菜单
-    var item = menus.filter(function(item) {
+    var item = menus.filter(function (item) {
       return item.text == itemText;
     })[0];
 
@@ -284,7 +286,7 @@ class homeai {
       menus.push(item);
     } else {
       // 找菜单
-      var item = menus.filter(function(item) {
+      var item = menus.filter(function (item) {
         return item.text == itemText;
       })[0];
 
@@ -306,7 +308,7 @@ class homeai {
     this._buildPage(data, req);
 
     // 输出
-    utils.end(res, {
+    res && utils.end(res, {
       code: 200,
       msg: '操作成功',
       type: 'menu',
@@ -337,15 +339,23 @@ class homeai {
     }
 
     var type = '';
+    var method = 'expressToPage';
+    var cb = this.createPageSuccess;
     if (name == '文生页') {
       type = 'list'; // 基础资料，列表页面
+    } else if (name == 'AI报表') {
+      method = 'expressToReport'
+      cb = this.createReportSuccess;
+      type = "report";
+      name = '文生页';
     }
 
     var that = this;
     var pageName = crabatool.stringUtils.getPinyinCode(itemName) + crabatool.cuid.newCuid(); // 防止同名菜单重复页面
-    this._postAI('expressToPage', { express: express, name: itemName, enname: pageName, type: type }, function(resdata, error) {
+    this._postAI(method, { express: express, name: itemName, enname: pageName, type: type }, function (resdata, error) {
       if (resdata !== false && resdata.code == 200) {
-        that._savePage(name, itemName, resdata.data, req, res);
+        resdata.data.enname = pageName;
+        cb.apply(that, [name, itemName, resdata, req, res])
       } else {
         utils.end(res, {
           code: 500,
@@ -355,6 +365,66 @@ class homeai {
     });
   }
 
+  createPageSuccess(name, itemName, resdata, req, res) {
+    this._savePage(name, itemName, resdata.data, req, res);
+  }
+
+
+  getReportProgress(obj, count) {
+    count = count ? count : 1;
+    if (count > 1000) {
+      return;
+    }
+    var _this = this;
+    this._postAI('getReportProgress', { id: obj.id }, function (resdata, error) {
+      if (resdata !== false && resdata.data && resdata.data.status == 'fail') {
+        //明确失败了
+        return;
+      }
+      if (resdata !== false && resdata.code == 200) {
+        var data = {
+          data: JSON.parse(JSON.stringify(resdata.data))
+        };
+        data.data.enname = obj.enname;
+        //成功后更新文件
+        _this.createReportSuccess(obj.name, obj.itemName, data, {
+          app: {
+            webPath: obj.webPath
+          }
+        });
+      } else {
+        //文件还没生成,继续请求
+        setTimeout(function () {
+          _this.getReportProgress(obj, count + 1);
+        }, 2000);
+      }
+    })
+  }
+
+  createReportSuccess(name, itemName, resdata, req, res) {
+    if (resdata.data.id) {
+      //存在id，说明生成的是临时页面，真正页面还没完全生成，需要循环去获取
+      this._savePage(name, itemName, resdata.data, req, res);
+      this.getReportProgress({
+        id: resdata.data.id,
+        enname: resdata.data.enname,
+        name: name,
+        itemName: itemName,
+        webPath: req.app.webPath
+      })
+    } else {
+      utils.mkdirsSync(utils.join(req.app.webPath, "../ai/jsCode/"), true)
+      var filePath = utils.join(req.app.webPath, `../ai/jsCode/${resdata.data.enname}.text`)
+      fs.writeFileSync(filePath, resdata.data.jsCode);
+      utils.mkdirsSync(utils.join(req.app.webPath, "../ai/reportConfig/"), true)
+      filePath = utils.join(req.app.webPath, `../ai/reportConfig/${resdata.data.enname}.text`)
+      fs.writeFileSync(filePath, resdata.data.reportConfig);
+      if (resdata.data.renderPage) {
+        this._savePage(name, itemName, resdata.data, req, res);
+      }
+    }
+  }
+
   _buildChildPage(pdata, req) {
     var datas = pdata.childInfos;
     if (!datas || datas.length == 0) {
@@ -362,7 +432,7 @@ class homeai {
     }
 
     var that = this;
-    datas.forEach(function(data) {
+    datas.forEach(function (data) {
       that._buildPage(data, req);
     });
   }
@@ -404,11 +474,11 @@ class homeai {
       url: aiHost + url,
       data: data,
       headers: { 'Content-Type': 'application/json' }
-    }).then(function(response) {
+    }).then(function (response) {
       //console.log("执行成功", response.data);
 
       cb(response.data);
-    }).catch(function(error) {
+    }).catch(function (error) {
       console.log("执行失败:" + error);
       cb(false, error);
     });

package/lib/utils.js

@@ -92,7 +92,9 @@ class Utils {
             var stat = fs.statSync(filePath);
             if (stat.isDirectory()) {
                 var basename = path.basename(fileName);
-                if (basename.startsWith(name)) return basename;
+                if (basename.startsWith(name)) {
+                    return basename;
+                }
             }
         }
         return "";

package/package.json

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

package/tool/install.js

@@ -17,6 +17,8 @@ class Install {
       //return console.log('本机没有APPDATA目录，本功能暂不支持mac');
       p1 = path.join(process.env.HOME, "/Library/Application Support"); // mac下面
     }
+    console.log(p1);
+    
     var JetBrains = path.join(p1, "JetBrains");
     if (fs.existsSync(JetBrains)) {
       var folderName = utils.searchFolder("IntelliJIdea", JetBrains);
@@ -24,6 +26,12 @@ class Install {
         this.doIDEA(path.join(JetBrains, folderName));
         return;
       }
+
+      var folderName = utils.searchFolder("Idea", JetBrains);
+      if (folderName != "") {
+        this.doIDEA(path.join(JetBrains, folderName));
+        return;
+      }
     }
 
 
@@ -115,7 +123,7 @@ class Install {
       xml = xmljs.json2xml(xmldata, { compact: true, ignoreComment: true, spaces: 2 });
       fs.writeFileSync(fileTypes, xml);
     }
-    console.log("Idea环境安装或更新完成");
+    console.log("Idea环境安装/更新完成，请重启idea!");
   }
 
   installVscode() {
@@ -174,7 +182,7 @@ class Install {
     // 第二步：下载xsd文件
     utils.downloadFile(utils.joinPath(config.SourceHost, "/setup/Craba.UI.xsd"), path.join(extPath, "Craba.UI.xsd"));
 
-    console.log("vscode插件安装/更新完成");
+    console.log("vscode插件安装/更新完成,请重启vscode!");
   }
 }