code sync from operation: report template tree

modules/reports/controllers/rpt_tpl_controller.js

@@ -16,6 +16,7 @@ let rptTplDef = rpttplDefObj.getUtil();
 //import stringUtil from "../../../public/stringUtil";
 import JV from "../rpt_component/jpc_value_define";
 import rttFacade from "../facade/rpt_tpl_tree_node_facade";
+import CompilationModel from "../../users/models/compilation_model";
 
 //import test_glj_type_util from "../../../public/cache/std_glj_type_util");
 
@@ -35,6 +36,17 @@ let mExport = {
             }
         });
     },
+    getCompilationList(req, res) {
+        let compilationModel = new CompilationModel();
+        let compilationList = compilationModel.getCompilationList();
+        if (compilationList) {
+            compilationList.then(function (rst) {
+                callback(req,res,false,"", rst);
+            })
+        } else {
+            callback(req,res, true,"no result", null);
+        }
+    },
     getRptTplTree: function(req, res) {
         let params = JSON.parse(req.body.params),
             compilationId = params.compilationId,
@@ -110,30 +122,85 @@ let mExport = {
             callback(req,res, err, "", results);
         });
     },
-    createTplTreeNode: function(req, res){
+    createTreeRootNode: function(req, res){
+        let params = JSON.parse(req.body.params),
+            doc = params.doc;
+        rttFacade.createNewTree(doc).then(function (rst) {
+            if (rst) {
+                //success
+                callback(req,res, false, "", rst);
+            } else {
+                //failed
+                callback(req,res, true, "创建失败！", null);
+            }
+        })
+    },
+    updateTreeRootNode: function(req, res){
+        let params = JSON.parse(req.body.params),
+            doc = params.doc;
+        rttFacade.updateTree(doc.compilationId, doc.engineerId, doc.userId, doc).then(function (rst) {
+            if (rst) {
+                //success
+                callback(req,res, false, "", rst);
+            } else {
+                //failed
+                callback(req,res, true, "更新失败！", null);
+            }
+        })
+    },
+    removeTreeRootNode: function (req, res) {
         let params = JSON.parse(req.body.params),
-            lastNodeId = params.lastNodeId,
-            nodeData = params.rawNodeData;
-        counter.counterDAO.getIDAfterCount(counter.moduleName.report, 1, function(err, result){
-            nodeData.ID = result.value.sequence_value;
-            let node = new TreeNodeModel(nodeData);
-            node.save(function (err, result) {
-                if (err) {
-                    callback(req,res, "树节点错误！", "", null);
+            compilationId = params.compilationId,
+            engineerId = params.engineerId,
+            userId = params.userId,
+            isPhysically = params.isPhysically
+            ;
+        if (isPhysically) {
+            rttFacade.removeTreePhycically(compilationId, engineerId, userId).then(function (rst) {
+                if (rst) {
+                    //success
+                    callback(req,res, false, "", rst);
                 } else {
-                    if (lastNodeId > 0) {
-                        TreeNodeModel.update({ID: lastNodeId}, {"NextSiblingID": nodeData.ID}, function(err, rst){
-                            if (err) {
-                                callback(req,res, "树节点错误！", "", null);
-                            } else {
-                                callback(req,res, false, "", result);
-                            }
-                        });
-                    } else callback(req,res, false, "", result);
+                    //failed
+                    callback(req,res, true, "删除失败！", null);
                 }
-            });
-        });
+            })
+        } else {
+            rttFacade.removeTree(compilationId, engineerId, userId).then(function (rst) {
+                if (rst) {
+                    //success
+                    callback(req,res, false, "", rst);
+                } else {
+                    //failed
+                    callback(req,res, true, "删除失败！", null);
+                }
+            })
+        }
     },
+    // createTplTreeNode: function(req, res){
+    //     let params = JSON.parse(req.body.params),
+    //         lastNodeId = params.lastNodeId,
+    //         nodeData = params.rawNodeData;
+    //     counter.counterDAO.getIDAfterCount(counter.moduleName.report, 1, function(err, result){
+    //         nodeData.ID = result.value.sequence_value;
+    //         let node = new TreeNodeModel(nodeData);
+    //         node.save(function (err, result) {
+    //             if (err) {
+    //                 callback(req,res, "树节点错误！", "", null);
+    //             } else {
+    //                 if (lastNodeId > 0) {
+    //                     TreeNodeModel.update({ID: lastNodeId}, {"NextSiblingID": nodeData.ID}, function(err, rst){
+    //                         if (err) {
+    //                             callback(req,res, "树节点错误！", "", null);
+    //                         } else {
+    //                             callback(req,res, false, "", result);
+    //                         }
+    //                     });
+    //                 } else callback(req,res, false, "", result);
+    //             }
+    //         });
+    //     });
+    // },
     createDftRptTpl: function(req, res) {
         let params = JSON.parse(req.body.params),
             treeNodeId = params.treeNodeId,

modules/reports/facade/rpt_tpl_tree_node_facade.js

@@ -29,17 +29,17 @@ async function createNewTree(doc) {
 }
 
 async function updateTree(compilationId, engineerId, userId, doc) {
-    let filter = {"compilationId": compilationId, "engineerId": engineerId, "userId": userId};
+    let filter = {"compilationId": compilationId, "engineerId": engineerId, "userId": userId, "$or": [{"isDeleted": null}, {"isDeleted": false}]};
     return await rpt_tpl_tree_mdl.update(filter, doc);
 }
 
 async function removeTree(compilationId, engineerId, userId, cb) {
-    let filter = {"compilationId": compilationId, "engineerId": engineerId, "userId": userId};
+    let filter = {"compilationId": compilationId, "engineerId": engineerId, "userId": userId, "$or": [{"isDeleted": null}, {"isDeleted": false}]};
     return await rpt_tpl_tree_mdl.findAndModify(filter, [], { $set: { "isDeleted": true } }, {'new':true}, cb);
 }
 
 async function removeTreePhycically(compilationId, engineerId, userId) {
-    let filter = {"compilationId": compilationId, "engineerId": engineerId, "userId": userId};
+    let filter = {"compilationId": compilationId, "engineerId": engineerId, "userId": userId, "$or": [{"isDeleted": null}, {"isDeleted": false}]};
     return await rpt_tpl_tree_mdl.remove(filter);
 }
 

modules/reports/routes/rpt_tpl_router.js

@@ -15,13 +15,16 @@ module.exports = function (app) {
         }
     });
 
-    rptTplRouter.post('/createTplTreeNode', reportTplController.createTplTreeNode);
+    rptTplRouter.post('/createTreeRootNode', reportTplController.createTreeRootNode);
+    rptTplRouter.post('/updateTreeRootNode', reportTplController.updateTreeRootNode);
+    rptTplRouter.post('/removeTreeRootNode', reportTplController.removeTreeRootNode);
     rptTplRouter.post('/getRptTplTree', reportTplController.getRptTplTree);
     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('/getCompilationList', reportTplController.getCompilationList);
 
     rptTplRouter.post('/getUserRptCfg', reportCfgController.getReportUserCfg);
     rptTplRouter.post('/getMappingFields', reportCfgController.getAllMappingFields);

modules/reports/rpt_component/jpc_value_define.js

@@ -1,13 +1,14 @@
-const fs = require('fs');
-let VAL_DEF = null;
+import fs from 'fs';
 
-let getValDefine = function() {
-    if (!(VAL_DEF)) {
-        let data = fs.readFileSync(__dirname.slice(0, __dirname.length - 30) + '/public/web/rpt_value_define.js', 'utf8', 'r');
-        eval(data + ' ; VAL_DEF = JV;');
-    }
-    return VAL_DEF;
-}
+function getValDefine() {
+    let tmpRst = null;
+    let data = fs.readFileSync(__dirname.slice(0, __dirname.length - 30) + '/public/web/rpt_value_define.js', 'utf8', 'r');
+    eval(data + ' ; tmpRst = JV;');
+    return tmpRst;
+};
 
+const VAL_DEF = getValDefine();
 
-module.exports = getValDefine();
+//export default VAL_DEF;
+//export {VAL_DEF as default};
+module.exports = VAL_DEF;

public/web/rpt_value_define.js

@@ -1,7 +1,7 @@
 /**
  * Created by Tony on 2017/6/7.
  */
-let JV = {
+const JV = {
     NODE_CROSS_INFO: "交叉表_信息",
     NODE_CROSS_ROW: "交叉行",
     NODE_CROSS_COL: "交叉列",
@@ -211,4 +211,4 @@ let JV = {
     ANTI_VERTICAL_ANGLE: "-90",
 
     LAST_DEF: ""
-}
+};

public/web/ztree_common.js

@@ -4,25 +4,6 @@
 zTreeHelper = {
     createTree: function(sourceData, setting, containerId, caller){
         let me = this, treeArr = tree_Data_Helper.buildTreeNodeDirectly(sourceData);
-        // let private_build_parentNodeIds = function(pNodeId, nodesArr){
-        //     let rst = [];
-        //     for (let i = 0; i < nodesArr.length; i++) {
-        //         if (nodesArr[i].items.length > 0) {
-        //             rst = rst.concat(private_build_parentNodeIds(nodesArr[i].ID, nodesArr[i].items));
-        //         } else {
-        //             rst.push(nodesArr[i].ID);
-        //         }
-        //     }
-        //     if (pNodeId && rst.length > 0) {
-        //         caller.parentNodeIds["_pNodeId_" + pNodeId] = rst;
-        //     }
-        //     return rst;
-        // };
-        // if (caller.parentNodeIds) {
-        //     private_build_parentNodeIds(null, treeArr);
-        // }
-        // caller.treeObj = $.fn.zTree.init($("#" + containerId), setting, treeArr);
-        // caller.treeObj.expandAll(true);
         me.createTreeDirectly(treeArr, setting, containerId, caller);
     },
     createTreeDirectly: function (treeArr, setting, containerId, caller) {