dtable-ui-component 6.0.29-beta13 → 6.0.29-beta15

package/lib/GeolocationEditor/index.css

@@ -205,7 +205,6 @@
 }
 
 .dtable-ui-geolocation-map-editor .search-tables-input {
-  line-height: 38px;
   padding-right: 30px;
   border-bottom: 0;
   background: #fff;

package/lib/GeolocationEditor/map-editor/index.js

@@ -334,23 +334,27 @@ class MapEditor extends _react.Component {
   componentDidMount() {
     if (this.mapType === _mapEditorUtils.MAP_TYPES.B_MAP) {
       if (!window.BMap) {
-        window.renderBaiduMap = () => this.renderBaiduMap();
-        (0, _mapEditorUtils.loadMapSource)(this.mapType, this.mapKey);
+        (0, _mapEditorUtils.loadMapSource)(this.mapType, this.mapKey).then(() => {
+          this.renderBaiduMap();
+        });
       } else {
         this.renderBaiduMap();
       }
       return;
     } else if (this.mapType === _mapEditorUtils.MAP_TYPES.G_MAP) {
       if (!window.google) {
-        window.renderGoogleMap = () => this.renderGoogleMap();
-        (0, _mapEditorUtils.loadMapSource)(this.mapType, this.mapKey);
+        (0, _mapEditorUtils.loadMapSource)(this.mapType, this.mapKey).then(() => {
+          this.renderGoogleMap();
+        });
       } else {
         this.renderGoogleMap();
       }
       return;
     } else if (this.mapType === _mapEditorUtils.MAP_TYPES.M_MAP) {
       if (!window.minemap) {
-        (0, _mapEditorUtils.loadMapSource)(this.mapType, this.mapKey, this.loadMineMapCallBack);
+        (0, _mapEditorUtils.loadMapSource)(this.mapType, this.mapKey).then(() => {
+          this.loadMineMapCallBack();
+        });
       } else {
         this.renderMineMap();
       }

package/lib/GeolocationEditor/map-editor/large-editor/index.css

@@ -51,7 +51,6 @@
 }
 
 .dtable-ui-large-map-editor-dialog .dtable-ui-geolocation-map-editor-large .search-tables-input {
-  line-height: 38px;
   padding-right: 30px;
   border-bottom: 0;
   background: #fff;

package/lib/GeolocationEditor/map-editor-utils.js

@@ -95,26 +95,53 @@ const getMapInfo = function () {
   };
 };
 exports.getMapInfo = getMapInfo;
-const loadMapSource = (mapType, mapKey, callback) => {
-  if (!mapType || !mapKey) return;
-  let scriptUrl = '';
-  let script = document.createElement('script');
-  script.type = 'text/javascript';
-  if (mapType === MAP_TYPES.B_MAP) {
-    scriptUrl = "https://api.map.baidu.com/api?v=3.0&ak=".concat(mapKey, "}&callback=renderBaiduMap");
-  } else if (mapType === MAP_TYPES.G_MAP) {
-    scriptUrl = "https://maps.googleapis.com/maps/api/js?key=".concat(mapKey, "&callback=renderGoogleMap&libraries=&v=weekly");
-  } else {
-    scriptUrl = 'https://minemap.minedata.cn/minemapapi/v2.1.1/minemap.js';
-    let link = document.createElement('link');
-    link.rel = 'stylesheet';
-    link.type = 'text/css';
-    link.href = 'https://minemap.minedata.cn/minemapapi/v2.1.1/minemap.css';
-    document.head.appendChild(link);
-  }
-  script.src = scriptUrl;
-  document.body.appendChild(script);
-  if (callback) callback();
+const isImplementedOnload = script => {
+  script = script || document.createElement('script');
+  if ('onload' in script) return true;
+  script.setAttribute('onload', '');
+  return typeof script['onload'] === 'function'; // ff true ie false .
+};
+const loadMapSource = (mapType, mapKey) => {
+  return new Promise((resolve, reject) => {
+    if (!mapType || !mapKey) {
+      reject();
+      return;
+    }
+    let scriptUrl = '';
+    let script = document.createElement('script');
+    script.type = 'text/javascript';
+    if (mapType === MAP_TYPES.B_MAP) {
+      scriptUrl = "https://api.map.baidu.com/api?v=3.0&ak=".concat(mapKey);
+    } else if (mapType === MAP_TYPES.G_MAP) {
+      scriptUrl = "https://maps.googleapis.com/maps/api/js?key=".concat(mapKey, "&libraries=&v=weekly");
+    } else {
+      scriptUrl = 'https://minemap.minedata.cn/minemapapi/v2.1.1/minemap.js';
+      let link = document.createElement('link');
+      link.rel = 'stylesheet';
+      link.type = 'text/css';
+      link.href = 'https://minemap.minedata.cn/minemapapi/v2.1.1/minemap.css';
+      document.head.appendChild(link);
+    }
+    script.src = scriptUrl;
+    script.onerror = err => {
+      reject(err);
+    };
+    if (isImplementedOnload(script)) {
+      // Firefox, Safari, Chrome, and Opera
+      script.onload = res => {
+        resolve(res);
+      };
+    } else {
+      // IE
+      script.onreadystatechange = () => {
+        if (script.readyState === 'loaded' || script.readyState === 'complete') {
+          script.onreadystatechange = null;
+          resolve();
+        }
+      };
+    }
+    document.body.appendChild(script);
+  });
 };
 exports.loadMapSource = loadMapSource;
 const locateCurrentPosition = (map, mapType, callback) => {

package/lib/GeolocationEditor/map-selection-editor/index.js

@@ -349,7 +349,7 @@ class MapSelectionEditor extends _react.Component {
     }
   }
   componentWillUnmount() {
-    if (this.mapType === _mapEditorUtils.MAP_TYPES.B_MAP) {
+    if (this.map && this.mapType === _mapEditorUtils.MAP_TYPES.B_MAP) {
       let center = {};
       center.zoom = this.map.getZoom();
       let coordinate = this.map.getCenter();

package/lib/GeolocationEditor/map-selection-editor/large-editor/index.js

@@ -355,7 +355,7 @@ class LargeMapSelectionEditorDialog extends _react.default.Component {
     }
   }
   componentWillUnmount() {
-    if (this.mapType === _mapEditorUtils.MAP_TYPES.B_MAP) {
+    if (this.map && this.mapType === _mapEditorUtils.MAP_TYPES.B_MAP) {
       let center = {};
       center.zoom = this.map.getZoom();
       let coordinate = this.map.getCenter();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.29-beta13",
+  "version": "6.0.29-beta15",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "4.0.2",