@smart100/spu-web-plugin 1.0.13 → 1.0.15

package/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.13";
+var version = "1.0.15";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -16162,29 +16162,32 @@ var TenantSetting = /*#__PURE__*/function () {
       //     }
       //   }
       // }
-      // // 高德地图key配置错误
-      // // 1 如果是key格式不对 那么没返回promise 连window.AMap都拿不到 地图和都不能用
-      // // 1 如果是key对式对 但key不对 有返回 window.AMap 但api定位调用失败 地图可以渲染空白地图
-      // // // 高德地图公司key
-      // // tenantsetting.lbssetting.setting.type = 'amap'
-      // // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
-      // // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
-      // // // 高德地图个人key
-      // // tenantsetting.lbssetting.setting.type = 'amap'
-      // // tenantsetting.lbssetting.setting.key.web = 'e4d25fe4661a34198c4e6f79abe9afac'
-      // // tenantsetting.lbssetting.setting.secretkey.web = 'a6b674affd9a3278c68602cf7ba02fcb'
-      // // tencent地图key配置错误
-      // // 1 如果是地图 会在地图上明确文字提示 鉴权失败，请传入正确的key
-      // // 2 如果是调用定位等api 会返回 catch 和详细的错误信息
-      // // getIPLocationByTMap fail: {"status":311,"message":"key格式错误","request_id":"ccedb04fd95e4f3f9cd45cfbad729d10","id":"cbm919vjdj0"}
-      // // getIPLocationByTMap fail: {"status":190,"message":"无效的key","request_id":"b6ca9d0749eb4c91a47db9412b1253ca","id":"cbm919wxo40"}
+      // 高德地图key配置错误
+      // 1 如果是key格式不对 那么没返回promise 连window.AMap都拿不到 地图和都不能用
+      // 1 如果是key对式对 但key不对 有返回 window.AMap 但api定位调用失败 地图可以渲染空白地图
+      // // 高德地图公司key
+      // tenantsetting.lbssetting.setting.type = 'amap'
+      // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
+      // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
+      // // 高德地图个人key
+      // tenantsetting.lbssetting.setting.type = 'amap'
+      // tenantsetting.lbssetting.setting.key.web = 'e4d25fe4661a34198c4e6f79abe9afac'
+      // tenantsetting.lbssetting.setting.secretkey.web = 'a6b674affd9a3278c68602cf7ba02fcb'
+      // tencent地图key配置错误
+      // 1 如果是地图 会在地图上明确文字提示 鉴权失败，请传入正确的key
+      // 2 如果是调用定位等api 会返回 catch 和详细的错误信息
+      // getIPLocationByTMap fail: {"status":311,"message":"key格式错误","request_id":"ccedb04fd95e4f3f9cd45cfbad729d10","id":"cbm919vjdj0"}
+      // getIPLocationByTMap fail: {"status":190,"message":"无效的key","request_id":"b6ca9d0749eb4c91a47db9412b1253ca","id":"cbm919wxo40"}
       // tenantsetting.lbssetting.setting.type = 'tencent'
       // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
       // tenantsetting.lbssetting.setting.secretkey.web = 'zowvV5I2pSxqgGb2Sgr1x62HGXbqdxT0'
-      // // 百度地图key配置错误alert以下信息
-      // // 您提供的密钥不是有效的百度LBS开放平台密钥，或此密钥未对本应用的百度地图JavaScriptAPI授权。您可以访问如下网址了解如何获取有效的密钥：http://lbsyun.baidu.com/apiconsole/key#。
-      // // tenantsetting.lbssetting.setting.type = 'baidu'
-      // // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
+      // 百度地图key配置错误alert以下信息
+      // 您提供的密钥不是有效的百度LBS开放平台密钥，或此密钥未对本应用的百度地图JavaScriptAPI授权。您可以访问如下网址了解如何获取有效的密钥：http://lbsyun.baidu.com/apiconsole/key#。
+      // tenantsetting.lbssetting.setting.type = 'baidu'
+      // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
+      // tenantsetting.lbssetting.setting.type = 'tencent'
+      // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT是的是的'
+      // tenantsetting.lbssetting.setting.secretkey.web = 'zowvV5I2pSxqgGb2Sgr1x62HGXbqdxT0对对对'
       // lsProxy.setItem('tenantsetting', JSON.stringify(tenantsetting))
       var tenantsettingStr = lsProxy.getItem('tenantsetting');
       if (tenantsettingStr) {
@@ -17199,40 +17202,63 @@ var MapService = /*#__PURE__*/function () {
     key: "_init",
     value: function () {
       var _init3 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee2() {
-        var type;
+        var type, key, secretkey;
         return _regeneratorRuntime$1().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               type = this.type;
+              key = this.key;
+              secretkey = this.secretkey;
               if (!(type === 'tencent')) {
-                _context2.next = 6;
+                _context2.next = 11;
                 break;
               }
-              _context2.next = 4;
+              if (!(!key || !secretkey)) {
+                _context2.next = 7;
+                break;
+              }
+              console.error('请填写腾讯地图 Web App Key 和 Web Secret Key');
+              return _context2.abrupt("return");
+            case 7:
+              _context2.next = 9;
               return this.initTecent();
-            case 4:
-              _context2.next = 14;
+            case 9:
+              _context2.next = 25;
               break;
-            case 6:
+            case 11:
               if (!(type === 'amap')) {
-                _context2.next = 11;
+                _context2.next = 19;
                 break;
               }
-              _context2.next = 9;
+              if (!(!key || !secretkey)) {
+                _context2.next = 15;
+                break;
+              }
+              console.error('请填写高德地图 Web App Key 和 Web Secret Key');
+              return _context2.abrupt("return");
+            case 15:
+              _context2.next = 17;
               return this.initAmap();
-            case 9:
-              _context2.next = 14;
+            case 17:
+              _context2.next = 25;
               break;
-            case 11:
+            case 19:
               if (!(type === 'baidu')) {
-                _context2.next = 14;
+                _context2.next = 25;
                 break;
               }
-              _context2.next = 14;
+              if (key) {
+                _context2.next = 23;
+                break;
+              }
+              console.error('请填写百度地图 Web App Key');
+              return _context2.abrupt("return");
+            case 23:
+              _context2.next = 25;
               return this.initBaidu();
-            case 14:
+            case 25:
               this.isInit = true;
-            case 15:
+            case 26:
             case "end":
               return _context2.stop();
           }
@@ -17288,7 +17314,7 @@ var MapService = /*#__PURE__*/function () {
                       case 0:
                         // 高德地图api初始化失败 没有返回reject 因此用超时机制检测
                         time = setTimeout(function () {
-                          console.error('initAmap fail: 请检查 AMap key 是否正确配置');
+                          console.error('initAmap fail: 请检查高德地图 Web App Key 和 Web Secret Key 是否正确配置');
                           resolve(null);
                         }, 3000);
                         if (_this.secretkey) {
@@ -17657,13 +17683,13 @@ var getAddressByAMap = /*#__PURE__*/function () {
         case 0:
           console.log('getAddressByAMap start...');
           return _context8.abrupt("return", new Promise(function (resolve, reject) {
+            var _window3;
+            if (!((_window3 = window) !== null && _window3 !== void 0 && _window3.AMap)) {
+              console.error('getAddressByAMap fail: AMap is undefinded');
+              resolve('');
+              return;
+            }
             if (position) {
-              var _window3;
-              if (!((_window3 = window) !== null && _window3 !== void 0 && _window3.AMap)) {
-                console.error('getAddressByAMap fail: AMap is undefinded');
-                resolve('');
-                return;
-              }
               new window.AMap.Geocoder({
                 city: '',
                 radius: 500
@@ -17701,6 +17727,12 @@ var getIPLocationByTMap = /*#__PURE__*/function () {
         case 0:
           console.log('getIPLocationByTMap start...');
           return _context9.abrupt("return", new Promise(function (resolve, reject) {
+            var _window4;
+            if (!((_window4 = window) !== null && _window4 !== void 0 && _window4.TMap)) {
+              console.error('getIPLocationByTMap fail: TMap is undefinded');
+              resolve(null);
+              return;
+            }
             var params = ip ? {
               ip: ip
             } : {};
@@ -17737,6 +17769,12 @@ var getAddressByTMap = /*#__PURE__*/function () {
         case 0:
           console.log('getAddressByTMap start...');
           return _context10.abrupt("return", new Promise(function (resolve, reject) {
+            var _window5;
+            if (!((_window5 = window) !== null && _window5 !== void 0 && _window5.TMap)) {
+              console.error('getAddressByTMap fail: TMap is undefinded');
+              resolve('');
+              return;
+            }
             if (position) {
               // debugger
               new window.TMap.service.Geocoder().getAddress({
@@ -17775,6 +17813,12 @@ var getLocationByBMap = /*#__PURE__*/function () {
         case 0:
           console.log('getLocationByBMap start...');
           return _context12.abrupt("return", new Promise(function (resolve, reject) {
+            var _window6;
+            if (!((_window6 = window) !== null && _window6 !== void 0 && _window6.BMap)) {
+              console.error('getLocationByBMap fail: BMap is undefinded');
+              resolve(null);
+              return;
+            }
             new window.BMap.Geolocation().getCurrentPosition( /*#__PURE__*/function () {
               var _ref12 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee11(res) {
                 var lng, lat, result;
@@ -17859,6 +17903,12 @@ var getCityLocationByBMap = /*#__PURE__*/function () {
         case 0:
           console.log('getCityLocationByBMap start...');
           return _context14.abrupt("return", new Promise(function (resolve, reject) {
+            var _window7;
+            if (!((_window7 = window) !== null && _window7 !== void 0 && _window7.BMap)) {
+              console.error('getCityLocationByBMap fail: BMap is undefinded');
+              resolve(null);
+              return;
+            }
             new window.BMap.LocalCity().get( /*#__PURE__*/function () {
               var _ref14 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee13(res) {
                 var lng, lat, point, result;
@@ -17923,18 +17973,27 @@ var getAddressByBmap = /*#__PURE__*/function () {
           console.log('getAddressByBmap start...');
           return _context16.abrupt("return", new Promise( /*#__PURE__*/function () {
             var _ref16 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee15(resolve, reject) {
+              var _window8;
               var point;
               return _regeneratorRuntime$1().wrap(function _callee15$(_context15) {
                 while (1) switch (_context15.prev = _context15.next) {
                   case 0:
-                    if (position) {
+                    if ((_window8 = window) !== null && _window8 !== void 0 && _window8.BMap) {
                       _context15.next = 4;
                       break;
                     }
-                    console.error('getAddressByBmap fail');
+                    console.error('getAddressByBmap fail: BMap is undefinded');
                     resolve('');
                     return _context15.abrupt("return");
                   case 4:
+                    if (position) {
+                      _context15.next = 8;
+                      break;
+                    }
+                    console.error('getAddressByBmap fail');
+                    resolve('');
+                    return _context15.abrupt("return");
+                  case 8:
                     // // 把 GCJ02 转化为百度 BD09 地址
                     // const points: any = await transformGCJ02ToBD09Points([{
                     //   lng: position.longitude,
@@ -17956,7 +18015,7 @@ var getAddressByBmap = /*#__PURE__*/function () {
                         resolve('');
                       }
                     });
-                  case 6:
+                  case 10:
                   case "end":
                     return _context15.stop();
                 }
@@ -17978,7 +18037,7 @@ var getAddressByBmap = /*#__PURE__*/function () {
 }();
 var getLocationPromise = /*#__PURE__*/function () {
   var _ref17 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee17() {
-    var _window4;
+    var _window9;
     var isuseiplocarion,
       location,
       _args17 = arguments;
@@ -17987,7 +18046,7 @@ var getLocationPromise = /*#__PURE__*/function () {
         case 0:
           isuseiplocarion = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : false;
           location = null; // 在 SPU 容器里使用 Native-API 的定位
-          if (!((_window4 = window) !== null && _window4 !== void 0 && (_window4 = _window4.Native) !== null && _window4 !== void 0 && _window4.getLocation)) {
+          if (!((_window9 = window) !== null && _window9 !== void 0 && (_window9 = _window9.Native) !== null && _window9 !== void 0 && _window9.getLocation)) {
             _context17.next = 6;
             break;
           }

package/package.json

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

package/src/map/MapService.ts

@@ -101,11 +101,25 @@ class MapService {
 
   private async _init() {
     const type = this.type
+    const key = this.key
+    const secretkey = this.secretkey
     if (type === 'tencent') {
+      if (!key || !secretkey) {
+        console.error('请填写腾讯地图 Web App Key 和 Web Secret Key')
+        return
+      }
       await this.initTecent()
     } else if (type === 'amap') {
+      if (!key || !secretkey) {
+        console.error('请填写高德地图 Web App Key 和 Web Secret Key')
+        return
+      }
       await this.initAmap()
     } else if (type === 'baidu') {
+      if (!key) {
+        console.error('请填写百度地图 Web App Key')
+        return
+      }
       await this.initBaidu()
     }
     this.isInit = true
@@ -130,7 +144,7 @@ class MapService {
     return new Promise(async (resolve, reject) => {
       // 高德地图api初始化失败 没有返回reject 因此用超时机制检测
       const time = setTimeout(() => {
-        console.error('initAmap fail: 请检查 AMap key 是否正确配置')
+        console.error('initAmap fail: 请检查高德地图 Web App Key 和 Web Secret Key 是否正确配置')
         resolve(null)
       }, 3000)
 

package/src/map/index.ts

@@ -241,12 +241,12 @@ const getCityLocationByAMap = async (): Promise<Location> => {
 const getAddressByAMap = async (position: Location): Promise<string> => {
   console.log('getAddressByAMap start...')
   return new Promise((resolve, reject) => {
+    if (!window?.AMap) {
+      console.error('getAddressByAMap fail: AMap is undefinded')
+      resolve('')
+      return
+    }
     if (position) {
-      if (!window?.AMap) {
-        console.error('getAddressByAMap fail: AMap is undefinded')
-        resolve('')
-        return
-      }
       new window.AMap.Geocoder({
         city: '',
         radius: 500
@@ -271,6 +271,12 @@ const getAddressByAMap = async (position: Location): Promise<string> => {
 const getIPLocationByTMap = async (ip?: string): Promise<Location> => {
   console.log('getIPLocationByTMap start...')
   return new Promise((resolve, reject) => {
+    if (!window?.TMap) {
+      console.error('getIPLocationByTMap fail: TMap is undefinded')
+      resolve(null)
+      return
+    }
+
     const params = ip ? { ip } : {}
     new window.TMap.service.IPLocation()
       .locate({ ...params, servicesk: mapService.secretkey })
@@ -294,6 +300,12 @@ const getIPLocationByTMap = async (ip?: string): Promise<Location> => {
 const getAddressByTMap = async (position: Location): Promise<string> => {
   console.log('getAddressByTMap start...')
   return new Promise((resolve, reject) => {
+    if (!window?.TMap) {
+      console.error('getAddressByTMap fail: TMap is undefinded')
+      resolve('')
+      return
+    }
+
     if (position) {
       // debugger
       new window.TMap.service.Geocoder()
@@ -322,6 +334,11 @@ const getAddressByTMap = async (position: Location): Promise<string> => {
 const getLocationByBMap = async (): Promise<Location> => {
   console.log('getLocationByBMap start...')
   return new Promise((resolve, reject) => {
+    if (!window?.BMap) {
+      console.error('getLocationByBMap fail: BMap is undefinded')
+      resolve(null)
+      return
+    }
     new window.BMap.Geolocation().getCurrentPosition(
       async (res: any) => {
         // console.log(res)
@@ -384,6 +401,11 @@ const getLocationByBMap = async (): Promise<Location> => {
 const getCityLocationByBMap = async (): Promise<Location> => {
   console.log('getCityLocationByBMap start...')
   return new Promise((resolve, reject) => {
+    if (!window?.BMap) {
+      console.error('getCityLocationByBMap fail: BMap is undefinded')
+      resolve(null)
+      return
+    }
     new window.BMap.LocalCity().get(async (res: any) => {
       // console.log(res)
       // debugger
@@ -417,7 +439,12 @@ const getCityLocationByBMap = async (): Promise<Location> => {
 const getAddressByBmap = async (position: Location): Promise<string> => {
   console.log('getAddressByBmap start...')
   return new Promise(async (resolve, reject) => {
-    // resolve('')
+    if (!window?.BMap) {
+      console.error('getAddressByBmap fail: BMap is undefinded')
+      resolve('')
+      return
+    }
+
     if (!position) {
       console.error('getAddressByBmap fail')
       resolve('')

package/src/tenantSetting.ts

@@ -60,33 +60,39 @@ class TenantSetting {
     //   }
     // }
 
-    // // 高德地图key配置错误
-    // // 1 如果是key格式不对 那么没返回promise 连window.AMap都拿不到 地图和都不能用
-    // // 1 如果是key对式对 但key不对 有返回 window.AMap 但api定位调用失败 地图可以渲染空白地图
-
-    // // // 高德地图公司key
-    // // tenantsetting.lbssetting.setting.type = 'amap'
-    // // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
-    // // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
-
-    // // // 高德地图个人key
-    // // tenantsetting.lbssetting.setting.type = 'amap'
-    // // tenantsetting.lbssetting.setting.key.web = 'e4d25fe4661a34198c4e6f79abe9afac'
-    // // tenantsetting.lbssetting.setting.secretkey.web = 'a6b674affd9a3278c68602cf7ba02fcb'
-
-    // // tencent地图key配置错误
-    // // 1 如果是地图 会在地图上明确文字提示 鉴权失败，请传入正确的key
-    // // 2 如果是调用定位等api 会返回 catch 和详细的错误信息
-    // // getIPLocationByTMap fail: {"status":311,"message":"key格式错误","request_id":"ccedb04fd95e4f3f9cd45cfbad729d10","id":"cbm919vjdj0"}
-    // // getIPLocationByTMap fail: {"status":190,"message":"无效的key","request_id":"b6ca9d0749eb4c91a47db9412b1253ca","id":"cbm919wxo40"}
+    // 高德地图key配置错误
+    // 1 如果是key格式不对 那么没返回promise 连window.AMap都拿不到 地图和都不能用
+    // 1 如果是key对式对 但key不对 有返回 window.AMap 但api定位调用失败 地图可以渲染空白地图
+
+    // // 高德地图公司key
+    // tenantsetting.lbssetting.setting.type = 'amap'
+    // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
+    // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
+
+    // // 高德地图个人key
+    // tenantsetting.lbssetting.setting.type = 'amap'
+    // tenantsetting.lbssetting.setting.key.web = 'e4d25fe4661a34198c4e6f79abe9afac'
+    // tenantsetting.lbssetting.setting.secretkey.web = 'a6b674affd9a3278c68602cf7ba02fcb'
+
+    // tencent地图key配置错误
+    // 1 如果是地图 会在地图上明确文字提示 鉴权失败，请传入正确的key
+    // 2 如果是调用定位等api 会返回 catch 和详细的错误信息
+    // getIPLocationByTMap fail: {"status":311,"message":"key格式错误","request_id":"ccedb04fd95e4f3f9cd45cfbad729d10","id":"cbm919vjdj0"}
+    // getIPLocationByTMap fail: {"status":190,"message":"无效的key","request_id":"b6ca9d0749eb4c91a47db9412b1253ca","id":"cbm919wxo40"}
     // tenantsetting.lbssetting.setting.type = 'tencent'
     // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
     // tenantsetting.lbssetting.setting.secretkey.web = 'zowvV5I2pSxqgGb2Sgr1x62HGXbqdxT0'
 
-    // // 百度地图key配置错误alert以下信息
-    // // 您提供的密钥不是有效的百度LBS开放平台密钥，或此密钥未对本应用的百度地图JavaScriptAPI授权。您可以访问如下网址了解如何获取有效的密钥：http://lbsyun.baidu.com/apiconsole/key#。
-    // // tenantsetting.lbssetting.setting.type = 'baidu'
-    // // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
+    // 百度地图key配置错误alert以下信息
+    // 您提供的密钥不是有效的百度LBS开放平台密钥，或此密钥未对本应用的百度地图JavaScriptAPI授权。您可以访问如下网址了解如何获取有效的密钥：http://lbsyun.baidu.com/apiconsole/key#。
+    // tenantsetting.lbssetting.setting.type = 'baidu'
+    // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
+
+
+
+    // tenantsetting.lbssetting.setting.type = 'tencent'
+    // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT是的是的'
+    // tenantsetting.lbssetting.setting.secretkey.web = 'zowvV5I2pSxqgGb2Sgr1x62HGXbqdxT0对对对'
 
     // lsProxy.setItem('tenantsetting', JSON.stringify(tenantsetting))