@lemon-fe/components 1.5.2 → 1.5.3

package/es/data-grid/components/custom-panel/field-modal.js

@@ -226,10 +226,13 @@ export default function FieldModal(props) {
     }),
     allowClear: true
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    label: fieldModal.customColumnExpressionText,
+    label: /*#__PURE__*/React.createElement("span", null, fieldModal.customColumnExpressionText, /*#__PURE__*/React.createElement(TipMark, {
+      infoContent: fieldModal.customColumnExpressionTextTooltip
+    })),
     name: 'expression',
     rules: [{
-      required: true
+      required: true,
+      message: fieldModal.customColumnExpressionTextRequired
     }]
   }, /*#__PURE__*/React.createElement(Input.TextArea, {
     ref: ref,

package/es/data-grid/index.js

@@ -74,17 +74,39 @@ function toNumber(a) {
   }
   return a;
 }
+
+/**
+ * 用于四则运算的数值转换：(基本按原逻辑)
+ * - 字符串以 % 结尾（如 "50%" / "1,234.5%"）→ 转为 BigNumber 后除以 100（0.5 / 12.345）
+ * - 普通数字字符串 → 去千分位后返回
+ * - 非法/NaN 格式 → 保持原值，避免污染整个表达式
+ * - 表达式字面量中不允许出现 %（中间的 % 视为取余运算符）
+ */
+function toMathNumber(a) {
+  if (typeof a === 'string') {
+    var normalized = a.replace(/,/g, '');
+    if (fieldSuffix.test(normalized)) {
+      var bn = new BigNumber(normalized.replace(fieldSuffix, ''));
+      if (bn.isNaN() || !bn.isFinite()) {
+        return a;
+      }
+      return bn.div(100);
+    }
+    return normalized;
+  }
+  return a;
+}
 var add = function add(a, b) {
-  return new BigNumber(toNumber(a)).plus(toNumber(b));
+  return new BigNumber(a).plus(b);
 };
 var subtract = function subtract(a, b) {
-  return new BigNumber(toNumber(a)).minus(toNumber(b));
+  return new BigNumber(a).minus(b);
 };
 var multiply = function multiply(a, b) {
-  return new BigNumber(toNumber(a)).times(toNumber(b));
+  return new BigNumber(a).times(b);
 };
 var divide = function divide(a, b) {
-  return new BigNumber(toNumber(a)).div(toNumber(b));
+  return new BigNumber(a).div(b);
 };
 var defaultColDef = {
   resizable: true,
@@ -1293,7 +1315,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
                     var _getValue;
                     var _ref7 = _slicedToArray(_ref6, 1),
                       k = _ref7[0];
-                    return [k, (_getValue = getValue(scopeMap[k])) !== null && _getValue !== void 0 ? _getValue : ''];
+                    return [k, toMathNumber((_getValue = getValue(scopeMap[k])) !== null && _getValue !== void 0 ? _getValue : '')];
                   }));
                   return code.evaluate(scope);
                 } catch (err) {

package/es/data-grid/locale/en_US.js

@@ -30,6 +30,8 @@ var locale = {
     addCustomColumnText: 'Add Custom Column',
     customColumnNameText: 'Name',
     customColumnExpressionText: 'Expression',
+    customColumnExpressionTextRequired: 'Please enter the custom column expression',
+    customColumnExpressionTextTooltip: 'Custom column formula only supports calculation on numeric columns, and only supports calculation with [four arithmetic operations (addition, subtraction, multiplication, division, parentheses), statistical functions (minimum value min, maximum value max, average value AVERAGE), rounding functions (round up ceil, round down floor, round)].',
     customColumnExpressionPlaceholder: 'Custom Expression length limit of 300',
     customColumnDecimalPlacesText: 'Decimal places',
     customColumnParentHeaderText: 'The corresponding superior header',

package/es/data-grid/locale/id.js

@@ -27,6 +27,8 @@ var locale = {
     addCustomColumnText: 'Tambah kolom kustom',
     customColumnNameText: 'Nama kolom kustom',
     customColumnExpressionText: 'Rumus kustom',
+    customColumnExpressionTextRequired: 'Silakan masukkan rumus kustom',
+    customColumnExpressionTextTooltip: 'Rumus kolom kustom hanya mendukung perhitungan pada kolom numerik, dan hanya mendukung perhitungan dengan [empat operasi aritmetika (tambah, kurang, kali, bagi, tanda kurung), fungsi statistik (nilai minimum min, nilai maksimum max, rata-rata AVERAGE), fungsi pembulatan (pembulatan ke atas ceil, pembulatan ke bawah floor, round)].',
     customColumnExpressionPlaceholder: 'Panjang maksimum rumus kustom adalah 300',
     customColumnDecimalPlacesText: 'Jumlah desimal',
     customColumnParentHeaderText: 'Header tabel tingkat atas yang dimilikinya',

package/es/data-grid/locale/locale.d.ts

@@ -9,6 +9,8 @@ export interface DataGridLocale {
         addCustomColumnText: string;
         customColumnNameText: string;
         customColumnExpressionText: string;
+        customColumnExpressionTextRequired: string;
+        customColumnExpressionTextTooltip: string;
         customColumnExpressionPlaceholder: string;
         customColumnDecimalPlacesText: string;
         customColumnParentHeaderText: string;

package/es/data-grid/locale/vi.js

@@ -27,6 +27,8 @@ var locale = {
     addCustomColumnText: 'Thêm cột tùy chỉnh',
     customColumnNameText: 'Tên cột tùy chỉnh',
     customColumnExpressionText: 'Công thức tùy chỉnh',
+    customColumnExpressionTextRequired: 'Vui lòng nhập công thức cột tùy chỉnh',
+    customColumnExpressionTextTooltip: 'Công thức cột tùy chỉnh chỉ hỗ trợ tính toán trên các cột dữ liệu số, chỉ hỗ trợ các phép tính [bốn phép toán số học (cộng, trừ, nhân, chia, dấu ngoặc), hàm thống kê (giá trị nhỏ nhất min, giá trị lớn nhất max, giá trị trung bình AVERAGE), hàm làm tròn (làm tròn lên ceil, làm tròn xuống floor, round)]',
     customColumnExpressionPlaceholder: 'Độ dài tối đa của công thức tùy chỉnh là 300',
     customColumnDecimalPlacesText: 'Số chữ số thập phân',
     customColumnParentHeaderText: 'Tiêu đề bảng cấp trên mà nó thuộc về',

package/es/data-grid/locale/zh_CN.js

@@ -27,6 +27,8 @@ var locale = {
     addCustomColumnText: '添加自定义列',
     customColumnNameText: '自定义列名',
     customColumnExpressionText: '自定义公式',
+    customColumnExpressionTextRequired: '请输入自定义公式',
+    customColumnExpressionTextTooltip: '自定义列公式仅支持对数值列计算，仅支持【四则运算（加减乘除、括号）、统计函数(最小值min, 最大值max、平均值AVERAGE)、四舍五入函数(向上取整ceil, 向下取整floor, round)】计算',
     customColumnExpressionPlaceholder: '自定义公式长度上限300',
     customColumnDecimalPlacesText: '小数位数',
     customColumnParentHeaderText: '所属上级表头',

package/es/data-grid/locale/zh_Hant_HK.js

@@ -27,6 +27,8 @@ var locale = {
     addCustomColumnText: '添加自定義列',
     customColumnNameText: '自定義列名',
     customColumnExpressionText: '自定義公式',
+    customColumnExpressionTextRequired: '請輸入自定義公式',
+    customColumnExpressionTextTooltip: '自定義公式僅支持數值列計算，僅支持【四則運算（加減乘除、括號）、統計函數(最小值min, 最大值max、平均值AVERAGE)、四捨五入函數(向上取整ceil, 向下取整floor, round)】計算',
     customColumnExpressionPlaceholder: '自定義公式長度上限300',
     customColumnDecimalPlacesText: '小數位數',
     customColumnParentHeaderText: '所屬上級表頭',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "f1d68fc8b34f14b697a46df4c0d2bad9bc698426"
+  "gitHead": "4e63726348818cadaa4544aec696136fabaed9a5"
 }