@zhenliang/sheet 0.2.5-beta.4 → 0.2.5-beta.6

package/dist/core/editor/InputOptionsEditor/index.d.ts

@@ -1,4 +1,5 @@
 import type { SheetType } from "../../../type";
+import { InputNumberProps } from 'antd';
 import './index.less';
 export interface OptionItem {
     label: string;
@@ -6,9 +7,12 @@ export interface OptionItem {
     info?: string;
     children?: OptionItem[];
 }
-export interface FormulaInputProps {
-    options: OptionItem[];
-    value?: string;
-}
-export declare const getFormulaInputEditor: (options: OptionItem[], replaceIndex?: string) => SheetType.CellEditor;
+type inputProps = Partial<Pick<InputNumberProps, 'max' | 'min' | 'addonBefore' | 'addonAfter' | 'precision'> & {
+    warnMethod?: (record: any) => void;
+    rangeMethod?: (record: any) => {
+        max?: number;
+        min?: number;
+    };
+}>;
+export declare const getFormulaInputEditor: (options: OptionItem[], replaceIndex?: string, extraProps?: inputProps, getExtraProps?: ((props: SheetType.CellEditorProps) => inputProps) | undefined, choseEditor?: ((record: any) => boolean) | undefined) => SheetType.CellEditor;
 export default getFormulaInputEditor;

package/dist/core/editor/InputOptionsEditor/index.js

@@ -11,13 +11,15 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { Dropdown, Menu, Tooltip } from 'antd';
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
+import { InfoCircleOutlined } from '@ant-design/icons';
+import { Dropdown, Input, Menu, Tooltip } from 'antd';
 import { get, head, isEmpty, isNil } from 'lodash';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { InfoCircleOutlined } from '@ant-design/icons';
-import { flattenOptions, getStringDiff, replaceLabelsWithValues, replaceLongestDiff, replaceValuesWithLabels, tokenize, validateVariables, getCursorPositionInSpan } from "./utils";
-import validateCalculationExpr from "./vaildFormula";
+import { formulaString } from "../numberEditor";
 import "./index.less";
+import { flattenOptions, getCursorPositionInSpan, getStringDiff, replaceLabelsWithValues, replaceLongestDiff, replaceValuesWithLabels, tokenize, validateVariables } from "./utils";
+import validateCalculationExpr from "./vaildFormula";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var OPERATORS = ['=', '+', '-', '*', '/'];
@@ -32,14 +34,25 @@ var getSpanAtCursor = function getSpanAtCursor(startContainer) {
   }
   return null;
 };
-export var getFormulaInputEditor = function getFormulaInputEditor(options, replaceIndex) {
+export var getFormulaInputEditor = function getFormulaInputEditor(options, replaceIndex, extraProps, getExtraProps, choseEditor) {
+  var _ref = extraProps || {},
+    warnMethod = _ref.warnMethod,
+    rangeMethod = _ref.rangeMethod,
+    precision = _ref.precision,
+    max = _ref.max,
+    min = _ref.min;
   var FormulaInputEditor = function FormulaInputEditor(props) {
     var _get;
     var originValue = props.value,
       onChange = props.onChange,
       isEditing = props.isEditing,
       record = props.record;
-    var calcValue = replaceIndex ? "".concat((_get = get(record, [replaceIndex])) !== null && _get !== void 0 ? _get : '') : originValue;
+    // 兼容number
+    var inputNumberRef = useRef(null);
+    var _ref2 = getExtraProps ? getExtraProps(props) : extraProps !== null && extraProps !== void 0 ? extraProps : {},
+      inputArgs = Object.assign({}, (_objectDestructuringEmpty(_ref2), _ref2));
+    var replaceValue = replaceIndex ? (_get = get(record, [replaceIndex])) !== null && _get !== void 0 ? _get : '' : originValue;
+    var calcValue = replaceValue.startsWith('=') ? replaceValue : "=".concat(replaceValue);
     var _useState = useState(calcValue),
       _useState2 = _slicedToArray(_useState, 1),
       inputValue = _useState2[0];
@@ -48,7 +61,7 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
       offsetX = _useState4[0],
       setOffsetX = _useState4[1];
     // 为了不重新render，再写一个
-    var _useState5 = useState(calcValue),
+    var _useState5 = useState(replaceValue),
       _useState6 = _slicedToArray(_useState5, 2),
       containerValue = _useState6[0],
       setContainerValue = _useState6[1];
@@ -288,7 +301,7 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
     }, [closeDorpDown]);
     var handleKeyDown = useCallback(function (e) {
       var _currentSpan$textCont, _currentSpan$textCont2;
-      if (e.key === 'ArrowUp' || e.key === "ArrowDown") {
+      if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
         e.preventDefault();
         e.stopPropagation();
         return;
@@ -519,6 +532,34 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
         }
       }, 0);
     }, []);
+
+    // 递归渲染多级菜单
+    var renderMenuItems = function renderMenuItems(items) {
+      return items.map(function (opt) {
+        if (opt.children && opt.children.length > 0) {
+          return /*#__PURE__*/_jsx(Menu.SubMenu, {
+            title: opt.label,
+            className: "formula-editor-dropdown-submenu",
+            children: renderMenuItems(opt.children)
+          }, opt.value);
+        }
+        return /*#__PURE__*/_jsxs(Menu.Item, {
+          className: "formula-editor-dropdown-item",
+          onClick: function onClick() {
+            return handleOptionClick(opt);
+          },
+          children: [opt.label, opt.info ? /*#__PURE__*/_jsx(Tooltip, {
+            title: opt.info,
+            children: /*#__PURE__*/_jsx(InfoCircleOutlined, {
+              style: {
+                color: '#FF9900',
+                marginLeft: 4
+              }
+            })
+          }) : null]
+        }, opt.value);
+      });
+    };
     var dropdownContent = /*#__PURE__*/_jsx(Menu, {
       className: "formula-editor-dropdown",
       style: {
@@ -534,36 +575,39 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
           className: "formula-editor-dropdown-no-data",
           children: "\u6682\u65E0\u6570\u636E"
         })
-      }, "no-data") : filteredHierarchyOptions.map(function (opt) {
-        return opt.children && opt.children.length > 0 ? /*#__PURE__*/_jsx(Menu.SubMenu, {
-          title: opt.label,
-          className: "formula-editor-dropdown-submenu",
-          children: opt.children.map(function (child) {
-            return /*#__PURE__*/_jsx(Menu.Item, {
-              className: "formula-editor-dropdown-item",
-              onClick: function onClick() {
-                return handleOptionClick(child);
-              },
-              children: child.label
-            }, child.value);
-          })
-        }, opt.value) : /*#__PURE__*/_jsxs(Menu.Item, {
-          className: "formula-editor-dropdown-item",
-          onClick: function onClick() {
-            return handleOptionClick(opt);
-          },
-          children: [opt.label, opt.info ? /*#__PURE__*/_jsx(Tooltip, {
-            title: opt.info,
-            children: /*#__PURE__*/_jsx(InfoCircleOutlined, {
-              style: {
-                color: '#FF9900',
-                marginLeft: 4
-              }
-            })
-          }) : null]
-        }, opt.value);
-      })
+      }, "no-data") : renderMenuItems(filteredHierarchyOptions)
     });
+    var handleChange = useCallback(function (value) {
+      onChange(!isNil(value) ? value : null);
+    }, [onChange]);
+    useEffect(function () {
+      if (isEditing) {
+        var _inputNumberRef$curre;
+        inputNumberRef === null || inputNumberRef === void 0 || (_inputNumberRef$curre = inputNumberRef.current) === null || _inputNumberRef$curre === void 0 || _inputNumberRef$curre.focus();
+      }
+    }, [isEditing]);
+    var reFocus = useCallback(function () {
+      if (isEditing) {
+        var _inputNumberRef$curre2;
+        inputNumberRef === null || inputNumberRef === void 0 || (_inputNumberRef$curre2 = inputNumberRef.current) === null || _inputNumberRef$curre2 === void 0 || _inputNumberRef$curre2.focus();
+      }
+    }, [isEditing]);
+    if (choseEditor && choseEditor(record)) {
+      var _ref3;
+      return /*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({
+        ref: inputNumberRef,
+        onBlur: reFocus
+      }, inputArgs), {}, {
+        className: "number-editor",
+        onMouseDown: function onMouseDown(e) {
+          return e.stopPropagation();
+        },
+        value: (_ref3 = originValue) !== null && _ref3 !== void 0 ? _ref3 : '',
+        onChange: function onChange(e) {
+          handleChange(e.target.value);
+        }
+      }));
+    }
     return /*#__PURE__*/_jsx(Dropdown, {
       overlayClassName: "dropDownOffset",
       overlay: dropdownContent,
@@ -604,22 +648,40 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
   var flatOptions = flattenOptions(options);
 
   // checker：使用 validateCalculationExpr 校验语法 + 校验变量是否都在 options 中
-  FormulaInputEditor.checker = function (value) {
+  FormulaInputEditor.checker = function (value, record, currentValue) {
     if (isNil(value)) return true;
+    if (choseEditor && choseEditor(record)) {
+      var _String;
+      var result = (_String = String(value)) === null || _String === void 0 ? void 0 : _String.replace(/,/g, '');
+      result = formulaString(result, currentValue, precision);
+      // parse number with thousands separator
+      var range = rangeMethod === null || rangeMethod === void 0 ? void 0 : rangeMethod(record);
+      if (!isNil(range === null || range === void 0 ? void 0 : range.max) && !isNil(range === null || range === void 0 ? void 0 : range.min)) {
+        var _ref4 = range || {},
+          _ref4$max = _ref4.max,
+          _max = _ref4$max === void 0 ? 0 : _ref4$max,
+          _ref4$min = _ref4.min,
+          _min = _ref4$min === void 0 ? 0 : _ref4$min;
+        if (result < _min || result > _max) {
+          warnMethod === null || warnMethod === void 0 || warnMethod(record);
+          return false;
+        }
+      }
+      if (isNaN(result)) {
+        return false;
+      }
+      return true;
+    }
     var strValue = String(value);
-
     // 如果以 = 开头，去掉 = 后校验
     var expr = strValue.startsWith('=') ? strValue.slice(1) : strValue;
     var parsedExpr = replaceLabelsWithValues(expr, flatOptions);
-
     // 空表达式不校验
     if (!parsedExpr.trim()) return true;
-
     // 1. 语法校验
     if (!validateCalculationExpr(parsedExpr)) {
       return false;
     }
-
     // 2. 变量校验：所有变量必须在 options 中
     if (!validateVariables(parsedExpr, flatOptions)) {
       return false;
@@ -628,10 +690,15 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
   };
 
   // formula：校验公式，校验成功返回 currentValue
-  FormulaInputEditor.formula = function (value, currentValue) {
+  FormulaInputEditor.formula = function (value, record, currentValue) {
     if (isNil(value)) {
       return null;
     }
+    if (choseEditor && choseEditor(record)) {
+      var _String2;
+      var formatValue = (_String2 = String(value)) === null || _String2 === void 0 ? void 0 : _String2.replace(/,/g, '');
+      return formulaString(formatValue, currentValue, precision, max, min, true);
+    }
     var strValue = String(value);
     var hasEqualSign = strValue.startsWith('=');
     var expr = hasEqualSign ? strValue.slice(1) : strValue;
@@ -656,8 +723,17 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
   };
 
   // parser：粘贴时处理，将 label 转换为 value
-  FormulaInputEditor.parser = function (value) {
+  FormulaInputEditor.parser = function (value, record, currentValue) {
     if (isNil(value)) return null;
+    if (choseEditor && choseEditor(record)) {
+      var _String3;
+      var result = (_String3 = String(value)) === null || _String3 === void 0 ? void 0 : _String3.replace(/[,|%]/g, '');
+      result = formulaString(result, currentValue, precision);
+      if (isNil(result) || isNaN(result)) {
+        return null;
+      }
+      return result;
+    }
     var strValue = String(value);
     var hasEqualSign = strValue.startsWith('=');
     var expr = hasEqualSign ? strValue.slice(1) : strValue;
@@ -668,15 +744,24 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
   };
 
   // formatter：复制时触发，将 value 转换为 label
-  FormulaInputEditor.formatter = function (value) {
-    if (isNil(value)) return null;
-    var strValue = String(value);
+  FormulaInputEditor.formatter = function (value, record) {
+    if (choseEditor && choseEditor(record)) {
+      var _String4;
+      if (isNil(value) || isNaN(value)) {
+        return null;
+      }
+      var result = parseFloat((_String4 = String(value)) === null || _String4 === void 0 ? void 0 : _String4.replace(/,/g, ''));
+      return result;
+    }
+    var replaceValue = replaceIndex ? get(record, [replaceIndex]) : value;
+    if (isNil(replaceValue)) return null;
+    var strValue = String(replaceValue);
     var hasEqualSign = strValue.startsWith('=');
     var expr = hasEqualSign ? strValue.slice(1) : strValue;
 
     // 将 value 替换为 label
     var displayExpr = replaceValuesWithLabels(expr, flatOptions);
-    return hasEqualSign ? '=' + displayExpr : displayExpr;
+    return hasEqualSign ? displayExpr : '=' + displayExpr;
   };
   return FormulaInputEditor;
 };

package/dist/core/editor/InputOptionsEditor/utils.d.ts

@@ -40,7 +40,7 @@ export declare const validateVariables: (expr: string, flatOptions: {
     value: string;
 }[]) => boolean;
 /**
- * 扁平化选项列表（将 children 展开）
+ * 扁平化选项列表（只获取叶子节点）
  */
 export declare const flattenOptions: (options: {
     label: string;

package/dist/core/editor/InputOptionsEditor/utils.js

@@ -38,7 +38,7 @@ export var replaceValuesWithLabels = function replaceValuesWithLabels(expr, flat
   } finally {
     _iterator.f();
   }
-  return result.replace(/\s/g, '');
+  return result.trim();
 };
 
 /**
@@ -207,7 +207,7 @@ export var validateVariables = function validateVariables(expr, flatOptions) {
 };
 
 /**
- * 扁平化选项列表（将 children 展开）
+ * 扁平化选项列表（只获取叶子节点）
  */
 export var flattenOptions = function flattenOptions(options) {
   var result = [];
@@ -216,12 +216,15 @@ export var flattenOptions = function flattenOptions(options) {
   try {
     for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
       var opt = _step5.value;
-      result.push({
-        label: opt.label,
-        value: opt.value
-      });
       if (opt.children && opt.children.length > 0) {
+        // 有 children，递归获取叶子节点，不添加当前节点
         result.push.apply(result, _toConsumableArray(flattenOptions(opt.children)));
+      } else {
+        // 没有 children，是叶子节点，添加到结果
+        result.push({
+          label: opt.label,
+          value: opt.value
+        });
       }
     }
   } catch (err) {

package/dist/core/editor/numberEditor/index.d.ts

@@ -9,6 +9,7 @@ type inputProps = Partial<Pick<InputNumberProps, 'max' | 'min' | 'addonBefore' |
         min?: number;
     };
 }>;
+export declare const formulaString: (value: unknown, currentValue: unknown, precision?: number, max?: number, min?: number, isEdit?: boolean) => unknown;
 export declare const NumberEditor: SheetType.CellEditor;
 export declare const getNumberEditor: (extraProps?: inputProps, getExtraProps?: ((props: SheetType.CellEditorProps) => inputProps) | undefined) => SheetType.CellEditor;
 export {};

package/dist/core/editor/numberEditor/index.js

@@ -13,7 +13,7 @@ import { evaluate } from 'mathjs';
 import { useCallback, useEffect, useRef } from 'react';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-var formulaString = function formulaString(value, currentValue, precision, max, min, isEdit) {
+export var formulaString = function formulaString(value, currentValue, precision, max, min, isEdit) {
   var curNumber = currentValue !== null && currentValue !== void 0 ? currentValue : 0;
   var headStr = head(String(value).trim());
   var formula = String(value).replace('=', '');
@@ -106,7 +106,7 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
       }
     }));
   };
-  NumberEditor.formula = function (value, currentValue) {
+  NumberEditor.formula = function (value, record, currentValue) {
     var _String;
     if (isNil(value)) {
       return null;

package/dist/core/sheet/Cell.js

@@ -89,7 +89,7 @@ var Cell = function Cell(props) {
       // 转化一下公式
       if (cell !== null && cell !== void 0 && (_cell$dataEditor3 = cell.dataEditor) !== null && _cell$dataEditor3 !== void 0 && _cell$dataEditor3.formula) {
         var _cell$dataEditor4;
-        newValue = cell === null || cell === void 0 || (_cell$dataEditor4 = cell.dataEditor) === null || _cell$dataEditor4 === void 0 ? void 0 : _cell$dataEditor4.formula(value, valueRef.current);
+        newValue = cell === null || cell === void 0 || (_cell$dataEditor4 = cell.dataEditor) === null || _cell$dataEditor4 === void 0 ? void 0 : _cell$dataEditor4.formula(value, cell.record, valueRef.current);
         if (newValue === Infinity) {
           antConfirm({
             title: '公式有误',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhenliang/sheet",
-  "version": "0.2.5-beta.4",
+  "version": "0.2.5-beta.6",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",