调整动态代码表缓存时间异常问题

src/service/app/codelist-service.ts

@@ -148,20 +148,25 @@ export default class CodeListService {
                 let cacheTimeout:any = codelist.cacheTimeout;
                     // 启用缓存
                     if(isEnableCache){
+                        const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{
+                            promise.then((result:any) =>{
+                                if(result.length > 0){
+                                    CodeListService.codelistCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
+                                    CodeListService.codelistCache.delete(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`);
+                                    return resolve(result);
+                                }else{
+                                    return resolve([]);
+                                }
+                            }).catch((result:any) =>{
+                                return reject(result);
+                            })
+                        }
                         // 加载完成,从本地缓存获取
                         if(CodeListService.codelistCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
                             let items:any = CodeListService.codelistCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`).items;
                             if(items.length >0){
                                 if(cacheTimeout !== -1){
-                                    if(new Date().getTime() > codelist.expirationTime){
-                                        codelist.getItems(context,data,isloading).then((result:any) =>{
-                                            CodeListService.codelistCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
-                                            codelist.expirationTime = new Date().getTime() + cacheTimeout;
-                                            resolve(result);
-                                        }).catch((error:any) =>{
-                                            Promise.reject([]);
-                                        })
-                                    }else{
+                                    if(new Date().getTime() <= codelist.getExpirationTime()){
                                         return resolve(items); 
                                     }
                                 }else{
@@ -170,18 +175,6 @@ export default class CodeListService {
                             }
                         }
                         if (codelist) {
-                            const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{
-                                promise.then((result:any) =>{
-                                    if(result.length > 0){
-                                        CodeListService.codelistCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
-                                        return resolve(result);
-                                    }else{
-                                        return resolve([]);
-                                    }
-                                }).catch((result:any) =>{
-                                    return reject(result);
-                                })
-                            }
                             // 加载中，UI又需要数据，解决连续加载同一代码表问题
                             if(CodeListService.codelistCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
                                 callback(context,data,tag,CodeListService.codelistCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`));
@@ -189,7 +182,7 @@ export default class CodeListService {
                                 let result:Promise<any> = codelist.getItems(context,data,isloading);
                                 CodeListService.codelistCache.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,result);
                                 if(cacheTimeout !== -1){
-                                    codelist.expirationTime = new Date().getTime() + cacheTimeout;
+                                    codelist.setExpirationTime(new Date().getTime() + cacheTimeout);
                                 }
                                 callback(context,data,tag,result);
                             }