@zat-design/sisyphus-react 4.0.0-beta.3 → 4.0.0-beta.5

package/es/ProEditTable/components/ActionButton/index.js

@@ -1,7 +1,9 @@
+import "antd/es/popconfirm/style";
+import _Popconfirm from "antd/es/popconfirm";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import React from 'react';
-import { Button, Popconfirm } from 'antd';
 import { isFunction, omit } from 'lodash';
 import { iconMap } from "../../utils/config";
 import locale from "../../../locale";
@@ -9,7 +11,7 @@ import locale from "../../../locale";
 // 渲染操作按钮
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-var ActionButton = function ActionButton(_ref) {
+var ActionButton = _ref => {
   var _editingKeys$includes, _btnConfig$buttonProp, _btnConfig$buttonProp2, _btnConfig$buttonProp3, _btnConfig$icon;
   var record = _ref.record,
     index = _ref.index,
@@ -25,33 +27,33 @@ var ActionButton = function ActionButton(_ref) {
     name = config.name,
     tableLength = config.tableLength,
     selectedRows = config.selectedRows;
-  var rowNamePath = [].concat(_toConsumableArray(name), [index]);
+  var rowNamePath = [...name, index];
 
   // 操作按钮权限控制
-  var getShow = function getShow(show) {
+  var getShow = show => {
     if (typeof show === 'function') {
       return show(record, {
-        index: index,
-        form: form,
-        name: name,
+        index,
+        form,
+        name,
         namePath: rowNamePath,
-        tableLength: tableLength,
-        selectedRows: selectedRows
+        tableLength,
+        selectedRows
       });
     }
     return show;
   };
 
   // 操作按钮权限控制
-  var getDisabled = function getDisabled(disabled) {
+  var getDisabled = disabled => {
     if (typeof disabled === 'function') {
       return disabled(record, {
-        index: index,
-        form: form,
-        name: name,
+        index,
+        form,
+        name,
         namePath: rowNamePath,
-        tableLength: tableLength,
-        selectedRows: selectedRows
+        tableLength,
+        selectedRows
       });
     }
 
@@ -76,14 +78,14 @@ var ActionButton = function ActionButton(_ref) {
 
   // 其他操作按钮Props
   var actionBtnProps = _objectSpread(_objectSpread({}, btnConfig.buttonProps), {}, {
-    onClick: function onClick() {
+    onClick: () => {
       btnConfig === null || btnConfig === void 0 || btnConfig.onEvent(record, {
-        index: index,
-        form: form,
-        name: name,
+        index,
+        form,
+        name,
         namePath: rowNamePath,
-        tableLength: tableLength,
-        selectedRows: selectedRows
+        tableLength,
+        selectedRows
       });
     },
     disabled: getDisabled((_btnConfig$buttonProp3 = btnConfig.buttonProps) === null || _btnConfig$buttonProp3 === void 0 ? void 0 : _btnConfig$buttonProp3.disabled)
@@ -92,71 +94,71 @@ var ActionButton = function ActionButton(_ref) {
   // 当传入函数时，先转成reactNode
   if (isFunction(btnConfig.label)) {
     var addIndex = tableLength ? tableLength - 1 : 0;
-    var namePath = [].concat(_toConsumableArray(name), [addIndex]);
+    var namePath = [...name, addIndex];
     var addRecord = form.getFieldValue(namePath) || {};
     btnConfig.label = btnConfig.label(addRecord, {
-      form: form,
-      namePath: namePath,
-      name: name,
-      tableLength: tableLength,
-      selectedRows: selectedRows,
+      form,
+      namePath,
+      name,
+      tableLength,
+      selectedRows,
       index: addIndex
     });
   }
   var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
   return _isEditing && getShow(btnConfig.show) ? /*#__PURE__*/_jsx(_Fragment, {
     children: ['delete', 'mulDelete'].includes(btnConfig.type) ? /*#__PURE__*/_jsx(_Fragment, {
-      children: btnConfig !== null && btnConfig !== void 0 && btnConfig.needConfirm ? /*#__PURE__*/_jsx(Popconfirm, {
+      children: btnConfig !== null && btnConfig !== void 0 && btnConfig.needConfirm ? /*#__PURE__*/_jsx(_Popconfirm, {
         placement: "topRight",
         title: deleteMsgMap[btnConfig.type],
-        onConfirm: function onConfirm() {
+        onConfirm: () => {
           btnConfig === null || btnConfig === void 0 || btnConfig.onEvent(record, {
-            index: index,
-            form: form,
-            name: name,
+            index,
+            form,
+            name,
             namePath: rowNamePath,
-            tableLength: tableLength,
-            selectedRows: selectedRows
+            tableLength,
+            selectedRows
           });
         },
         disabled: isDisabled,
         okText: locale.ProEditTable.confirm,
         cancelText: locale.ProEditTable.cancel,
         children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
-          record: record,
-          index: index,
+          record,
+          index,
           disabled: isDisabled
-        }))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        }))) : /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
         }))
       }) : /*#__PURE__*/_jsx(_Fragment, {
         children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
-          record: record,
-          index: index,
+          record,
+          index,
           disabled: isDisabled,
-          onClick: function onClick() {
+          onClick: () => {
             btnConfig === null || btnConfig === void 0 || btnConfig.onEvent(record, {
-              index: index,
-              form: form,
-              name: name,
+              index,
+              form,
+              name,
               namePath: rowNamePath,
-              tableLength: tableLength,
-              selectedRows: selectedRows
+              tableLength,
+              selectedRows
             });
           }
-        }))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        }))) : /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
-          onClick: function onClick() {
+          onClick: () => {
             btnConfig === null || btnConfig === void 0 || btnConfig.onEvent(record, {
-              index: index,
-              form: form,
-              name: name,
+              index,
+              form,
+              name,
               namePath: rowNamePath,
-              tableLength: tableLength,
-              selectedRows: selectedRows
+              tableLength,
+              selectedRows
             });
           },
           children: btnConfig.label
@@ -164,9 +166,9 @@ var ActionButton = function ActionButton(_ref) {
       })
     }) : /*#__PURE__*/_jsx(_Fragment, {
       children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
-        record: record,
-        index: index
-      }))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
+        record,
+        index
+      }))) : /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread({
         className: "action-button"
       }, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         type: "link",

package/es/ProEditTable/components/RcTable/BaseTable.js

@@ -1,15 +1,18 @@
+import "antd/es/table/style";
+import _Table from "antd/es/table";
+import "antd/es/badge/style";
+import _Badge from "antd/es/badge";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["tableProps"];
 import { memo, useCallback } from 'react';
-import { Badge, Table } from 'antd';
 import { isFunction, isNumber } from 'lodash';
 import useEditTableError from "../../utils/useEditTableError";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-var BaseTable = function BaseTable(_ref) {
+var BaseTable = _ref => {
   var _value$;
   var tableProps = _ref.tableProps,
     resetProps = _objectWithoutProperties(_ref, _excluded);
@@ -40,7 +43,7 @@ var BaseTable = function BaseTable(_ref) {
     }),
     _useEditTableError2 = _slicedToArray(_useEditTableError, 1),
     errorLength = _useEditTableError2[0];
-  var getScroll = useCallback(function () {
+  var getScroll = useCallback(() => {
     if (scroll !== null && scroll !== void 0 && scroll.x && scroll !== null && scroll !== void 0 && scroll.y) {
       return {
         x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
@@ -60,38 +63,36 @@ var BaseTable = function BaseTable(_ref) {
     return null;
   }, [scroll]);
   var nextTableProps = _objectSpread(_objectSpread({
-    className: className,
-    columns: columns,
-    rowClassName: rowClassName,
+    className,
+    columns,
+    rowClassName,
     dataSource: value !== null && value !== void 0 && (_value$ = value[0]) !== null && _value$ !== void 0 && _value$.rowKey ? value : [],
     rowSelection: renderRowSelection(),
-    onRow: function onRow() {
-      return {
-        disabled: disabled || virtualKey && !!editingKeys.length,
-        'data-hide': isHideCheckBox,
-        'data-row-draggable': rowDraggable,
-        onClick: function onClick() {}
-      };
-    }
+    onRow: () => ({
+      disabled: disabled || virtualKey && !!editingKeys.length,
+      'data-hide': isHideCheckBox,
+      'data-row-draggable': rowDraggable,
+      onClick: () => {}
+    })
   }, resetProps), {}, {
     rowKey: rowKey || 'rowKey',
-    summary: summary,
+    summary,
     pagination: pagination ? _objectSpread(_objectSpread({
       showSizeChanger: true,
       pageSizeOptions: [5, 10, 20, 50],
       showQuickJumper: true,
       total: value === null || value === void 0 ? void 0 : value.length,
-      showTotal: function showTotal(total) {
+      showTotal: total => {
         var _locale$ProEditTable;
         if (!total) return;
         return formatMessage(locale === null || locale === void 0 || (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
-          total: total
+          total
         });
       },
-      itemRender: function itemRender(index, type, originalElement) {
+      itemRender: (index, type, originalElement) => {
         return type === 'page' && page.pageNum === index && errorLength ? /*#__PURE__*/_jsxs("div", {
           className: "pro-edit-table-pagination-item-badge",
-          children: [/*#__PURE__*/_jsx(Badge, {
+          children: [/*#__PURE__*/_jsx(_Badge, {
             count: errorLength
           }), originalElement]
         }) : originalElement;
@@ -107,7 +108,7 @@ var BaseTable = function BaseTable(_ref) {
     children: [headerRender ? /*#__PURE__*/_jsx("div", {
       className: "pro-edit-table-header",
       children: isFunction(headerRender) ? headerRender() : headerRender
-    }) : null, /*#__PURE__*/_jsx(Table, _objectSpread({
+    }) : null, /*#__PURE__*/_jsx(_Table, _objectSpread({
       ref: tableRef
     }, nextTableProps))]
   });

package/es/ProEditTable/components/RcTable/DraggableTable.js

@@ -1,8 +1,9 @@
+import "antd/es/table/style";
+import _Table from "antd/es/table";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["disabled", "children"],
   _excluded2 = ["tableProps", "draggableProps"];
-import { Table } from 'antd';
 import React, { memo, useCallback } from 'react';
 import { DndContext } from '@dnd-kit/core';
 import { isNumber } from 'lodash';
@@ -11,13 +12,13 @@ import { CSS } from '@dnd-kit/utilities';
 import ProIcon from "../../../ProIcon";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var Row = function Row(props) {
+var Row = props => {
   var disabled = props.disabled,
     children = props.children,
     restProps = _objectWithoutProperties(props, _excluded);
   var data = useSortable({
     id: props['data-row-key'],
-    disabled: disabled
+    disabled
   });
   var attributes = data.attributes,
     listeners = data.listeners,
@@ -29,7 +30,7 @@ var Row = function Row(props) {
     transform: CSS.Transform.toString(transform && _objectSpread(_objectSpread({}, transform), {}, {
       scaleY: 1
     })),
-    transition: transition
+    transition
   }, isDragging ? {
     position: 'relative',
     zIndex: 2
@@ -38,7 +39,7 @@ var Row = function Row(props) {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
-    children: React.Children.map(children, function (child) {
+    children: React.Children.map(children, child => {
       if (child.key === 'RC_TABLE_KEY' && !disabled) {
         var _restProps$dataRowD;
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
@@ -48,7 +49,7 @@ var Row = function Row(props) {
         var isDrag = restProps['data-row-draggable'] ? (_restProps$dataRowD = restProps['data-row-draggable']) === null || _restProps$dataRowD === void 0 ? void 0 : _restProps$dataRowD.call(restProps, record) : true;
         return /*#__PURE__*/React.cloneElement(child, {
           children: /*#__PURE__*/_jsxs("span", {
-            className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
+            className: `pro-edit-table-drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
             children: [isDrag ? /*#__PURE__*/_jsx(ProIcon, _objectSpread({
               className: "drag-icon",
               style: {
@@ -67,7 +68,7 @@ var Row = function Row(props) {
     })
   }));
 };
-var DndWrapper = function DndWrapper(_ref2) {
+var DndWrapper = _ref2 => {
   var _value$;
   var draggable = _ref2.draggable,
     value = _ref2.value,
@@ -76,16 +77,12 @@ var DndWrapper = function DndWrapper(_ref2) {
     onDragEnd = _ref2.onDragEnd,
     disabled = _ref2.disabled,
     children = _ref2.children;
-  var onDragEndtInside = function onDragEndtInside(event) {
+  var onDragEndtInside = event => {
     var active = event.active,
       over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
-      var activeIndex = value.findIndex(function (i) {
-        return i.rowKey === active.id;
-      });
-      var overIndex = value.findIndex(function (i) {
-        return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
-      });
+      var activeIndex = value.findIndex(i => i.rowKey === active.id);
+      var overIndex = value.findIndex(i => i.rowKey === (over === null || over === void 0 ? void 0 : over.id));
       var nextValue = arrayMove(value, activeIndex, overIndex);
       if (onDrag || onDragEnd) {
         var nextList = onDragEnd ? onDragEnd(event, value, nextValue) : onDrag(event, value, nextValue);
@@ -98,15 +95,13 @@ var DndWrapper = function DndWrapper(_ref2) {
   return draggable && !disabled ? /*#__PURE__*/_jsx(DndContext, {
     onDragEnd: onDragEndtInside,
     children: /*#__PURE__*/_jsx(SortableContext, {
-      items: value !== null && value !== void 0 && (_value$ = value[0]) !== null && _value$ !== void 0 && _value$.rowKey ? value.map(function (i) {
-        return i.rowKey;
-      }) : [],
+      items: value !== null && value !== void 0 && (_value$ = value[0]) !== null && _value$ !== void 0 && _value$.rowKey ? value.map(i => i.rowKey) : [],
       strategy: verticalListSortingStrategy,
       children: children
     })
   }) : children;
 };
-var DraggableTable = function DraggableTable(_ref3) {
+var DraggableTable = _ref3 => {
   var _value$2;
   var tableProps = _ref3.tableProps,
     draggableProps = _ref3.draggableProps,
@@ -135,7 +130,7 @@ var DraggableTable = function DraggableTable(_ref3) {
     onDrag = draggableProps.onDrag,
     draggable = draggableProps.draggable,
     onDragEnd = draggableProps.onDragEnd;
-  var getScroll = useCallback(function () {
+  var getScroll = useCallback(() => {
     if (scroll !== null && scroll !== void 0 && scroll.x && scroll !== null && scroll !== void 0 && scroll.y) {
       return {
         x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
@@ -155,23 +150,21 @@ var DraggableTable = function DraggableTable(_ref3) {
     return null;
   }, [scroll]);
   var nextTableProps = _objectSpread(_objectSpread({
-    className: className,
-    columns: columns,
-    rowClassName: rowClassName,
+    className,
+    columns,
+    rowClassName,
     rowSelection: renderRowSelection(),
     components: {
       body: {
         row: Row
       }
     },
-    onRow: function onRow() {
-      return {
-        disabled: disabled || virtualKey && !!editingKeys.length,
-        'data-hide': isHideCheckBox,
-        'data-row-draggable': rowDraggable,
-        onClick: function onClick() {}
-      };
-    },
+    onRow: () => ({
+      disabled: disabled || virtualKey && !!editingKeys.length,
+      'data-hide': isHideCheckBox,
+      'data-row-draggable': rowDraggable,
+      onClick: () => {}
+    }),
     dataSource: value !== null && value !== void 0 && (_value$2 = value[0]) !== null && _value$2 !== void 0 && _value$2.rowKey ? value : []
   }, resetProps), {}, {
     rowKey: rowKey || 'rowKey',
@@ -181,17 +174,17 @@ var DraggableTable = function DraggableTable(_ref3) {
       showSizeChanger: false,
       showQuickJumper: true,
       total: value === null || value === void 0 ? void 0 : value.length,
-      showTotal: function showTotal(total) {
+      showTotal: total => {
         var _locale$ProEditTable;
         if (!total) return;
         return formatMessage(locale === null || locale === void 0 || (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
-          total: total
+          total
         });
       },
       onChange: handlePageChange
     }, pagination) : false,
     scroll: getScroll(),
-    summary: summary
+    summary
   });
   return /*#__PURE__*/_jsxs(DndWrapper, {
     value: value,
@@ -203,7 +196,7 @@ var DraggableTable = function DraggableTable(_ref3) {
     children: [headerRender ? /*#__PURE__*/_jsx("div", {
       className: "pro-edit-table-header",
       children: typeof headerRender === 'function' ? headerRender() : headerRender
-    }) : null, /*#__PURE__*/_jsx(Table, _objectSpread({
+    }) : null, /*#__PURE__*/_jsx(_Table, _objectSpread({
       ref: tableRef
     }, nextTableProps))]
   });

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

@@ -1,9 +1,11 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
 import React, { useMemo } from 'react';
-import { Space, Tooltip } from 'antd';
 import classnames from 'classnames';
 import { get } from 'lodash';
 import { diffOriginal } from "../../utils/diffOriginal";
@@ -11,18 +13,16 @@ import { useProConfig } from "../../../ProConfigProvider";
 import { isEmpty } from "../../../utils";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
-var toNamePath = function toNamePath(name) {
+var toNamePath = name => {
   if (Array.isArray(name)) {
     return name;
   }
   return [name];
 };
-var toNamePaths = function toNamePaths(names) {
-  return names.map(function (name) {
-    return toNamePath(name);
-  });
+var toNamePaths = names => {
+  return names.map(name => toNamePath(name));
 };
-var getOriginalValue = function getOriginalValue(_ref) {
+var getOriginalValue = _ref => {
   var namePath = _ref.namePath,
     originalName = _ref.originalName,
     originalNames = _ref.originalNames,
@@ -42,39 +42,35 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
-    originRecord = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
+    originRecord = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(item => {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
     var originalValue;
     if (originalNames !== null && originalNames !== void 0 && originalNames.length) {
-      var originalNamesValue = originalNames.map(function (originalName) {
+      var originalNamesValue = originalNames.map(originalName => {
         return get(originRecord, originalName.slice(rowKeyPath.length - 1));
       });
 
       // 有可能出现数组中全是undefined的情况  视为没有值
-      var fillUndefined = originalNamesValue.every(function (valItem) {
-        return valItem === undefined;
-      });
+      var fillUndefined = originalNamesValue.every(valItem => valItem === undefined);
       originalValue = fillUndefined ? undefined : originalNamesValue;
     } else {
       originalValue = get(originRecord, originalName.slice(rowKeyPath.length - 1));
     }
     return {
-      originalValue: originalValue,
-      originRecord: originRecord,
+      originalValue,
+      originRecord,
       record: rowValue
     };
   }
 
   // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
   return {
-    originalValue: originalNames !== null && originalNames !== void 0 && originalNames.length ? originalNames.map(function (originalName) {
-      return get(originalValues, originalName);
-    }) : get(originalValues, originalName),
-    originRecord: originRecord
+    originalValue: originalNames !== null && originalNames !== void 0 && originalNames.length ? originalNames.map(originalName => get(originalValues, originalName)) : get(originalValues, originalName),
+    originRecord
   };
 };
-var ListChangedWrapper = function ListChangedWrapper(props) {
+var ListChangedWrapper = props => {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
     names = props.names,
@@ -108,16 +104,16 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var toolTip = (_diffConfig$toolTip = diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
   var isWatch = Boolean(originalValues);
   var originalDTO = getOriginalValue({
-    namePath: namePath,
+    namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
-    originalValues: originalValues,
-    rowKeyPath: rowKeyPath,
-    form: form
+    originalValues,
+    rowKeyPath,
+    form
   });
   var originalValue = isWatch ? originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValue : undefined;
   var noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
-  var diffType = useMemo(function () {
+  var diffType = useMemo(() => {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
     : props[valuePropName];
@@ -132,16 +128,17 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     return diffOriginal({
       value: _value,
       originalValue: _originalValue,
-      form: form,
-      onDiff: onDiff,
+      form,
+      onDiff,
       originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
       record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
-      index: index
+      index,
+      type: props.type
     });
   }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
-  var tipContent = useMemo(function () {
+  var tipContent = useMemo(() => {
     var _getValueProps;
     if (!isWatch || noChange) return undefined;
     var orgValue = getValueProps ? (_getValueProps = getValueProps(originalValue, true)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : originalValue;
@@ -151,17 +148,28 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     if (viewRender) {
       if (! /*#__PURE__*/React.isValidElement(viewRender)) {
         return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord) || {}, {
-          form: form,
-          name: name,
-          index: index
+          form,
+          name,
+          index
         });
       }
       _children = viewRender;
     }
-    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, _defineProperty(_defineProperty({
+
+    // 对于ProNumberRange类型，需要将字符串数组转换为数字数组
+    var processedValue = orgValue;
+    if (type === 'ProNumberRange' && Array.isArray(orgValue)) {
+      processedValue = orgValue.map(item => {
+        var num = Number(item);
+        return Number.isNaN(num) ? item : num;
+      });
+    }
+    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, {
       // @ts-ignore
-      isView: true
-    }, valuePropName, orgValue), "checked", type === 'Switch' ? originalValue : undefined))) : undefined;
+      isView: true,
+      [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));
@@ -169,7 +177,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   // const isFocus = useFocus(contentRef.current);
-  var tipOpenCalc = function tipOpenCalc() {
+  var tipOpenCalc = () => {
     if (!toolTip) return false;
 
     // 传入undefined 鼠标移入显示移出隐藏
@@ -187,24 +195,22 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     'pro-form-item-add': isAdd
   });
   var open = tipOpenCalc();
-  return /*#__PURE__*/_jsx(Tooltip, {
+  return /*#__PURE__*/_jsx(_Tooltip, {
     open: open,
-    getPopupContainer: function getPopupContainer(trigger) {
-      return scrollFollowParent ? trigger.parentElement : document.body;
-    },
+    getPopupContainer: trigger => scrollFollowParent ? trigger.parentElement : document.body,
     classNames: {
       root: classNames
     },
     placement: "topLeft",
     autoAdjustOverflow: false,
-    title: /*#__PURE__*/_jsxs(Space, {
+    title: /*#__PURE__*/_jsxs(_Space, {
       direction: "vertical",
       className: "changed-tooltip",
-      children: [/*#__PURE__*/_jsxs(Space, {
+      children: [/*#__PURE__*/_jsxs(_Space, {
         align: "start",
         className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-      }), _showEllipse && /*#__PURE__*/_jsxs(Space, {
+      }), _showEllipse && /*#__PURE__*/_jsxs(_Space, {
         className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
           isView: true