@aochuang/common 1.0.142 → 1.0.143

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/common",
-  "version": "1.0.142",
+  "version": "1.0.143",
   "description": "",
   "main": "index.js",
   "publishConfig": {

package/utils/util.js

@@ -221,6 +221,9 @@ export function createThrottleRequest (requestFn, idField = 'id') {
   let loadMap = {}
   let timer = null
 	return (id) => {
+    if (cacheMap[id]) {
+      return cacheMap[id]
+    }
     const ps = createPromise()
     cacheMap[id] = ps
     loadMap[id] = true
@@ -231,12 +234,15 @@ export function createThrottleRequest (requestFn, idField = 'id') {
       requestFn(keys).then(rs => {
         if (rs && rs.length) {
           rs.forEach(v => {
-            cacheMap[v[idField]]._execed = true
-            cacheMap[v[idField]].resolve(v)
+            const cacheId = v[idField]
+            if (cacheMap[cacheId]) {
+              cacheMap[cacheId]._execed = true
+              cacheMap[cacheId].resolve(v)
+            }
           })
         }
         keys.forEach(id => {
-          if (!cacheMap[id]._execed) {
+          if (cacheMap[id] && !cacheMap[id]._execed) {
             // 如果没有返回表示没有找到数据
             cacheMap[id].reject(new Error('未找到数据'))
           }
@@ -244,8 +250,10 @@ export function createThrottleRequest (requestFn, idField = 'id') {
         return rs
       }, err => {
         keys.forEach(id => {
-          cacheMap[id]._execed = true
-          cacheMap[id].reject(err)
+          if (cacheMap[id]) {
+            cacheMap[id]._execed = true
+            cacheMap[id].reject(err)
+          }
         })
       }).finally(() => {
         cacheMap = {}
@@ -424,4 +432,4 @@ export const retryRequest = (() => {
 			}
 		}
 	}
-})()
+})()