@zat-design/sisyphus-react 3.7.3 → 3.8.0-beat.10

package/es/ProTreeModal/index.js

@@ -15,7 +15,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * @Author: za-xuwenli xuwenli@zhongan.io
  * @Date: 2024-06-04 10:01:18
  * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2024-06-25 17:56:33
+ * @LastEditTime: 2024-09-27 11:49:28
  * @FilePath: /za-material-warehouse/src/ProTreeModal/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -26,7 +26,8 @@ import { ReactSVG } from 'react-svg';
 import classNames from 'classnames';
 import { ProDrawerForm, useProConfig } from '../index';
 import { Trigger, ListView, TreeView, Cascader } from './components';
-import { getFlatTreeData, filterCheckedNodes, getChildrenKeys, findTreeNodeByKey, getAllKeys, transformMessage } from './utils';
+import { getFlatTreeData, filterCheckedNodes, getChildrenKeys, findTreeNodeByKey, getAllKeys, transformMessage, addLevelAndParentId } from './utils';
+import { transformTreeToArray, treeNodeFind } from '../ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index';
 import searchSVG from '../assets/input-search.svg';
 import locale, { formatMessage } from '../locale';
 import './style/index.less';
@@ -98,7 +99,8 @@ var ProTreeModal = function ProTreeModal(props) {
       flatTreeData: [],
       searchStr: '',
       checkAll: false,
-      allKeys: []
+      allKeys: [],
+      transformedTree: []
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
@@ -220,6 +222,12 @@ var ProTreeModal = function ProTreeModal(props) {
       });
     }
   }, [value, state.allKeys, state.open]);
+  useDeepCompareEffect(function () {
+    var transformedTree = addLevelAndParentId(state.treeData, fieldNames);
+    setState({
+      transformedTree: transformedTree
+    });
+  }, [state.treeData]);
   var handleClick = function handleClick() {
     setState({
       open: true
@@ -360,8 +368,55 @@ var ProTreeModal = function ProTreeModal(props) {
   var onCheck = function onCheck(checkedKeys, info) {
     var checkedValues = _toConsumableArray(state.checkedValues);
     var originalTreeData = state.originalTreeData;
+    // 如果有检索则自管理
+    if (state.searchStr) {
+      var _transformTreeToArray;
+      var node = info.node;
+      // 从完整树中找到当前节点
+      var activeNode = treeNodeFind(state.transformedTree, function (t) {
+        return t[fieldNameValue] === node[fieldNameValue];
+      }, {
+        childrenKey: fieldNames.children
+      });
+      var allChildren = (_transformTreeToArray = transformTreeToArray([activeNode], {
+        childrenKey: fieldNames.children
+      })) === null || _transformTreeToArray === void 0 ? void 0 : _transformTreeToArray.map(function (item) {
+        return item[fieldNameValue];
+      });
+      // 子项合并勾选
+      checkedValues = checkedValues.concat(allChildren);
+      // 从完整树中拿到父节点 只要存在父节点，那么就判断当前children是否全被勾选 若全被勾选就合并当前key到勾选队列
+      var _recourse2 = function _recourse(findNode) {
+        if (findNode.parentId) {
+          var _transformTreeToArray2;
+          var parentNode = treeNodeFind(state.transformedTree, function (t) {
+            return t[fieldNameValue] === findNode.parentId;
+          }, {
+            childrenKey: fieldNames.children
+          });
+          var parentChildrenKeys = (_transformTreeToArray2 = transformTreeToArray([parentNode], {
+            childrenKey: fieldNames.children
+          })) === null || _transformTreeToArray2 === void 0 ? void 0 : _transformTreeToArray2.map(function (item) {
+            return item[fieldNameValue];
+          });
+          var parentChildrenAllChecked = parentChildrenKeys.every(function (key) {
+            return checkedValues.includes(key);
+          });
+          if (parentChildrenAllChecked) {
+            // 把当前父节点追加进来
+            checkedValues = checkedValues.concat([parentNode[fieldNameValue]]);
+            // 继续向上查找
+            if (parentNode.parentId) {
+              _recourse2(parentNode);
+            }
+          }
+        }
+      };
+      _recourse2(activeNode);
+    }
+    var _checkStrictly = state.searchStr ? true : checkStrictly;
     // 此时应该取消掉自身并包含它所有的子集
-    if (!info.checked && !checkStrictly) {
+    if (!info.checked && !_checkStrictly) {
       // 1. 取消自身
       // 2. 把所有的子节点也要取消
       var childrenkeys = [];
@@ -378,8 +433,8 @@ var ProTreeModal = function ProTreeModal(props) {
         return !parentKeys.includes(key);
       });
     } else {
-      // checkStrictly 模式下取 checkedKeys.checked 或者自身的 key
-      if (checkStrictly) {
+      // _checkStrictly 模式下取 checkedKeys.checked 或者自身的 key
+      if (_checkStrictly) {
         if (!info.checked) {
           checkedValues = checkedValues.filter(function (key) {
             return key !== info.node.key;
@@ -618,7 +673,7 @@ var ProTreeModal = function ProTreeModal(props) {
         });
       case TREE:
         return _jsx(TreeView, {
-          treeData: state.treeData,
+          treeData: state.transformedTree,
           originalTreeData: state.originalTreeData,
           flatTreeData: state.flatTreeData,
           checkedValues: state.checkedValues,

package/es/ProTreeModal/utils.d.ts

@@ -36,3 +36,4 @@ export declare function filterCheckedNodes(data: any, checkedKeys: any, searchSt
  */
 export declare function getChildrenKeys(node: TreeDataProps, childrenKeys: string[], fieldNames: FieldNamesType, type: 'treeClose' | 'treeCheck'): void;
 export declare const transformMessage: (obj: any, message: string) => string;
+export declare const addLevelAndParentId: (tree: any[], fieldNames: any, currentLevel?: number, currentParentId?: any) => any[];

package/es/ProTreeModal/utils.js

@@ -197,4 +197,24 @@ export var transformMessage = function transformMessage(obj, message) {
     _message = message.replaceAll("{".concat(key, "}"), obj[key]);
   });
   return _message;
-};
+};
+var _addLevelAndParentId = function addLevelAndParentId() {
+  var tree = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var fieldNames = arguments.length > 1 ? arguments[1] : undefined;
+  var currentLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  var currentParentId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+  var _fieldNames$children = fieldNames.children,
+    children = _fieldNames$children === void 0 ? 'children' : _fieldNames$children,
+    _fieldNames$value = fieldNames.value,
+    value = _fieldNames$value === void 0 ? 'value' : _fieldNames$value;
+  return tree.map(function (node) {
+    var newNode = _objectSpread({}, node);
+    newNode.level = currentLevel;
+    newNode.parentId = currentParentId;
+    if (node[children]) {
+      newNode[children] = _addLevelAndParentId(node[children], fieldNames, currentLevel + 1, newNode[value]);
+    }
+    return newNode;
+  });
+};
+export { _addLevelAndParentId as addLevelAndParentId };

package/es/ProUpload/components/ImageRender.js

@@ -168,7 +168,7 @@ var ImageRender = function ImageRender(props) {
                   disabled: isView || disabled,
                   className: "action-item",
                   onClick: function () {
-                    var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                    var _onClick = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
                       var res;
                       return _regeneratorRuntime().wrap(function _callee$(_context) {
                         while (1) switch (_context.prev = _context.next) {

package/es/ProViewer/index.js

@@ -109,8 +109,8 @@ var ProViewer = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   useEffect(function () {
     if (previewFile) {
       try {
-        previewFile().then( /*#__PURE__*/function () {
-          var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
+        previewFile().then(/*#__PURE__*/function () {
+          var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
             var res, blob, blobUrl;
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {

package/es/old/ProEditableTable/index.js

@@ -172,7 +172,7 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
    * @returns {Promise<{nextList: IRowDataPropsType[], list: IRowDataPropsType[], rowData: IRowDataPropsType, rowIndex: number}>}
    */
   var onMultipleDelete = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res, values, nextList, resetFieldsIndex;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -278,7 +278,7 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
    * @returns {Promise<{nextList: IRowDataPropsType[], list: IRowDataPropsType[], rowData: IRowDataPropsType, rowIndex: number}>}
    */
   var onSave = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(rowIndex, callback) {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(rowIndex, callback) {
       var _form$getFieldsValue$, _form$getFieldsValue, nextValues, res, values;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -404,12 +404,12 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
           }, antButtonProps), {}, {
             children: buttonText
           }))]
-        }) : ( /*#__PURE__*/cloneElement(buttonText, antButtonProps))
+        }) : (/*#__PURE__*/cloneElement(buttonText, antButtonProps))
       }) : null
     });
   };
   var validateFields = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var values, nextValues, nextList, isEditing;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {

package/es/style/theme/antd.less

@@ -749,3 +749,8 @@
     }
   }
 }
+
+.@{ant-prefix}-picker.@{ant-prefix}-picker-disabled  {
+  background: var(--zaui-disabled-bg);
+}
+

package/es/style/theme/index.less

@@ -8,7 +8,7 @@
   --zaui-brand                      : #006aff;
   --zaui-brand-hover                : #3387ff;
   --zaui-brand-active               : #005ad9;
-  --zaui-brand-disabled             : #99c3ff;
+  --zaui-brand-disabled             : color-mix(in srgb, var(--zaui-brand) 70%, white);
   --zaui-text                       : #343434;
   --zaui-text-weak                  : #616161;
   --zaui-aide-text                  : #909090;
@@ -55,6 +55,7 @@
   --zaui-table-selected-hover-bg    : var(--zaui-table-hover-bg); // 默认同悬停
   --zaui-table-nested-bg            : #fafcfe;
   --zaui-contract-bg                : #fffaa1; // 对比背景色
+  --zaui-contract-bg-add            : #d2fff4; // 新增对比背景色
   --zaui-form-label-width           : 130px; // 8个全角字符宽度
   --zaui-border-radius              : 8px;
   --zaui-border-radius-card         : 4px;

package/es/style/theme/tokens.less

@@ -53,6 +53,7 @@
 @zaui-table-selected-hover-bg: var(--zaui-table-hover-bg #fafafa);
 @zaui-table-nested-bg: var(--zaui-table-nested-bg #FAFCFE);
 @zaui-contract-bg: var(--zaui-contract-bg; #fffaa1); // 对比背景色
+@zaui-contract-bg-add: var(--zaui-contract-bg-add; #d2fff4); // 新增对比背景色
 @zaui-form-required-after: var(--zaui-form-required-after; inline);
 @zaui-form-required-before: var(--zaui-form-required-before; none);
 @zaui-form-label-width: var(--zaui-form-label-width; 130px);

package/es/utils/index.d.ts

@@ -0,0 +1,2 @@
+/** 判断一个值是否是空值 */
+export declare const isEmpty: (value: any) => boolean;

package/es/utils/index.js

@@ -0,0 +1,13 @@
+var EMPTY_VALUE = [undefined, null, ''];
+/** 判断一个值是否是空值 */
+export var isEmpty = function isEmpty(value) {
+  if (EMPTY_VALUE.includes(value)) {
+    return true;
+  }
+  if (Array.isArray(value)) {
+    return !(value === null || value === void 0 ? void 0 : value.length) || value.every(function (item) {
+      return EMPTY_VALUE.includes(item);
+    });
+  }
+  return false;
+};

package/lib/ProAction/index.js

@@ -44,7 +44,7 @@ var ProAction = function ProAction(props) {
     servicesArray = state.servicesArray;
   var length = config.length;
   var _onActionRun = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(currentIndex, array) {
+    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().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 (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {

package/lib/ProDownload/index.js

@@ -44,7 +44,7 @@ var ProDownload = function ProDownload(props) {
     onErrorConfig = _ref.onError;
   defaultProps.headers = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, headers), defaultProps.headers);
   var handDownload = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _params;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -138,7 +138,7 @@ var ProDownload = function ProDownload(props) {
   return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     className: cls,
     onClick: function () {
-      var _onClick = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+      var _onClick = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
         var res;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -153,7 +153,7 @@ var ProDownload = function ProDownload(props) {
                 _context3.next = 13;
                 break;
               }
-              if (!(beforeDownload instanceof /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+              if (!(beforeDownload instanceof /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
                 return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
                   while (1) switch (_context2.prev = _context2.next) {
                     case 0:

package/lib/ProDownload/utils.js

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

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

@@ -49,7 +49,7 @@ var ProDrawer = function ProDrawer(_ref) {
     loading = _useState2[0],
     toggleLoading = _useState2[1];
   var noRenderFooter = isView || footer === false || footer === null;
-  var onConfirm = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+  var onConfirm = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -77,7 +77,7 @@ var ProDrawer = function ProDrawer(_ref) {
       }
     }, _callee);
   })), [onCancel, modalRef.current]);
-  var handleFinish = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+  var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
     var values, _error$errorFields, _error$errorFields$;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -169,7 +169,7 @@ var ProDrawer = function ProDrawer(_ref) {
     if (noRenderFooter) {
       return null;
     }
-    if ( /*#__PURE__*/_react.default.isValidElement(footer)) {
+    if (/*#__PURE__*/_react.default.isValidElement(footer)) {
       return (0, _jsxRuntime.jsx)("div", {
         className: "pro-drawer-footer",
         children: footer
@@ -179,7 +179,7 @@ var ProDrawer = function ProDrawer(_ref) {
       return (0, _jsxRuntime.jsx)("div", {
         className: "pro-drawer-footer",
         children: footer.map(function (item) {
-          if ( /*#__PURE__*/_react.default.isValidElement(item)) {
+          if (/*#__PURE__*/_react.default.isValidElement(item)) {
             return item;
           }
           return false;

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

@@ -55,7 +55,7 @@ var ProModal = function ProModal(_ref) {
     'pro-modal-no-footer': noRenderFooter,
     'pro-modal-footer-shadow': height >= 450
   }]);
-  var handleFinish = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+  var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var values, _error$errorFields, _error$errorFields$;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -149,7 +149,7 @@ var ProModal = function ProModal(_ref) {
     if (noRenderFooter) {
       return null;
     }
-    if ( /*#__PURE__*/_react.default.isValidElement(footer)) {
+    if (/*#__PURE__*/_react.default.isValidElement(footer)) {
       return (0, _jsxRuntime.jsx)("div", {
         className: "pro-drawer-footer",
         children: footer
@@ -159,7 +159,7 @@ var ProModal = function ProModal(_ref) {
       return (0, _jsxRuntime.jsx)("div", {
         className: "pro-drawer-footer",
         children: footer.map(function (item) {
-          if ( /*#__PURE__*/_react.default.isValidElement(item)) {
+          if (/*#__PURE__*/_react.default.isValidElement(item)) {
             return item;
           }
           return false;

package/lib/ProEditLabel/index.js

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

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

@@ -86,7 +86,7 @@ var ActionButton = function ActionButton(_ref) {
         disabled: isDisabled,
         okText: _locale.default.ProEditTable.confirm,
         cancelText: _locale.default.ProEditTable.cancel,
-        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? (/*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled
@@ -96,7 +96,7 @@ var ActionButton = function ActionButton(_ref) {
           children: btnConfig.label
         }))
       }) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? (/*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled,
@@ -113,7 +113,7 @@ var ActionButton = function ActionButton(_ref) {
         }))
       })
     }) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+      children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? (/*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         record: record,
         index: index
       }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({

package/lib/ProEditTable/components/RenderField/{ListChanged.d.ts → ListChangedWrapper.d.ts}

@@ -1,6 +1,7 @@
 import React from 'react';
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/lib/form/interface';
+import { DiffOriginalParams } from '../../../ProForm/utils/diffOriginal';
 interface Props {
     name?: NamePath;
     names?: NamePath[];
@@ -9,8 +10,8 @@ interface Props {
     namesStr?: NamePath;
     originalValues?: any;
     form: FormInstance;
-    equalWith?: (preValue: any, curValue: any) => boolean | undefined;
+    equalWith?: DiffOriginalParams['equalWith'];
     [name: string]: any;
 }
-declare const ListChanged: React.FC<Props>;
-export default ListChanged;
+declare const ListChangedWrapper: React.FC<Props>;
+export default ListChangedWrapper;

package/lib/ProEditTable/components/RenderField/{ListChanged.js → ListChangedWrapper.js}

@@ -11,9 +11,12 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
 var _diffOriginal = require("../../../ProForm/utils/diffOriginal");
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type"];
+var _ProConfigProvider = require("../../../ProConfigProvider");
+var _utils = require("../../../utils");
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "valuePropName"];
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -43,7 +46,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = (0, _lodash.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;
@@ -66,7 +69,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     return (0, _lodash.get)(originalValues, originalName);
   }) : (0, _lodash.get)(originalValues, originalName);
 };
-var ListChanged = function ListChanged(props) {
+var ListChangedWrapper = function ListChangedWrapper(props) {
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -80,12 +83,16 @@ var ListChanged = function ListChanged(props) {
     rowKeyPath = props.rowKeyPath,
     children = props.children,
     type = props.type,
+    normalize = props.normalize,
+    valuePropName = props.valuePropName,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEditTable') || {},
+    isDiffAll = _ref2.isDiffAll;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var notWatch = !originalValues || ['FormList', 'ProEditTable'].includes(type);
-  var originalValue = !notWatch ? getOriginalValue({
+  var isWatch = originalValues && !['FormList', 'ProEditTable'].includes(type);
+  var originalValue = isWatch ? getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
@@ -93,22 +100,32 @@ var ListChanged = function ListChanged(props) {
     rowKeyPath: rowKeyPath,
     form: form
   }) : undefined;
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = (0, _react.useMemo)(function () {
-    if (notWatch || noChange) return false;
+  var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
+  var diffType = (0, _react.useMemo)(function () {
+    if (!isWatch || noChange) return 'same';
+    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
     return (0, _diffOriginal.diffOriginal)({
-      value: props.value,
+      value: _value,
       originalValue: originalValue,
       form: form,
       equalWith: equalWith
       // name: isString(namesStr) ? namesStr : originalName || name,
     });
-  }, [props.value, originalValue]);
-  if (notWatch || noChange) {
+  }, [props[valuePropName], originalValue]);
+  var isAdd = diffType === 'add';
+  var isChanged = diffType === 'changed';
+  if (!isWatch || noChange) {
     return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest));
   }
-  return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-    open: changed ? undefined : false,
+  var diffClassName = (0, _classnames.default)({
+    'pro-form-item-changed': isChanged,
+    'pro-form-item-add': isAdd
+  });
+  return (0, _jsxRuntime.jsx)(_antd.Tooltip
+  // 传入undefined 鼠标移入显示移出隐藏
+  , {
+    // 传入undefined 鼠标移入显示移出隐藏
+    open: isChanged ? undefined : false,
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
@@ -121,9 +138,9 @@ var ListChanged = function ListChanged(props) {
       })) : undefined]
     }),
     children: (0, _jsxRuntime.jsx)("div", {
-      className: changed ? 'pro-form-item-changed' : '',
+      className: diffClassName,
       children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest)) : undefined
     })
   });
 };
-var _default = exports.default = ListChanged;
+var _default = exports.default = ListChangedWrapper;

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

@@ -29,7 +29,7 @@ var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"
 var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
 var _getDefaultProps = require("../../utils/getDefaultProps");
-var _ListChanged = _interopRequireDefault(require("./ListChanged"));
+var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -253,7 +253,7 @@ var RenderField = function RenderField(_ref) {
     if (typeof _editRender === 'function') {
       TargetComponent = _editRender.apply(void 0, rowParams);
     }
-    if ( /*#__PURE__*/_react.default.isValidElement(_editRender)) {
+    if (/*#__PURE__*/_react.default.isValidElement(_editRender)) {
       TargetComponent = _editRender;
     }
   }
@@ -269,7 +269,7 @@ var RenderField = function RenderField(_ref) {
         children: View
       });
     }
-    if ( /*#__PURE__*/_react.default.isValidElement(viewRender)) {
+    if (/*#__PURE__*/_react.default.isValidElement(viewRender)) {
       TargetComponent = viewRender;
     }
   }
@@ -312,7 +312,7 @@ var RenderField = function RenderField(_ref) {
     }, 100);
   };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
-  var _onChange = (0, _lodash.debounce)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+  var _onChange = (0, _lodash.debounce)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var _len2,
       args,
       _key2,
@@ -416,7 +416,7 @@ var RenderField = function RenderField(_ref) {
     }, _callee);
   })), 300);
   var _onblur = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+    var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
       var _len3,
         args,
@@ -517,7 +517,7 @@ var RenderField = function RenderField(_ref) {
       form: form,
       names: names,
       namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index]),
-      name: cellName,
+      name: originalName,
       listName: cellName,
       viewEmpty: viewEmpty,
       valueType: _valueType,
@@ -552,9 +552,9 @@ var RenderField = function RenderField(_ref) {
   var getFieldItem = function getFieldItem() {
     var _componentProps;
     var FormItem = null;
-    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
+    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? (/*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
     if (originalValues) {
-      FieldComponent = (0, _jsxRuntime.jsx)(_ListChanged.default, {
+      FieldComponent = (0, _jsxRuntime.jsx)(_ListChangedWrapper.default, {
         name: cellName,
         names: names,
         namesStr: [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]),
@@ -566,6 +566,8 @@ var RenderField = function RenderField(_ref) {
         equalWith: equalWith,
         type: type,
         onChange: _onChange,
+        valuePropName: _formItemProps.valuePropName,
+        normalize: _formItemProps.normalize,
         children: FieldComponent
       });
     }