dtable-ui-component 0.1.99 → 0.1.100

package/lib/DurationFormatter/index.js

@@ -28,7 +28,9 @@ var DurationFormatter = /*#__PURE__*/function (_React$Component) {
       var classname = cn('dtable-ui cell-formatter-container duration-formatter', containerClassName);
       return /*#__PURE__*/React.createElement("div", {
         className: classname
-      }, getDurationDisplayString(value, format));
+      }, getDurationDisplayString(value, {
+        duration_format: format
+      }));
     }
   }]);
 

package/lib/NumberEditor/index.js

@@ -5,7 +5,8 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React from 'react';
 import isHotkey from 'is-hotkey';
 import { NUMBER_TYPES } from '../constants';
-import { getNumberDisplayString, formatStringToNumber, formatNumberString } from '../utils/value-format-utils';
+import { getNumberDisplayString, formatStringToNumber, replaceNumberNotAllowInput } from '../utils/value-format-utils';
+import { isMac } from '../utils/utils';
 
 var NumberEditor = /*#__PURE__*/function (_React$Component) {
   _inherits(NumberEditor, _React$Component);
@@ -51,12 +52,19 @@ var NumberEditor = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.onChange = function (event) {
+      var data = _this.props.column.data; // data maybe 'null'
+
       var value = event.target.value.trim();
-      value = formatNumberString(value, _this.dataFormat); // format the number in changing
+      var currency_symbol = null;
 
-      if (value === _this.state.inputValue) {
-        return;
-      }
+      if (data && data.format === 'custom_currency') {
+        currency_symbol = data['currency_symbol'];
+      } //Prevent the repetition of periods bug in the Chinese input method of the Windows system
+
+
+      if (!isMac() && value.indexOf('.。') > -1) return;
+      value = replaceNumberNotAllowInput(value, _this.dataFormat, currency_symbol);
+      if (value === _this.state.inputValue) return;
 
       _this.setState({
         inputValue: value

package/lib/constants/index.js

@@ -35,7 +35,10 @@ var DEFAULT_NUMBER_FORMAT = 'number';
 var DEFAULT_DATE_FORMAT = 'YYYY-MM-DD';
 var DURATION_FORMATS_MAP = {
   H_MM: 'h:mm',
-  H_MM_SS: 'h:mm:ss'
+  H_MM_SS: 'h:mm:ss',
+  H_MM_SS_S: 'h:mm:ss.s',
+  H_MM_SS_SS: 'h:mm:ss.ss',
+  H_MM_SS_SSS: 'h:mm:ss.sss'
 };
 var DURATION_FORMATS = [{
   name: DURATION_FORMATS_MAP.H_MM,
@@ -44,6 +47,6 @@ var DURATION_FORMATS = [{
   name: DURATION_FORMATS_MAP.H_MM_SS,
   type: DURATION_FORMATS_MAP.H_MM_SS
 }];
-var DURATION_ZERO_DISPLAY = (_DURATION_ZERO_DISPLA = {}, _defineProperty(_DURATION_ZERO_DISPLA, DURATION_FORMATS_MAP.H_MM, '0:00'), _defineProperty(_DURATION_ZERO_DISPLA, DURATION_FORMATS_MAP.H_MM_SS, '0:00'), _DURATION_ZERO_DISPLA);
-var DURATION_DECIMAL_DIGITS = (_DURATION_DECIMAL_DIG = {}, _defineProperty(_DURATION_DECIMAL_DIG, DURATION_FORMATS_MAP.H_MM, 0), _defineProperty(_DURATION_DECIMAL_DIG, DURATION_FORMATS_MAP.H_MM_SS, 0), _DURATION_DECIMAL_DIG);
+var DURATION_ZERO_DISPLAY = (_DURATION_ZERO_DISPLA = {}, _defineProperty(_DURATION_ZERO_DISPLA, DURATION_FORMATS_MAP.H_MM, '0:00'), _defineProperty(_DURATION_ZERO_DISPLA, DURATION_FORMATS_MAP.H_MM_SS, '0:00'), _defineProperty(_DURATION_ZERO_DISPLA, DURATION_FORMATS_MAP.H_MM_SS_S, '0:00.0'), _defineProperty(_DURATION_ZERO_DISPLA, DURATION_FORMATS_MAP.H_MM_SS_SS, '0:00.00'), _defineProperty(_DURATION_ZERO_DISPLA, DURATION_FORMATS_MAP.H_MM_SS_SSS, '0:00.000'), _DURATION_ZERO_DISPLA);
+var DURATION_DECIMAL_DIGITS = (_DURATION_DECIMAL_DIG = {}, _defineProperty(_DURATION_DECIMAL_DIG, DURATION_FORMATS_MAP.H_MM, 0), _defineProperty(_DURATION_DECIMAL_DIG, DURATION_FORMATS_MAP.H_MM_SS, 0), _defineProperty(_DURATION_DECIMAL_DIG, DURATION_FORMATS_MAP.H_MM_SS_S, 1), _defineProperty(_DURATION_DECIMAL_DIG, DURATION_FORMATS_MAP.H_MM_SS_SS, 2), _defineProperty(_DURATION_DECIMAL_DIG, DURATION_FORMATS_MAP.H_MM_SS_SSS, 3), _DURATION_DECIMAL_DIG);
 export { CellType, NUMBER_TYPES, DATE_TYPES, FORMULA_RESULT_TYPE, SIMPLE_CELL_COLUMNS, ARRAY_FORMAL_COLUMNS, SIMPLE_CELL_FORMULA_RESULTS, COLLABORATOR_COLUMN_TYPES, ARRAY_FORMAL_COLUMNS_TYPES, DEFAULT_NUMBER_FORMAT, DEFAULT_DATE_FORMAT, DURATION_FORMATS_MAP, DURATION_FORMATS, DURATION_ZERO_DISPLAY, DURATION_DECIMAL_DIGITS };

package/lib/index.js

@@ -4,7 +4,7 @@ export { default as toaster } from './toaster'; // Loading
 export { default as Loading } from './Loading';
 export { setLocale } from './lang'; // utils
 
-export { getDateDisplayString, getNumberDisplayString, formatStringToNumber, formatNumberString } from './utils/value-format-utils'; // formatter
+export { getDateDisplayString, getNumberDisplayString, formatStringToNumber } from './utils/value-format-utils'; // formatter
 
 export { default as CheckboxFormatter } from './CheckboxFormatter';
 export { default as ImageFormatter } from './ImageFormatter';

package/lib/utils/utils.js

@@ -1,3 +1,4 @@
+import NP from './number-precision';
 export var debounce = function debounce(fn, wait) {
   var timeout = null;
   return function () {
@@ -22,4 +23,22 @@ export var throttle = function throttle(func, delay) {
       timer = setTimeout(func, remaining);
     }
   };
+};
+export var getFloatNumber = function getFloatNumber(data, format) {
+  if (!data && data !== 0) {
+    return null;
+  }
+
+  var newData = parseFloat(data.replace(/[^.-\d]/g, ''));
+
+  if (format === 'percent' && !isNaN(newData)) {
+    return NP.divide(newData, 100);
+  }
+
+  return isNaN(newData) ? null : newData;
+};
+export var isMac = function isMac() {
+  var platform = navigator.platform; // eslint-disable-next-line eqeqeq
+
+  return platform == 'Mac68K' || platform == 'MacPPC' || platform == 'Macintosh' || platform == 'MacIntel';
 };

package/lib/utils/value-format-utils.js

@@ -1,7 +1,8 @@
 /* eslint-disable no-case-declarations */
 import dayjs from 'dayjs';
 import NP from './number-precision';
-import { CellType, NUMBER_TYPES, DEFAULT_NUMBER_FORMAT, DURATION_FORMATS_MAP, DURATION_FORMATS, DURATION_ZERO_DISPLAY, DURATION_DECIMAL_DIGITS, FORMULA_RESULT_TYPE, COLLABORATOR_COLUMN_TYPES, ARRAY_FORMAL_COLUMNS_TYPES, DEFAULT_DATE_FORMAT } from '../constants';
+import { CellType, DEFAULT_NUMBER_FORMAT, DURATION_FORMATS_MAP, DURATION_FORMATS, DURATION_ZERO_DISPLAY, DURATION_DECIMAL_DIGITS, FORMULA_RESULT_TYPE, COLLABORATOR_COLUMN_TYPES, ARRAY_FORMAL_COLUMNS_TYPES, DEFAULT_DATE_FORMAT } from '../constants';
+import { getFloatNumber } from './utils';
 NP.enableBoundaryChecking(false);
 var _separatorMap = {
   'comma': ',',
@@ -168,53 +169,89 @@ export var getNumberDisplayString = function getNumberDisplayString(value, forma
       return '' + value;
   }
 };
-export var formatStringToNumber = function formatStringToNumber(value) {
-  var isIncludePercent = value.indexOf('%') > -1;
-  var newData = parseFloat(value.replace(/[^.-\d]/g, ''));
+export var formatStringToNumber = function formatStringToNumber(numberString, formatData) {
+  var _ref3 = formatData || {},
+      format = _ref3.format,
+      decimal = _ref3.decimal,
+      thousands = _ref3.thousands,
+      enable_precision = _ref3.enable_precision,
+      precision = _ref3.precision;
+
+  var value = numberString;
+
+  if (decimal && thousands && decimal === 'comma') {
+    if (thousands === 'dot') {
+      value = value.replace(/,/, '@');
+      value = value.replace(/\./g, ',');
+      value = value.replace(/@/, '.');
+    } else {
+      value = value.replace(/\./g, '');
+      value = value.replace(/,/, '.');
+    }
+  }
 
-  if (isIncludePercent && !isNaN(newData)) {
-    return newData / 100;
+  value = getFloatNumber(value, format);
+
+  if (enable_precision && value) {
+    if (format === 'percent') {
+      precision += 2;
+    }
+
+    value = Number(parseFloat(value).toFixed(precision));
   }
 
-  return isNaN(newData) ? '' : newData;
+  return value;
 };
-export var formatNumberString = function formatNumberString(value, format) {
-  var formattedValue = '';
+export var replaceNumberNotAllowInput = function replaceNumberNotAllowInput(value) {
+  var format = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : DEFAULT_NUMBER_FORMAT;
+  var currency_symbol = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+
+  if (!value) {
+    return '';
+  }
+
+  value = value.replace(/。/g, '.');
 
   switch (format) {
-    case NUMBER_TYPES.NUMBER:
-    case NUMBER_TYPES.NUMBER_WITH_COMMAS:
-      formattedValue = value.replace(/[^.-\d,]/g, '');
-      break;
+    case 'number':
+      {
+        return value.replace(/[^.-\d,]/g, '');
+      }
 
-    case NUMBER_TYPES.PERCENT:
-      formattedValue = value.replace(/[^.-\d,%]/g, '');
-      break;
+    case 'percent':
+      {
+        return value.replace(/[^.-\d,%]/g, '');
+      }
 
-    case NUMBER_TYPES.YUAN:
-      formattedValue = value.replace(/[^.-\d￥,]/g, '');
-      break;
+    case 'yuan':
+      {
+        return value.replace(/[^.-\d¥￥,]/g, '');
+      }
 
-    case NUMBER_TYPES.DOLLAR:
-      formattedValue = value.replace(/[^.-\d$,]/g, '');
-      break;
+    case 'dollar':
+      {
+        return value.replace(/[^.-\d$,]/g, '');
+      }
+
+    case 'euro':
+      {
+        return value.replace(/[^.-\d€,]/g, '');
+      }
 
-    case NUMBER_TYPES.EURO:
-      formattedValue = value.replace(/[^.-\d€,]/g, '');
-      break;
+    case 'custom_currency':
+      {
+        // eslint-disable-next-line
+        var reg = new RegExp('[^.-\d' + currency_symbol + ',]', 'g');
+        return value.replace(reg, '');
+      }
 
     default:
-      formattedValue = value.replace(/[^.-\d,]/g, '');
+      return value.replace(/[^.-\d,]/g, '');
   }
-
-  return formattedValue;
 };
 export var getDateDisplayString = function getDateDisplayString(value, format) {
-  var formattedValue = '';
-
-  if (!value) {
-    // value === '', value === undefine, value === null
-    return formattedValue;
+  if (value === '' || !value || typeof value !== 'string') {
+    return '';
   }
 
   var date = dayjs(value);
@@ -247,8 +284,46 @@ export var getDateDisplayString = function getDateDisplayString(value, format) {
       return date.format('YYYY-MM-DD');
   }
 };
-export var getDurationDisplayString = function getDurationDisplayString(value, duration_format) {
+
+var _getMathRoundedDuration = function _getMathRoundedDuration(num, duration_format) {
+  var decimalDigits = DURATION_DECIMAL_DIGITS[duration_format];
+
+  if (decimalDigits < 1) {
+    return num;
+  }
+
+  var ratio = Math.pow(10, decimalDigits);
+  return Math.round(num * ratio) / ratio;
+};
+
+var _getDurationDecimalSuffix = function _getDurationDecimalSuffix(duration_format, decimal) {
+  if (duration_format === DURATION_FORMATS_MAP.H_MM_SS_S) {
+    return decimal === 0 ? '.0' : '';
+  } else if (duration_format === DURATION_FORMATS_MAP.H_MM_SS_SS) {
+    if (decimal === 0) {
+      return '.00';
+    } else if (decimal < 10) {
+      return '0';
+    }
+  } else if (duration_format === DURATION_FORMATS_MAP.H_MM_SS_SSS) {
+    if (decimal === 0) {
+      return '.000';
+    } else if (decimal < 10) {
+      return '00';
+    } else if (decimal < 100) {
+      return '0';
+    }
+  }
+
+  return '';
+};
+
+export var getDurationDisplayString = function getDurationDisplayString(value, data) {
   if (!value && value !== 0) return '';
+
+  var _ref4 = data || {},
+      duration_format = _ref4.duration_format;
+
   duration_format = duration_format || DURATION_FORMATS_MAP.H_MM;
 
   if (DURATION_FORMATS.findIndex(function (format) {
@@ -268,7 +343,7 @@ export var getDurationDisplayString = function getDurationDisplayString(value, d
     positiveValue = Math.round(positiveValue);
   }
 
-  positiveValue = getMathRoundedDuration(positiveValue, duration_format);
+  positiveValue = _getMathRoundedDuration(positiveValue, duration_format);
   var decimalParts = (positiveValue + '').split('.');
   var decimalPartsLen = decimalParts.length;
   var decimal = 0;
@@ -279,7 +354,9 @@ export var getDurationDisplayString = function getDurationDisplayString(value, d
   }
 
   var decimalDigits = DURATION_DECIMAL_DIGITS[duration_format];
-  var decimalSuffix = getDurationDecimalSuffix(duration_format, decimal);
+
+  var decimalSuffix = _getDurationDecimalSuffix(duration_format, decimal);
+
   var displayString = value < 0 ? '-' : '';
   var hours = parseInt(positiveValue / 3600);
   var minutes = parseInt((positiveValue - hours * 3600) / 60);
@@ -290,50 +367,11 @@ export var getDurationDisplayString = function getDurationDisplayString(value, d
   }
 
   var seconds = Number.parseFloat((positiveValue - hours * 3600 - minutes * 60).toFixed(decimalDigits));
-
-  if (hours > 0) {
-    displayString += "".concat(hours, ":");
-    minutes = minutes > 9 ? minutes : "0".concat(minutes);
-  }
-
+  minutes = minutes > 9 ? minutes : "0".concat(minutes);
   seconds = seconds > 9 ? seconds : "0".concat(seconds);
-  displayString += "".concat(minutes, ":").concat(seconds).concat(decimalSuffix);
+  displayString += "".concat(hours, ":").concat(minutes, ":").concat(seconds).concat(decimalSuffix);
   return displayString;
 };
-
-var getMathRoundedDuration = function getMathRoundedDuration(num, duration_format) {
-  var decimalDigits = DURATION_DECIMAL_DIGITS[duration_format];
-
-  if (decimalDigits < 1) {
-    return num;
-  }
-
-  var ratio = Math.pow(10, decimalDigits);
-  return Math.round(num * ratio) / ratio;
-};
-
-var getDurationDecimalSuffix = function getDurationDecimalSuffix(duration_format, decimal) {
-  if (duration_format === DURATION_FORMATS_MAP.H_MM_SS_S) {
-    return decimal === 0 ? '.0' : '';
-  } else if (duration_format === DURATION_FORMATS_MAP.H_MM_SS_SS) {
-    if (decimal === 0) {
-      return '.00';
-    } else if (decimal < 10) {
-      return '0';
-    }
-  } else if (duration_format === DURATION_FORMATS_MAP.H_MM_SS_SSS) {
-    if (decimal === 0) {
-      return '.000';
-    } else if (decimal < 10) {
-      return '00';
-    } else if (decimal < 100) {
-      return '0';
-    }
-  }
-
-  return '';
-};
-
 export var getOptionName = function getOptionName(options, targetOptionID) {
   if (!targetOptionID || !options || !Array.isArray(options)) return null;
   var option = options.find(function (option) {
@@ -352,8 +390,8 @@ export var getMultipleOptionName = function getMultipleOptionName(options, cellV
   }).join(', ');
 };
 export var getLongtextDisplayString = function getLongtextDisplayString(value) {
-  var _ref3 = value || {},
-      text = _ref3.text;
+  var _ref5 = value || {},
+      text = _ref5.text;
 
   if (!text) {
     return null;
@@ -384,13 +422,13 @@ export var getCollaboratorsName = function getCollaboratorsName(collaborators, c
   return null;
 };
 export var getGeolocationDisplayString = function getGeolocationDisplayString(value, columnData) {
-  var _ref4 = columnData || {},
-      geo_format = _ref4.geo_format;
+  var _ref6 = columnData || {},
+      geo_format = _ref6.geo_format;
 
   var cellValue = value || {};
 
   if (!value) {
-    return null;
+    return '';
   }
 
   if (geo_format === 'lng_lat' && value.lng && value.lat) {
@@ -417,9 +455,9 @@ export var getGeolocationDisplayString = function getGeolocationDisplayString(va
   return "".concat(province || '').concat(city || '').concat(district || '').concat(detail || '');
 };
 export var getFormulaDisplayString = function getFormulaDisplayString(cellValue, columnData) {
-  var _ref5 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-      _ref5$collaborators = _ref5.collaborators,
-      collaborators = _ref5$collaborators === void 0 ? [] : _ref5$collaborators;
+  var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      _ref7$collaborators = _ref7.collaborators,
+      collaborators = _ref7$collaborators === void 0 ? [] : _ref7$collaborators;
 
   if (!columnData) {
     return null;
@@ -470,10 +508,10 @@ export var getFormulaDisplayString = function getFormulaDisplayString(cellValue,
   return cellValue;
 };
 export function getCellValueDisplayString(cellValue, type) {
-  var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-      data = _ref6.data,
-      _ref6$collaborators = _ref6.collaborators,
-      collaborators = _ref6$collaborators === void 0 ? [] : _ref6$collaborators;
+  var _ref8 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      data = _ref8.data,
+      _ref8$collaborators = _ref8.collaborators,
+      collaborators = _ref8$collaborators === void 0 ? [] : _ref8$collaborators;
 
   var newData = data || {};
 
@@ -517,9 +555,9 @@ export function getCellValueDisplayString(cellValue, type) {
 
     case CellType.DATE:
       {
-        var _ref7 = newData || {},
-            _ref7$format = _ref7.format,
-            format = _ref7$format === void 0 ? DEFAULT_DATE_FORMAT : _ref7$format;
+        var _ref9 = newData || {},
+            _ref9$format = _ref9.format,
+            format = _ref9$format === void 0 ? DEFAULT_DATE_FORMAT : _ref9$format;
 
         return getDateDisplayString(cellValue, format);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "0.1.99",
+  "version": "0.1.100",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "0.0.9",