fix: 修复动态getData缓存的bug

#15
fast-crud · Aug 4, 2021 · 86cd495 · 86cd495
1 parent 72fd641
commit 86cd495
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/packages/fast-crud/src/use/use-dict-define.ts b/packages/fast-crud/src/use/use-dict-define.ts
@@ -156,28 +156,27 @@ class Dict extends UnMergeable {
   async getRemoteDictData(context?) {
     let getFromRemote;
     let cacheKey;
-    if (this.getData != null) {
-      cacheKey = this.getData;
-      getFromRemote = async () => {
-        // @ts-ignore
-        return await this.getData({ dict: this, ...context });
-      };
-    } else if (this.url) {
-      let url = this.url;
+    let url;
+    if (this.url) {
+      url = this.url;
       if (url instanceof Function) {
         url = url({ ...context, dict: this });
       }
-      if (url == null) {
-        return;
-      }
       cacheKey = url;
+    }
+    if (this.getData != null) {
+      getFromRemote = async () => {
+        // @ts-ignore
+        return await this.getData({ url, dict: this, ...context });
+      };
+    } else if (url) {
       getFromRemote = async () => {
         return await dictRequest({ url, dict });
       };
     } else {
       return [];
     }
-    if (this.cache) {
+    if (this.cache && cacheKey) {
       let cached = DictGlobalCache.get(cacheKey);
 
       if (cached == null) {