|
@@ -32,18 +32,23 @@ var PROJECT = {
|
|
|
};
|
|
};
|
|
|
tools.doAfterLoad = function(result, callback){
|
|
tools.doAfterLoad = function(result, callback){
|
|
|
var counter;
|
|
var counter;
|
|
|
|
|
+ //必须要先load ProjectInfo的信息
|
|
|
|
|
+ let projectInfoModule = result.find(data => data.moduleName === ModuleNames.projectInfo);
|
|
|
|
|
+ if (projectInfoModule) {
|
|
|
|
|
+ me._project.projectInfo = projectInfoModule.data;
|
|
|
|
|
+ }
|
|
|
result.forEach(function(item){
|
|
result.forEach(function(item){
|
|
|
- if (me.modules[item.moduleName]){
|
|
|
|
|
- me.modules[item.moduleName].loadData(item.data);
|
|
|
|
|
- } else if (item.moduleName === me.projCounter) {
|
|
|
|
|
- counter = item.data;
|
|
|
|
|
- } else if (item.moduleName === me.projSetting) {
|
|
|
|
|
- me._project.projSetting = item.data;
|
|
|
|
|
- me._project.projSetting.moduleName = me.projSetting;
|
|
|
|
|
- }else if(item.moduleName === ModuleNames.projectGLJ){
|
|
|
|
|
- me._project.projectGLJ.loadToCache(item.data);
|
|
|
|
|
- } else if (item.moduleName === ModuleNames.projectInfo) {
|
|
|
|
|
- me._project.projectInfo = item.data;
|
|
|
|
|
|
|
+ if (item.moduleName !== ModuleNames.projectInfo) {
|
|
|
|
|
+ if (me.modules[item.moduleName]){
|
|
|
|
|
+ me.modules[item.moduleName].loadData(item.data);
|
|
|
|
|
+ } else if (item.moduleName === me.projCounter) {
|
|
|
|
|
+ counter = item.data;
|
|
|
|
|
+ } else if (item.moduleName === me.projSetting) {
|
|
|
|
|
+ me._project.projSetting = item.data;
|
|
|
|
|
+ me._project.projSetting.moduleName = me.projSetting;
|
|
|
|
|
+ } else if(item.moduleName === ModuleNames.projectGLJ){
|
|
|
|
|
+ me._project.projectGLJ.loadToCache(item.data);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
for (module in counter) {
|
|
for (module in counter) {
|
