dtable-ui-component 7.0.13 → 7.0.15

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

@@ -13,7 +13,7 @@ var _selectorList = _interopRequireDefault(require("./selector-list"));
 var _selectorHeaderItem = _interopRequireDefault(require("./selector-header-item"));
 var _constants = require("../../constants");
 var _Loading = _interopRequireDefault(require("../../Loading"));
-var _parseGeolocation2 = _interopRequireDefault(require("./parse-geolocation"));
+var _parseGeolocation = _interopRequireDefault(require("./parse-geolocation"));
 var _lang = require("../../lang");
 var _jsxRuntime = require("react/jsx-runtime");
 class LocationEditor extends _react.Component {
@@ -116,9 +116,10 @@ class LocationEditor extends _react.Component {
       this.props.setValue(this.value);
     };
     this.selectSelectorType = type => {
-      const _this$state = this.state,
-        selectedProvince = _this$state.selectedProvince,
-        selectedCity = _this$state.selectedCity;
+      const {
+        selectedProvince,
+        selectedCity
+      } = this.state;
       if (!selectedProvince) return;
       if (type === 'county' && !selectedCity) return;
       this.setState({
@@ -145,11 +146,12 @@ class LocationEditor extends _react.Component {
         this.timer = null;
         const value = this.parseRef.value;
         if (this.isComposing) return;
-        const _parseGeolocation = (0, _parseGeolocation2.default)(this.locations, value),
-          province = _parseGeolocation.province,
-          city = _parseGeolocation.city,
-          district = _parseGeolocation.district,
-          detail = _parseGeolocation.detail;
+        const {
+          province,
+          city,
+          district,
+          detail
+        } = (0, _parseGeolocation.default)(this.locations, value);
         if (this.detailInfo) {
           this.detailInfo.value = detail || '';
           this.value = Object.assign({}, this.value, {
@@ -171,10 +173,11 @@ class LocationEditor extends _react.Component {
       this.isComposing = false;
     };
     this.onSubmit = () => {
-      const _this$value = this.value,
-        province = _this$value.province,
-        city = _this$value.city,
-        district = _this$value.district;
+      const {
+        province,
+        city,
+        district
+      } = this.value;
       if (!province || !city || !district) {
         const errMessage = (0, _lang.getLocale)('Province/City/District_must_be_filled_in');
         this.setState({
@@ -188,7 +191,7 @@ class LocationEditor extends _react.Component {
     this.locations = {};
     this.state = {
       isShowSelector: false,
-      location: "".concat(this.value.province || '').concat(this.value.city || '').concat(this.value.district || ''),
+      location: `${this.value.province || ''}${this.value.city || ''}${this.value.district || ''}`,
       selectedProvince: null,
       selectedCity: null,
       selectedCounty: null,
@@ -202,11 +205,12 @@ class LocationEditor extends _react.Component {
   UNSAFE_componentWillMount() {
     this.props.getData().then(data => {
       this.locations = data;
-      const _this$initLocationSel = this.initLocationSelecting(this.value),
-        selectedProvince = _this$initLocationSel.selectedProvince,
-        selectedCity = _this$initLocationSel.selectedCity,
-        selectedCounty = _this$initLocationSel.selectedCounty,
-        selectedItem = _this$initLocationSel.selectedItem;
+      const {
+        selectedProvince,
+        selectedCity,
+        selectedCounty,
+        selectedItem
+      } = this.initLocationSelecting(this.value);
       this.setState({
         isLoadingData: false,
         selectedProvince,
@@ -217,14 +221,15 @@ class LocationEditor extends _react.Component {
     });
   }
   render() {
-    const _this$state2 = this.state,
-      selectedItem = _this$state2.selectedItem,
-      selectedCity = _this$state2.selectedCity,
-      selectedProvince = _this$state2.selectedProvince,
-      selectedCounty = _this$state2.selectedCounty,
-      isShowSelector = _this$state2.isShowSelector,
-      isLoadingData = _this$state2.isLoadingData,
-      location = _this$state2.location;
+    const {
+      selectedItem,
+      selectedCity,
+      selectedProvince,
+      selectedCounty,
+      isShowSelector,
+      isLoadingData,
+      location
+    } = this.state;
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [!isLoadingData ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         onClick: this.onClick,
@@ -238,7 +243,7 @@ class LocationEditor extends _react.Component {
             className: "dtable-ui-geolocation-editor-item-right",
             children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
               onClick: this.onToggleSelector,
-              className: "dtable-ui-geolocation-editor-selector text-truncate ".concat(isShowSelector ? 'focus' : ''),
+              className: `dtable-ui-geolocation-editor-selector text-truncate ${isShowSelector ? 'focus' : ''}`,
               children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
                 className: "selected-option-show",
                 children: location ? location : (0, _lang.getLocale)('Select_province_city_district')

package/lib/GeolocationEditor/pc-editor/map-editor/index.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 _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _react = _interopRequireWildcard(require("react"));
 var _dtableUtils = require("dtable-utils");
 var _toaster = _interopRequireDefault(require("../../../toaster"));
@@ -50,12 +49,13 @@ class MapEditor extends _react.Component {
     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;
@@ -82,11 +82,14 @@ class MapEditor extends _react.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;
@@ -110,11 +113,14 @@ class MapEditor extends _react.Component {
         this.map = new window.BMap.Map('geolocation-map-container', {
           enableMapClick: false
         });
-        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;
@@ -133,7 +139,9 @@ class MapEditor extends _react.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({
@@ -149,10 +157,11 @@ class MapEditor extends _react.Component {
       this.setState({
         isLoading: false
       }, () => {
-        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: {
@@ -166,7 +175,9 @@ class MapEditor extends _react.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;
@@ -201,8 +212,10 @@ class MapEditor extends _react.Component {
       });
     };
     this.setPropsValue = _ref => {
-      let lng = _ref.lng,
-        lat = _ref.lat;
+      let {
+        lng,
+        lat
+      } = _ref;
       if (!(0, _dtableUtils.isNumber)(lng) || !(0, _dtableUtils.isNumber)(lat)) {
         this.props.setValue(null);
         return;
@@ -266,7 +279,9 @@ class MapEditor extends _react.Component {
       event.preventDefault();
       event.stopPropagation();
       event.nativeEvent.stopImmediatePropagation();
-      const value = this.state.value;
+      const {
+        value
+      } = this.state;
       const numericValue = (0, _dtableUtils.normalizeMapPoint)(value);
       this.setPropsValue(numericValue);
       this.setState({
@@ -283,8 +298,10 @@ class MapEditor extends _react.Component {
       this.props.onSubmit();
     };
     this.rerenderMapMarker = _ref2 => {
-      let lng = _ref2.lng,
-        lat = _ref2.lat;
+      let {
+        lng,
+        lat
+      } = _ref2;
       if (!(0, _dtableUtils.isNumber)(lng) || !(0, _dtableUtils.isNumber)(lat)) return;
       if (this.map) {
         if (this.mapType === _mapEditorUtils.MAP_TYPES.G_MAP || this.mapType === _mapEditorUtils.MAP_TYPES.M_MAP) {
@@ -299,16 +316,19 @@ class MapEditor extends _react.Component {
       this.addMarkerByPosition(lng, lat);
     };
     this.onBlur = () => {
-      const value = this.state.value;
+      const {
+        value
+      } = this.state;
       const numericValue = (0, _dtableUtils.normalizeMapPoint)(value);
       this.setState({
         value: numericValue
       });
     };
     this.onChangeLatitude = event => {
-      const newValue = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.state.value), {}, {
+      const newValue = {
+        ...this.state.value,
         lat: event.target.value
-      });
+      };
       this.setState({
         value: newValue
       }, () => {
@@ -317,9 +337,10 @@ class MapEditor extends _react.Component {
       });
     };
     this.onChangeLongitude = event => {
-      const newValue = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.state.value), {}, {
+      const newValue = {
+        ...this.state.value,
         lng: event.target.value
-      });
+      };
       this.setState({
         value: newValue
       }, () => {
@@ -351,9 +372,10 @@ class MapEditor extends _react.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.readOnly = props.readOnly;
@@ -389,10 +411,11 @@ class MapEditor extends _react.Component {
     this.onSubmit();
   }
   render() {
-    const _this$state = this.state,
-      isLoading = _this$state.isLoading,
-      lng_lat = _this$state.value,
-      isShowLargeEditor = _this$state.isShowLargeEditor;
+    const {
+      isLoading,
+      value: lng_lat,
+      isShowLargeEditor
+    } = this.state;
     const lat = lng_lat && !(0, _dtableUtils.isEmpty)(lng_lat.lat) ? lng_lat.lat : '';
     const lng = lng_lat && !(0, _dtableUtils.isEmpty)(lng_lat.lng) ? lng_lat.lng : '';
     if (!isShowLargeEditor) {
@@ -492,11 +515,12 @@ class MapEditor extends _react.Component {
         })]
       });
     }
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_largeEditor.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.props), {}, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_largeEditor.default, {
+      ...this.props,
       value: this.state.value,
       setValue: this.setValue,
       toggleFullScreen: this.toggleFullScreen
-    }));
+    });
   }
 }
 var _default = exports.default = MapEditor;

package/lib/GeolocationEditor/pc-editor/map-editor/large-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 _reactstrap = require("reactstrap");
 var _dtableUtils = require("dtable-utils");
@@ -23,12 +22,13 @@ class LargeMapEditorDialog extends _react.default.Component {
     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;
@@ -55,11 +55,14 @@ class LargeMapEditorDialog 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;
@@ -81,11 +84,14 @@ class LargeMapEditorDialog extends _react.default.Component {
       }, () => {
         if (!window.BMap.Map) return;
         this.map = new window.BMap.Map('geolocation-map-container-large');
-        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;
@@ -106,10 +112,11 @@ class LargeMapEditorDialog extends _react.default.Component {
       this.setState({
         isLoading: false
       }, () => {
-        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: {
@@ -123,7 +130,9 @@ class LargeMapEditorDialog 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;
@@ -147,7 +156,9 @@ class LargeMapEditorDialog 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({
@@ -160,8 +171,10 @@ class LargeMapEditorDialog extends _react.default.Component {
       }
     };
     this.setPropsValue = _ref => {
-      let lng = _ref.lng,
-        lat = _ref.lat;
+      let {
+        lng,
+        lat
+      } = _ref;
       if (!(0, _dtableUtils.isNumber)(lng) || !(0, _dtableUtils.isNumber)(lat)) {
         this.props.setValue(null);
         return;
@@ -229,8 +242,10 @@ class LargeMapEditorDialog extends _react.default.Component {
       }
     };
     this.rerenderMapMarker = _ref2 => {
-      let lng = _ref2.lng,
-        lat = _ref2.lat;
+      let {
+        lng,
+        lat
+      } = _ref2;
       if (!(0, _dtableUtils.isNumber)(lng) || !(0, _dtableUtils.isNumber)(lat)) return;
       if (this.map) {
         if (this.mapType === _mapEditorUtils.MAP_TYPES.G_MAP || this.mapType === _mapEditorUtils.MAP_TYPES.M_MAP) {
@@ -245,16 +260,19 @@ class LargeMapEditorDialog extends _react.default.Component {
       this.addMarkerByPosition(lng, lat);
     };
     this.onBlur = () => {
-      const value = this.state.value;
+      const {
+        value
+      } = this.state;
       const numericValue = (0, _dtableUtils.normalizeMapPoint)(value);
       this.setState({
         value: numericValue
       });
     };
     this.onChangeLatitude = event => {
-      const newValue = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.state.value), {}, {
+      const newValue = {
+        ...this.state.value,
         lat: event.target.value
-      });
+      };
       this.setState({
         value: newValue
       }, () => {
@@ -264,9 +282,10 @@ class LargeMapEditorDialog extends _react.default.Component {
       });
     };
     this.onChangeLongitude = event => {
-      const newValue = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.state.value), {}, {
+      const newValue = {
+        ...this.state.value,
         lng: event.target.value
-      });
+      };
       this.setState({
         value: newValue
       }, () => {
@@ -283,7 +302,9 @@ class LargeMapEditorDialog extends _react.default.Component {
       }
     };
     this.onSubmit = () => {
-      const value = this.state.value;
+      const {
+        value
+      } = this.state;
       this.props.setValue(value);
       this.props.onSubmit();
     };
@@ -304,7 +325,9 @@ class LargeMapEditorDialog extends _react.default.Component {
       event.preventDefault();
       event.stopPropagation();
       event.nativeEvent.stopImmediatePropagation();
-      const value = this.state.value;
+      const {
+        value
+      } = this.state;
       this.props.setValue(value);
       this.props.toggleFullScreen(event);
     };
@@ -313,16 +336,19 @@ class LargeMapEditorDialog extends _react.default.Component {
       e.nativeEvent.stopImmediatePropagation();
       e.stopPropagation();
     };
-    const readOnly = props.readOnly,
-      config = props.config;
+    const {
+      readOnly,
+      config
+    } = props;
     const _value = props.value || {
       lng: '',
       lat: ''
     };
     this.readOnly = readOnly;
-    const _getMapInfo = (0, _mapEditorUtils.getMapInfo)(config),
-      mapType = _getMapInfo.mapType,
-      mapKey = _getMapInfo.mapKey;
+    const {
+      mapType,
+      mapKey
+    } = (0, _mapEditorUtils.getMapInfo)(config);
     this.mapType = mapType;
     this.mapKey = mapKey;
     this.map = null;
@@ -377,9 +403,10 @@ class LargeMapEditorDialog extends _react.default.Component {
     this.map = null;
   }
   render() {
-    const _this$state = this.state,
-      isLoading = _this$state.isLoading,
-      lng_lat = _this$state.value;
+    const {
+      isLoading,
+      value: lng_lat
+    } = this.state;
     const lat = lng_lat && !(0, _dtableUtils.isEmpty)(lng_lat.lat) ? lng_lat.lat : '';
     const lng = lng_lat && !(0, _dtableUtils.isEmpty)(lng_lat.lng) ? lng_lat.lng : '';
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactstrap.Modal, {