dtable-ui-component 6.0.42 → 6.0.44

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/NumberEditor/index.js

@@ -95,7 +95,8 @@ class NumberEditor extends _react.default.Component {
   }
   render() {
     const {
-      isInModal
+      isInModal,
+      readOnly
     } = this.props;
     let style = isInModal ? {
       textAlign: 'left',
@@ -113,7 +114,8 @@ class NumberEditor extends _react.default.Component {
       onCut: this.onCut,
       onKeyDown: this.onKeyDown,
       onChange: this.onChange,
-      style: style
+      style: style,
+      disabled: readOnly
     });
   }
 }

package/lib/SelectOptionGroup/index.css

@@ -77,27 +77,32 @@
   margin: 0;
 }
 
-.option-group-selector-single-select .select-option-name,
-.option-group-selector-multiple-select .multiple-option-name {
+.option-group-dtable-ui-single-select-selector .select-option-name,
+.option-group-dtable-ui-multiple-select-selector .multiple-option-name {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
 
-.option-group-selector-multiple-select .multiple-check-icon {
+.option-group-dtable-ui-multiple-select-selector .multiple-check-icon {
   display: inline-flex;
   width: 20px;
   text-align: center;
 }
 
-.option-group-selector-multiple-select .multiple-check-icon .dtable-icon-check-mark {
+.option-group-dtable-ui-multiple-select-selector .multiple-check-icon .dtable-icon-check-mark {
   font-size: 12px;
   color: #798d99;
 }
 
-.option-group-selector-single-select .option:hover,
-.option-group-selector-single-select .option.option-active,
-.option-group-selector-multiple-select .option:hover,
-.option-group-selector-multiple-select .option.option-active {
+.option-group-dtable-ui-single-select-selector .option:hover,
+.option-group-dtable-ui-single-select-selector .option.option-active,
+.option-group-dtable-ui-multiple-select-selector .option:hover,
+.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/lib/locales/de.json

@@ -24,6 +24,11 @@
   "Deleted_department": "Gelöschter Bereich",
   "View_original_image": "View original image",
   "Add_filter": "Filter hinzufügen",
+  "And": "Und",
+  "Or": "Oder",
+  "Add_filter_group": "Filtergruppe hinzufügen",
+  "Click_to_add_filter": "Klicken, um einen Filter hinzuzufügen",
+  "Click_to_input_value": "Wert eingeben",
   "Submit": "Abschicken",
   "No_filters": "Es sind keine Filter definiert.",
   "Select_an_option": "Option wählen",

package/lib/locales/en.json

@@ -24,6 +24,11 @@
   "Deleted_department": "Deleted department",
   "View_original_image": "View original image",
   "Add_filter": "Add filter",
+  "And": "And",
+  "Or": "Or",
+  "Add_filter_group": "Add filter group",
+  "Click_to_add_filter": "Click to add filter",
+  "Click_to_input_value": "Click to input value",
   "Submit": "Submit",
   "No_filters": "No filters",
   "Select_an_option": "Select an option",

package/lib/locales/es.json

@@ -24,6 +24,11 @@
   "Deleted_department": "Deleted department",
   "View_original_image": "View original image",
   "Add_filter": "Añadir filtro",
+  "And": "Y",
+  "Or": "O",
+  "Add_filter_group": "Añadir grupo de filtros", 
+  "Click_to_add_filter": "Haz clic para añadir filtro",
+  "Click_to_input_value": "Haz clic para introducir valor",
   "Submit": "Enviar",
   "No_filters": "Sin filtros",
   "Select_an_option": "Elige una opción",

package/lib/locales/fr.json

@@ -24,6 +24,11 @@
   "Deleted_department": "Département supprimé",
   "View_original_image": "View original image",
   "Add_filter": "Ajouter un filtre",
+  "And": "Et",
+  "Or": "Ou",
+  "Add_filter_group": "Ajouter un groupe de filtres",
+  "Click_to_add_filter": "Cliquer pour ajouter un filtre",
+  "Click_to_input_value": "Click to input value",
   "Submit": "Soumettre",
   "No_filters": "Aucun filtre",
   "Select_an_option": "Sélectionnner une option",

package/lib/locales/pt.json

@@ -24,6 +24,11 @@
   "Deleted_department": "Deleted department",
   "View_original_image": "View original image",
   "Add_filter": "Adicione o filtro",
+  "And": "E",
+  "Or": "Ou",
+  "Add_filter_group": "Adicione o grupo de filtros",
+  "Click_to_add_filter": "Clique para adicionar filtro",
+  "Click_to_input_value": "Clique para inserir valor",
   "Submit": "Enviar",
   "No_filters": "Sem filtros",
   "Select_an_option": "Selecione uma opção",

package/lib/locales/ru.json

@@ -24,6 +24,11 @@
   "Deleted_department": "Удаленный отдел",
   "View_original_image": "View original image",
   "Add_filter": "Добавить фильтр",
+  "And": "И",
+  "Or": "Или",
+  "Add_filter_group": "Добавить группу фильтров",
+  "Click_to_add_filter": "Нажмите для добавления фильтра",
+  "Click_to_input_value": "Нажмите для ввода значения",
   "Submit": "Сохранить",
   "No_filters": "Нет фильтров",
   "Select_an_option": "Выберите опцию",

package/lib/locales/zh-CN.json

@@ -24,6 +24,11 @@
   "Deleted_department": "已删除部门",
   "View_original_image": "View original image",
   "Add_filter": "增加过滤条件",
+  "And": "并且",
+  "Or": "或者",
+  "Add_filter_group": "增加过滤组",
+  "Click_to_add_filter": "点击添加过滤器",
+  "Click_to_input_value": "点击输入值",
   "Submit": "提交",
   "No_filters": "没有过滤器",
   "Select_an_option": "选择标签",

package/lib/utils/column-utils.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isEnableCheckFormat = exports.getDateColumnFormat = void 0;
+exports.getDateColumnFormat = void 0;
+exports.isCheckboxColumn = isCheckboxColumn;
+exports.isEnableCheckFormat = void 0;
 var _dtableUtils = require("dtable-utils");
 const isEnableCheckFormat = column => {
   if (!column) return false;
@@ -22,4 +24,21 @@ const getDateColumnFormat = column => {
   // Old Europe format is D/M/YYYY new format is DD/MM/YYYY
   return format;
 };
-exports.getDateColumnFormat = getDateColumnFormat;
+exports.getDateColumnFormat = getDateColumnFormat;
+function isCheckboxColumn(column) {
+  let {
+    type,
+    data
+  } = column;
+  if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[type]) {
+    const {
+      result_type,
+      array_type
+    } = data || {};
+    if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.ARRAY) {
+      return array_type === _dtableUtils.CellType.CHECKBOX;
+    }
+    return false;
+  }
+  return type === _dtableUtils.CellType.CHECKBOX;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.42",
+  "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",
@@ -72,7 +72,7 @@
     "@babel/plugin-transform-runtime": "7.22.10",
     "@babel/polyfill": "^7.10.1",
     "@babel/preset-env": "^7.9.5",
-    "@babel/runtime": "7.22.11",
+    "@babel/runtime": "7.27.6",
     "@cfaester/enzyme-adapter-react-18": "0.8.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
     "@storybook/addon-actions": "8.6.12",
@@ -142,7 +142,7 @@
     "react-i18next": "12.1.4",
     "react-refresh": "^0.11.0",
     "resolve": "^1.20.0",
-    "resolve-url-loader": "^4.0.0",
+    "resolve-url-loader": "^5.0.0",
     "sass-loader": "^12.3.0",
     "semver": "^7.3.5",
     "source-map-loader": "^3.0.0",