@vtx/map 1.2.38 → 2.0.0-beta.2

package/README.md

@@ -1,44 +1,44 @@
-# map
-
-> 地图控件
-
-## 安装
-
-```bash
-# Install
-$ npm install @vtx/map
-#或者
-$ yarn add @vtx/map
-```
-
-## 文档
-
--   [VtxMap](/docs/VtxMap.md)
--   [MapPlayer](/docs/MapPlayer.md)
--   [VtxSearchMap](/docs/VtxSearchMap.md)
--   [VtxOptMap](/docs/VtxOptMap.md)
-
-### 全量导入引用方式（==不推荐==）：
-
-```js
-# 地图组件(地图组件的ref函数现在改为getMapInstance)
-$ import { VtxMap, VtxOptMap, VtxZoomMap } from '@vtx/map';
-
-# 地图弹出框组件
-$ import { VtxSearchMap } from '@vtx/map';
-```
-
-### 使用 babel-plugin-import 动态加载引用方式(==推荐==)：
-
-```js
-# 地图组件(地图组件的ref函数现在改为getMapInstance)
-$ import { VtxMap } from '@vtx/map';
-$ const { VtxOptMap, VtxZoomMap, MapPlayer } = VtxMap;
-
-# 地图弹出框组件
-$ import { VtxSearchMap } from '@vtx/map';
-```
-
-## License
-
-[MIT](https://tldrlegal.com/license/mit-license)
+# map
+
+> 地图控件
+
+## 安装
+
+```bash
+# Install
+$ npm install @vtx/map
+#或者
+$ yarn add @vtx/map
+```
+
+## 文档
+
+-   [VtxMap](/docs/VtxMap.md)
+-   [MapPlayer](/docs/MapPlayer.md)
+-   [VtxSearchMap](/docs/VtxSearchMap.md)
+-   [VtxOptMap](/docs/VtxOptMap.md)
+
+### 全量导入引用方式（==不推荐==）：
+
+```js
+# 地图组件(地图组件的ref函数现在改为getMapInstance)
+$ import { VtxMap, VtxOptMap, VtxZoomMap } from '@vtx/map';
+
+# 地图弹出框组件
+$ import { VtxSearchMap } from '@vtx/map';
+```
+
+### 使用 babel-plugin-import 动态加载引用方式(==推荐==)：
+
+```js
+# 地图组件(地图组件的ref函数现在改为getMapInstance)
+$ import { VtxMap } from '@vtx/map';
+$ const { VtxOptMap, VtxZoomMap, MapPlayer } = VtxMap;
+
+# 地图弹出框组件
+$ import { VtxSearchMap } from '@vtx/map';
+```
+
+## License
+
+[MIT](https://tldrlegal.com/license/mit-license)

package/lib/VtxMap/AMap/AMap.js

@@ -9,7 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 var _reactDom = require("react-dom");
 var _MapToolFunction = require("../MapToolFunction");
 var _immutable = _interopRequireDefault(require("immutable"));
-var _default2 = _interopRequireDefault(require("../../default"));
+var _default2 = _interopRequireWildcard(require("../../default"));
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
@@ -115,45 +116,47 @@ var VortexAMap = /*#__PURE__*/function (_React$Component) {
     key: "loadMapJs",
     value: function loadMapJs() {
       this.loadMapComplete = new Promise(function (resolve, reject) {
-        if (window.AMap) {
-          resolve(window.AMap);
-        } else {
-          $.getScript("".concat(_default2["default"].mapServerURL, "/A_content.js"), function () {
-            $.getScript(_default2["default"].amapScriptUrl, function () {
-              var PointCollection = new Promise(function (resolve, reject) {
-                $.getScript("".concat(_default2["default"].mapServerURL, "/GPointCollection.js"), function () {
-                  resolve();
+        (0, _default2.ensurejQuery)().then(function () {
+          if (window.AMap) {
+            resolve(window.AMap);
+          } else {
+            $.getScript("".concat(_default2["default"].mapServerURL, "/A_content.js"), function () {
+              $.getScript(_default2["default"].amapScriptUrl, function () {
+                var PointCollection = new Promise(function (resolve, reject) {
+                  $.getScript("".concat(_default2["default"].mapServerURL, "/GPointCollection.js"), function () {
+                    resolve();
+                  });
                 });
-              });
-              Promise.all([PointCollection]).then(function () {
-                (function setTime() {
-                  var allEvents = [window.AMap, 'MarkerClusterer', 'MapType', 'Scale', 'ToolBar', 'DistrictSearch', 'RangingTool', 'MouseTool', 'PolyEditor', 'CircleEditor', 'PlaceSearch', 'Heatmap'];
-                  var isLoading = true;
-                  for (var i = 0; i <= allEvents.length - 1; i++) {
-                    if (i === 0) {
-                      if (!allEvents[i]) {
-                        isLoading = false;
-                        break;
+                Promise.all([PointCollection]).then(function () {
+                  (function setTime() {
+                    var allEvents = [window.AMap, 'MarkerClusterer', 'MapType', 'Scale', 'ToolBar', 'DistrictSearch', 'RangingTool', 'MouseTool', 'PolyEditor', 'CircleEditor', 'PlaceSearch', 'Heatmap'];
+                    var isLoading = true;
+                    for (var i = 0; i <= allEvents.length - 1; i++) {
+                      if (i === 0) {
+                        if (!allEvents[i]) {
+                          isLoading = false;
+                          break;
+                        }
+                      } else {
+                        if (!allEvents[0][allEvents[i]]) {
+                          isLoading = false;
+                          break;
+                        }
                       }
+                    }
+                    if (isLoading) {
+                      resolve(window.AMap);
                     } else {
-                      if (!allEvents[0][allEvents[i]]) {
-                        isLoading = false;
-                        break;
-                      }
+                      setTimeout(function () {
+                        setTime();
+                      }, 50);
                     }
-                  }
-                  if (isLoading) {
-                    resolve(window.AMap);
-                  } else {
-                    setTimeout(function () {
-                      setTime();
-                    }, 50);
-                  }
-                })();
+                  })();
+                });
               });
             });
-          });
-        }
+          }
+        });
       });
     }
     //初始化地图
@@ -807,7 +810,6 @@ var VortexAMap = /*#__PURE__*/function (_React$Component) {
     value: function getMapExtent() {
       var t = this;
       var gis = t.state.gis;
-      if (!gis) return {};
       var northEast = (this.props.viewMode == '3D' ? gis.getBounds().toBounds() : gis.getBounds()).getNorthEast(),
         southWest = (this.props.viewMode == '3D' ? gis.getBounds().toBounds() : gis.getBounds()).getSouthWest();
       var obj = {