unify request interface for ration

modules/rationRepository/controllers/rationChapterTreeController.js

@@ -3,21 +3,8 @@
  */
 
 var rationChapterTreeData = require('../models/rationChapterTree');
-var callback = function(req,res,err,data){
-    if(data){
-        res.status(200)
-        res.json({success:true,data:data});
-    }
-    else
-    if(err){
-        res.status(500)
-        res.json({success:false,error:err});
-        //res.json(err);
-    }
-    else{
-        res.status(204);
-        res.json({success:true,data:null});
-    }
+var callback = function(req,res,err,message, data){
+    res.json({error: err, message: message, data: data});
 }
 module.exports ={
     getRationChapterTree: function(req,res){
@@ -25,11 +12,11 @@ module.exports ={
         var repId = req.body.rationRepositoryId;
         if (libName) {
             rationChapterTreeData.getRationChapterTree(libName,function(err,data){
-                callback(req,res,err,data)
+                callback(req,res,err, "", data);
             })
         } else if (repId) {
             rationChapterTreeData.getRationChapterTreeByRepId(repId,function(err,data){
-                callback(req,res,err,data)
+                callback(req,res,err,"", data)
             })
         }
     },
@@ -38,13 +25,13 @@ module.exports ={
         var lastNodeId = req.body.lastNodeId;
         var nodeData = JSON.parse(req.body.rawNodeData);
         rationChapterTreeData.createNewNode(libName, lastNodeId, nodeData, function(err,data){
-            callback(req,res,err,data)
+            callback(req,res,err,"", data)
         });
     },
     updateNodes: function(req, res) {
         var nodes = JSON.parse(req.body.nodes);
         rationChapterTreeData.updateNodes(nodes, function(err,results){
-            callback(req,res, err, results)
+            callback(req,res, err, "", results)
         });
     },
     deleteNodes: function(req, res) {
@@ -52,7 +39,7 @@ module.exports ={
         var preNodeId = req.body.preNodeId;
         var preNodeNextId = req.body.preNodeNextId;
         rationChapterTreeData.removeNodes(nodes, preNodeId, preNodeNextId, function(err,results){
-            callback(req,res, err, results)
+            callback(req,res, err, "", results)
         });
     }
 }

modules/rationRepository/controllers/rationRepositoryController.js

@@ -3,20 +3,8 @@
  */
 var rationRepository = require("../models/repositoryMap");
 
-var callback = function(req,res,err,data){
-    if(data){
-        res.status(200)
-        res.json({success:true,data:data});
-    }
-    else
-    if(err){
-        res.status(500)
-        res.json({success:false,error:err});
-    }
-    else{
-        res.status(204);
-        res.json({success:true});
-    }
+var callback = function(req, res, err, message, data){
+    res.json({error: err, message: message, data: data});
 };
 
 module.exports = {
@@ -24,18 +12,18 @@ module.exports = {
         var rationObj = JSON.parse(req.body.rationRepObj);
         rationRepository.addRationRepository(rationObj,function(err,data){
             if (data) {
-                callback(req, res, err, data);
+                callback(req, res, err, "has data", data);
             } else {
-                callback(req, res, err, null);
+                callback(req, res, err, "no data", null);
             }
         })
     },
     getDisPlayRationLibs: function(req, res){
         rationRepository.getDisplayRationLibs(function(err, data){
             if (data) {
-                callback(req, res, err, data);
+                callback(req, res, err, "has data",data);
             } else {
-                callback(req, res, err, null);
+                callback(req, res, err, "no data", null);
             }
         });
     },
@@ -43,9 +31,9 @@ module.exports = {
         var libName = req.body.rationName;
         rationRepository.getRealLibName(libName,function(err,data){
             if (data) {
-                callback(req, res, err, data);
+                callback(req, res, err, "has data", data);
             } else {
-                callback(req, res, err, null);
+                callback(req, res, err, "no data", null);
             }
         })
     },
@@ -53,9 +41,9 @@ module.exports = {
         var rationName = req.body.rationName;
         rationRepository.deleteRationLib(rationName,function(err,data){
             if (data) {
-                callback(req, res, err, data);
+                callback(req, res, err, "has data", data);
             } else {
-                callback(req, res, err,  null);
+                callback(req, res, err, "no data", null);
             }
         })
     },
@@ -64,9 +52,9 @@ module.exports = {
         var newName = req.body.newName;
         rationRepository.updateName(orgName, newName, function(err, data){
             if (data) {
-                callback(req, res, err, data);
+                callback(req, res, err, "has data", data);
             } else {
-                callback(req, res, err, null);
+                callback(req, res, err, "no data", null);
             }
         });
     }

web/rationLibEditor/js/chapterTree.js

@@ -194,8 +194,9 @@ var zTreeOprObj = {
         } else {
             sheetCommonObj.cleanSheet(rationOprObj.workBook.getSheet(0), rationOprObj.setting, -1);
             sheetCommonObj.shieldAllCells(rationOprObj.workBook.getSheet(0));
-            sheetCommonObj.shieldAllCells(rationGLJOprObj.workBook.getSheet(0));
         }
+        sheetCommonObj.cleanSheet(rationGLJOprObj.workBook.getSheet(0), rationGLJOprObj.setting, -1);
+        sheetCommonObj.shieldAllCells(rationGLJOprObj.workBook.getSheet(0));
     }
 
 };

web/rationLibEditor/js/ration.js

@@ -45,11 +45,12 @@ var rationOprObj = {
             sheetCommonObj.cleanSheet(sheet, setting, -1);
             sheetCommonObj.shieldAllCells(sheet);
         } else {
+            sheetCommonObj.cleanSheet(rationGLJOprObj.workBook.getSheet(0), rationGLJOprObj.setting, -1);
+            sheetCommonObj.shieldAllCells(rationGLJOprObj.workBook.getSheet(0));
             var cacheSection = me.getCache();
             if (cacheSection && args.row < cacheSection.length) {
                 rationGLJOprObj.getGljItems(cacheSection[args.row]);
             }
-            //
         }
     },
     getCache: function() {

web/rationLibEditor/js/rationGLJ.js

@@ -33,12 +33,14 @@ var rationGLJOprObj = {
             if (args.col == 0) {
                 if (me.cache["_GLJ_" + me.currentRationItem.ID]) {
                     var cacheArr = me.cache["_GLJ_" + me.currentRationItem.ID];
-                    for (var i = args.rowCount - 1; i <= 0; i--) {
+                    for (var i = args.rowCount - 1; i >= 0; i--) {
                         if (args.row + i < cacheArr.length) {
                             cacheArr.splice(args.row + i, 1);
                         }
                     }
                     me.updateRationItem();
+                    sheetCommonObj.cleanSheet(me.workBook.getSheet(0), me.setting, -1);
+                    me.showGljItems(me.currentRationItem.ID);
                 }
             }
 
@@ -85,6 +87,8 @@ var rationGLJOprObj = {
                     if (args.row < cacheArr.length) {
                         cacheArr.splice(args.row, 1);
                         me.updateRationItem();
+                        sheetCommonObj.cleanSheet(me.workBook.getSheet(0), me.setting, -1);
+                        me.showGljItems(me.currentRationItem.ID);
                     }
                 }
             } else {

web/rationLibEditor/js/sheetCommon.js

@@ -37,6 +37,7 @@ var sheetCommonObj = {
         sheet.suspendEvent();
         sheet.clear(-1, 0, -1, setting.header.length, GC.Spread.Sheets.SheetArea.viewport, GC.Spread.Sheets.StorageType.data);
         if (rowCount > 0) sheet.setRowCount(rowCount);
+        sheet.clearSelection();
         sheet.resumeEvent();
         sheet.resumePaint();
     },