@zat-design/sisyphus-react 3.9.4-beta.1 → 3.9.4-beta.11

package/.vscode/extensions.json

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

package/es/ProEditTable/components/RenderField/ListChangedWrapper.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/lib/form/interface';
-import { DiffOriginalParams } from '../../../ProForm/utils/diffOriginal';
+import { DiffOriginalParams } from '../../utils/diffOriginal';
 interface Props {
     name?: NamePath;
     names?: NamePath[];

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

@@ -10,7 +10,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo, useRef } from 'react';
 import classnames from 'classnames';
 import { get } from 'lodash';
-import { diffOriginal } from '../../../ProForm/utils/diffOriginal';
+import { diffOriginal } from '../../utils/diffOriginal';
 import { useProConfig } from '../../../ProConfigProvider';
 import { isEmpty } from '../../../utils';
 var toNamePath = function toNamePath(name) {
@@ -34,7 +34,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
   if (!originalValues) {
     return undefined;
   }
-  var originalValueRow;
+  var originRecord;
   if (rowKeyPath) {
     var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
     var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
@@ -43,13 +43,13 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
-    originalValueRow = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
+    originRecord = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
     var originalValue;
     if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
       var originalNamesValue = originalNames.map(function (originalName) {
-        return get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+        return get(originRecord, originalName.slice(rowKeyPath.length - 1));
       });
       // 有可能出现数组中全是undefined的情况  视为没有值
       var fillUndefined = originalNamesValue.every(function (valItem) {
@@ -57,11 +57,12 @@ var getOriginalValue = function getOriginalValue(_ref) {
       });
       originalValue = fillUndefined ? undefined : originalNamesValue;
     } else {
-      originalValue = get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+      originalValue = get(originRecord, originalName.slice(rowKeyPath.length - 1));
     }
     return {
       originalValue: originalValue,
-      originalValueRow: originalValueRow
+      originRecord: originRecord,
+      record: rowValue
     };
   }
   // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
@@ -69,7 +70,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     originalValue: (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
       return get(originalValues, originalName);
     }) : get(originalValues, originalName),
-    originalValueRow: originalValueRow
+    originRecord: originRecord
   };
 };
 var ListChangedWrapper = function ListChangedWrapper(props) {
@@ -130,8 +131,10 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      equalWith: equalWith
-      // name: isString(namesStr) ? namesStr : originalName || name,
+      equalWith: equalWith,
+      originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
+      record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
+      index: index
     });
   }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
@@ -144,7 +147,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     var _children = children;
     if (viewRender) {
       if (! /*#__PURE__*/React.isValidElement(viewRender)) {
-        return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValueRow) || {}, {
+        return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord) || {}, {
           form: form,
           name: name,
           index: index

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

@@ -6,7 +6,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "onDiff", "className", "trim", "confirm", "dependencies"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -52,7 +52,6 @@ var RenderField = function RenderField(_ref) {
     required = _column$required === void 0 ? false : _column$required,
     _column$rules = column.rules,
     rules = _column$rules === void 0 ? [] : _column$rules,
-    equalWith = column.equalWith,
     onDiff = column.onDiff,
     className = column.className,
     trim = column.trim,
@@ -568,7 +567,7 @@ var RenderField = function RenderField(_ref) {
         originalNames: originalNames,
         originalValues: originalValues,
         form: form,
-        equalWith: onDiff || equalWith,
+        equalWith: onDiff,
         type: type,
         onChange: _onChange,
         valuePropName: _formItemProps.valuePropName,

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

@@ -0,0 +1,21 @@
+import { FormInstance } from 'antd';
+export type DiffType = 'same' | 'add' | 'changed';
+export interface DiffOriginalParams {
+    originalValue: any;
+    value: any;
+    form: FormInstance;
+    equalWith?: ({ originValue, originRecord, value, record, index }: {
+        originValue: any;
+        originRecord: any;
+        value: any;
+        record: any;
+        index: number;
+    }) => DiffType | undefined;
+    /** 原始行数据 */
+    originRecord: any;
+    /** 当前行数据 */
+    record: any;
+    /** 当前行索引 */
+    index: number;
+}
+export declare const diffOriginal: (params: DiffOriginalParams) => DiffType;

package/es/ProEditTable/utils/diffOriginal.js

@@ -0,0 +1,62 @@
+import { isEqual, isFunction, isObject } from 'lodash';
+import { validate } from '@zat-design/utils';
+var isEmpty = validate.isEmpty;
+// 过滤对象中undefined字段
+// 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
+var filterObject = function filterObject(data) {
+  if (!isObject(data) || Array.isArray(data) || data === null) return data;
+  var resData = {};
+  Object.keys(data).forEach(function (key) {
+    if (!isEmpty(data[key])) {
+      resData[key] = data[key];
+    }
+  });
+  // 空对象视为null 比较时 null undefined {} [] '' 视为相等
+  if (!Object.keys(resData).length) return null;
+  return resData;
+};
+export var diffOriginal = function diffOriginal(params) {
+  var originalValue = params.originalValue,
+    value = params.value,
+    equalWith = params.equalWith,
+    originRecord = params.originRecord,
+    record = params.record,
+    index = params.index;
+  // 支持传入自定义比较事件
+  if (isFunction(equalWith)) {
+    var diffRes = equalWith({
+      originValue: originalValue,
+      originRecord: originRecord,
+      value: value,
+      record: record,
+      index: index
+    });
+    // 如果返回undefined走内置比较逻辑
+    if (diffRes !== undefined) {
+      if (typeof diffRes === 'boolean') {
+        return diffRes ? 'same' : 'changed';
+      }
+      return diffRes;
+    }
+  }
+  var _value = filterObject(value);
+  var _originalValue = filterObject(originalValue);
+  // 如果原始值为空 且当前有值的话 认为变更类型是新增
+  if (isEmpty(_originalValue) && !isEmpty(_value)) {
+    return 'add';
+  }
+  if (Array.isArray(_originalValue)) {
+    var isSame = _originalValue.every(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
+        return isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
+      }
+      return true;
+    });
+    return isSame ? 'same' : 'changed';
+  }
+  if (!isEmpty(_originalValue) || !isEmpty(_value)) {
+    return isEqual(_value, _originalValue) ? 'same' : 'changed';
+  }
+  return 'same';
+};

package/es/ProEnum/index.js

@@ -230,7 +230,7 @@ var ProEnum = function ProEnum(props) {
   };
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
-    _message.error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
+    _message.error("".concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.label, "-").concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name, "-").concat(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType));
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -2,7 +2,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView", "viewRender"];
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
 import { FieldProvider } from '../../../../utils/useFieldProps';
@@ -30,6 +30,7 @@ var getComRender = function getComRender(component, props, componentProps) {
 };
 /** 渲染组件 */
 var ComRender = function ComRender(props) {
+  var _props$component, _props$component$prop;
   var type = props.type,
     confirm = props.confirm,
     component = props.component,
@@ -50,6 +51,12 @@ var ComRender = function ComRender(props) {
   };
   var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
+  var isSeparator = (props === null || props === void 0 ? void 0 : (_props$component = props.component) === null || _props$component === void 0 ? void 0 : (_props$component$prop = _props$component.props) === null || _props$component$prop === void 0 ? void 0 : _props$component$prop.className) === 'group-separator';
+  if (isSeparator && isView) {
+    return _jsx(_Fragment, {
+      children: "/"
+    });
+  }
   if (viewRender && isView) {
     return _jsx(FieldProvider, {
       value: _objectSpread(_objectSpread({}, contextProps), {}, {

package/es/ProForm/components/combination/Group/index.js

@@ -71,7 +71,7 @@ var Group = function Group(props) {
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
       children: columns.map(function (column, index) {
         column.otherProps = otherProps;
-        // 自定义间隔移除对于参数
+        // 自定义间隔移除对应参数
         if (column === null || column === void 0 ? void 0 : column.separator) {
           delete column.separator;
           delete column.otherProps;

package/es/ProForm/components/combination/Group/utils.js

@@ -329,7 +329,7 @@ export var useTransformColumns = function useTransformColumns(params) {
     }, reactiveProps), {}, {
       disabled: getLastDisabled(),
       getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
-      fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
+      fieldProps: _objectSpread(_objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
         onChange: handleChange,
         onBlur: handleBlur,
         value: value === null || value === void 0 ? void 0 : value[index]

package/es/ProTable/components/FormatColumn/index.js

@@ -128,6 +128,7 @@ export var formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       var _isAddCell = isAddCell;
       otherProps.isChanged = isChanged;
+      var nextValue = value;
       // 存在比对
       if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender) && (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
         var _originalObj$record$r;
@@ -139,10 +140,17 @@ export var formatColumn = function formatColumn(_ref2) {
           index: index
         });
         // viewRender 返回值为 false 时，不显示对比
-        if (isBoolean(diffResult)) {
+        if (isBoolean(diffResult) && !diffResult) {
           otherProps.isChanged = false;
         }
         originalValue = diffResult;
+        nextValue = otherProps.viewRender({
+          originalValue: value,
+          originalRecord: record !== null && record !== void 0 ? record : {},
+          value: value,
+          record: record,
+          index: index
+        });
       }
       // 存在自定义onDiff比对
       if (isFunction(onDiff)) {
@@ -150,14 +158,16 @@ export var formatColumn = function formatColumn(_ref2) {
         var _diffResult = onDiff({
           originalValue: originalValue,
           originalRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
-          value: value,
+          value: nextValue,
           record: record,
           index: index
         });
         if (_diffResult === 'changed') {
+          _isAddCell = false;
           otherProps.isChanged = true;
         }
         if (_diffResult === 'same') {
+          _isAddCell = false;
           otherProps.isChanged = false;
         }
         if (_diffResult === 'add') {

package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -106,7 +106,7 @@ var DndWrapper = function DndWrapper(_ref2) {
   }();
   var onDragEnd = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
-      var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
+      var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -114,7 +114,7 @@ var DndWrapper = function DndWrapper(_ref2) {
             // 为数据源划分层级及parentId
             transformedValue = addLevelAndParentId(value, rowKey); // 同一level层级的且parentId相同的，可以互相之间拖拽替换
             if (!(active.id !== (over === null || over === void 0 ? void 0 : over.id))) {
-              _context2.next = 15;
+              _context2.next = 20;
               break;
             }
             activeObject = treeNodeFind(transformedValue, function (t) {
@@ -124,47 +124,51 @@ var DndWrapper = function DndWrapper(_ref2) {
               return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
             });
             if (!(activeObject && overObject)) {
-              _context2.next = 15;
+              _context2.next = 20;
               break;
             }
             activeLevel = activeObject.level, activeParentId = activeObject.parentId;
-            overLevel = overObject.level, overParentId = overObject.parentId; // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
+            overLevel = overObject.level, overParentId = overObject.parentId;
+            nextDataSource = value;
+            if (!(activeLevel === overLevel && activeParentId === overParentId)) {
+              _context2.next = 20;
+              break;
+            }
+            // 将树平铺
+            _flatTree = transformTreeToArray(transformedValue).map(function (item) {
+              return _objectSpread(_objectSpread({}, item), {}, {
+                children: undefined
+              });
+            });
+            activeIndex = _flatTree.findIndex(function (i) {
+              return i.rowKey === active.id;
+            });
+            overIndex = _flatTree.findIndex(function (i) {
+              return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+            });
+            nextValue = arrayMove(_flatTree, activeIndex, overIndex);
+            nextDataSource = createTreeFromArray(nextValue, {
+              itemKey: 'rowKey',
+              parentKey: 'parentId',
+              childrenKey: 'children'
+            });
+            // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
             if (!(onDragEndGuard && isFunction(onDragEndGuard))) {
-              _context2.next = 14;
+              _context2.next = 19;
               break;
             }
-            _context2.next = 11;
+            _context2.next = 18;
             return onDragEndGuard({
               activeObject: activeObject,
               overObject: overObject,
-              currentDataSource: value
+              originDataSource: value,
+              currentDataSource: nextDataSource
             });
-          case 11:
+          case 18:
             nextDataSource = _context2.sent;
-            onChange(nextDataSource !== null && nextDataSource !== void 0 ? nextDataSource : []);
-            return _context2.abrupt("return");
-          case 14:
-            if (activeLevel === overLevel && activeParentId === overParentId) {
-              // 将树平铺
-              _flatTree = transformTreeToArray(transformedValue).map(function (item) {
-                return _objectSpread(_objectSpread({}, item), {}, {
-                  children: undefined
-                });
-              });
-              activeIndex = _flatTree.findIndex(function (i) {
-                return i.rowKey === active.id;
-              });
-              overIndex = _flatTree.findIndex(function (i) {
-                return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
-              });
-              nextValue = arrayMove(_flatTree, activeIndex, overIndex);
-              onChange(createTreeFromArray(nextValue, {
-                itemKey: 'rowKey',
-                parentKey: 'parentId',
-                childrenKey: 'children'
-              }));
-            }
-          case 15:
+          case 19:
+            onChange((_nextDataSource = nextDataSource) !== null && _nextDataSource !== void 0 ? _nextDataSource : []);
+          case 20:
           case "end":
             return _context2.stop();
         }

package/es/ProTable/index.js

@@ -187,6 +187,26 @@ var ProTable = function ProTable(props) {
       return 'new-cell';
     }
   };
+  var _formatColumns = function formatColumns(nextColumns) {
+    nextColumns === null || nextColumns === void 0 ? void 0 : nextColumns.forEach(function (item, index) {
+      formatColumn({
+        column: item,
+        originalObj: originalObj,
+        rowKey: props.rowKey,
+        diffConfig: diffConfig,
+        wrapToolTipProps: wrapToolTipProps,
+        scroll: _scroll,
+        onUpdateMinWidth: function onUpdateMinWidth(w) {
+          curColumns[index].minWidth = w;
+        },
+        isInNewRow: _rowClassName
+      });
+      if (item.children && Array.isArray(item.children)) {
+        _formatColumns(item.children);
+      }
+    });
+    return nextColumns;
+  };
   var columns = useMemo(function () {
     var newColumns = curColumns.map(function (item, index) {
       var _propsColumnObj$getCo2;
@@ -208,21 +228,8 @@ var ProTable = function ProTable(props) {
     }).filter(function (item) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
-    newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item, index) {
-      formatColumn({
-        column: item,
-        originalObj: originalObj,
-        rowKey: props.rowKey,
-        diffConfig: diffConfig,
-        wrapToolTipProps: wrapToolTipProps,
-        scroll: _scroll,
-        onUpdateMinWidth: function onUpdateMinWidth(w) {
-          curColumns[index].minWidth = w;
-        },
-        isInNewRow: _rowClassName
-      });
-    });
-    return newColumns;
+    var nextColumns = _formatColumns(newColumns);
+    return nextColumns;
   }, [curColumns, handleResize, _scroll, originalDataSource, originalObj, _rowClassName]);
   var _columns = useMemo(function () {
     return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {

package/es/ProTable/propsType.d.ts

@@ -19,7 +19,7 @@ export interface ProTableSummaryProps {
     fixed?: boolean;
 }
 export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
-    dataIndex: string | string[];
+    dataIndex?: string | string[];
     width?: number | string;
     minWidth?: number;
     valueType?: ProTableValueType;
@@ -43,8 +43,9 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     /** 自定义比对函数, 触发条件必须写render */
     onDiff?: ({ value, record, index, originalValue, originalRecord }: any) => any;
     /** 自定义提示render, 触发条件必须写render */
-    viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => 'same' | 'changed' | 'add' | undefined;
+    viewRender?: ({ value, record, index, originalValue, originalRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
     isChanged?: boolean | null;
+    children?: ProTableColumn[];
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/lib/ProEditTable/components/RenderField/ListChangedWrapper.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/lib/form/interface';
-import { DiffOriginalParams } from '../../../ProForm/utils/diffOriginal';
+import { DiffOriginalParams } from '../../utils/diffOriginal';
 interface Props {
     name?: NamePath;
     names?: NamePath[];

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

@@ -14,7 +14,7 @@ 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 _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
 var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
@@ -39,7 +39,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
   if (!originalValues) {
     return undefined;
   }
-  var originalValueRow;
+  var originRecord;
   if (rowKeyPath) {
     var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
     var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
@@ -48,13 +48,13 @@ 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));
-    originalValueRow = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
+    originRecord = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
     var originalValue;
     if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
       var originalNamesValue = originalNames.map(function (originalName) {
-        return (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+        return (0, _lodash.get)(originRecord, originalName.slice(rowKeyPath.length - 1));
       });
       // 有可能出现数组中全是undefined的情况  视为没有值
       var fillUndefined = originalNamesValue.every(function (valItem) {
@@ -62,11 +62,12 @@ var getOriginalValue = function getOriginalValue(_ref) {
       });
       originalValue = fillUndefined ? undefined : originalNamesValue;
     } else {
-      originalValue = (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+      originalValue = (0, _lodash.get)(originRecord, originalName.slice(rowKeyPath.length - 1));
     }
     return {
       originalValue: originalValue,
-      originalValueRow: originalValueRow
+      originRecord: originRecord,
+      record: rowValue
     };
   }
   // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
@@ -74,7 +75,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     originalValue: (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
       return (0, _lodash.get)(originalValues, originalName);
     }) : (0, _lodash.get)(originalValues, originalName),
-    originalValueRow: originalValueRow
+    originRecord: originRecord
   };
 };
 var ListChangedWrapper = function ListChangedWrapper(props) {
@@ -135,8 +136,10 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      equalWith: equalWith
-      // name: isString(namesStr) ? namesStr : originalName || name,
+      equalWith: equalWith,
+      originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
+      record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
+      index: index
     });
   }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
@@ -149,7 +152,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     var _children = children;
     if (viewRender) {
       if (! /*#__PURE__*/_react.default.isValidElement(viewRender)) {
-        return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValueRow) || {}, {
+        return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord) || {}, {
           form: form,
           name: name,
           index: index

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

@@ -30,7 +30,7 @@ var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
 var _getDefaultProps = require("../../utils/getDefaultProps");
 var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "onDiff", "className", "trim", "confirm", "dependencies"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
@@ -59,7 +59,6 @@ var RenderField = function RenderField(_ref) {
     required = _column$required === void 0 ? false : _column$required,
     _column$rules = column.rules,
     rules = _column$rules === void 0 ? [] : _column$rules,
-    equalWith = column.equalWith,
     onDiff = column.onDiff,
     className = column.className,
     trim = column.trim,
@@ -575,7 +574,7 @@ var RenderField = function RenderField(_ref) {
         originalNames: originalNames,
         originalValues: originalValues,
         form: form,
-        equalWith: onDiff || equalWith,
+        equalWith: onDiff,
         type: type,
         onChange: _onChange,
         valuePropName: _formItemProps.valuePropName,

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

@@ -0,0 +1,21 @@
+import { FormInstance } from 'antd';
+export type DiffType = 'same' | 'add' | 'changed';
+export interface DiffOriginalParams {
+    originalValue: any;
+    value: any;
+    form: FormInstance;
+    equalWith?: ({ originValue, originRecord, value, record, index }: {
+        originValue: any;
+        originRecord: any;
+        value: any;
+        record: any;
+        index: number;
+    }) => DiffType | undefined;
+    /** 原始行数据 */
+    originRecord: any;
+    /** 当前行数据 */
+    record: any;
+    /** 当前行索引 */
+    index: number;
+}
+export declare const diffOriginal: (params: DiffOriginalParams) => DiffType;

package/lib/ProEditTable/utils/diffOriginal.js

@@ -0,0 +1,68 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.diffOriginal = void 0;
+var _lodash = require("lodash");
+var _utils = require("@zat-design/utils");
+var isEmpty = _utils.validate.isEmpty;
+// 过滤对象中undefined字段
+// 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
+var filterObject = function filterObject(data) {
+  if (!(0, _lodash.isObject)(data) || Array.isArray(data) || data === null) return data;
+  var resData = {};
+  Object.keys(data).forEach(function (key) {
+    if (!isEmpty(data[key])) {
+      resData[key] = data[key];
+    }
+  });
+  // 空对象视为null 比较时 null undefined {} [] '' 视为相等
+  if (!Object.keys(resData).length) return null;
+  return resData;
+};
+var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
+  var originalValue = params.originalValue,
+    value = params.value,
+    equalWith = params.equalWith,
+    originRecord = params.originRecord,
+    record = params.record,
+    index = params.index;
+  // 支持传入自定义比较事件
+  if ((0, _lodash.isFunction)(equalWith)) {
+    var diffRes = equalWith({
+      originValue: originalValue,
+      originRecord: originRecord,
+      value: value,
+      record: record,
+      index: index
+    });
+    // 如果返回undefined走内置比较逻辑
+    if (diffRes !== undefined) {
+      if (typeof diffRes === 'boolean') {
+        return diffRes ? 'same' : 'changed';
+      }
+      return diffRes;
+    }
+  }
+  var _value = filterObject(value);
+  var _originalValue = filterObject(originalValue);
+  // 如果原始值为空 且当前有值的话 认为变更类型是新增
+  if (isEmpty(_originalValue) && !isEmpty(_value)) {
+    return 'add';
+  }
+  if (Array.isArray(_originalValue)) {
+    var isSame = _originalValue.every(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
+        return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
+      }
+      return true;
+    });
+    return isSame ? 'same' : 'changed';
+  }
+  if (!isEmpty(_originalValue) || !isEmpty(_value)) {
+    return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
+  }
+  return 'same';
+};

package/lib/ProEnum/index.js

@@ -231,7 +231,7 @@ var ProEnum = function ProEnum(props) {
   };
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
-    _antd.message.error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
+    _antd.message.error("".concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.label, "-").concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name, "-").concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType));
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;

package/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -38,6 +38,7 @@ var getComRender = function getComRender(component, props, componentProps) {
 };
 /** 渲染组件 */
 var ComRender = function ComRender(props) {
+  var _props$component, _props$component$prop;
   var type = props.type,
     confirm = props.confirm,
     component = props.component,
@@ -58,6 +59,12 @@ var ComRender = function ComRender(props) {
   };
   var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), _props);
+  var isSeparator = (props === null || props === void 0 ? void 0 : (_props$component = props.component) === null || _props$component === void 0 ? void 0 : (_props$component$prop = _props$component.props) === null || _props$component$prop === void 0 ? void 0 : _props$component$prop.className) === 'group-separator';
+  if (isSeparator && isView) {
+    return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      children: "/"
+    });
+  }
   if (viewRender && isView) {
     return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
       value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {

package/lib/ProForm/components/combination/Group/index.js

@@ -77,7 +77,7 @@ var Group = function Group(props) {
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? (0, _jsxRuntime.jsx)(_antd.Space.Compact, {
       children: columns.map(function (column, index) {
         column.otherProps = otherProps;
-        // 自定义间隔移除对于参数
+        // 自定义间隔移除对应参数
         if (column === null || column === void 0 ? void 0 : column.separator) {
           delete column.separator;
           delete column.otherProps;

package/lib/ProForm/components/combination/Group/utils.js

@@ -337,7 +337,7 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
     }, reactiveProps), {}, {
       disabled: getLastDisabled(),
       getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
-      fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
+      fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
         onChange: handleChange,
         onBlur: handleBlur,
         value: value === null || value === void 0 ? void 0 : value[index]

package/lib/ProTable/components/FormatColumn/index.js

@@ -134,6 +134,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       var _isAddCell = isAddCell;
       otherProps.isChanged = isChanged;
+      var nextValue = value;
       // 存在比对
       if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender) && (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
         var _originalObj$record$r;
@@ -145,10 +146,17 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           index: index
         });
         // viewRender 返回值为 false 时，不显示对比
-        if ((0, _lodash.isBoolean)(diffResult)) {
+        if ((0, _lodash.isBoolean)(diffResult) && !diffResult) {
           otherProps.isChanged = false;
         }
         originalValue = diffResult;
+        nextValue = otherProps.viewRender({
+          originalValue: value,
+          originalRecord: record !== null && record !== void 0 ? record : {},
+          value: value,
+          record: record,
+          index: index
+        });
       }
       // 存在自定义onDiff比对
       if ((0, _lodash.isFunction)(onDiff)) {
@@ -156,14 +164,16 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         var _diffResult = onDiff({
           originalValue: originalValue,
           originalRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
-          value: value,
+          value: nextValue,
           record: record,
           index: index
         });
         if (_diffResult === 'changed') {
+          _isAddCell = false;
           otherProps.isChanged = true;
         }
         if (_diffResult === 'same') {
+          _isAddCell = false;
           otherProps.isChanged = false;
         }
         if (_diffResult === 'add') {

package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -113,7 +113,7 @@ var DndWrapper = function DndWrapper(_ref2) {
   }();
   var onDragEnd = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
-      var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
+      var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -121,7 +121,7 @@ var DndWrapper = function DndWrapper(_ref2) {
             // 为数据源划分层级及parentId
             transformedValue = (0, _index.addLevelAndParentId)(value, rowKey); // 同一level层级的且parentId相同的，可以互相之间拖拽替换
             if (!(active.id !== (over === null || over === void 0 ? void 0 : over.id))) {
-              _context2.next = 15;
+              _context2.next = 20;
               break;
             }
             activeObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
@@ -131,47 +131,51 @@ var DndWrapper = function DndWrapper(_ref2) {
               return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
             });
             if (!(activeObject && overObject)) {
-              _context2.next = 15;
+              _context2.next = 20;
               break;
             }
             activeLevel = activeObject.level, activeParentId = activeObject.parentId;
-            overLevel = overObject.level, overParentId = overObject.parentId; // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
+            overLevel = overObject.level, overParentId = overObject.parentId;
+            nextDataSource = value;
+            if (!(activeLevel === overLevel && activeParentId === overParentId)) {
+              _context2.next = 20;
+              break;
+            }
+            // 将树平铺
+            _flatTree = (0, _index.transformTreeToArray)(transformedValue).map(function (item) {
+              return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+                children: undefined
+              });
+            });
+            activeIndex = _flatTree.findIndex(function (i) {
+              return i.rowKey === active.id;
+            });
+            overIndex = _flatTree.findIndex(function (i) {
+              return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+            });
+            nextValue = (0, _sortable.arrayMove)(_flatTree, activeIndex, overIndex);
+            nextDataSource = (0, _index.createTreeFromArray)(nextValue, {
+              itemKey: 'rowKey',
+              parentKey: 'parentId',
+              childrenKey: 'children'
+            });
+            // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
             if (!(onDragEndGuard && (0, _lodash.isFunction)(onDragEndGuard))) {
-              _context2.next = 14;
+              _context2.next = 19;
               break;
             }
-            _context2.next = 11;
+            _context2.next = 18;
             return onDragEndGuard({
               activeObject: activeObject,
               overObject: overObject,
-              currentDataSource: value
+              originDataSource: value,
+              currentDataSource: nextDataSource
             });
-          case 11:
+          case 18:
             nextDataSource = _context2.sent;
-            onChange(nextDataSource !== null && nextDataSource !== void 0 ? nextDataSource : []);
-            return _context2.abrupt("return");
-          case 14:
-            if (activeLevel === overLevel && activeParentId === overParentId) {
-              // 将树平铺
-              _flatTree = (0, _index.transformTreeToArray)(transformedValue).map(function (item) {
-                return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-                  children: undefined
-                });
-              });
-              activeIndex = _flatTree.findIndex(function (i) {
-                return i.rowKey === active.id;
-              });
-              overIndex = _flatTree.findIndex(function (i) {
-                return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
-              });
-              nextValue = (0, _sortable.arrayMove)(_flatTree, activeIndex, overIndex);
-              onChange((0, _index.createTreeFromArray)(nextValue, {
-                itemKey: 'rowKey',
-                parentKey: 'parentId',
-                childrenKey: 'children'
-              }));
-            }
-          case 15:
+          case 19:
+            onChange((_nextDataSource = nextDataSource) !== null && _nextDataSource !== void 0 ? _nextDataSource : []);
+          case 20:
           case "end":
             return _context2.stop();
         }

package/lib/ProTable/index.js

@@ -194,6 +194,26 @@ var ProTable = function ProTable(props) {
       return 'new-cell';
     }
   };
+  var _formatColumns = function formatColumns(nextColumns) {
+    nextColumns === null || nextColumns === void 0 ? void 0 : nextColumns.forEach(function (item, index) {
+      (0, _FormatColumn.formatColumn)({
+        column: item,
+        originalObj: originalObj,
+        rowKey: props.rowKey,
+        diffConfig: diffConfig,
+        wrapToolTipProps: wrapToolTipProps,
+        scroll: _scroll,
+        onUpdateMinWidth: function onUpdateMinWidth(w) {
+          curColumns[index].minWidth = w;
+        },
+        isInNewRow: _rowClassName
+      });
+      if (item.children && Array.isArray(item.children)) {
+        _formatColumns(item.children);
+      }
+    });
+    return nextColumns;
+  };
   var columns = (0, _react.useMemo)(function () {
     var newColumns = curColumns.map(function (item, index) {
       var _propsColumnObj$getCo2;
@@ -215,21 +235,8 @@ var ProTable = function ProTable(props) {
     }).filter(function (item) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
-    newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item, index) {
-      (0, _FormatColumn.formatColumn)({
-        column: item,
-        originalObj: originalObj,
-        rowKey: props.rowKey,
-        diffConfig: diffConfig,
-        wrapToolTipProps: wrapToolTipProps,
-        scroll: _scroll,
-        onUpdateMinWidth: function onUpdateMinWidth(w) {
-          curColumns[index].minWidth = w;
-        },
-        isInNewRow: _rowClassName
-      });
-    });
-    return newColumns;
+    var nextColumns = _formatColumns(newColumns);
+    return nextColumns;
   }, [curColumns, handleResize, _scroll, originalDataSource, originalObj, _rowClassName]);
   var _columns = (0, _react.useMemo)(function () {
     return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {

package/lib/ProTable/propsType.d.ts

@@ -19,7 +19,7 @@ export interface ProTableSummaryProps {
     fixed?: boolean;
 }
 export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
-    dataIndex: string | string[];
+    dataIndex?: string | string[];
     width?: number | string;
     minWidth?: number;
     valueType?: ProTableValueType;
@@ -43,8 +43,9 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     /** 自定义比对函数, 触发条件必须写render */
     onDiff?: ({ value, record, index, originalValue, originalRecord }: any) => any;
     /** 自定义提示render, 触发条件必须写render */
-    viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => 'same' | 'changed' | 'add' | undefined;
+    viewRender?: ({ value, record, index, originalValue, originalRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
     isChanged?: boolean | null;
+    children?: ProTableColumn[];
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.9.4-beta.1",
+  "version": "3.9.4-beta.11",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",