feat: drop 新增失败时自动 refresh 逻辑

Author: CJY0208

index.d.ts

@@ -53,13 +53,23 @@ export interface CachingNode {
   id: string
   [key: string]: any
 }
+
+export interface KeeperDropConfig {
+  delay: string
+  refreshIfDropFailed: boolean
+}
 export interface AliveController {
-  drop: (name: string | RegExp) => Promise<boolean>
-  dropScope: (name: string | RegExp) => Promise<boolean>
-  dropById: (id: string) => Promise<boolean>
-  dropScopeByIds: (ids: string[]) => Promise<boolean>
+  drop: (name: string | RegExp, config?: KeeperDropConfig) => Promise<boolean>
+  dropScope: (
+    name: string | RegExp,
+    config?: KeeperDropConfig
+  ) => Promise<boolean>
+  dropById: (id: string, config?: KeeperDropConfig) => Promise<boolean>
+  dropScopeByIds: (ids: string[], config?: KeeperDropConfig) => Promise<boolean>
   refresh: (name: string | RegExp) => Promise<boolean>
   refreshScope: (name: string | RegExp) => Promise<boolean>
+  refreshById: (id: string) => Promise<boolean>
+  refreshScopeByIds: (ids: string[]) => Promise<boolean>
   clear: () => Promise<boolean>
   getCachingNodes: () => Array<CachingNode>
 }

src/core/KeepAlive.js

@@ -157,9 +157,14 @@ class KeepAlive extends Component {
     }
   }
 
-  drop = () => {
+  refresh = () => {
     const { _helpers, id } = this.props
-    return _helpers.dropById(id)
+    return _helpers.refreshById(id)
+  }
+
+  drop = (config) => {
+    const { _helpers, id } = this.props
+    return _helpers.dropById(id, config)
   }
 
   init = () => {

src/core/Keeper.js

@@ -158,7 +158,7 @@ export default class Keeper extends PureComponent {
     attach: this.attach,
   }
 
-  drop = ({ delay = 1200 } = {}) =>
+  drop = ({ delay = 1200, refreshIfDropFailed = true } = {}) =>
     new Promise((resolve) => {
       let timeout
       const { scope, id } = this.props
@@ -177,7 +177,11 @@ export default class Keeper extends PureComponent {
         this.eventBus.on(LIFECYCLE_UNACTIVATE, drop)
         timeout = setTimeout(() => {
           this.eventBus.off(LIFECYCLE_UNACTIVATE, drop)
-          resolve(false)
+          if (refreshIfDropFailed) {
+            this.refresh().then((result) => resolve(result))
+          } else {
+            resolve(false)
+          }
         }, delay)
         return
       }

src/core/withAliveScope.js

@@ -17,6 +17,8 @@ function controllerCherryPick(controller) {
     getCachingNodes,
     dropById,
     dropScopeByIds,
+    refreshById,
+    refreshScopeByIds,
   } = controller
 
   return {
@@ -28,6 +30,8 @@ function controllerCherryPick(controller) {
     getCachingNodes,
     dropById,
     dropScopeByIds,
+    refreshById,
+    refreshScopeByIds,
   }
 }