dtable-ui-component 7.0.13 → 7.0.15

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

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 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;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 const INPUT_MODE_MAP = exports.INPUT_MODE_MAP = {
   ANY_LOCATION: 'any_location',
   ONLY_MOBILE_POSITIONING: 'only_mobile_positioning'
@@ -30,19 +28,19 @@ const MINE_MAP_ONLINE_SERVICE = {
 const getMineMapUrl = function () {
   var _window;
   let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  const _window$dtable$config = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (_window = window) === null || _window === void 0 ? void 0 : _window.dtable), config),
-    _window$dtable$config2 = _window$dtable$config.dtableMineMapCustomConfig,
-    dtableMineMapCustomConfig = _window$dtable$config2 === void 0 ? {} : _window$dtable$config2;
-  const _dtableMineMapCustomC = dtableMineMapCustomConfig.domain_url,
-    domain_url = _dtableMineMapCustomC === void 0 ? '' : _dtableMineMapCustomC,
-    _dtableMineMapCustomC2 = dtableMineMapCustomConfig.data_domain_url,
-    data_domain_url = _dtableMineMapCustomC2 === void 0 ? '' : _dtableMineMapCustomC2,
-    _dtableMineMapCustomC3 = dtableMineMapCustomConfig.server_domain_url,
-    server_domain_url = _dtableMineMapCustomC3 === void 0 ? '' : _dtableMineMapCustomC3,
-    _dtableMineMapCustomC4 = dtableMineMapCustomConfig.sprite_url,
-    sprite_url = _dtableMineMapCustomC4 === void 0 ? '' : _dtableMineMapCustomC4,
-    _dtableMineMapCustomC5 = dtableMineMapCustomConfig.service_url,
-    service_url = _dtableMineMapCustomC5 === void 0 ? '' : _dtableMineMapCustomC5;
+  const {
+    dtableMineMapCustomConfig = {}
+  } = {
+    ...((_window = window) === null || _window === void 0 ? void 0 : _window.dtable),
+    ...config
+  };
+  const {
+    domain_url = '',
+    data_domain_url = '',
+    server_domain_url = '',
+    sprite_url = '',
+    service_url = ''
+  } = dtableMineMapCustomConfig;
   return {
     domainUrl: domain_url || MINE_MAP_ONLINE_SERVICE.DOMAIN_URL,
     dataDomainUrl: data_domain_url || MINE_MAP_ONLINE_SERVICE.DATA_DOMAIN_URL,
@@ -75,10 +73,14 @@ exports.getInitCenter = getInitCenter;
 const getMapInfo = function () {
   var _window2;
   let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  const _window$dtable$config3 = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.dtable), config),
-    baiduMapKey = _window$dtable$config3.dtableBaiduMapKey,
-    googleMapKey = _window$dtable$config3.dtableGoogleMapKey,
-    mineMapKey = _window$dtable$config3.dtableMineMapKey;
+  const {
+    dtableBaiduMapKey: baiduMapKey,
+    dtableGoogleMapKey: googleMapKey,
+    dtableMineMapKey: mineMapKey
+  } = {
+    ...((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.dtable),
+    ...config
+  };
   let mapType;
   let mapKey;
   if (baiduMapKey) {
@@ -103,9 +105,9 @@ 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=${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");
+    scriptUrl = `https://maps.googleapis.com/maps/api/js?key=${mapKey}&callback=renderGoogleMap&libraries=&v=weekly`;
   } else {
     scriptUrl = 'https://minemap.minedata.cn/minemapapi/v2.1.1/minemap.js';
     let link = document.createElement('link');

package/lib/GeolocationEditor/mb-editor/country-editor.js

@@ -1,34 +1,31 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _Picker = _interopRequireDefault(require("../../Picker"));
 var _List = _interopRequireDefault(require("../../List"));
 var _MobileFullScreenPage = _interopRequireDefault(require("../../MobileFullScreenPage"));
 var _lang = require("../../lang");
 var _jsxRuntime = require("react/jsx-runtime");
-const Header = _MobileFullScreenPage.default.Header,
-  Body = _MobileFullScreenPage.default.Body;
+const {
+  Header,
+  Body
+} = _MobileFullScreenPage.default;
 const CountryEditor = _ref => {
-  let column = _ref.column,
-    oldValue = _ref.value,
-    getData = _ref.getData,
-    onToggle = _ref.onToggle,
-    onCommit = _ref.onCommit;
-  const _useState = (0, _react.useState)([]),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    value = _useState2[0],
-    setValue = _useState2[1];
-  const _useState3 = (0, _react.useState)(true),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    isLoading = _useState4[0],
-    setLoading = _useState4[1];
+  let {
+    column,
+    value: oldValue,
+    getData,
+    onToggle,
+    onCommit
+  } = _ref;
+  const [value, setValue] = (0, _react.useState)([]);
+  const [isLoading, setLoading] = (0, _react.useState)(true);
   const locations = (0, _react.useRef)([]);
   (0, _react.useEffect)(() => {
     getData().then(data => {

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

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _dtableUtils = require("dtable-utils");
 var _countryEditor = _interopRequireDefault(require("./country-editor"));
@@ -18,7 +16,6 @@ var _mapEditor = _interopRequireDefault(require("./map-editor"));
 var _mapSelectionEditor = _interopRequireDefault(require("./map-selection-editor"));
 require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["column", "config", "getLocationData", "getCountryData"];
 const transLocationData = data => {
   if (Object.prototype.toString.call(data) === '[object Object]') {
     const name = data.name;
@@ -55,11 +52,13 @@ const transCountryData = data => {
   return _data;
 };
 const MBGeolocationEditor = _ref => {
-  let column = _ref.column,
-    config = _ref.config,
-    getLocationData = _ref.getLocationData,
-    getCountryData = _ref.getCountryData,
-    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  let {
+    column,
+    config,
+    getLocationData,
+    getCountryData,
+    ...props
+  } = _ref;
   const format = (0, _react.useMemo)(() => {
     let data = column.data || {};
     return data.geo_format ? data.geo_format : _dtableUtils.DEFAULT_GEOLOCATION_FORMAT;
@@ -75,53 +74,60 @@ const MBGeolocationEditor = _ref => {
   switch (format) {
     case _dtableUtils.GEOLOCATION_FORMAT.LNG_LAT:
       {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_mapEditor.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_mapEditor.default, {
+          ...props,
           config: config,
           column: column
-        }));
+        });
       }
     case _dtableUtils.GEOLOCATION_FORMAT.MAP_SELECTION:
       {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_mapSelectionEditor.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_mapSelectionEditor.default, {
+          ...props,
           config: config,
           column: column
-        }));
+        });
       }
     case _dtableUtils.GEOLOCATION_FORMAT.COUNTRY_REGION:
       {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_countryEditor.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_countryEditor.default, {
+          ...props,
           getData: _getCountryData,
           column: column
-        }));
+        });
       }
     case _dtableUtils.GEOLOCATION_FORMAT.PROVINCE:
       {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provinceEditor.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provinceEditor.default, {
+          ...props,
           getData: getData,
           column: column
-        }));
+        });
       }
     case _dtableUtils.GEOLOCATION_FORMAT.PROVINCE_CITY:
       {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provinceCityEditor.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provinceCityEditor.default, {
+          ...props,
           getData: getData,
           column: column
-        }));
+        });
       }
     case _dtableUtils.GEOLOCATION_FORMAT.PROVINCE_CITY_DISTRICT:
       {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_locationEditor.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_locationEditor.default, {
+          ...props,
           getData: getData,
           column: column
-        }));
+        });
       }
     default:
       {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_locationEditor.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_locationEditor.default, {
+          ...props,
           isShowDetails: true,
           getData: getData,
           column: column
-        }));
+        });
       }
   }
 };

package/lib/GeolocationEditor/mb-editor/location-editor.js

@@ -1,12 +1,11 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _InputItem = _interopRequireDefault(require("../../InputItem"));
 var _Picker = _interopRequireDefault(require("../../Picker"));
@@ -15,27 +14,25 @@ var _MobileFullScreenPage = _interopRequireDefault(require("../../MobileFullScre
 var _lang = require("../../lang");
 var _objectUtils = _interopRequireDefault(require("../../utils/object-utils"));
 var _jsxRuntime = require("react/jsx-runtime");
-const Header = _MobileFullScreenPage.default.Header,
-  Body = _MobileFullScreenPage.default.Body;
+const {
+  Header,
+  Body
+} = _MobileFullScreenPage.default;
 const LocationEditor = _ref => {
-  let isShowDetails = _ref.isShowDetails,
-    column = _ref.column,
-    oldValue = _ref.value,
-    getData = _ref.getData,
-    onToggle = _ref.onToggle,
-    onCommit = _ref.onCommit;
+  let {
+    isShowDetails,
+    column,
+    value: oldValue,
+    getData,
+    onToggle,
+    onCommit
+  } = _ref;
   let initValue = [(oldValue === null || oldValue === void 0 ? void 0 : oldValue.province) || '', (oldValue === null || oldValue === void 0 ? void 0 : oldValue.city) || '', (oldValue === null || oldValue === void 0 ? void 0 : oldValue.district) || ''];
   if (isShowDetails) {
     initValue.push((oldValue === null || oldValue === void 0 ? void 0 : oldValue.detail) || '');
   }
-  const _useState = (0, _react.useState)(initValue),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    value = _useState2[0],
-    setValue = _useState2[1];
-  const _useState3 = (0, _react.useState)(true),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    isLoading = _useState4[0],
-    setLoading = _useState4[1];
+  const [value, setValue] = (0, _react.useState)(initValue);
+  const [isLoading, setLoading] = (0, _react.useState)(true);
   const locations = (0, _react.useRef)([]);
   (0, _react.useEffect)(() => {
     getData().then(data => {

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _react = _interopRequireDefault(require("react"));
 var _dtableUtils = require("dtable-utils");
 var _InputItem = _interopRequireDefault(require("../../../InputItem"));
@@ -18,20 +17,23 @@ var _Loading = _interopRequireDefault(require("../../../Loading"));
 var _objectUtils = _interopRequireDefault(require("../../../utils/object-utils"));
 require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
-const Header = _MobileFullScreenPage.default.Header,
-  Body = _MobileFullScreenPage.default.Body;
+const {
+  Header,
+  Body
+} = _MobileFullScreenPage.default;
 class MapEditor extends _react.default.Component {
   constructor(props) {
     super(props);
     this.loadMineMapCallBack = () => {
       if (!this.timer) {
         this.timer = setTimeout(() => {
-          const _getMineMapUrl = (0, _mapEditorUtils.getMineMapUrl)(),
-            domainUrl = _getMineMapUrl.domainUrl,
-            dataDomainUrl = _getMineMapUrl.dataDomainUrl,
-            serverDomainUrl = _getMineMapUrl.serverDomainUrl,
-            spriteUrl = _getMineMapUrl.spriteUrl,
-            serviceUrl = _getMineMapUrl.serviceUrl;
+          const {
+            domainUrl,
+            dataDomainUrl,
+            serverDomainUrl,
+            spriteUrl,
+            serviceUrl
+          } = (0, _mapEditorUtils.getMineMapUrl)();
           window.minemap.domainUrl = domainUrl;
           window.minemap.dataDomainUrl = dataDomainUrl;
           window.minemap.serverDomainUrl = serverDomainUrl;
@@ -59,11 +61,14 @@ class MapEditor extends _react.default.Component {
             minZoom: 3,
             projection: 'MERCATOR'
           });
-          let _getInitCenter = (0, _mapEditorUtils.getInitCenter)(),
-            lng = _getInitCenter.lng,
-            lat = _getInitCenter.lat,
-            zoom = _getInitCenter.zoom;
-          const value = this.state.value;
+          let {
+            lng,
+            lat,
+            zoom
+          } = (0, _mapEditorUtils.getInitCenter)();
+          const {
+            value
+          } = this.state;
           if ((0, _cell.isValidPosition)(value.lng, value.lat)) {
             lng = value.lng;
             lat = value.lat;
@@ -87,11 +92,14 @@ class MapEditor extends _react.default.Component {
         if (!window.BMap.Map) return;
         setTimeout(() => {
           this.map = new window.BMap.Map('dtable-ui-mobile-geolocation-map-container');
-          let _getInitCenter2 = (0, _mapEditorUtils.getInitCenter)(),
-            lng = _getInitCenter2.lng,
-            lat = _getInitCenter2.lat,
-            zoom = _getInitCenter2.zoom;
-          const value = this.state.value;
+          let {
+            lng,
+            lat,
+            zoom
+          } = (0, _mapEditorUtils.getInitCenter)();
+          const {
+            value
+          } = this.state;
           if ((0, _cell.isValidPosition)(value.lng, value.lat)) {
             lng = value.lng;
             lat = value.lat;
@@ -111,7 +119,9 @@ class MapEditor extends _react.default.Component {
     };
     this.geolocationCallback = (error, point) => {
       if (!error) {
-        this.setValue((0, _objectSpread2.default)({}, point));
+        this.setValue({
+          ...point
+        });
         this.addMarkerByPosition(point.lng, point.lat);
         if (this.mapType === _mapEditorUtils.MAP_TYPES.G_MAP) {
           this.map.setCenter({
@@ -128,10 +138,11 @@ class MapEditor extends _react.default.Component {
         isLoading: false
       }, () => {
         setTimeout(() => {
-          let _getInitCenter3 = (0, _mapEditorUtils.getInitCenter)(),
-            lng = _getInitCenter3.lng,
-            lat = _getInitCenter3.lat,
-            zoom = _getInitCenter3.zoom;
+          let {
+            lng,
+            lat,
+            zoom
+          } = (0, _mapEditorUtils.getInitCenter)();
           this.map = new window.google.maps.Map(this.ref, {
             zoom,
             center: {
@@ -145,7 +156,9 @@ class MapEditor extends _react.default.Component {
             rotateControl: false,
             fullscreenControl: false
           });
-          const value = this.state.value;
+          const {
+            value
+          } = this.state;
           if (value.lng && value.lat) {
             lng = value.lng;
             lat = value.lat;
@@ -231,13 +244,16 @@ class MapEditor extends _react.default.Component {
       });
     };
     this.onSubmit = () => {
-      const value = this.state.value;
+      const {
+        value
+      } = this.state;
       if (!_objectUtils.default.isSameObject(value, this.props.value)) {
         this.props.onCommit(value);
       }
-      const _normalizeMapPoint = (0, _dtableUtils.normalizeMapPoint)(value),
-        lng = _normalizeMapPoint.lng,
-        lat = _normalizeMapPoint.lat;
+      const {
+        lng,
+        lat
+      } = (0, _dtableUtils.normalizeMapPoint)(value);
       const newValue = !(0, _dtableUtils.isNumber)(lng) || !(0, _dtableUtils.isNumber)(lat) ? null : value;
       this.props.onCommit(newValue);
       this.onClose();
@@ -277,16 +293,19 @@ class MapEditor extends _react.default.Component {
       this.props.onToggle();
     };
     this.onBlur = () => {
-      const value = this.state.value;
+      const {
+        value
+      } = this.state;
       const numericValue = (0, _dtableUtils.normalizeMapPoint)(value);
       this.setState({
         value: numericValue
       });
     };
     this.handleLatitudeChange = value => {
-      const newValue = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.state.value), {}, {
+      const newValue = {
+        ...this.state.value,
         lat: value
-      });
+      };
       this.setState({
         value: newValue
       }, () => {
@@ -295,9 +314,10 @@ class MapEditor extends _react.default.Component {
       });
     };
     this.handleLongitudeChange = value => {
-      const newValue = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.state.value), {}, {
+      const newValue = {
+        ...this.state.value,
         lng: value
-      });
+      };
       this.setState({
         value: newValue
       }, () => {
@@ -306,8 +326,10 @@ class MapEditor extends _react.default.Component {
       });
     };
     this.rerenderMapMarker = _ref => {
-      let lng = _ref.lng,
-        lat = _ref.lat;
+      let {
+        lng,
+        lat
+      } = _ref;
       if (!(0, _dtableUtils.isNumber)(lng) || !(0, _dtableUtils.isNumber)(lat)) {
         return;
       }
@@ -324,10 +346,11 @@ class MapEditor extends _react.default.Component {
       this.addMarkerByPosition(lng, lat);
     };
     this.renderMap = () => {
-      const _this$state = this.state,
-        isLoading = _this$state.isLoading,
-        mode = _this$state.mode,
-        lng_lat = _this$state.value;
+      const {
+        isLoading,
+        mode,
+        value: lng_lat
+      } = this.state;
       if (isLoading) return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "w-100 h-100 d-flex align-items-center justify-content-center",
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Loading.default, {})
@@ -420,14 +443,17 @@ class MapEditor extends _react.default.Component {
       lng: '',
       lat: ''
     };
-    const _getMapInfo = (0, _mapEditorUtils.getMapInfo)(props.config),
-      mapType = _getMapInfo.mapType,
-      mapKey = _getMapInfo.mapKey;
+    const {
+      mapType,
+      mapKey
+    } = (0, _mapEditorUtils.getMapInfo)(props.config);
     this.mapType = mapType;
     this.mapKey = mapKey;
     this.map = null;
-    const _lng = _value.lng,
-      _lat = _value.lat;
+    const {
+      lng: _lng,
+      lat: _lat
+    } = _value;
     this.state = {
       mode: (0, _cell.isValidPosition)(_lng, _lat) ? 'preview' : 'edit',
       isLoading: true,
@@ -485,8 +511,12 @@ class MapEditor extends _react.default.Component {
     this.map = null;
   }
   render() {
-    const column = this.props.column;
-    const mode = this.state.mode;
+    const {
+      column
+    } = this.props;
+    const {
+      mode
+    } = this.state;
     const isEdit = mode === 'edit';
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_MobileFullScreenPage.default, {
       className: "dtable-ui-mobile-geolocation-map-editor",