@zat-design/sisyphus-react 4.0.0-beta.2 → 4.0.0-beta.4

package/es/ProEditTable/utils/config.js

@@ -1,16 +1,15 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _set from "lodash/set";
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
-import { jsx as _jsx } from "react/jsx-runtime";
 import { PlusOutlined } from '@ant-design/icons';
 import { tools } from '@zat-design/utils';
 import { message } from 'antd';
-import { onDelete, getRandom } from './tools';
-import locale from '../../locale';
+import { set } from 'lodash';
+import { onDelete, getRandom } from "./tools";
+import locale from "../../locale";
+import { jsx as _jsx } from "react/jsx-runtime";
 export var defaultBtnNameMap = {
   add: locale.ProEditTable.add,
   edit: locale.ProEditTable.edit,
@@ -21,10 +20,12 @@ export var defaultBtnNameMap = {
   cancel: locale.ProEditTable.cancel,
   custom: locale.ProEditTable.custom
 };
+
 // 默认按钮配置
 export var iconMap = {
-  add: _jsx(PlusOutlined, {})
+  add: /*#__PURE__*/_jsx(PlusOutlined, {})
 };
+
 // 单行编辑 操作栏默认配置按钮
 export var defaultSingleActionKeys = ['edit', 'delete', 'save', 'cancel'];
 // 多行编辑 操作栏默认配置按钮
@@ -33,6 +34,7 @@ export var defaultMultipleActionKeys = ['delete'];
 export var defaultEditingActionKeys = ['save', 'cancel'];
 // 工具栏默认配置按钮
 export var defaultToolbarKeys = ['add', 'mulDelete'];
+
 // 操作枚举
 export var actions = {
   edit: function edit(_ref) {
@@ -52,7 +54,7 @@ export var actions = {
     // 开启编辑状态
     nextEditingKeys.push(record.rowKey);
     // 编辑时赋值编辑状态，供validator做保存校验
-    if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
+    if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
       record._isEditing = true;
     } else {
       delete record._isEditing;
@@ -64,10 +66,10 @@ export var actions = {
     });
   },
   save: function () {
-    var _save = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref2) {
+    var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.n) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
             record = _ref2.record, editingKeys = _ref2.editingKeys, setState = _ref2.setState, form = _ref2.form, rowName = _ref2.rowName, virtualRowName = _ref2.virtualRowName, result = _ref2.result;
             // 保存返回数据与当前行内数据做合并
@@ -78,20 +80,21 @@ export var actions = {
             nextEditingKeys = editingKeys.filter(function (key) {
               return key !== record.rowKey;
             }); // 保存后取消编辑状态，供validator做保存校验
-            if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
+            if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
               record._isEditing = true;
             } else {
               delete record._isEditing;
             }
             // 防止value引用不变, 值不更新 - (自定义组件)
             values = form.getFieldsValue();
-            _set(values, rowName, record);
+            set(values, rowName, record);
             form.setFieldsValue(values);
             setState({
               editingKeys: nextEditingKeys
             });
-          case 1:
-            return _context.a(2);
+          case 10:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -112,7 +115,7 @@ export var actions = {
       return key !== record.rowKey;
     });
     // 保存后取消编辑状态，供validator做保存校验
-    if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
+    if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
       record._isEditing = true;
     } else {
       delete record._isEditing;
@@ -131,7 +134,7 @@ export var actions = {
     } else {
       // 防止value引用不变, 值不更新 - (自定义组件)
       var values = form.getFieldsValue();
-      _set(values, virtualRowName, record);
+      set(values, virtualRowName, record);
       form.setFieldsValue(values);
     }
   },
@@ -166,21 +169,21 @@ export var actions = {
     }
   },
   add: function () {
-    var _add = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(_ref5) {
-      var _tableRef$current, _tableRef$current$chi, _tableRef$current$chi2, _tableRef$current$chi3;
+    var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
+      var _tableRef$current, _tableRef$current$scr;
       var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys;
-      return _regenerator().w(function (_context4) {
-        while (1) switch (_context4.n) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls, page = _ref5.page, handlePageChange = _ref5.handlePageChange;
             nextData = _toConsumableArray(form.getFieldValue(name) || []); // 单行编辑时，需要先保存，才能进行下面的编辑
             if (!(virtualKey && editingKeys.length >= 1)) {
-              _context4.n = 1;
+              _context4.next = 5;
               break;
             }
             message.warning(onlyOneLineMsg);
-            return _context4.a(2, false);
-          case 1:
+            return _context4.abrupt("return", false);
+          case 5:
             rowKey = getRandom(); // 添加新增对象数据
             addData = _objectSpread(_objectSpread({}, _typeof(result) === 'object' ? result : {}), {}, {
               rowKey: rowKey
@@ -191,30 +194,33 @@ export var actions = {
             }
             if (insertType === 'before') {
               nextData.unshift(addData);
-              setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
-                return _regenerator().w(function (_context2) {
-                  while (1) switch (_context2.n) {
+              setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                  while (1) switch (_context2.prev = _context2.next) {
                     case 0:
                       handlePageChange(1, page.pageSize);
                     case 1:
-                      return _context2.a(2);
+                    case "end":
+                      return _context2.stop();
                   }
                 }, _callee2);
               })), 0);
             } else {
               nextData.push(addData);
               nextPageNum = Math.ceil(tools.calc(nextData.length, '/', page.pageSize));
-              setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
-                return _regenerator().w(function (_context3) {
-                  while (1) switch (_context3.n) {
+              setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                  while (1) switch (_context3.prev = _context3.next) {
                     case 0:
                       handlePageChange(nextPageNum, page.pageSize);
                     case 1:
-                      return _context3.a(2);
+                    case "end":
+                      return _context3.stop();
                   }
                 }, _callee3);
               })), 0);
             }
+
             // 当单选情况下，存储正在编辑值
             if (virtualKey) {
               nextEditingKeys = _toConsumableArray(editingKeys); // 开启编辑状态
@@ -225,18 +231,19 @@ export var actions = {
               });
             }
             form.setFieldValue(name, nextData);
-            (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$chi = _tableRef$current.children[0]) === null || _tableRef$current$chi === void 0 ? void 0 : (_tableRef$current$chi2 = _tableRef$current$chi.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$chi2 === void 0 ? void 0 : (_tableRef$current$chi3 = _tableRef$current$chi2.scrollTo) === null || _tableRef$current$chi3 === void 0 ? void 0 : _tableRef$current$chi3.call(_tableRef$current$chi2, {
+            (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.children[0]) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current === void 0 || (_tableRef$current$scr = _tableRef$current.scrollTo) === null || _tableRef$current$scr === void 0 || _tableRef$current$scr.call(_tableRef$current, {
               top: insertType === 'before' ? -10000 : 10000,
               behavior: 'smooth'
             });
             if (!virtualKey) {
-              _context4.n = 2;
+              _context4.next = 15;
               break;
             }
-            _context4.n = 2;
+            _context4.next = 15;
             return form.validateFields([name]);
-          case 2:
-            return _context4.a(2);
+          case 15:
+          case "end":
+            return _context4.stop();
         }
       }, _callee4);
     }));

package/es/ProEditTable/utils/diffOriginal.d.ts

@@ -4,6 +4,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
+    type?: string;
     onDiff?: ({ originValue, originRecord, value, record, index, }: {
         originValue: any;
         originRecord: any;

package/es/ProEditTable/utils/diffOriginal.js

@@ -1,12 +1,69 @@
-import _isObject from "lodash/isObject";
-import _isFunction from "lodash/isFunction";
-import _isEqual from "lodash/isEqual";
+import { isEqual, isFunction, isObject } from 'lodash';
 import { validate } from '@zat-design/utils';
 var isEmpty = validate.isEmpty;
+
+// 比较策略接口
+
+// 数字类型标准化函数
+var normalizeNumberValue = function normalizeNumberValue(value) {
+  if (value === null || value === undefined || value === '') return null;
+  var num = Number(value);
+  return Number.isNaN(num) ? null : num;
+};
+
+// InputNumber 比较策略
+var inputNumberStrategy = {
+  compare: function compare(val1, val2) {
+    var num1 = normalizeNumberValue(val1);
+    var num2 = normalizeNumberValue(val2);
+    return num1 === num2;
+  }
+};
+
+// ProNumberRange 比较策略
+var proNumberRangeStrategy = {
+  compare: function compare(val1, val2) {
+    if (!Array.isArray(val1) || !Array.isArray(val2)) return false;
+    if (val1.length !== val2.length) return false;
+    return val1.every(function (item, index) {
+      var num1 = normalizeNumberValue(item);
+      var num2 = normalizeNumberValue(val2[index]);
+      return num1 === num2;
+    });
+  }
+};
+
+// 数字类型处理函数
+var handleNumberTypeDiff = function handleNumberTypeDiff(params) {
+  var originalValue = params.originalValue,
+    value = params.value,
+    type = params.type;
+  var isEmptyVal = isEmpty(value);
+  var isEmptyOrg = isEmpty(originalValue);
+
+  // 都为空视为相等
+  if (isEmptyOrg && isEmptyVal) return 'same';
+
+  // 如果原始值为空 且当前有值的话 视为新增
+  if (isEmptyOrg && !isEmptyVal) return 'add';
+
+  // 根据类型选择对应的比较策略
+  var compareStrategy;
+  if (type === 'InputNumber') {
+    compareStrategy = inputNumberStrategy;
+  } else if (type === 'ProNumberRange') {
+    compareStrategy = proNumberRangeStrategy;
+  } else {
+    return 'changed'; // 未知类型视为已改变
+  }
+  return compareStrategy.compare(value, originalValue) ? 'same' : 'changed';
+};
+
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
 var filterObject = function filterObject(data) {
-  if (!_isObject(data) || data === null) return data;
+  if (!isObject(data) || data === null) return data;
+
   // ['1', undefined] ['1', ''] 视为相等
   if (Array.isArray(data)) {
     // 数组中全是empty值的话 视为null
@@ -26,6 +83,7 @@ var filterObject = function filterObject(data) {
       resData[key] = data[key];
     }
   });
+
   // 空对象视为null 比较时 null undefined {} [] '' 视为相等
   if (!Object.keys(resData).length) return null;
   return resData;
@@ -36,9 +94,11 @@ export var diffOriginal = function diffOriginal(params) {
     onDiff = params.onDiff,
     originRecord = params.originRecord,
     record = params.record,
-    index = params.index;
+    index = params.index,
+    type = params.type;
+
   // 支持传入自定义比较事件
-  if (_isFunction(onDiff)) {
+  if (isFunction(onDiff)) {
     var diffRes = onDiff({
       originValue: originalValue,
       originRecord: originRecord,
@@ -54,13 +114,22 @@ export var diffOriginal = function diffOriginal(params) {
       return diffRes;
     }
   }
+
+  // 数字类型特殊处理
+  if (['InputNumber', 'ProNumberRange'].includes(type)) {
+    return handleNumberTypeDiff(params);
+  }
+
+  // 其他类型使用原有逻辑
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
   var isEmptyVal = isEmpty(_value);
   var isEmptyOrg = isEmpty(_originalValue);
+
   // 都为空视为相等
   if (isEmptyOrg && isEmptyVal) return 'same';
+
   // 如果原始值为空 且当前有值的话 视为新增
   if (isEmptyOrg && !isEmptyVal) return 'add';
-  return _isEqual(_value, _originalValue) ? 'same' : 'changed';
+  return isEqual(_value, _originalValue) ? 'same' : 'changed';
 };

package/es/ProEditTable/utils/getDefaultProps.js

@@ -1,6 +1,5 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _isEqual from "lodash/isEqual";
-import _get from "lodash/get";
+import { get, isEqual } from 'lodash';
 var defaultPropsMap = {
   ProSelect: function ProSelect(props) {
     var fieldProps = props.fieldProps,
@@ -9,18 +8,19 @@ var defaultPropsMap = {
     var _ref = fieldProps || {},
       filterInList = _ref.filterInList;
     var defaultProps = {};
+
     // formList场景传入列表过滤时
     if (filterInList && namePath && name) {
       var _namePath = _toConsumableArray(namePath).splice(2, namePath.length - 1);
       defaultProps.shouldUpdate = function (preValues, curValues) {
-        var _get2, _get2$map, _get3, _get3$map;
-        var preListValue = (_get2 = _get(preValues, name)) === null || _get2 === void 0 ? void 0 : (_get2$map = _get2.map) === null || _get2$map === void 0 ? void 0 : _get2$map.call(_get2, function (item) {
-          return _get(item, _namePath);
+        var _get, _get$map, _get2, _get2$map;
+        var preListValue = (_get = get(preValues, name)) === null || _get === void 0 || (_get$map = _get.map) === null || _get$map === void 0 ? void 0 : _get$map.call(_get, function (item) {
+          return get(item, _namePath);
         });
-        var curListValue = (_get3 = _get(curValues, name)) === null || _get3 === void 0 ? void 0 : (_get3$map = _get3.map) === null || _get3$map === void 0 ? void 0 : _get3$map.call(_get3, function (item) {
-          return _get(item, _namePath);
+        var curListValue = (_get2 = get(curValues, name)) === null || _get2 === void 0 || (_get2$map = _get2.map) === null || _get2$map === void 0 ? void 0 : _get2$map.call(_get2, function (item) {
+          return get(item, _namePath);
         });
-        return !_isEqual(preListValue, curListValue);
+        return !isEqual(preListValue, curListValue);
       };
     }
     return defaultProps;