code sync from BE

modules/reports/controllers/rpt_tpl_controller.js

@@ -9,6 +9,7 @@ let RptTplModel = require('../models/rpt_template');
 let TreeNodeModel = require('../models/tpl_tree_node');
 let rptTplDef = require("../../../public/rpt_tpl_def").getUtil();
 let stringUtil = require("../../../public/stringUtil");
+let JV = require('../rpt_component/jpc_value_define');
 
 //let test_glj_type_util = require("../../../public/cache/std_glj_type_util");
 
@@ -145,5 +146,17 @@ module.exports = {
                 callback(req, res, 'The report template was not found!', null);
             }
         })
+    },
+    updateRptTpl: function (req, res) {
+        let params = JSON.parse(req.body.params),
+            rptTpl = JSON.parse(params.rptTpl);
+        let filter = {"ID": parseInt(rptTpl[JV.PROP_ID])};
+        RptTplModel.update(filter, rptTpl, function (err, rst) {
+            if (err) {
+                callback(req, res, true, 'The report template was updated failed!', false);
+            } else {
+                callback(req, res, false, 'The report template was updated successfully!', true);
+            }
+        });
     }
 }

modules/reports/routes/rpt_tpl_router.js

@@ -9,7 +9,9 @@ rptTplRouter.post('/updateRptTplNodes', reportTplController.updateTreeNodes);
 rptTplRouter.post('/deleteRptTplNodes', reportTplController.deleteRptTplNodes);
 rptTplRouter.post('/createDftRptTpl', reportTplController.createDftRptTpl);
 rptTplRouter.post('/getRefRptTpl', reportTplController.getRefRptTpl);
+rptTplRouter.post('/updateRptTpl', reportTplController.updateRptTpl);
 
 rptTplRouter.post('/getUserRptCfg', reportCfgController.getReportUserCfg);
+rptTplRouter.post('/getMappingFields', reportCfgController.getAllMappingFields);
 
 module.exports = rptTplRouter;

modules/reports/rpt_component/jpc_ex.js

@@ -8,7 +8,7 @@ let JpcParam = require('./jpc_param');
 let JpcFunc = require('./jpc_function');
 let JpcData = require('./jpc_data');
 let JpcCommonHelper = require('./helper/jpc_helper_common');
-let JE = require('./jpc_rte'); //Important: for self-define function execution purpose
+let $JE = require('./jpc_rte'); //Important: for self-define function execution purpose
 
 let JpcExSrv = function(){};
 JpcExSrv.prototype.createNew = function(){
@@ -144,6 +144,7 @@ JpcExSrv.prototype.createNew = function(){
             if (me.formulas[i][JV.PROP_RUN_TYPE] === runType) {
                 let expression = me.formulas[i][JV.PROP_EXPRESSION];
                 if (expression) {
+                    let $ME = me.formulas[i];
                     eval(expression);
                 }
             }

server.js

@@ -12,6 +12,7 @@ cfgCacheUtil.setupDftCache();
 let path = require('path');
 let session = require('express-session');
 let DBStore = require('connect-mongo')(session);
+let fs = require('fs');
 
 let URL = require('url');
 
@@ -183,6 +184,16 @@ app.use(function(err, req, res, next) {
     console.error(err.stack);
     res.status(500).send('500 Error');
 });
+
+//设置Date Format函数
+fs.readFile(__dirname + '/public/web/date_util.js', 'utf8', 'r', function (err, data) {
+    eval(data);
+    // let dt = new Date();
+    // console.log(dt.Format('yyyy-M-dd'));
+    // console.log(dt.Format('yyyy 年 M 月 dd 日'));
+    // console.log(dt.Format('yyyy 年 M 月 20 日'));
+});
+
 app.listen(6060, function(){
     console.log('server started!');
 });

test/public/testLoadDateFormat.js

@@ -0,0 +1,19 @@
+/**
+ * Created by Tony on 2017/7/13.
+ */
+let test = require('tape');
+let fs = require("fs");
+
+test('std glj types test1', function(t){
+    //console.log(__dirname.slice(0, __dirname.length - 12) + '/public/web/date_util.js');
+    fs.readFile(__dirname.slice(0, __dirname.length - 12) + '/public/web/date_util.js', 'utf8', 'r', function (err, data) {
+        eval(data);
+        let dt = new Date();
+        //dt.setMonth(dt.getMonth() + 3);
+        t.equal(dt.Format('yyyy-M-dd'), "2017-7-13");
+        t.equal(dt.Format('yyyy年M月dd日'), "2017年7月13日");
+        t.equal(dt.Format('yyyy年M月20日'), "2017年7月20日");
+        t.end();
+    });
+});
+