@smart100/spu-web-plugin 1.0.10 → 1.0.11

package/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.10";
+var version = "1.0.11";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -17071,6 +17071,7 @@ var MapService = /*#__PURE__*/function () {
   function MapService() {
     _classCallCheck$1(this, MapService);
     _defineProperty$1(this, "isInit", false);
+    _defineProperty$1(this, "initPromise", null);
     _defineProperty$1(this, "AMap", null);
     _defineProperty$1(this, "TMap", null);
     _defineProperty$1(this, "BMap", null);
@@ -17145,8 +17146,7 @@ var MapService = /*#__PURE__*/function () {
     //   return window.BMap
     // }
     function () {
-      var _init = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee() {
-        var type;
+      var _init2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee() {
         return _regeneratorRuntime$1().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -17156,70 +17156,97 @@ var MapService = /*#__PURE__*/function () {
               }
               return _context.abrupt("return");
             case 2:
-              this.isInit = true;
-              type = this.type; // if (process.env.NODE_ENV === 'development') {
-              //     type = 'baidu'
-              // }
-              if (!(type === 'tencent')) {
-                _context.next = 9;
+              if (!this.initPromise) {
+                _context.next = 4;
                 break;
               }
+              return _context.abrupt("return", this.initPromise);
+            case 4:
+              this.initPromise = this._init();
               _context.next = 7;
-              return this.initTecent();
+              return this.initPromise;
             case 7:
-              _context.next = 17;
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function init() {
+        return _init2.apply(this, arguments);
+      }
+      return init;
+    }()
+  }, {
+    key: "_init",
+    value: function () {
+      var _init3 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee2() {
+        var type;
+        return _regeneratorRuntime$1().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              type = this.type;
+              if (!(type === 'tencent')) {
+                _context2.next = 6;
+                break;
+              }
+              _context2.next = 4;
+              return this.initTecent();
+            case 4:
+              _context2.next = 14;
               break;
-            case 9:
+            case 6:
               if (!(type === 'amap')) {
-                _context.next = 14;
+                _context2.next = 11;
                 break;
               }
-              _context.next = 12;
+              _context2.next = 9;
               return this.initAmap();
-            case 12:
-              _context.next = 17;
+            case 9:
+              _context2.next = 14;
               break;
-            case 14:
+            case 11:
               if (!(type === 'baidu')) {
-                _context.next = 17;
+                _context2.next = 14;
                 break;
               }
-              _context.next = 17;
+              _context2.next = 14;
               return this.initBaidu();
-            case 17:
+            case 14:
+              this.isInit = true;
+            case 15:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
-      function init() {
-        return _init.apply(this, arguments);
+      function _init() {
+        return _init3.apply(this, arguments);
       }
-      return init;
+      return _init;
     }() // reset() {
     //   this.isInit = false
     // }
   }, {
     key: "initTecent",
     value: function () {
-      var _initTecent = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee2() {
-        return _regeneratorRuntime$1().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _initTecent = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee3() {
+        return _regeneratorRuntime$1().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context2.next = 2;
+              _context3.next = 2;
               return importJS("https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=".concat(this.key),
               // `https://map.qq.com/api/gljs?v=1.exp&key=${this.key}`,
               'TMap');
             case 2:
               this.TMap = window.TMap;
               this.MapCore = window.TMap;
-              _context2.next = 6;
+              _context3.next = 6;
               return delay(300);
             case 6:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function initTecent() {
         return _initTecent.apply(this, arguments);
@@ -17229,10 +17256,10 @@ var MapService = /*#__PURE__*/function () {
   }, {
     key: "initAmap",
     value: function () {
-      var _initAmap = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee3() {
+      var _initAmap = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee4() {
         var plugin, AMap;
-        return _regeneratorRuntime$1().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime$1().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               // if (this.secretkey) {
               //   window._AMapSecurityConfig = {
@@ -17240,7 +17267,7 @@ var MapService = /*#__PURE__*/function () {
               //   }
               // }
               plugin = ['AMap.Geolocation']; // plugin.push('AMap.Geocoder') // 不开放地址查询 改用ipaas
-              _context3.next = 3;
+              _context4.next = 3;
               return AMapLoader$1.load({
                 key: this.key,
                 version: '2.0',
@@ -17251,7 +17278,7 @@ var MapService = /*#__PURE__*/function () {
                 }
               });
             case 3:
-              AMap = _context3.sent;
+              AMap = _context4.sent;
               window.AMap = AMap;
               this.AMap = AMap;
               this.MapCore = window.AMap;
@@ -17262,9 +17289,9 @@ var MapService = /*#__PURE__*/function () {
               // console.log(window.AMap === aaaa)
             case 7:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
       function initAmap() {
         return _initAmap.apply(this, arguments);
@@ -17274,12 +17301,12 @@ var MapService = /*#__PURE__*/function () {
   }, {
     key: "initBaidu",
     value: function () {
-      var _initBaidu = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee4() {
+      var _initBaidu = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee5() {
         var _this = this;
-        return _regeneratorRuntime$1().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime$1().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              return _context4.abrupt("return", new Promise(function (resolve, reject) {
+              return _context5.abrupt("return", new Promise(function (resolve, reject) {
                 window.BMAP_INITIAL_CALLBACK = function () {
                   _this.BMap = window.BMap;
                   _this.MapCore = window.BMap;
@@ -17300,9 +17327,9 @@ var MapService = /*#__PURE__*/function () {
               }));
             case 1:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4);
+        }, _callee5);
       }));
       function initBaidu() {
         return _initBaidu.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",

package/src/map/MapService.ts

@@ -20,6 +20,7 @@ interface ILbsSettingData {
 
 class MapService {
   private isInit = false
+  private initPromise: any = null
 
   get isLbssettingEnable() {
     return tenantSetting.get('lbssetting')?.enable === '1'
@@ -89,13 +90,17 @@ class MapService {
   async init() {
     if (this.isInit) return
 
-    this.isInit = true
+    // 兼容同时间发起多个
+    if (this.initPromise) {
+      return this.initPromise
+    }
 
-    const type = this.type
+    this.initPromise = this._init()
+    await this.initPromise
+  }
 
-    // if (process.env.NODE_ENV === 'development') {
-    //     type = 'baidu'
-    // }
+  private async _init() {
+    const type = this.type
     if (type === 'tencent') {
       await this.initTecent()
     } else if (type === 'amap') {
@@ -103,6 +108,7 @@ class MapService {
     } else if (type === 'baidu') {
       await this.initBaidu()
     }
+    this.isInit = true
   }
 
   // reset() {