fix: map config

src/GeolocationEditor/country-editor.js

@@ -177,12 +177,12 @@ class CountryEditor extends Component {
 
   getLocationData = () => {
     const { config } = this.props;
-    const { mediaUrl } = { ...window.dtable, ...config };
+    const { mediaUrl, server } = { ...window?.dtable, ...config };
     let geoFileName = 'en-region-location';
     if (this.lang === 'cn') {
       geoFileName = 'cn-region-location';
     }
-    return fetch(`${mediaUrl}geo-data/${geoFileName}.json`)
+    return fetch(`${server}${mediaUrl}geo-data/${geoFileName}.json`.replaceAll('//', '/'))
       .then(res => {
         return res.json();
       })

src/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;

src/GeolocationEditor/index.js

@@ -31,6 +31,9 @@ class GeolocationEditor extends React.Component {
     this.state = {
       editorPosition: null,
     };
+    if (!window.app) {
+      window.app = {};
+    }
     this.editor = null;
   }
 

src/GeolocationEditor/location-editor.js

@@ -97,10 +97,11 @@ class LocationEditor extends Component {
   };
 
   getLocationData = () => {
-    const { mediaUrl } = window.dtable;
+    const { config } = this.props;
+    const { mediaUrl, server } = { ...window?.dtable, ...config };
 
     // get locations from server
-    return fetch(`${mediaUrl}geo-data/cn-location.json`).then((res) => {
+    return fetch(`${server}${mediaUrl}geo-data/cn-location.json`.replaceAll('//', '/')).then((res) => {
       return res.json();
     }).catch(() => {
       // get locations from local

src/GeolocationEditor/map-editor-utils.js

@@ -16,7 +16,7 @@ const MINE_MAP_ONLINE_SERVICE = {
 };
 
 export const getMineMapUrl = (config = {}) => {
-  const { dtableMineMapCustomConfig = {} } = { ...window.dtable, ...config };
+  const { dtableMineMapCustomConfig = {} } = { ...window?.dtable, ...config };
   const { domain_url = '', data_domain_url = '', server_domain_url = '',
     sprite_url = '', service_url = '' } = dtableMineMapCustomConfig;
   return {
@@ -44,7 +44,7 @@ export const getInitCenter = (isSelectionEditor = false) => {
 };
 
 export const getMapInfo = (config = {}) => {
-  const { dtableBaiduMapKey: baiduMapKey, dtableGoogleMapKey: googleMapKey, dtableMineMapKey: mineMapKey } = { ...window.dtable, ...config };
+  const { dtableBaiduMapKey: baiduMapKey, dtableGoogleMapKey: googleMapKey, dtableMineMapKey: mineMapKey } = { ...window?.dtable, ...config };
   let mapType;
   let mapKey;
   if (baiduMapKey) {

src/GeolocationEditor/map-editor/index.js

@@ -88,7 +88,7 @@ class MapEditor extends Component {
   loadMineMapCallBack = () => {
     if (!this.timer) {
       this.timer = setTimeout(() => {
-        const { domainUrl, dataDomainUrl, serverDomainUrl, spriteUrl, serviceUrl } = getMineMapUrl();
+        const { domainUrl, dataDomainUrl, serverDomainUrl, spriteUrl, serviceUrl } = getMineMapUrl(this.props.config);
         window.minemap.domainUrl = domainUrl;
         window.minemap.dataDomainUrl = dataDomainUrl;
         window.minemap.serverDomainUrl = serverDomainUrl;

src/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;

src/GeolocationEditor/map-editor/large-editor/index.js

@@ -90,7 +90,7 @@ class LargeMapEditorDialog extends React.Component {
   loadMineMapCallBack = () => {
     if (!this.timer) {
       this.timer = setTimeout(() => {
-        const { domainUrl, dataDomainUrl, serverDomainUrl, spriteUrl, serviceUrl } = getMineMapUrl();
+        const { domainUrl, dataDomainUrl, serverDomainUrl, spriteUrl, serviceUrl } = getMineMapUrl(this.props.config);
         window.minemap.domainUrl = domainUrl;
         window.minemap.dataDomainUrl = dataDomainUrl;
         window.minemap.serverDomainUrl = serverDomainUrl;

src/GeolocationEditor/map-selection-editor/index.js

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

src/GeolocationEditor/map-selection-editor/large-editor/index.js

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

src/GeolocationEditor/province-city-editor.js

@@ -85,10 +85,11 @@ class ProvinceCityEditor extends Component {
   };
 
   getLocationData = () => {
-    const { mediaUrl } = window.dtable;
+    const { config } = this.props;
+    const { mediaUrl, server } = { ...window?.dtable, ...config };
 
     // get locations from server
-    return fetch(`${mediaUrl}geo-data/cn-location.json`).then((res) => {
+    return fetch(`${server}${mediaUrl}geo-data/cn-location.json`.replaceAll('//', '/')).then((res) => {
       return res.json();
     }).catch(() => {
       // get locations from local

src/GeolocationEditor/province-editor.js

@@ -61,9 +61,10 @@ class ProvinceEditor extends Component {
 
   getLocationData = () => {
     // mediaUrl
-    const { mediaUrl } = window.dtable;
+    const { config } = this.props;
+    const { mediaUrl, server } = { ...window?.dtable, ...config };
     // get locations from server
-    return fetch(`${mediaUrl}geo-data/cn-location.json`).then((res) => {
+    return fetch(`${server}${mediaUrl}geo-data/cn-location.json`.replaceAll('//', '/')).then((res) => {
       return res.json();
     }).catch(() => {
       // get locations from local

src/RowExpandEditor/RowExpandGeolocationEditor/index.js

@@ -123,14 +123,14 @@ class RowExpandGeolocationEditor extends React.Component {
   };
 
   getLocationInfo = (value) => {
-    const { column } = this.props;
-    const { dtableBaiduMapKey, dtableMineMapKey } = window.dtable;
+    const { column, config } = this.props;
+    const { dtableBaiduMapKey, dtableMineMapKey } = { ...window?.dtable, ...config };
     const isBaiduMap = !!(dtableBaiduMapKey || dtableMineMapKey);
     return getGeolocationDisplayString(value, column.data, { isBaiduMap, hyphen: ' ' });
   };
 
   render() {
-    const { column, row } = this.props;
+    const { column, row, config } = this.props;
     const { value } = this.state;
     return (
       <div ref={ref => this.editorContainer = ref} className="mt-2">
@@ -140,6 +140,7 @@ class RowExpandGeolocationEditor extends React.Component {
             ref={ref => this.geoEditor = ref}
             isInModal={true}
             column={column}
+            config={config}
             row={row}
             value={value}
             onCommit={this.onCommit}