@zat-design/sisyphus-react 3.13.15 → 3.13.16-beta.2

package/es/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -133,7 +133,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       onDiff: onDiff,
       originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
       record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
-      index: index
+      index: index,
+      type: props.type
     });
   }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
@@ -154,10 +155,18 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       }
       _children = viewRender;
     }
+    // 对于ProNumberRange类型，需要将字符串数组转换为数字数组
+    var processedValue = orgValue;
+    if (type === 'ProNumberRange' && Array.isArray(orgValue)) {
+      processedValue = orgValue.map(function (item) {
+        var num = Number(item);
+        return Number.isNaN(num) ? item : num;
+      });
+    }
     return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, _defineProperty(_defineProperty({
       // @ts-ignore
       isView: true
-    }, valuePropName, orgValue), "checked", type === 'Switch' ? originalValue : undefined))) : undefined;
+    }, valuePropName, processedValue), "checked", type === 'Switch' ? originalValue : undefined))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
     return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
@@ -180,6 +189,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     'pro-form-item-add': isAdd
   });
   var open = tipOpenCalc();
+  // debugger;
   return _jsx(_Tooltip, {
     open: open,
     getPopupContainer: function getPopupContainer(trigger) {

package/es/ProEditTable/propsType.d.ts

@@ -7,7 +7,7 @@ import type { NamePath } from 'antd/es/form/interface';
 import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
 import type { ProFormValueType, FunctionArgs, ProRule } from '../ProForm/components/render/propsType';
-import type { DiffOriginalParams } from '../ProForm/utils/diffOriginal';
+import type { DiffOriginalParams } from './utils/diffOriginal';
 /**
  * 操作类型定义
  */

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

@@ -3,6 +3,54 @@ import _isFunction from "lodash/isFunction";
 import _isEqual from "lodash/isEqual";
 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) {
@@ -36,7 +84,8 @@ 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)) {
     var diffRes = onDiff({
@@ -54,6 +103,11 @@ 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);

package/es/ProForm/components/render/ChangedWrapper.js

@@ -58,8 +58,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      onDiff: onDiff
-      // name: namesStr || name,
+      onDiff: onDiff,
+      type: props.type
     });
   }, [isWatch, noChange, props[valuePropName], originalValue, _typeof(onDiff)]);
   var isAdd = diffType === 'add';

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

@@ -3,6 +3,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
+    type?: string;
     onDiff?: (originalValue: any, currentValue: any) => DiffType | boolean | undefined;
 }
 export type DiffType = 'same' | 'add' | 'changed';

package/es/ProForm/utils/diffOriginal.js

@@ -2,6 +2,54 @@ import _isObject from "lodash/isObject";
 import _isFunction from "lodash/isFunction";
 import _isEqual from "lodash/isEqual";
 import { isEmpty } from '../../utils';
+// 数字类型标准化函数
+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) {
@@ -32,7 +80,8 @@ var filterObject = function filterObject(data) {
 export var diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
     value = params.value,
-    onDiff = params.onDiff;
+    onDiff = params.onDiff,
+    type = params.type;
   // 支持传入自定义比较事件
   if (_isFunction(onDiff)) {
     var diffRes = onDiff(originalValue, value);
@@ -44,6 +93,10 @@ 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);

package/es/ProSelect/utils/index.js

@@ -48,9 +48,66 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     }
   });
   var diffList = _difference(selectValues, mode === 'multiple' ? value : [value]);
-  return dataSource.filter(function (item) {
+  var result = dataSource.filter(function (item) {
     return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
   });
+  var isSingle = list === null || list === void 0 ? void 0 : list.find(function (item) {
+    return item === null || item === void 0 ? void 0 : item._isEditing;
+  });
+  // 修复单行编辑模式下，选择器无法过滤的问题
+  if (mode === 'multiple' && isSingle) {
+    // 找到当前编辑行
+    var editingRow = list.find(function (item) {
+      return item === null || item === void 0 ? void 0 : item._isEditing;
+    });
+    // 收集其他行的已选择值
+    var otherRowsValues = [];
+    list.forEach(function (item) {
+      if (item !== editingRow) {
+        // 排除当前编辑行
+        var _result = item;
+        var _iterator2 = _createForOfIteratorHelper(selectName),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var key = _step2.value;
+            _result = _result[key];
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+        if (_result) {
+          otherRowsValues.push.apply(otherRowsValues, _toConsumableArray(Array.isArray(_result) ? _result : [_result]));
+        }
+      }
+    });
+    // 获取当前编辑行的已选择值
+    var currentRowValues = [];
+    if (editingRow) {
+      var _result2 = editingRow;
+      var _iterator3 = _createForOfIteratorHelper(selectName),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var key = _step3.value;
+          _result2 = _result2[key];
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+      currentRowValues = Array.isArray(_result2) ? _result2 : _result2 ? [_result2] : [];
+    }
+    // 从dataSource中过滤掉其他行的值，但保留当前行的值
+    var _diffList = _difference(otherRowsValues, currentRowValues);
+    return dataSource.filter(function (item) {
+      return !_diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
+    });
+  }
+  return result;
 };
 /**
  * 返回当前组件可以显示的数据源

package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -141,7 +141,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       onDiff: onDiff,
       originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
       record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
-      index: index
+      index: index,
+      type: props.type
     });
   }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
@@ -162,10 +163,18 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       }
       _children = viewRender;
     }
+    // 对于ProNumberRange类型，需要将字符串数组转换为数字数组
+    var processedValue = orgValue;
+    if (type === 'ProNumberRange' && Array.isArray(orgValue)) {
+      processedValue = orgValue.map(function (item) {
+        var num = Number(item);
+        return Number.isNaN(num) ? item : num;
+      });
+    }
     return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({
       // @ts-ignore
       isView: true
-    }, valuePropName, orgValue), "checked", type === 'Switch' ? originalValue : undefined))) : undefined;
+    }, valuePropName, processedValue), "checked", type === 'Switch' ? originalValue : undefined))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
     return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest));
@@ -188,6 +197,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     'pro-form-item-add': isAdd
   });
   var open = tipOpenCalc();
+  // debugger;
   return (0, _jsxRuntime.jsx)(_tooltip.default, {
     open: open,
     getPopupContainer: function getPopupContainer(trigger) {

package/lib/ProEditTable/propsType.d.ts

@@ -7,7 +7,7 @@ import type { NamePath } from 'antd/es/form/interface';
 import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
 import type { ProFormValueType, FunctionArgs, ProRule } from '../ProForm/components/render/propsType';
-import type { DiffOriginalParams } from '../ProForm/utils/diffOriginal';
+import type { DiffOriginalParams } from './utils/diffOriginal';
 /**
  * 操作类型定义
  */

package/lib/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/lib/ProEditTable/utils/diffOriginal.js

@@ -10,6 +10,54 @@ var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
 var _utils = require("@zat-design/utils");
 var isEmpty = _utils.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) {
@@ -43,7 +91,8 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     onDiff = params.onDiff,
     originRecord = params.originRecord,
     record = params.record,
-    index = params.index;
+    index = params.index,
+    type = params.type;
   // 支持传入自定义比较事件
   if ((0, _isFunction2.default)(onDiff)) {
     var diffRes = onDiff({
@@ -61,6 +110,11 @@ var diffOriginal = exports.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);

package/lib/ProForm/components/render/ChangedWrapper.js

@@ -66,8 +66,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      onDiff: onDiff
-      // name: namesStr || name,
+      onDiff: onDiff,
+      type: props.type
     });
   }, [isWatch, noChange, props[valuePropName], originalValue, (0, _typeof2.default)(onDiff)]);
   var isAdd = diffType === 'add';

package/lib/ProForm/utils/diffOriginal.d.ts

@@ -3,6 +3,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
+    type?: string;
     onDiff?: (originalValue: any, currentValue: any) => DiffType | boolean | undefined;
 }
 export type DiffType = 'same' | 'add' | 'changed';

package/lib/ProForm/utils/diffOriginal.js

@@ -9,6 +9,54 @@ var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
 var _utils = require("../../utils");
+// 数字类型标准化函数
+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 = (0, _utils.isEmpty)(value);
+  var isEmptyOrg = (0, _utils.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) {
@@ -39,7 +87,8 @@ var filterObject = function filterObject(data) {
 var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
     value = params.value,
-    onDiff = params.onDiff;
+    onDiff = params.onDiff,
+    type = params.type;
   // 支持传入自定义比较事件
   if ((0, _isFunction2.default)(onDiff)) {
     var diffRes = onDiff(originalValue, value);
@@ -51,6 +100,10 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
       return diffRes;
     }
   }
+  if (['InputNumber', 'ProNumberRange'].includes(type)) {
+    return handleNumberTypeDiff(params);
+  }
+  // 其他类型使用原有逻辑
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
   var isEmptyVal = (0, _utils.isEmpty)(_value);

package/lib/ProSelect/utils/index.js

@@ -55,9 +55,66 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     }
   });
   var diffList = (0, _difference2.default)(selectValues, mode === 'multiple' ? value : [value]);
-  return dataSource.filter(function (item) {
+  var result = dataSource.filter(function (item) {
     return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
   });
+  var isSingle = list === null || list === void 0 ? void 0 : list.find(function (item) {
+    return item === null || item === void 0 ? void 0 : item._isEditing;
+  });
+  // 修复单行编辑模式下，选择器无法过滤的问题
+  if (mode === 'multiple' && isSingle) {
+    // 找到当前编辑行
+    var editingRow = list.find(function (item) {
+      return item === null || item === void 0 ? void 0 : item._isEditing;
+    });
+    // 收集其他行的已选择值
+    var otherRowsValues = [];
+    list.forEach(function (item) {
+      if (item !== editingRow) {
+        // 排除当前编辑行
+        var _result = item;
+        var _iterator2 = (0, _createForOfIteratorHelper2.default)(selectName),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var key = _step2.value;
+            _result = _result[key];
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+        if (_result) {
+          otherRowsValues.push.apply(otherRowsValues, (0, _toConsumableArray2.default)(Array.isArray(_result) ? _result : [_result]));
+        }
+      }
+    });
+    // 获取当前编辑行的已选择值
+    var currentRowValues = [];
+    if (editingRow) {
+      var _result2 = editingRow;
+      var _iterator3 = (0, _createForOfIteratorHelper2.default)(selectName),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var key = _step3.value;
+          _result2 = _result2[key];
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+      currentRowValues = Array.isArray(_result2) ? _result2 : _result2 ? [_result2] : [];
+    }
+    // 从dataSource中过滤掉其他行的值，但保留当前行的值
+    var _diffList = (0, _difference2.default)(otherRowsValues, currentRowValues);
+    return dataSource.filter(function (item) {
+      return !_diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
+    });
+  }
+  return result;
 };
 /**
  * 返回当前组件可以显示的数据源

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.15",
+  "version": "3.13.16-beta.2",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -28,7 +28,7 @@
     "postpublish": "git clean -fd",
     "release": "yarn build && npm publish",
     "release:beta": "yarn build && npm publish --tag=beta",
-    "start": "dumi dev",
+    "start": "export NODE_OPTIONS=--openssl-legacy-provider && dumi dev",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
     "tsc": "tsc --noEmit"
@@ -67,7 +67,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "1.1.37",
+    "@zat-design/utils": "1.1.41",
     "ahooks": "3.8.4",
     "antd": "4.24.16",
     "big.js": "^6.2.1",