@zat-design/sisyphus-react 3.8.0 → 3.8.2

package/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "kisstkondoros.vscode-codemetrics"
+    ]
+}

package/dist/index.esm.css

@@ -2339,8 +2339,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-number-range .range-split {
   width: 32px !important;
   text-align: center !important;
-  border-right: 0px;
-  border-left: 0px;
   pointer-events: none;
 }
 .pro-number-range .range-split.ant-input[disabled] {
@@ -2349,60 +2347,18 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-number-range .ant-input-number-status-error:not(.ant-input-number-disabled):not( .ant-input-number-borderless).ant-input-number {
   border-color: var(--zaui-danger, #ff5050) !important;
 }
-.pro-number-range .ant-input-status-error.range-split {
-  color: var(--zaui-danger, #ff5050) !important;
+.pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-split,
+.pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-addon-before,
+.pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-addon-after {
   border-color: var(--zaui-danger, #ff5050);
 }
-.pro-number-range .ant-input-rtl.range-right {
-  border-right-width: 0;
-}
-.pro-number-range .ant-input-rtl.range-right:hover,
-.pro-number-range .ant-input-rtl.range-right:focus {
-  border-right-width: 1px;
-}
 .pro-number-range .ant-form-item {
   margin-bottom: 0;
 }
-.pro-number-range .range-left,
-.pro-number-range .range-right {
-  width: calc(50% - 16px);
-  text-align: center;
-  -webkit-transition: none;
-  transition: none;
-}
-.pro-number-range .range-left .range-left,
-.pro-number-range .range-right .range-left {
-  width: calc(100% + 2px) !important;
-}
-.pro-number-range .range-left .ant-input-number {
-  border-right: none;
-}
-.pro-number-range .range-right .ant-input-number {
-  border-left: none;
-}
-.pro-number-range .range-right .range-right {
-  width: 100%;
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.pro-number-range.ant-input-group.ant-input-group-compact > *:not(:last-child) {
-  margin-right: 0;
-}
-.pro-number-range > *:first-child {
-  border-top-right-radius: 0 !important;
-  border-bottom-right-radius: 0 !important;
-}
-.pro-number-range > *:first-child > .ant-select-selector {
-  border-top-right-radius: 0 !important;
-  border-bottom-right-radius: 0 !important;
-}
-.pro-number-range > *:last-child {
-  border-top-left-radius: 0 !important;
-  border-bottom-left-radius: 0 !important;
-}
-.pro-number-range > *:last-child > .ant-select-selector {
-  border-top-left-radius: 0 !important;
-  border-bottom-left-radius: 0 !important;
+.pro-number-range .range-addon-before,
+.pro-number-range .range-addon-after {
+  color: var(--zaui-disabled-text);
+  pointer-events: none;
 }
 .pro-modal-select .ant-input-group-wrapper .close-icon,
 .pro-tree-modal .ant-input-group-wrapper .close-icon {
@@ -4605,7 +4561,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table .is-new-row.ant-table-row:hover td,
 .pro-edit-table .is-new-row .ant-table-cell-row-hover,
 .pro-edit-table .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
-  background: var(--ant-primary-2) !important;
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
 .pro-edit-table-footer {
   margin-top: 12px;

package/dist/less.esm.css

@@ -2339,8 +2339,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-number-range .range-split {
   width: 32px !important;
   text-align: center !important;
-  border-right: 0px;
-  border-left: 0px;
   pointer-events: none;
 }
 .pro-number-range .range-split.ant-input[disabled] {
@@ -2349,60 +2347,18 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-number-range .ant-input-number-status-error:not(.ant-input-number-disabled):not( .ant-input-number-borderless).ant-input-number {
   border-color: var(--zaui-danger, #ff5050) !important;
 }
-.pro-number-range .ant-input-status-error.range-split {
-  color: var(--zaui-danger, #ff5050) !important;
+.pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-split,
+.pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-addon-before,
+.pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-addon-after {
   border-color: var(--zaui-danger, #ff5050);
 }
-.pro-number-range .ant-input-rtl.range-right {
-  border-right-width: 0;
-}
-.pro-number-range .ant-input-rtl.range-right:hover,
-.pro-number-range .ant-input-rtl.range-right:focus {
-  border-right-width: 1px;
-}
 .pro-number-range .ant-form-item {
   margin-bottom: 0;
 }
-.pro-number-range .range-left,
-.pro-number-range .range-right {
-  width: calc(50% - 16px);
-  text-align: center;
-  -webkit-transition: none;
-  transition: none;
-}
-.pro-number-range .range-left .range-left,
-.pro-number-range .range-right .range-left {
-  width: calc(100% + 2px) !important;
-}
-.pro-number-range .range-left .ant-input-number {
-  border-right: none;
-}
-.pro-number-range .range-right .ant-input-number {
-  border-left: none;
-}
-.pro-number-range .range-right .range-right {
-  width: 100%;
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.pro-number-range.ant-input-group.ant-input-group-compact > *:not(:last-child) {
-  margin-right: 0;
-}
-.pro-number-range > *:first-child {
-  border-top-right-radius: 0 !important;
-  border-bottom-right-radius: 0 !important;
-}
-.pro-number-range > *:first-child > .ant-select-selector {
-  border-top-right-radius: 0 !important;
-  border-bottom-right-radius: 0 !important;
-}
-.pro-number-range > *:last-child {
-  border-top-left-radius: 0 !important;
-  border-bottom-left-radius: 0 !important;
-}
-.pro-number-range > *:last-child > .ant-select-selector {
-  border-top-left-radius: 0 !important;
-  border-bottom-left-radius: 0 !important;
+.pro-number-range .range-addon-before,
+.pro-number-range .range-addon-after {
+  color: var(--zaui-disabled-text);
+  pointer-events: none;
 }
 .pro-modal-select .ant-input-group-wrapper .close-icon,
 .pro-tree-modal .ant-input-group-wrapper .close-icon {
@@ -4605,7 +4561,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table .is-new-row.ant-table-row:hover td,
 .pro-edit-table .is-new-row .ant-table-cell-row-hover,
 .pro-edit-table .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
-  background: var(--ant-primary-2) !important;
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
 .pro-edit-table-footer {
   margin-top: 12px;

package/es/ProAction/index.js

@@ -40,7 +40,7 @@ var ProAction = function ProAction(props) {
     servicesArray = state.servicesArray;
   var length = config.length;
   var _onActionRun = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(currentIndex, array) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(currentIndex, array) {
       var _actionProps$useReque, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
       var actionProps, newServicesArray, _ref2, service, options, transformResponse, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
       return _regeneratorRuntime().wrap(function _callee$(_context) {

package/es/ProDownload/index.js

@@ -37,7 +37,7 @@ var ProDownload = function ProDownload(props) {
     onErrorConfig = _ref.onError;
   defaultProps.headers = _objectSpread(_objectSpread({}, headers), defaultProps.headers);
   var handDownload = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _params;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -131,7 +131,7 @@ var ProDownload = function ProDownload(props) {
   return _jsx(_Button, _objectSpread(_objectSpread({
     className: cls,
     onClick: function () {
-      var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _onClick = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -146,7 +146,7 @@ var ProDownload = function ProDownload(props) {
                 _context3.next = 13;
                 break;
               }
-              if (!(beforeDownload instanceof /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+              if (!(beforeDownload instanceof /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                   while (1) switch (_context2.prev = _context2.next) {
                     case 0:

package/es/ProDownload/utils.js

@@ -70,7 +70,7 @@ export function getFilenameFromContentDisposition(contentDisposition) {
 }
 // 发起请求获取下载文件
 export var DownloadRequest = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
     var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, onError, config, res, fileBlob, data, contentFileName;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -97,8 +97,8 @@ export var DownloadRequest = /*#__PURE__*/function () {
             config.headers = _objectSpread(_objectSpread({}, config.headers), headers);
           }
           _context2.next = 7;
-          return fetch(url, config).then( /*#__PURE__*/function () {
-            var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
+          return fetch(url, config).then(/*#__PURE__*/function () {
+            var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
               var _data, errorMsg;
               return _regeneratorRuntime().wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {

package/es/ProDrawerForm/components/ProDrawer/index.js

@@ -46,7 +46,7 @@ var ProDrawer = function ProDrawer(_ref) {
     loading = _useState2[0],
     toggleLoading = _useState2[1];
   var noRenderFooter = isView || footer === false || footer === null;
-  var onConfirm = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var onConfirm = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -74,7 +74,7 @@ var ProDrawer = function ProDrawer(_ref) {
       }
     }, _callee);
   })), [onCancel, modalRef.current]);
-  var handleFinish = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+  var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var values, _error$errorFields, _error$errorFields$;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -166,7 +166,7 @@ var ProDrawer = function ProDrawer(_ref) {
     if (noRenderFooter) {
       return null;
     }
-    if ( /*#__PURE__*/React.isValidElement(footer)) {
+    if (/*#__PURE__*/React.isValidElement(footer)) {
       return _jsx("div", {
         className: "pro-drawer-footer",
         children: footer
@@ -176,7 +176,7 @@ var ProDrawer = function ProDrawer(_ref) {
       return _jsx("div", {
         className: "pro-drawer-footer",
         children: footer.map(function (item) {
-          if ( /*#__PURE__*/React.isValidElement(item)) {
+          if (/*#__PURE__*/React.isValidElement(item)) {
             return item;
           }
           return false;

package/es/ProDrawerForm/components/ProModal/index.js

@@ -52,7 +52,7 @@ var ProModal = function ProModal(_ref) {
     'pro-modal-no-footer': noRenderFooter,
     'pro-modal-footer-shadow': height >= 450
   }]);
-  var handleFinish = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var values, _error$errorFields, _error$errorFields$;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -146,7 +146,7 @@ var ProModal = function ProModal(_ref) {
     if (noRenderFooter) {
       return null;
     }
-    if ( /*#__PURE__*/React.isValidElement(footer)) {
+    if (/*#__PURE__*/React.isValidElement(footer)) {
       return _jsx("div", {
         className: "pro-drawer-footer",
         children: footer
@@ -156,7 +156,7 @@ var ProModal = function ProModal(_ref) {
       return _jsx("div", {
         className: "pro-drawer-footer",
         children: footer.map(function (item) {
-          if ( /*#__PURE__*/React.isValidElement(item)) {
+          if (/*#__PURE__*/React.isValidElement(item)) {
             return item;
           }
           return false;

package/es/ProEditLabel/index.js

@@ -134,7 +134,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
    * pop确认回调
    */
   var onConfirmHandle = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res, value;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -221,7 +221,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
       })
     });
     if (disabled) {
-      if ( /*#__PURE__*/React.isValidElement(children)) {
+      if (/*#__PURE__*/React.isValidElement(children)) {
         return children;
       }
       if (props.value && !popupProps) {
@@ -253,7 +253,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
     if (mode === 'popup') {
       // 查看时内容渲染
       var labelRender = function labelRender() {
-        if ( /*#__PURE__*/React.isValidElement(children)) {
+        if (/*#__PURE__*/React.isValidElement(children)) {
           return children;
         }
         return TextNode;

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

@@ -82,7 +82,7 @@ var ActionButton = function ActionButton(_ref) {
         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'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled
@@ -92,7 +92,7 @@ var ActionButton = function ActionButton(_ref) {
           children: btnConfig.label
         }))
       }) : _jsx(_Fragment, {
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled,
@@ -109,7 +109,7 @@ var ActionButton = function ActionButton(_ref) {
         }))
       })
     }) : _jsx(_Fragment, {
-      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         record: record,
         index: index
       }))) : _jsx(_Button, _objectSpread(_objectSpread({

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

@@ -4,7 +4,7 @@ import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 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", "equalWith", "rowKeyPath", "children", "type"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "valuePropName"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
@@ -41,7 +41,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
-    var originalValueRow = originalValueList.find(function (item) {
+    var originalValueRow = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
     var originalValue;
@@ -78,13 +78,16 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     rowKeyPath = props.rowKeyPath,
     children = props.children,
     type = props.type,
+    normalize = props.normalize,
+    _props$valuePropName = props.valuePropName,
+    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = _objectWithoutProperties(props, _excluded);
   var _ref2 = useProConfig('ProEditTable') || {},
     isDiffAll = _ref2.isDiffAll;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var isWatch = originalValues && !['FormList', 'ProEditTable'].includes(type);
+  var isWatch = Boolean(originalValues);
   var originalValue = isWatch ? getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
@@ -96,14 +99,15 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   var diffType = useMemo(function () {
     if (!isWatch || noChange) return 'same';
+    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
     return diffOriginal({
-      value: props.value,
+      value: _value,
       originalValue: originalValue,
       form: form,
       equalWith: equalWith
       // name: isString(namesStr) ? namesStr : originalName || name,
     });
-  }, [props.value, originalValue]);
+  }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
   if (!isWatch || noChange) {

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

@@ -70,8 +70,6 @@ var RenderField = function RenderField(_ref) {
     viewEmpty = config.viewEmpty,
     originalValues = config.originalValues,
     formNamePath = config.namePath,
-    _config$originalDiffT = config.originalDiffTip,
-    originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
     rowDisabled = config.rowDisabled,
     _config$validateTrigg = config.validateTrigger,
     validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
@@ -216,10 +214,10 @@ var RenderField = function RenderField(_ref) {
   var originalNames = names;
   if (virtualKey) {
     var _cellName$slice, _names2, _names2$map;
-    originalName = [].concat(_toConsumableArray(name), _toConsumableArray(cellName === null || cellName === void 0 ? void 0 : (_cellName$slice = cellName.slice) === null || _cellName$slice === void 0 ? void 0 : _cellName$slice.call(cellName, 1)));
+    originalName = [].concat(_toConsumableArray(name), _toConsumableArray(cellName === null || cellName === void 0 ? void 0 : (_cellName$slice = cellName.slice) === null || _cellName$slice === void 0 ? void 0 : _cellName$slice.call(cellName, name.length)));
     originalNames = (_names2 = names) === null || _names2 === void 0 ? void 0 : (_names2$map = _names2.map) === null || _names2$map === void 0 ? void 0 : _names2$map.call(_names2, function (item) {
       var _item$slice;
-      return [].concat(_toConsumableArray(name), _toConsumableArray(item === null || item === void 0 ? void 0 : (_item$slice = item.slice) === null || _item$slice === void 0 ? void 0 : _item$slice.call(item, 1)));
+      return [].concat(_toConsumableArray(name), _toConsumableArray(item === null || item === void 0 ? void 0 : (_item$slice = item.slice) === null || _item$slice === void 0 ? void 0 : _item$slice.call(item, name.length)));
     });
   }
   /**
@@ -246,7 +244,7 @@ var RenderField = function RenderField(_ref) {
     if (typeof _editRender === 'function') {
       TargetComponent = _editRender.apply(void 0, rowParams);
     }
-    if ( /*#__PURE__*/React.isValidElement(_editRender)) {
+    if (/*#__PURE__*/React.isValidElement(_editRender)) {
       TargetComponent = _editRender;
     }
   }
@@ -262,7 +260,7 @@ var RenderField = function RenderField(_ref) {
         children: View
       });
     }
-    if ( /*#__PURE__*/React.isValidElement(viewRender)) {
+    if (/*#__PURE__*/React.isValidElement(viewRender)) {
       TargetComponent = viewRender;
     }
   }
@@ -305,7 +303,7 @@ var RenderField = function RenderField(_ref) {
     }, 100);
   };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
-  var _onChange = debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var _onChange = debounce(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _len2,
       args,
       _key2,
@@ -409,7 +407,7 @@ var RenderField = function RenderField(_ref) {
     }, _callee);
   })), 300);
   var _onblur = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
       var _len3,
         args,
@@ -545,7 +543,7 @@ var RenderField = function RenderField(_ref) {
   var getFieldItem = function getFieldItem() {
     var _componentProps;
     var FormItem = null;
-    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
+    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? (/*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
     if (originalValues) {
       FieldComponent = _jsx(ListChangedWrapper, {
         name: cellName,
@@ -559,6 +557,8 @@ var RenderField = function RenderField(_ref) {
         equalWith: equalWith,
         type: type,
         onChange: _onChange,
+        valuePropName: _formItemProps.valuePropName,
+        normalize: _formItemProps.normalize,
         children: FieldComponent
       });
     }

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

@@ -76,7 +76,7 @@ var RenderToolbar = function RenderToolbar(config) {
     toolbar.show = show !== null && show !== void 0 ? show : true;
     toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     toolbar.onEvent = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
         var onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {

package/es/ProEditTable/index.js

@@ -177,7 +177,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
     var className = isEdit ? 'is-editing' : '';
     var originalArr = get(originalValues, name);
-    if (!isEdit && IsNew(originalArr, record)) {
+    if (IsNew(originalArr, record)) {
       return "is-new-row ".concat(className);
     }
     return className;
@@ -276,19 +276,23 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return transformColumns(columns, config);
   }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
   useEffect(function () {
-    var _value$every;
+    var _value$every, _originalArr$every;
     var isAllHasKey = value === null || value === void 0 ? void 0 : (_value$every = value.every) === null || _value$every === void 0 ? void 0 : _value$every.call(value, function (item) {
       return item.rowKey;
     });
+    // 原始值也需要设置对应的rowkey，后续比对通过rowkey对比
+    var originalArr = get(originalValues, name);
+    var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
+      return item.rowKey;
+    }) : true;
     // 初始化默认生成row-key
-    if ((value === null || value === void 0 ? void 0 : value.length) && !isAllHasKey) {
+    if ((value === null || value === void 0 ? void 0 : value.length) && !isAllHasKey || (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && !isOriginalAllHasKey) {
       var _originalArr$forEach;
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
           rowKey: getRowKey(item)
         });
       });
-      var originalArr = get(originalValues, name);
       originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
         item.rowKey = getRowKey(item);
       });
@@ -297,7 +301,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         form.setFieldValue(virtualRowName, nextValues);
       }
     }
-  }, [value]);
+  }, [value, originalValues]);
   useImperativeHandle((resetProps === null || resetProps === void 0 ? void 0 : resetProps.ref) || ref, function () {
     return {
       getInternalState: function getInternalState() {

package/es/ProEditTable/style/index.less

@@ -283,7 +283,8 @@
 
   .is-new-row, .is-new-row.@{ant-prefix}-table-row:hover {
     td, .@{ant-prefix}-table-cell-row-hover {
-      background: var(--ant-primary-2) !important;
+      background: var(--zaui-contract-bg-add, #d2fff4) !important;
+      
     }
   }
 }

package/es/ProEditTable/utils/config.js

@@ -63,7 +63,7 @@ export var actions = {
     });
   },
   save: function () {
-    var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
+    var _save = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -166,7 +166,7 @@ export var actions = {
     }
   },
   add: function () {
-    var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
+    var _add = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
       var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {

package/es/ProEditTable/utils/index.js

@@ -26,7 +26,7 @@ import locale from '../../locale';
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
   var _cloneDeepWith = cloneDeepWith(config, function (value) {
-      if ( /*#__PURE__*/React.isValidElement(value)) {
+      if (/*#__PURE__*/React.isValidElement(value)) {
         return value;
       }
     }),
@@ -83,7 +83,7 @@ var getActionColumn = function getActionColumn(config) {
     action.show = show !== null && show !== void 0 ? show : true;
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onEvent = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
         var _form$getFieldValue;
         var rowName, _record, onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -234,7 +234,7 @@ export var transformColumns = function transformColumns() {
           children: [before, columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
-            children: icon ? ( /*#__PURE__*/React.cloneElement(icon, {
+            children: icon ? (/*#__PURE__*/React.cloneElement(icon, {
               className: 'icon-tip'
             })) : _jsx(ReactSVG, {
               className: "icon-tip",
@@ -380,8 +380,8 @@ export var transformColumns = function transformColumns() {
   }
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
-    Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
+    Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
         var _item, key, value, _ref4, service, option;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {

package/es/ProEditTable/utils/tools.js

@@ -191,7 +191,7 @@ export var handleScrollToError = function handleScrollToError() {
  */
 export function cloneDeepFilterNode(value) {
   return cloneDeepWith(value, function (val) {
-    if ( /*#__PURE__*/React.isValidElement(val)) {
+    if (/*#__PURE__*/React.isValidElement(val)) {
       return val;
     }
   });

package/es/ProEnum/hooks/useEnumRequest.js

@@ -52,7 +52,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     staleTime: 6e4 * 60
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
     setCache: function () {
-      var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+      var _setCache = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
         var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -162,7 +162,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     }
   }));
   var mergeData = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {

package/es/ProEnum/index.js

@@ -153,7 +153,7 @@ var ProEnum = function ProEnum(props) {
         list = [];
       }
     }
-    if ( /*#__PURE__*/React.isValidElement(component)) {
+    if (/*#__PURE__*/React.isValidElement(component)) {
       var Component = component;
       return _jsx(Component, _objectSpread(_objectSpread({}, enumProps), {}, {
         dataSource: list,