dtable-ui-component 6.0.29-beta9 → 6.0.29

package/lib/GeolocationEditor/{pc-editor/country-editor.js → country-editor.js}

@@ -8,9 +8,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
-var _constants = require("../../constants");
-var _Loading = _interopRequireDefault(require("../../Loading"));
-var _lang = require("../../lang");
+var _constants = require("../constants");
+var _Loading = _interopRequireDefault(require("../Loading"));
+var _lang = require("../lang");
 class CountryEditor extends _react.Component {
   constructor(props) {
     super(props);
@@ -126,6 +126,29 @@ class CountryEditor extends _react.Component {
         }
       }, 300);
     };
+    this.getLocationData = () => {
+      const {
+        config
+      } = this.props;
+      const {
+        mediaUrl
+      } = {
+        ...window.dtable,
+        ...config
+      };
+      let geoFileName = 'en-region-location';
+      if (this.lang === 'cn') {
+        geoFileName = 'cn-region-location';
+      }
+      return fetch("".concat(mediaUrl, "geo-data/").concat(geoFileName, ".json")).then(res => {
+        return res.json();
+      }).catch(() => {
+        // get locations from local
+        return fetch("./geo-data/".concat(geoFileName, ".json")).then(res => {
+          return res.json();
+        });
+      });
+    };
     this.createContinentList = () => {
       let isSearchResultEmpty = true;
       const continents = Object.keys(this.filteredCountry);
@@ -237,12 +260,33 @@ class CountryEditor extends _react.Component {
   }
   componentDidMount() {
     document.addEventListener('keydown', this.onHotKey, true);
-    this.props.getData(this.lang).then(data => {
-      this.geolocationRegions = data;
+    if (this.lang === 'cn' && window.app.countryListCn) {
+      this.geolocationRegions = window.app.countryListCn;
+      this.filteredCountry = this.geolocationRegions;
+      this.setState({
+        isLoadingData: false
+      });
+      return;
+    }
+    if (this.lang !== 'cn' && window.app.countryListEn) {
+      this.geolocationRegions = window.app.countryListEn;
       this.filteredCountry = this.geolocationRegions;
       this.setState({
         isLoadingData: false
       });
+      return;
+    }
+    this.getLocationData().then(data => {
+      this.geolocationRegions = data || {};
+      this.filteredCountry = this.geolocationRegions;
+      if (this.lang === 'cn') {
+        window.app.countryListCn = this.geolocationRegions;
+      } else {
+        window.app.countryListEn = this.geolocationRegions;
+      }
+      this.setState({
+        isLoadingData: false
+      });
     });
   }
   componentWillUnmount() {

package/lib/GeolocationEditor/{pc-editor/index.css → index.css}

@@ -205,6 +205,7 @@
 }
 
 .dtable-ui-geolocation-map-editor .search-tables-input {
+  line-height: 38px;
   padding-right: 30px;
   border-bottom: 0;
   background: #fff;
@@ -434,7 +435,7 @@
   box-shadow: 0 -0 3px rgb(0 0 0 / 30%);
 }
 
-.dtable-ui-geolocation-map-editor-error-message {
+.dtable-ui-geolocation-map-editor .error-message {
   word-break: break-all;
   padding: 10px;
   margin: auto;
@@ -479,7 +480,7 @@
   background-color: #f5f5f5;
 }
 
-@media screen and (max-width: 768px) {
+@media screen and (max-width: 767.8px) {
   .dtable-ui-geolocation-locate-control,
   .dtable-ui-geolocation-zoom-control .dtable-ui-geolocation-zoom-control-btn {
     margin-bottom: 4px;
@@ -493,7 +494,7 @@
   }
 }
 
-@media screen and (min-width: 768px) {
+@media screen and (min-width: 767.8px) {
   .dtable-ui-geolocation-locate-control,
   .dtable-ui-geolocation-zoom-control .dtable-ui-geolocation-zoom-control-btn {
     margin-bottom: 4px;

package/lib/GeolocationEditor/index.js

@@ -1,100 +1,240 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _reactResponsive = _interopRequireDefault(require("react-responsive"));
-var _pcEditor = _interopRequireDefault(require("./pc-editor"));
-var _mbEditor = _interopRequireDefault(require("./mb-editor"));
-const GeolocationEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
-  let {
-    isMobile,
-    config: propsConfig,
-    ...props
-  } = _ref;
-  const config = (0, _react.useMemo)(() => {
-    var _window;
-    return {
-      ...((_window = window) === null || _window === void 0 ? void 0 : _window.dtable),
-      ...propsConfig
+var _react = _interopRequireDefault(require("react"));
+var _dtableUtils = require("dtable-utils");
+var _constants = require("../constants");
+var _objectUtils = _interopRequireDefault(require("../utils/object-utils"));
+var _locationEditor = _interopRequireDefault(require("./location-editor"));
+var _mapEditor = _interopRequireDefault(require("./map-editor"));
+var _mapSelectionEditor = _interopRequireDefault(require("./map-selection-editor"));
+var _countryEditor = _interopRequireDefault(require("./country-editor"));
+var _provinceEditor = _interopRequireDefault(require("./province-editor"));
+var _provinceCityEditor = _interopRequireDefault(require("./province-city-editor"));
+require("./index.css");
+class GeolocationEditor extends _react.default.Component {
+  constructor(_props) {
+    super(_props);
+    this.onHotKey = e => {
+      if (e.keyCode === _constants.KeyCodes.Enter && e.target.tagName !== 'TEXTAREA') {
+        this.onSubmit();
+      } else if (e.keyCode === _constants.KeyCodes.Escape) {
+        if (this.props.isInModal) {
+          e.stopPropagation();
+          this.onCancel();
+        }
+      }
     };
-  }, [propsConfig]);
-  const getLocationData = (0, _react.useCallback)(() => {
-    var _window2, _window2$app;
-    if ((_window2 = window) !== null && _window2 !== void 0 && (_window2$app = _window2.app) !== null && _window2$app !== void 0 && _window2$app.location) return new Promise((resolve, reject) => {
-      resolve(window.app.location);
-    });
-    const {
-      mediaUrl
-    } = config || {};
-    return fetch("".concat(mediaUrl, "geo-data/cn-location.json")).then(res => {
-      // get locations from server
-      return res.json();
-    }).catch(() => {
-      // get locations from local
-      return fetch('./geo-data/cn-location.json').then(res => {
-        return res.json();
-      });
-    });
-  }, [config]);
-  const getCountryData = (0, _react.useCallback)(lang => {
-    if (lang === 'cn' && window.app.countryListCn) return new Promise((resolve, reject) => {
-      resolve(window.app.countryListCn);
-    });
-    if (lang !== 'cn' && window.app.countryListEn) return new Promise((resolve, reject) => {
-      resolve(window.app.countryListEn);
-    });
-    const {
-      mediaUrl
-    } = config;
-    const geoFileName = lang === 'cn' ? 'cn-region-location' : 'en-region-location';
-    return fetch("".concat(mediaUrl, "geo-data/").concat(geoFileName, ".json")).then(res => {
-      return res.json();
-    }).catch(() => {
-      // get locations from local
-      return fetch("./geo-data/".concat(geoFileName, ".json")).then(res => {
-        return res.json();
-      });
-    }).then(res => {
-      const data = res || {};
-      if (lang === 'cn') {
-        window.app.countryListCn = data;
-      } else {
-        window.app.countryListEn = data;
+    this.getValue = () => {
+      return this.value;
+    };
+    this.setValue = value => {
+      this.value = value;
+    };
+    this.onSubmit = () => {
+      if (_objectUtils.default.isSameObject(this.initValue, this.value)) {
+        this.onCancel();
+        return;
       }
-      return data;
-    });
-  }, [config]);
-  if (isMobile === false) return /*#__PURE__*/_react.default.createElement(_pcEditor.default, Object.assign({}, props, {
-    config: config,
-    getLocationData: getLocationData,
-    getCountryData: getCountryData,
-    ref: ref
-  }));
-  if (isMobile === true) return /*#__PURE__*/_react.default.createElement(_mbEditor.default, Object.assign({}, props, {
-    config: config,
-    getLocationData: getLocationData,
-    getCountryData: getCountryData,
-    ref: ref
-  }));
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactResponsive.default, {
-    query: "(min-width: 768px)"
-  }, /*#__PURE__*/_react.default.createElement(_pcEditor.default, Object.assign({}, props, {
-    config: config,
-    getLocationData: getLocationData,
-    getCountryData: getCountryData,
-    ref: ref
-  }))), /*#__PURE__*/_react.default.createElement(_reactResponsive.default, {
-    query: "(max-width: 768px)"
-  }, /*#__PURE__*/_react.default.createElement(_mbEditor.default, Object.assign({}, props, {
-    config: config,
-    getLocationData: getLocationData,
-    getCountryData: getCountryData,
-    ref: ref
-  }))));
-});
+      this.props.onCommit(this.value);
+    };
+    this.onCancel = () => {
+      this.props.onCommitCancel && this.props.onCommitCancel();
+    };
+    this.setEditorPosition = () => {
+      const {
+        isInModal
+      } = this.props;
+      const editorFormat = this.getGeoFormat();
+      if (this.ref && (editorFormat === _dtableUtils.GEOLOCATION_FORMAT.COUNTRY_REGION || editorFormat === _dtableUtils.GEOLOCATION_FORMAT.PROVINCE)) {
+        let height = 240;
+        let width = 200;
+        let left = this.ref.parentNode.getBoundingClientRect().x;
+        let top = this.ref.parentNode.getBoundingClientRect().y;
+        if (isInModal) {
+          left = 220;
+        }
+        if (top + height > window.innerHeight) {
+          top = window.innerHeight - height - 35;
+        }
+        this.setState({
+          editorPosition: {
+            top,
+            left,
+            width,
+            zIndex: 1000,
+            position: 'fixed'
+          }
+        });
+        return;
+      }
+      if (this.ref && editorFormat === _dtableUtils.GEOLOCATION_FORMAT.PROVINCE_CITY) {
+        let height = 215;
+        let width = 400;
+        let left = this.ref.parentNode.getBoundingClientRect().x;
+        let top = this.ref.parentNode.getBoundingClientRect().y;
+        if (isInModal) {
+          left = 220;
+          if (top + height + 35 + 200 > window.innerHeight) {
+            top = window.innerHeight - height - 235;
+          }
+        } else {
+          if (top + height + 200 > window.innerHeight) {
+            top = window.innerHeight - height - 200 - 5;
+          }
+          if (left + width > window.innerWidth) {
+            left = window.innerWidth - width - 10;
+          }
+        }
+        this.setState({
+          editorPosition: {
+            top,
+            left,
+            width,
+            zIndex: 1000,
+            position: 'fixed'
+          }
+        });
+        return;
+      }
+      if (this.ref) {
+        const isMapTypeEditor = editorFormat === _dtableUtils.GEOLOCATION_FORMAT.LNG_LAT || editorFormat === _dtableUtils.GEOLOCATION_FORMAT.MAP_SELECTION;
+        let width = isMapTypeEditor ? 500 : 400;
+        let height = isMapTypeEditor ? 454 : 310;
+        let geoEditorTop = 0;
+        let geoEditorLeft = 0;
+        if (isInModal) {
+          let innerHeight = window.innerHeight;
+          const offsetTop = this.ref.parentNode.getBoundingClientRect().y;
+          geoEditorTop = offsetTop;
+          geoEditorTop = height + geoEditorTop > innerHeight ? innerHeight - height - 30 : geoEditorTop;
+          geoEditorLeft = -30;
+        } else {
+          let {
+            offsetLeft,
+            offsetTop
+          } = this.ref.parentNode;
+          geoEditorLeft = offsetLeft - width;
+          geoEditorTop = offsetTop;
+          if (offsetLeft < width) {
+            geoEditorLeft = offsetLeft + this.props.column.width;
+          }
+          if (geoEditorLeft + width > window.innerWidth) {
+            geoEditorLeft = window.innerWidth - width;
+          }
+          if (offsetTop + height > window.innerHeight) {
+            geoEditorTop = window.innerHeight - height;
+          }
+        }
+        this.setState({
+          editorPosition: {
+            top: geoEditorTop,
+            left: geoEditorLeft,
+            zIndex: 1000,
+            position: 'fixed'
+          }
+        });
+      }
+    };
+    this.getGeoFormat = () => {
+      const {
+        column
+      } = this.props;
+      let data = column.data || {};
+      return data.geo_format ? data.geo_format : _dtableUtils.DEFAULT_GEOLOCATION_FORMAT;
+    };
+    this.getLargeEditorState = () => {
+      var _this$editor, _this$editor$state;
+      return (_this$editor = this.editor) === null || _this$editor === void 0 ? void 0 : (_this$editor$state = _this$editor.state) === null || _this$editor$state === void 0 ? void 0 : _this$editor$state.isShowLargeEditor;
+    };
+    this.createEditor = () => {
+      const geoFormat = this.getGeoFormat();
+      const {
+        config,
+        column
+      } = this.props;
+      const props = {
+        column,
+        config,
+        value: this.value,
+        setValue: this.setValue,
+        onSubmit: this.onSubmit,
+        onCancel: this.onCancel
+      };
+      switch (geoFormat) {
+        case _dtableUtils.GEOLOCATION_FORMAT.LNG_LAT:
+          {
+            return /*#__PURE__*/_react.default.createElement(_mapEditor.default, Object.assign({}, props, {
+              ref: ref => this.editor = ref
+            }));
+          }
+        case _dtableUtils.GEOLOCATION_FORMAT.MAP_SELECTION:
+          {
+            return /*#__PURE__*/_react.default.createElement(_mapSelectionEditor.default, Object.assign({}, props, {
+              ref: ref => this.editor = ref
+            }));
+          }
+        case _dtableUtils.GEOLOCATION_FORMAT.COUNTRY_REGION:
+          {
+            return /*#__PURE__*/_react.default.createElement(_countryEditor.default, Object.assign({}, props, {
+              ref: ref => this.editor = ref
+            }));
+          }
+        case _dtableUtils.GEOLOCATION_FORMAT.PROVINCE:
+          {
+            return /*#__PURE__*/_react.default.createElement(_provinceEditor.default, Object.assign({}, props, {
+              onPressTab: this.props.onPressTab,
+              ref: ref => this.editor = ref
+            }));
+          }
+        case _dtableUtils.GEOLOCATION_FORMAT.PROVINCE_CITY:
+          {
+            return /*#__PURE__*/_react.default.createElement(_provinceCityEditor.default, Object.assign({}, props, {
+              ref: ref => this.editor = ref
+            }));
+          }
+        case _dtableUtils.GEOLOCATION_FORMAT.PROVINCE_CITY_DISTRICT:
+          {
+            return /*#__PURE__*/_react.default.createElement(_locationEditor.default, Object.assign({}, props, {
+              ref: ref => this.editor = ref
+            }));
+          }
+        default:
+          {
+            return /*#__PURE__*/_react.default.createElement(_locationEditor.default, Object.assign({}, props, {
+              isShowAddressDetail: true,
+              ref: ref => this.editor = ref
+            }));
+          }
+      }
+    };
+    this.value = _props.value || {};
+    this.initValue = this.value;
+    this.state = {
+      editorPosition: null
+    };
+    this.editor = null;
+  }
+  componentDidMount() {
+    this.setEditorPosition();
+    document.addEventListener('keydown', this.onHotKey, true);
+  }
+  componentWillUnmount() {
+    document.removeEventListener('keydown', this.onHotKey, true);
+  }
+  render() {
+    const {
+      editorPosition
+    } = this.state;
+    return /*#__PURE__*/_react.default.createElement("div", {
+      ref: ref => this.ref = ref,
+      style: editorPosition,
+      className: "dtable-ui-dtable-ui-geolocation-editor"
+    }, this.createEditor());
+  }
+}
 var _default = exports.default = GeolocationEditor;

package/lib/GeolocationEditor/{pc-editor/location-editor.js → location-editor.js}

@@ -8,13 +8,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
-var _DTableCustomFooter = _interopRequireDefault(require("../../DTableCustomFooter"));
+var _DTableCustomFooter = _interopRequireDefault(require("../DTableCustomFooter"));
 var _selectorList = _interopRequireDefault(require("./selector-list"));
 var _selectorHeaderItem = _interopRequireDefault(require("./selector-header-item"));
-var _constants = require("../../constants");
-var _Loading = _interopRequireDefault(require("../../Loading"));
+var _constants = require("../constants");
+var _Loading = _interopRequireDefault(require("../Loading"));
 var _parseGeolocation = _interopRequireDefault(require("./parse-geolocation"));
-var _lang = require("../../lang");
+var _lang = require("../lang");
 class LocationEditor extends _react.Component {
   constructor(props) {
     super(props);
@@ -62,6 +62,21 @@ class LocationEditor extends _react.Component {
         selectedItem: 'county'
       };
     };
+    this.getLocationData = () => {
+      const {
+        mediaUrl
+      } = window.dtable;
+
+      // get locations from server
+      return fetch("".concat(mediaUrl, "geo-data/cn-location.json")).then(res => {
+        return res.json();
+      }).catch(() => {
+        // get locations from local
+        return fetch('./geo-data/cn-location.json').then(res => {
+          return res.json();
+        });
+      });
+    };
     this.onKeyDown = e => {
       e.stopPropagation();
       e.nativeEvent.stopImmediatePropagation();
@@ -202,8 +217,26 @@ class LocationEditor extends _react.Component {
     this.timer = null;
   }
   UNSAFE_componentWillMount() {
-    this.props.getData().then(data => {
-      this.locations = data;
+    if (!window.app.location) {
+      this.getLocationData().then(data => {
+        this.locations = data;
+        window.app.location = data;
+        const {
+          selectedProvince,
+          selectedCity,
+          selectedCounty,
+          selectedItem
+        } = this.initLocationSelecting(this.value);
+        this.setState({
+          isLoadingData: false,
+          selectedProvince,
+          selectedCity,
+          selectedCounty,
+          selectedItem
+        });
+      });
+    } else {
+      this.locations = window.app.location;
       const {
         selectedProvince,
         selectedCity,
@@ -217,7 +250,7 @@ class LocationEditor extends _react.Component {
         selectedCounty,
         selectedItem
       });
-    });
+    }
   }
   render() {
     const {
@@ -282,7 +315,7 @@ class LocationEditor extends _react.Component {
       parent: selectedCity,
       selectedItem: selectedCounty,
       clickHandler: this.selectCounty
-    })))), this.props.isShowDetails && /*#__PURE__*/_react.default.createElement("div", {
+    })))), this.props.isShowAddressDetail && /*#__PURE__*/_react.default.createElement("div", {
       className: "dtable-ui-geolocation-editor-item dtable-ui-geolocation-editor-detail"
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "dtable-ui-geolocation-editor-item-left"

package/lib/GeolocationEditor/{pc-editor/map-editor → map-editor}/index.js

@@ -7,13 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _toaster = _interopRequireDefault(require("../../../toaster"));
-var _Loading = _interopRequireDefault(require("../../../Loading"));
-var _constants = require("../../../constants");
-var _cell = require("../../../utils/cell");
-var _mapEditorUtils = require("../../map-editor-utils");
+var _toaster = _interopRequireDefault(require("../../toaster"));
+var _Loading = _interopRequireDefault(require("../../Loading"));
+var _constants = require("../../constants");
+var _cell = require("../../utils/cell");
+var _mapEditorUtils = require("../map-editor-utils");
 var _largeEditor = _interopRequireDefault(require("./large-editor"));
-var _lang = require("../../../lang");
+var _lang = require("../../lang");
 class MapEditor extends _react.Component {
   constructor(props) {
     super(props);

package/lib/GeolocationEditor/{pc-editor/map-editor → map-editor}/large-editor/index.js

@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactstrap = require("reactstrap");
-var _toaster = _interopRequireDefault(require("../../../../toaster"));
-var _Loading = _interopRequireDefault(require("../../../../Loading"));
-var _constants = require("../../../../constants");
-var _cell = require("../../../../utils/cell");
-var _mapEditorUtils = require("../../../map-editor-utils");
-var _lang = require("../../../../lang");
+var _toaster = _interopRequireDefault(require("../../../toaster"));
+var _Loading = _interopRequireDefault(require("../../../Loading"));
+var _constants = require("../../../constants");
+var _cell = require("../../../utils/cell");
+var _mapEditorUtils = require("../../map-editor-utils");
+var _lang = require("../../../lang");
 require("./index.css");
 class LargeMapEditorDialog extends _react.default.Component {
   constructor(props) {
@@ -427,7 +427,7 @@ class LargeMapEditorDialog extends _react.default.Component {
     }, (0, _lang.getLocale)('Submit'))), /*#__PURE__*/_react.default.createElement("div", {
       className: this.readOnly ? 'geolocation-map-read-only-container' : 'geolocation-map-container-large'
     }, this.mapType && isLoading && /*#__PURE__*/_react.default.createElement(_Loading.default, null), !this.mapType && /*#__PURE__*/_react.default.createElement("div", {
-      className: "dtable-ui-geolocation-map-editor-error-message d-flex justify-content-center mt-9"
+      className: "error-message d-flex justify-content-center mt-9"
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: "alert-danger"
     }, (0, _lang.getLocale)('The_map_plugin_is_not_properly_configured_contact_the_administrator'))), !isLoading && this.mapType && /*#__PURE__*/_react.default.createElement("div", {

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

@@ -3,11 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.locateCurrentPosition = exports.loadMapSource = exports.getMineMapUrl = exports.getMapInfo = exports.getInitCenter = exports.MAP_TYPES = exports.INPUT_MODE_MAP = exports.DOMESTIC_MAP_TYPE = void 0;
-const INPUT_MODE_MAP = exports.INPUT_MODE_MAP = {
-  ANY_LOCATION: 'any_location',
-  ONLY_MOBILE_POSITIONING: 'only_mobile_positioning'
-};
+exports.locateCurrentPosition = exports.loadMapSource = exports.getMineMapUrl = exports.getMapInfo = exports.getInitCenter = exports.MAP_TYPES = exports.DOMESTIC_MAP_TYPE = void 0;
 const MAP_TYPES = exports.MAP_TYPES = {
   B_MAP: 'b_map',
   // baidu
@@ -26,12 +22,11 @@ const MINE_MAP_ONLINE_SERVICE = {
   SERVICE_URL: 'https://service.minedata.cn/service'
 };
 const getMineMapUrl = function () {
-  var _window;
   let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const {
     dtableMineMapCustomConfig = {}
   } = {
-    ...((_window = window) === null || _window === void 0 ? void 0 : _window.dtable),
+    ...window.dtable,
     ...config
   };
   const {
@@ -71,14 +66,13 @@ const getInitCenter = function () {
 };
 exports.getInitCenter = getInitCenter;
 const getMapInfo = function () {
-  var _window2;
   let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const {
     dtableBaiduMapKey: baiduMapKey,
     dtableGoogleMapKey: googleMapKey,
     dtableMineMapKey: mineMapKey
   } = {
-    ...((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.dtable),
+    ...window.dtable,
     ...config
   };
   let mapType;
@@ -105,7 +99,7 @@ const loadMapSource = (mapType, mapKey, callback) => {
   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");
+    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 {

package/lib/GeolocationEditor/{pc-editor/map-selection-editor → map-selection-editor}/index.js

@@ -8,13 +8,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _dtableUtils = require("dtable-utils");
-var _toaster = _interopRequireDefault(require("../../../toaster"));
-var _Loading = _interopRequireDefault(require("../../../Loading"));
-var _constants = require("../../../constants");
-var _cell = require("../../../utils/cell");
-var _mapEditorUtils = require("../../map-editor-utils");
+var _toaster = _interopRequireDefault(require("../../toaster"));
+var _Loading = _interopRequireDefault(require("../../Loading"));
+var _constants = require("../../constants");
+var _cell = require("../../utils/cell");
+var _mapEditorUtils = require("../map-editor-utils");
 var _largeEditor = _interopRequireDefault(require("./large-editor"));
-var _lang = require("../../../lang");
+var _lang = require("../../lang");
 class MapSelectionEditor extends _react.Component {
   constructor(props) {
     super(props);
@@ -421,7 +421,7 @@ class MapSelectionEditor extends _react.Component {
     })))), /*#__PURE__*/_react.default.createElement("div", {
       className: this.readOnly ? 'geolocation-map-selection-read-only-container' : 'geolocation-map-selection-container'
     }, this.mapType && isLoading && /*#__PURE__*/_react.default.createElement(_Loading.default, null), !this.mapType && /*#__PURE__*/_react.default.createElement("div", {
-      className: "dtable-ui-geolocation-map-editor-error-message d-flex justify-content-center mt-9"
+      className: "error-message d-flex justify-content-center mt-9"
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: "alert-danger"
     }, (0, _lang.getLocale)('The_map_plugin_is_not_properly_configured_contact_the_administrator'))), !isLoading && this.mapType && /*#__PURE__*/_react.default.createElement("div", {