dtable-ui-component 6.0.43 → 6.0.44

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

@@ -170,22 +170,19 @@ class MapEditor extends _react.default.Component {
           this.map.addListener('mousedown', event => {
             const lng = event.latLng.lng();
             const lat = event.latLng.lat();
-            const point = {
+            this.setValue({
               lng,
               lat
-            };
-            this.setValue(point);
+            });
             this.addMarkerByPosition(lng, lat);
           });
         }, 1);
       });
     };
     this.setValue = point => {
+      const value = (0, _dtableUtils.normalizeMapPoint)(point);
       this.setState({
-        value: {
-          lng: point.lng,
-          lat: point.lat
-        }
+        value
       });
     };
     this.addMarkerByPosition = (lng, lat) => {
@@ -255,7 +252,7 @@ class MapEditor extends _react.default.Component {
       const {
         lng,
         lat
-      } = this.getNumericValue(value);
+      } = (0, _dtableUtils.normalizeMapPoint)(value);
       const newValue = !(0, _dtableUtils.isNumber)(lng) || !(0, _dtableUtils.isNumber)(lat) ? null : value;
       this.props.onCommit(newValue);
       this.onClose();
@@ -294,37 +291,36 @@ class MapEditor extends _react.default.Component {
     this.onClose = () => {
       this.props.onToggle();
     };
-    this.getNumericValue = value => {
+    this.onBlur = () => {
       const {
-        lng,
-        lat
-      } = value || {};
-      const numLng = typeof lng === 'string' ? parseFloat(lng.trim()) : lng;
-      const numLat = typeof lat === 'string' ? parseFloat(lat.trim()) : lat;
-      return {
-        lng: numLng,
-        lat: numLat
-      };
+        value
+      } = this.state;
+      const numericValue = (0, _dtableUtils.normalizeMapPoint)(value);
+      this.setState({
+        value: numericValue
+      });
     };
     this.handleLatitudeChange = value => {
+      const newValue = {
+        ...this.state.value,
+        lat: value
+      };
       this.setState({
-        value: {
-          ...this.state.value,
-          lat: value
-        }
+        value: newValue
       }, () => {
-        const numericValue = this.getNumericValue(this.state.value);
+        const numericValue = (0, _dtableUtils.normalizeMapPoint)(newValue);
         this.rerenderMapMarker(numericValue);
       });
     };
     this.handleLongitudeChange = value => {
+      const newValue = {
+        ...this.state.value,
+        lng: value
+      };
       this.setState({
-        value: {
-          ...this.state.value,
-          lng: value
-        }
+        value: newValue
       }, () => {
-        const numericValue = this.getNumericValue(this.state.value);
+        const numericValue = (0, _dtableUtils.normalizeMapPoint)(newValue);
         this.rerenderMapMarker(numericValue);
       });
     };
@@ -352,7 +348,7 @@ class MapEditor extends _react.default.Component {
       const {
         isLoading,
         mode,
-        value
+        value: lng_lat
       } = this.state;
       if (isLoading) return /*#__PURE__*/_react.default.createElement("div", {
         className: "w-100 h-100 d-flex align-items-center justify-content-center"
@@ -365,10 +361,8 @@ class MapEditor extends _react.default.Component {
         }, (0, _lang.getLocale)('The_map_plugin_is_not_properly_configured_contact_the_administrator')));
       }
       const isEdit = mode === 'edit';
-      const {
-        lat,
-        lng
-      } = value;
+      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__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
         className: "dtable-ui-mobile-geolocation-map-editor-input-container"
       }, /*#__PURE__*/_react.default.createElement("div", {
@@ -381,6 +375,7 @@ class MapEditor extends _react.default.Component {
         },
         value: lat,
         editable: isEdit,
+        onBlur: this.onBlur,
         onChange: this.handleLatitudeChange,
         placeholder: (0, _lang.getLocale)('Latitude')
       }), /*#__PURE__*/_react.default.createElement("div", {
@@ -393,6 +388,7 @@ class MapEditor extends _react.default.Component {
         },
         value: lng,
         editable: isEdit,
+        onBlur: this.onBlur,
         onChange: this.handleLongitudeChange,
         placeholder: (0, _lang.getLocale)('Longitude')
       })), /*#__PURE__*/_react.default.createElement("div", {

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

@@ -206,22 +206,10 @@ class MapEditor extends _react.Component {
       this.setState({
         value
       }, () => {
-        const numericValue = this.getNumericValue(this.state.value);
+        const numericValue = (0, _dtableUtils.normalizeMapPoint)(this.state.value);
         this.setPropsValue(numericValue);
       });
     };
-    this.getNumericValue = value => {
-      const {
-        lng,
-        lat
-      } = value || {};
-      const numLng = typeof lng === 'string' ? parseFloat(lng.trim()) : lng;
-      const numLat = typeof lat === 'string' ? parseFloat(lat.trim()) : lat;
-      return {
-        lng: numLng,
-        lat: numLat
-      };
-    };
     this.setPropsValue = _ref => {
       let {
         lng,
@@ -293,7 +281,7 @@ class MapEditor extends _react.Component {
       const {
         value
       } = this.state;
-      const numericValue = this.getNumericValue(value);
+      const numericValue = (0, _dtableUtils.normalizeMapPoint)(value);
       this.setPropsValue(numericValue);
       this.setState({
         isShowLargeEditor: !this.state.isShowLargeEditor
@@ -326,25 +314,36 @@ class MapEditor extends _react.Component {
       }
       this.addMarkerByPosition(lng, lat);
     };
+    this.onBlur = () => {
+      const {
+        value
+      } = this.state;
+      const numericValue = (0, _dtableUtils.normalizeMapPoint)(value);
+      this.setState({
+        value: numericValue
+      });
+    };
     this.onChangeLatitude = event => {
+      const newValue = {
+        ...this.state.value,
+        lat: event.target.value
+      };
       this.setState({
-        value: {
-          ...this.state.value,
-          lat: event.target.value
-        }
+        value: newValue
       }, () => {
-        const numericValue = this.getNumericValue(this.state.value);
+        const numericValue = (0, _dtableUtils.normalizeMapPoint)(newValue);
         this.setPropsValue(numericValue);
       });
     };
     this.onChangeLongitude = event => {
+      const newValue = {
+        ...this.state.value,
+        lng: event.target.value
+      };
       this.setState({
-        value: {
-          ...this.state.value,
-          lng: event.target.value
-        }
+        value: newValue
       }, () => {
-        const numericValue = this.getNumericValue(this.state.value);
+        const numericValue = (0, _dtableUtils.normalizeMapPoint)(newValue);
         this.setPropsValue(numericValue);
       });
     };
@@ -413,11 +412,11 @@ class MapEditor extends _react.Component {
   render() {
     const {
       isLoading,
-      value,
+      value: lng_lat,
       isShowLargeEditor
     } = this.state;
-    const lat = value ? value.lat : '';
-    const lng = value ? value.lng : '';
+    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) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
         className: "dtable-ui-geolocation-map-editor-header"
@@ -441,6 +440,7 @@ class MapEditor extends _react.Component {
       }, /*#__PURE__*/_react.default.createElement("span", null, (0, _lang.getLocale)('Latitude_abbr'))), /*#__PURE__*/_react.default.createElement("input", {
         type: "text",
         value: lat,
+        onBlur: this.onBlur,
         onChange: this.onChangeLatitude,
         onKeyDown: this.onKeyDown,
         className: "form-control",
@@ -453,6 +453,7 @@ class MapEditor extends _react.Component {
       }, /*#__PURE__*/_react.default.createElement("span", null, (0, _lang.getLocale)('Longitude_abbr'))), /*#__PURE__*/_react.default.createElement("input", {
         type: "text",
         value: lng,
+        onBlur: this.onBlur,
         onChange: this.onChangeLongitude,
         onKeyDown: this.onKeyDown,
         className: "form-control",

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

@@ -169,18 +169,6 @@ class LargeMapEditorDialog extends _react.default.Component {
         _toaster.default.danger((0, _lang.getLocale)('Positioning_failed'));
       }
     };
-    this.getNumericValue = value => {
-      const {
-        lng,
-        lat
-      } = value || {};
-      const numLng = typeof lng === 'string' ? parseFloat(lng.trim()) : lng;
-      const numLat = typeof lat === 'string' ? parseFloat(lat.trim()) : lat;
-      return {
-        lng: numLng,
-        lat: numLat
-      };
-    };
     this.setPropsValue = _ref => {
       let {
         lng,
@@ -203,7 +191,7 @@ class LargeMapEditorDialog extends _react.default.Component {
       this.setState({
         value
       }, () => {
-        const numericValue = this.getNumericValue(this.state.value);
+        const numericValue = (0, _dtableUtils.normalizeMapPoint)(this.state.value);
         this.setPropsValue(numericValue);
       });
     };
@@ -270,26 +258,37 @@ class LargeMapEditorDialog extends _react.default.Component {
       }
       this.addMarkerByPosition(lng, lat);
     };
+    this.onBlur = () => {
+      const {
+        value
+      } = this.state;
+      const numericValue = (0, _dtableUtils.normalizeMapPoint)(value);
+      this.setState({
+        value: numericValue
+      });
+    };
     this.onChangeLatitude = event => {
+      const newValue = {
+        ...this.state.value,
+        lat: event.target.value
+      };
       this.setState({
-        value: {
-          ...this.state.value,
-          lat: event.target.value
-        }
+        value: newValue
       }, () => {
-        const numericValue = this.getNumericValue(this.state.value);
+        const numericValue = (0, _dtableUtils.normalizeMapPoint)(newValue);
         this.setPropsValue(numericValue);
         this.rerenderMapMarker(numericValue);
       });
     };
     this.onChangeLongitude = event => {
+      const newValue = {
+        ...this.state.value,
+        lng: event.target.value
+      };
       this.setState({
-        value: {
-          ...this.state.value,
-          lng: event.target.value
-        }
+        value: newValue
       }, () => {
-        const numericValue = this.getNumericValue(this.state.value);
+        const numericValue = (0, _dtableUtils.normalizeMapPoint)(newValue);
         this.setPropsValue(numericValue);
         this.rerenderMapMarker(numericValue);
       });
@@ -405,10 +404,10 @@ class LargeMapEditorDialog extends _react.default.Component {
   render() {
     const {
       isLoading,
-      value
+      value: lng_lat
     } = this.state;
-    const lat = value ? value.lat : '';
-    const lng = value ? value.lng : '';
+    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__*/_react.default.createElement(_reactstrap.Modal, {
       size: "lg",
       isOpen: true,
@@ -438,6 +437,7 @@ class LargeMapEditorDialog extends _react.default.Component {
     }, /*#__PURE__*/_react.default.createElement("span", null, (0, _lang.getLocale)('Latitude_abbr'))), /*#__PURE__*/_react.default.createElement("input", {
       type: "text",
       value: lat,
+      onBlur: this.onBlur,
       onChange: this.onChangeLatitude,
       onKeyDown: this.onKeyDown,
       className: "form-control",
@@ -450,6 +450,7 @@ class LargeMapEditorDialog extends _react.default.Component {
     }, /*#__PURE__*/_react.default.createElement("span", null, (0, _lang.getLocale)('Longitude_abbr'))), /*#__PURE__*/_react.default.createElement("input", {
       type: "text",
       value: lng,
+      onBlur: this.onBlur,
       onChange: this.onChangeLongitude,
       onKeyDown: this.onKeyDown,
       className: "form-control",

package/lib/SelectOptionGroup/index.css

@@ -101,3 +101,8 @@
 .option-group-dtable-ui-multiple-select-selector .option.option-active {
   background-color: #f5f5f5;
 }
+
+.option-group-selector-single-select .option.option-active .select-option-name,
+.option-group-selector-multiple-select .option.option-active .select-option-name {
+  color: #212529;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.43",
+  "version": "6.0.44",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "4.0.2",
@@ -8,7 +8,7 @@
     "@seafile/seafile-editor": "~2.0.6",
     "classnames": "2.3.2",
     "dayjs": "1.10.7",
-    "dtable-utils": "~5.0.21",
+    "dtable-utils": "~5.0.22",
     "is-hotkey": "0.2.0",
     "rc-checkbox": "3.5.0",
     "react-color": "2.19.3",