修复 jsonp 功能失效 review by luox

xilanhuaweidapao · xilanhuaweidapao · commit 94b3c7d65a66 · 2023-06-28T15:18:01.000+08:00
diff --git a/src/common/util/FetchRequest.js b/src/common/util/FetchRequest.js
@@ -31,12 +31,6 @@ export var RequestJSONPPromise = {
           uid = me.getUid(),
           url = config.url,
           splitQuestUrl = [];
-      var p = new Promise(function (resolve) {
-          me.supermap_callbacks[uid] = function (response) {
-              delete me.supermap_callbacks[uid];
-              resolve(response);
-          };
-      });
 
       // me.addQueryStrings({
       //     callback: "RequestJSONPPromise.supermap_callbacks[" + uid + "]"
@@ -94,12 +88,11 @@ export var RequestJSONPPromise = {
           }
       }
       splitQuestUrl.push(sectionURL);
-      me.send(
+      return me.send(
           splitQuestUrl,
-          'RequestJSONPPromise.supermap_callbacks[' + uid + ']',
+          'SuperMapJSONPCallbacks_' + uid,
           config && config.proxy
       );
-      return p;
   },
 
   getUid: function () {
@@ -126,9 +119,11 @@ export var RequestJSONPPromise = {
                   url = decodeURIComponent(url);
                   url = proxy + encodeURIComponent(url);
               }
-              fetchJsonp(url, {
+              return fetchJsonp(url, {
                   jsonpCallbackFunction: callback,
                   timeout: 30000
+              }).then((result) => {
+                return result.json();
               });
           }
       }
diff --git a/test/common/util/FetchRequestSpec.js b/test/common/util/FetchRequestSpec.js
@@ -8,7 +8,7 @@ describe('FetchRequest', () => {
         fetch = jasmine.createSpy('fetch').and.resolveTo({ success: 'ok' });
         setFetch(fetch);
     });
-    xit('RequestJSONPPromise', () => {
+    it('RequestJSONPPromise', () => {
         var url = 'http://test.supermap.io/examples/leaflet/editor.html#addressMatchService';
         var params;
         var options;
