@smart100/spu-web-plugin 1.0.9 → 1.0.11

package/dist/index.d.ts

@@ -1,5 +1,25 @@
 // import type { App } from 'vue'
 // import type { AxiosInstance } from 'axios'
+declare global {
+  interface Window {
+    // 高德地图
+    AMapLoader: any
+    _AMapSecurityConfig: {
+      securityJsCode: string
+    }
+    AMap: any
+    AMapUI: any
+    // 百度地图
+    BMap: any
+    BMAP_ANCHOR_TOP_LEFT: any
+    BMAP_ANCHOR_TOP_RIGHT: any
+    BMAP_ANCHOR_BOTTOM_LEFT: any
+    BMAP_ANCHOR_BOTTOM_RIGHT: any
+    BMAP_INITIAL_CALLBACK: any
+    // 腾讯地图
+    TMap: any
+  }
+}
 
 interface IAMapLoader {
   load: (options?: {
@@ -16,6 +36,7 @@ interface IMapService {
   AMap: any
   BMap: any
   TMap: any
+  MapCore: any
 }
 
 type StorageType = 'storage' | 'storage-1d' | 'storage-3m' | 'storage-1y'

package/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.9";
+var version = "1.0.11";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -16163,11 +16163,11 @@ var TenantSetting = /*#__PURE__*/function () {
         //     }
         //   }
         // }
-        // // tenantsetting.lbssetting.setting.type = 'amap'
-        // // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
-        // // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
-        // // tenantsetting.lbssetting.setting.type = 'tencent'
-        // // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
+        // tenantsetting.lbssetting.setting.type = 'amap'
+        // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
+        // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
+        // tenantsetting.lbssetting.setting.type = 'tencent'
+        // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
         // tenantsetting.lbssetting.setting.type = 'baidu'
         // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
         if (key) {
@@ -17071,6 +17071,11 @@ 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);
+    _defineProperty$1(this, "MapCore", null);
   }
   _createClass$1(MapService, [{
     key: "isLbssettingEnable",
@@ -17114,35 +17119,34 @@ var MapService = /*#__PURE__*/function () {
         return 'amap';
       }
     }
-  }, {
-    key: "AMap",
-    get: function get() {
-      if (!this.isInit || this.type !== 'amap') {
-        return null;
-      }
-      return window.AMap;
-    }
-  }, {
-    key: "TMap",
-    get: function get() {
-      if (!this.isInit || this.type !== 'tencent') {
-        return null;
-      }
-      return window.TMap;
-    }
-  }, {
-    key: "BMap",
-    get: function get() {
-      if (!this.isInit || this.type !== 'baidu') {
-        return null;
-      }
-      return window.BMap;
-    }
   }, {
     key: "init",
-    value: function () {
-      var _init = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee() {
-        var type;
+    value: // get AMap() {
+    //   if (!this.isInit || this.type !== 'amap') {
+    //     return null
+    //   }
+    //   return window.AMap
+    // }
+    // get TMap() {
+    //   if (!this.isInit || this.type !== 'tencent') {
+    //     return null
+    //   }
+    //   return window.TMap
+    // }
+    // get BMap() {
+    //   if (!this.isInit || this.type !== 'baidu') {
+    //     return null
+    //   }
+    //   return window.BMap
+    // }
+    // get MapCore() {
+    //   if (!this.isInit) {
+    //     return null
+    //   }
+    //   return window.BMap
+    // }
+    function () {
+      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:
@@ -17152,68 +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:
-              _context2.next = 4;
+              this.TMap = window.TMap;
+              this.MapCore = window.TMap;
+              _context3.next = 6;
               return delay(300);
-            case 4:
+            case 6:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function initTecent() {
         return _initTecent.apply(this, arguments);
@@ -17223,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 = {
@@ -17234,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',
@@ -17245,18 +17278,20 @@ var MapService = /*#__PURE__*/function () {
                 }
               });
             case 3:
-              AMap = _context3.sent;
+              AMap = _context4.sent;
               window.AMap = AMap;
+              this.AMap = AMap;
+              this.MapCore = window.AMap;
               // console.log(window)
               // console.log(window.AMap)
               // console.log(window.AMapUI)
               // console.log(window.AMapLoader)
               // console.log(window.AMap === aaaa)
-            case 5:
+            case 7:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
       function initAmap() {
         return _initAmap.apply(this, arguments);
@@ -17266,13 +17301,16 @@ 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) {
-                window.__baiduMapInitial = function () {
+              return _context5.abrupt("return", new Promise(function (resolve, reject) {
+                window.BMAP_INITIAL_CALLBACK = function () {
+                  _this.BMap = window.BMap;
+                  _this.MapCore = window.BMap;
+                  // debugger
                   // 启用google标准坐标体系
                   // coordsType 指定输入输出的坐标类型，BMAP_COORD_GCJ02为gcj02坐标，BMAP_COORD_BD09为bd0ll坐标，默认为BMAP_COORD_BD09。
                   window.BMap.coordType = 'BMAP_COORD_GCJ02';
@@ -17280,8 +17318,8 @@ var MapService = /*#__PURE__*/function () {
                 };
                 var script = document.createElement('script');
                 // 使用最新 3.0 api https://lbsyun.baidu.com/index.php?title=jspopular3.0
-                script.src = "https://api.map.baidu.com/api?v=3.0&ak=".concat(_this.key, "&callback=__baiduMapInitial");
-                // script.src = `https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=${this.key}&callback=__baiduMapInitial`
+                script.src = "https://api.map.baidu.com/api?v=3.0&ak=".concat(_this.key, "&callback=BMAP_INITIAL_CALLBACK");
+                // script.src = `https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=${this.key}&callback=BMAP_INITIAL_CALLBACK`
                 script.onerror = function (err) {
                   reject(err);
                 };
@@ -17289,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.9",
+  "version": "1.0.11",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",

package/src/map/MapService.ts

@@ -19,7 +19,8 @@ interface ILbsSettingData {
 }
 
 class MapService {
-  isInit = false
+  private isInit = false
+  private initPromise: any = null
 
   get isLbssettingEnable() {
     return tenantSetting.get('lbssetting')?.enable === '1'
@@ -53,37 +54,53 @@ class MapService {
     }
   }
 
-  get AMap() {
-    if (!this.isInit || this.type !== 'amap') {
-      return null
-    }
-    return window.AMap
-  }
+  AMap: any = null
+  TMap: any = null
+  BMap: any = null
+  MapCore: any = null
 
-  get TMap() {
-    if (!this.isInit || this.type !== 'tencent') {
-      return null
-    }
-    return window.TMap
-  }
+  // get AMap() {
+  //   if (!this.isInit || this.type !== 'amap') {
+  //     return null
+  //   }
+  //   return window.AMap
+  // }
 
-  get BMap() {
-    if (!this.isInit || this.type !== 'baidu') {
-      return null
-    }
-    return window.BMap
-  }
+  // get TMap() {
+  //   if (!this.isInit || this.type !== 'tencent') {
+  //     return null
+  //   }
+  //   return window.TMap
+  // }
+
+  // get BMap() {
+  //   if (!this.isInit || this.type !== 'baidu') {
+  //     return null
+  //   }
+  //   return window.BMap
+  // }
+
+  // get MapCore() {
+  //   if (!this.isInit) {
+  //     return null
+  //   }
+  //   return window.BMap
+  // }
 
   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') {
@@ -91,6 +108,7 @@ class MapService {
     } else if (type === 'baidu') {
       await this.initBaidu()
     }
+    this.isInit = true
   }
 
   // reset() {
@@ -103,6 +121,8 @@ class MapService {
       // `https://map.qq.com/api/gljs?v=1.exp&key=${this.key}`,
       'TMap'
     )
+    this.TMap = window.TMap
+    this.MapCore = window.TMap
     await delay(300)
   }
 
@@ -126,6 +146,8 @@ class MapService {
       }
     })
     window.AMap = AMap
+    this.AMap = AMap
+    this.MapCore = window.AMap
     // console.log(window)
     // console.log(window.AMap)
     // console.log(window.AMapUI)
@@ -144,7 +166,10 @@ class MapService {
     //     mp.centerAndZoom(new BMap.Point(121.491, 31.233), 11)
     // }
     return new Promise((resolve, reject) => {
-      window.__baiduMapInitial = function () {
+      window.BMAP_INITIAL_CALLBACK = () => {
+        this.BMap = window.BMap
+        this.MapCore = window.BMap
+        // debugger
         // 启用google标准坐标体系
         // coordsType 指定输入输出的坐标类型，BMAP_COORD_GCJ02为gcj02坐标，BMAP_COORD_BD09为bd0ll坐标，默认为BMAP_COORD_BD09。
         window.BMap.coordType = 'BMAP_COORD_GCJ02'
@@ -152,8 +177,8 @@ class MapService {
       }
       const script = document.createElement('script')
       // 使用最新 3.0 api https://lbsyun.baidu.com/index.php?title=jspopular3.0
-      script.src = `https://api.map.baidu.com/api?v=3.0&ak=${this.key}&callback=__baiduMapInitial`
-      // script.src = `https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=${this.key}&callback=__baiduMapInitial`
+      script.src = `https://api.map.baidu.com/api?v=3.0&ak=${this.key}&callback=BMAP_INITIAL_CALLBACK`
+      // script.src = `https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=${this.key}&callback=BMAP_INITIAL_CALLBACK`
       script.onerror = (err) => {
         reject(err)
       }

package/src/tenantSetting.ts

@@ -43,7 +43,6 @@ class TenantSetting {
     if (tenantsettingStr) {
       const tenantsetting = JSON.parse(tenantsettingStr)
 
-
       // tenantsetting.lbssetting = {
       //   enable: '1',
       //   setting: {
@@ -62,17 +61,16 @@ class TenantSetting {
       //     }
       //   }
       // }
-      // // tenantsetting.lbssetting.setting.type = 'amap'
-      // // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
-      // // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
+      // tenantsetting.lbssetting.setting.type = 'amap'
+      // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
+      // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
 
-      // // tenantsetting.lbssetting.setting.type = 'tencent'
-      // // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
+      // tenantsetting.lbssetting.setting.type = 'tencent'
+      // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
 
       // tenantsetting.lbssetting.setting.type = 'baidu'
       // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
 
-
       if (key) {
         return tenantsetting[key]
       }

package/src/types/index.d.ts

@@ -1,5 +1,25 @@
 // import type { App } from 'vue'
 // import type { AxiosInstance } from 'axios'
+declare global {
+  interface Window {
+    // 高德地图
+    AMapLoader: any
+    _AMapSecurityConfig: {
+      securityJsCode: string
+    }
+    AMap: any
+    AMapUI: any
+    // 百度地图
+    BMap: any
+    BMAP_ANCHOR_TOP_LEFT: any
+    BMAP_ANCHOR_TOP_RIGHT: any
+    BMAP_ANCHOR_BOTTOM_LEFT: any
+    BMAP_ANCHOR_BOTTOM_RIGHT: any
+    BMAP_INITIAL_CALLBACK: any
+    // 腾讯地图
+    TMap: any
+  }
+}
 
 interface IAMapLoader {
   load: (options?: {
@@ -16,6 +36,7 @@ interface IMapService {
   AMap: any
   BMap: any
   TMap: any
+  MapCore: any
 }
 
 type StorageType = 'storage' | 'storage-1d' | 'storage-3m' | 'storage-1y'