crabatool 1.0.390 → 1.0.392

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;
@@ -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,22 @@ 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);
+        cb.apply(that, [name, itemName, resdata, req, res])
       } else {
         utils.end(res, {
           code: 500,
@@ -355,6 +364,59 @@ 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) {
+        //成功后更新文件
+        _this._savePage(obj.name, obj.itemName, resdata.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,
+        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);
+      this._savePage(name, itemName, resdata.data, req, res);
+    }
+  }
+
   _buildChildPage(pdata, req) {
     var datas = pdata.childInfos;
     if (!datas || datas.length == 0) {

package/package.json

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

package/tool/install.js

@@ -24,6 +24,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;
+      }
     }