|
@@ -102,18 +102,21 @@ Project.prototype.getData = function(projectID, callback){
|
|
|
callback(1, 'load project failed', null)
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
};
|
|
|
|
|
|
-Project.prototype.getFilterData = function (projectID, filter) {
|
|
|
+Project.prototype.getFilterData = function (projectID, filter, callback) {
|
|
|
let functions = [];
|
|
|
let getModuleData = function (moduleName) {
|
|
|
return function (cb) {
|
|
|
- moduleMap[moduleName].getData(projectID, function (err, name, data) {
|
|
|
- cb(err, {'moduleName': name, 'data': data})
|
|
|
- });
|
|
|
+ if (moduleMap[moduleName]) {
|
|
|
+ moduleMap[moduleName].getData(projectID, function (err, name, data) {
|
|
|
+ cb(err, {'moduleName': name, 'data': data})
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ throw '要查询的项目模块不存在';
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
+ };
|
|
|
for (let itemName of filter) {
|
|
|
functions.push(getModuleData(itemName));
|
|
|
}
|
|
@@ -121,9 +124,9 @@ Project.prototype.getFilterData = function (projectID, filter) {
|
|
|
if (err) {
|
|
|
throw '获取项目数据出错';
|
|
|
} else {
|
|
|
- return results;
|
|
|
+ callback(results);
|
|
|
}
|
|
|
});
|
|
|
-}
|
|
|
+};
|
|
|
|
|
|
module.exports = new Project();
|