@zat-design/sisyphus-react 3.9.2 → 3.9.3

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

@@ -113,9 +113,9 @@ export var formatColumn = function formatColumn(_ref2) {
     }
   };
   if (column === null || column === void 0 ? void 0 : column.render) {
-    if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0 && !onDiff) {
-      return;
-    }
+    // if (!originalObj && Object.keys(originalObj ?? {}).length === 0 && !onDiff) {
+    //   return;
+    // }
     var originalRender = column.render; // 保存原始的 render 方法
     // 自定义render 手动重载下
     column.render = function (value, record, index) {
@@ -123,8 +123,10 @@ export var formatColumn = function formatColumn(_ref2) {
       var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
       var originalResult = getOriginalValue(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
       var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        isAddCell = originalResult.isAddCell;
       var isInNewRowFlag = isInNewRow(record);
+      var _isAddCell = isAddCell;
       otherProps.isChanged = isChanged;
       // 存在比对
       if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender) && (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
@@ -142,6 +144,27 @@ export var formatColumn = function formatColumn(_ref2) {
         }
         originalValue = diffResult;
       }
+      // 存在自定义onDiff比对
+      if (isFunction(onDiff)) {
+        var _originalObj$record$r2;
+        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,
+          record: record,
+          index: index
+        });
+        if (_diffResult === 'changed') {
+          otherProps.isChanged = true;
+        }
+        if (_diffResult === 'same') {
+          otherProps.isChanged = false;
+        }
+        if (_diffResult === 'add') {
+          _isAddCell = true;
+          otherProps.isChanged = false;
+        }
+      }
       return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
         originalValue: isEmpty(originalValue) ? null : originalValue,
@@ -152,7 +175,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: _value,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: _isAddCell
       }));
     };
     return;
@@ -177,8 +201,9 @@ export var formatColumn = function formatColumn(_ref2) {
       var realValue = tools.calc(Number(value !== null && value !== void 0 ? value : 0), '*', multiple);
       var renderValue = getDecimalDigits(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
       var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRealValue = tools.calc(Number(originalValue || null), '*', multiple);
       var originalRenderValue = getDecimalDigits(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
@@ -208,7 +233,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
     // 千分位, 千分位带CNY前缀
@@ -217,8 +243,9 @@ export var formatColumn = function formatColumn(_ref2) {
       var valueStr = valueTypePrecision ? "".concat(Number(value).toFixed(valueTypePrecision)) : "".concat(value);
       var renderValue = valueStr.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
       var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
       var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
@@ -248,7 +275,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -256,8 +284,9 @@ export var formatColumn = function formatColumn(_ref2) {
       var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
       var renderValue = (_moment = moment(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
       var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRenderValue = (_moment2 = moment(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
@@ -311,7 +340,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -319,8 +349,9 @@ export var formatColumn = function formatColumn(_ref2) {
       var realCode = typeof code === 'function' ? code(value, record) : code;
       var renderValue = getEnumLabel(realCode, value, valueType === 'enumCodeName');
       var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRenderValue = getEnumLabel(realCode, originalValue, valueType === 'enumCodeName');
       if (Array.isArray(column === null || column === void 0 ? void 0 : column.codeValues) && !realCode) {
@@ -354,15 +385,17 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (precision || prefix || suffix) {
     column.render = function (value, record, index) {
       var renderValue = value === 'number' ? value.toFixed(precision) : value;
       var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
       var node = _jsxs(_Space, {
@@ -391,7 +424,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (valueType === 'address') {
@@ -399,8 +433,9 @@ export var formatColumn = function formatColumn(_ref2) {
       var _realValue$filter;
       var realValue = transform ? transform(value, record) : value;
       var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRealValue = transform ? transform(originalValue, record) : originalValue;
       var isEmpty = !realValue || Array.isArray(realValue) && (realValue === null || realValue === void 0 ? void 0 : (_realValue$filter = realValue.filter(function (item) {
@@ -448,7 +483,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (copyable) {
@@ -473,8 +509,9 @@ export var formatColumn = function formatColumn(_ref2) {
   } else if (ellipsis) {
     column.render = function (value, record, index) {
       var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       if (!value && value !== 0 && value === originalValue) {
         _jsx("div", {
@@ -497,15 +534,17 @@ export var formatColumn = function formatColumn(_ref2) {
           currentValue: value || '-',
           toolTipProps: _toolTipProps,
           minWidth: minWidth,
-          isInNewRowFlag: isInNewRowFlag
+          isInNewRowFlag: isInNewRowFlag,
+          isAddCell: isAddCell
         })), suffixNode(value, record, index)]
       });
     };
   } else {
     column.render = function (value, record, index) {
       var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var node = _jsxs(_Space, {
         size: 8,
@@ -530,7 +569,8 @@ export var formatColumn = function formatColumn(_ref2) {
         currentValue: value || '-',
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   }

package/es/ProTable/components/RenderColumn/index.d.ts

@@ -13,6 +13,8 @@ interface Props {
     minWidth?: number;
     isInNewRowFlag?: boolean;
     isChanged?: boolean;
+    /** 新增单元格字段 */
+    isAddCell?: boolean;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;

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

@@ -37,7 +37,8 @@ var RenderColumn = function RenderColumn(props) {
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
   var cellDiffCls = classNames({
-    'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged
+    'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged,
+    'add-cell': props === null || props === void 0 ? void 0 : props.isAddCell
   });
   // 比对场景走的逻辑
   if (!isInNewRowFlag && isBoolean(props === null || props === void 0 ? void 0 : props.isChanged)) {
@@ -97,10 +98,7 @@ var RenderColumn = function RenderColumn(props) {
         children: renderNode
       }));
     }
-    if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
-      return renderNode;
-    }
-    return _jsx("span", {
+    return _jsx("div", {
       className: cellDiffCls,
       style: {
         width: width,

package/es/ProTable/propsType.d.ts

@@ -40,11 +40,10 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     transform?: (value: any, record?: any) => string[];
     show?: boolean | (() => boolean);
-    onDiff?: ({ value, originValue }: {
-        value: any;
-        originValue: any;
-    }) => boolean;
-    viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
+    /** 自定义比对函数, 触发条件必须写render */
+    onDiff?: ({ value, record, index, originalValue, originalRecord }: any) => any;
+    /** 自定义提示render, 触发条件必须写render */
+    viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => 'same' | 'changed' | 'add' | undefined;
     isChanged?: boolean | null;
 }
 export interface CreateTreeFromArrayOptions {

package/es/ProTable/style/index.less

@@ -277,16 +277,30 @@
       }
     }
 
-    .@{ant-prefix}-table-cell .varied-cell {
-      margin-left: -8px;
-      padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
-
-      background: var(--zaui-contract-bg; #fffaa1) !important;
-      border-radius: var(--zaui-border-radius, 8px);
-      .pro-form-view-container {
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
+    .@{ant-prefix}-table-cell {
+      .varied-cell {
+        display: block;
+        margin-left: -8px;
+        padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+        background-color: var(--zaui-contract-bg; #fffaa1) !important;
+        border-radius: var(--zaui-border-radius, 8px);
+        .pro-form-view-container {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+      }
+      .add-cell{
+        display: block;
+        margin-left: -8px;
+        padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+        background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
+        border-radius: var(--zaui-border-radius, 8px);
+        .pro-form-view-container {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
       }
     }
 
@@ -586,5 +600,8 @@
 .@{ant-prefix}-table{
   .original-value-tooltip{
     position: fixed;
+    &.@{ant-prefix}-tooltip > @{ant-prefix}-tooltip-content > @{ant-prefix}-tooltip-inner{
+      width: max-content;
+    }
   }
 }

package/es/ProTable/utils/index.d.ts

@@ -12,9 +12,11 @@ export declare const getDecimalDigits: (num?: number) => number;
  * @param any originalObj
  * @param {any} dataIndex
  * @return {any} isChanged 返回bool值，表示存在比对
+ * @return {any} isAddCell 返回bool值，表示存在比对
  */
 export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => {
     originalValue: any;
+    isAddCell: boolean;
     isChanged: boolean;
 };
 export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;

package/es/ProTable/utils/index.js

@@ -1,4 +1,6 @@
 import { get, isEqual } from 'lodash';
+import { validate } from '@zat-design/utils';
+var isEmpty = validate.isEmpty;
 /**
  * 获取小数点后的位数
  * @param num 数字
@@ -17,25 +19,36 @@ export var getDecimalDigits = function getDecimalDigits() {
  * @param any originalObj
  * @param {any} dataIndex
  * @return {any} isChanged 返回bool值，表示存在比对
+ * @return {any} isAddCell 返回bool值，表示存在比对
  */
 export var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
   if (!originalObj) {
     return {
       originalValue: null,
-      isChanged: null
+      isChanged: null,
+      isAddCell: null
     };
   }
   var originalRecord = get(originalObj, get(record, rowKey));
   var originalValue = get(originalRecord, dataIndex);
+  if (isEmpty(originalValue) && !isEmpty(value)) {
+    return {
+      originalValue: originalValue,
+      isAddCell: true,
+      isChanged: false
+    };
+  }
   if (!isEqual(originalValue, value)) {
     return {
       originalValue: originalValue,
-      isChanged: true
+      isChanged: true,
+      isAddCell: false
     };
   }
   return {
     originalValue: null,
-    isChanged: false
+    isChanged: false,
+    isAddCell: false
   };
 };
 export var getColumnDataIndex = function getColumnDataIndex(dataIndex) {

package/lib/ProConfigProvider/index.js

@@ -114,8 +114,8 @@ var ProConfigProvider = exports.ProConfigProvider = function ProConfigProvider(p
     },
     children: (0, _jsxRuntime.jsx)(_antd.ConfigProvider, {
       locale: antdLangMap[lang],
-      children: (0, _jsxRuntime.jsxs)("div", {
-        children: [" ", props.children]
+      children: (0, _jsxRuntime.jsx)("div", {
+        children: props.children
       })
     })
   });

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

@@ -82,7 +82,8 @@ var RenderField = function RenderField(_ref) {
     _config$validateTrigg = config.validateTrigger,
     validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
     otherProps = config.otherProps,
-    diffConfig = config.diffConfig;
+    diffConfig = config.diffConfig,
+    getIsNew = config.getIsNew;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -553,7 +554,7 @@ var RenderField = function RenderField(_ref) {
     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));
-    if (originalValues) {
+    if (originalValues && !getIsNew(record)) {
       FieldComponent = (0, _jsxRuntime.jsx)(_ListChangedWrapper.default, {
         name: cellName,
         names: names,

package/lib/ProEditTable/index.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -130,17 +129,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     }
     return key;
   };
-  var IsNew = function IsNew(preArr, record) {
-    var _preArr$find;
-    if (!(preArr === null || preArr === void 0 ? void 0 : preArr.length)) {
-      return false;
-    }
-    return !(preArr === null || preArr === void 0 ? void 0 : (_preArr$find = preArr.find) === null || _preArr$find === void 0 ? void 0 : _preArr$find.call(preArr, function (item) {
-      return getRowKey(item) === getRowKey(record);
-    }));
-  };
   var originalValues = (0, _react.useMemo)(function () {
     var _originalArr$every, _originalArr$some;
+    var nextOriginalValues;
     // 原始值也需要设置对应的rowkey，后续比对通过rowkey对比
     var originalArr = (0, _lodash.get)(resetProps === null || resetProps === void 0 ? void 0 : resetProps.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) {
@@ -156,8 +147,22 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         item.rowKey = getRowKey(item);
       });
     }
-    return (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) ? (0, _defineProperty2.default)({}, name, originalArr) : undefined;
+    if (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) {
+      nextOriginalValues = {};
+      (0, _lodash.set)(nextOriginalValues, name, originalArr);
+    }
+    return nextOriginalValues;
   }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues]);
+  var getIsNew = function getIsNew(record) {
+    var _originalArr$find;
+    var originalArr = (0, _lodash.get)(originalValues, name);
+    if (!(originalArr === null || originalArr === void 0 ? void 0 : originalArr.length)) {
+      return false;
+    }
+    return !(originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$find = originalArr.find) === null || _originalArr$find === void 0 ? void 0 : _originalArr$find.call(originalArr, function (item) {
+      return getRowKey(item) === getRowKey(record);
+    }));
+  };
   var config = (0, _objectSpread2.default)({
     form: form,
     mode: mode,
@@ -191,14 +196,14 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     prefixCls: prefixCls,
     rowDisabled: rowDisabled,
     actionDirection: actionDirection,
-    diffConfig: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig)
+    diffConfig: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig),
+    getIsNew: getIsNew
   }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
     var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
     var className = isEdit ? 'is-editing' : '';
-    var originalArr = (0, _lodash.get)(originalValues, name);
-    if (IsNew(originalArr, record)) {
+    if (getIsNew(record)) {
       return "is-new-row ".concat(className);
     }
     return className;

package/lib/ProEnum/hooks/useEnum.js

@@ -28,6 +28,8 @@ function useEnum(codes, value, compose) {
     _ref3$clear = _ref3.clear,
     clear = _ref3$clear === void 0 ? true : _ref3$clear;
   var catchData = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage);
+  // 默认枚举缓存数据
+  baseEnumStorage = catchData;
   if (!codes) {
     return catchData;
   }

package/lib/ProForm/components/combination/FormList/components/ActionButton.js

@@ -19,6 +19,7 @@ var _ProIcon = _interopRequireDefault(require("../../../../../ProIcon"));
 var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _excluded = ["label", "onClick", "onHandle", "type", "needConfirm", "confirmProps", "title"],
   _excluded2 = ["onClick", "label"];
+var filterKeys = ['actionType'];
 var getDefaultActions = function getDefaultActions(mode) {
   var originActions = {
     add: {
@@ -43,9 +44,11 @@ var getDefaultActions = function getDefaultActions(mode) {
       label: "".concat(_locale.default.ProForm.formListActions[1]),
       icon: mode === 'less' ? (0, _jsxRuntime.jsx)(_ProIcon.default, {
         type: "solid-close",
-        className: "single-delete"
+        className: "single-delete",
+        buttonIcon: false
       }) : (0, _jsxRuntime.jsx)(_ProIcon.default, {
-        type: "delete"
+        type: "delete",
+        buttonIcon: false
       })
     },
     copy: {
@@ -241,14 +244,14 @@ var ActionButton = function ActionButton(props) {
             handleClick(internalOnClick, _onClick, index, item);
           }
         }, _confirmProps), {}, {
-          children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), rest), {}, {
+          children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), (0, _lodash.omit)(rest, filterKeys)), {}, {
             type: "text",
             onClick: function onClick(e) {
               return e.stopPropagation();
             },
             children: label || defaultLabel
           }))
-        }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), rest), {}, {
+        }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), (0, _lodash.omit)(rest, filterKeys)), {}, {
           type: "text",
           onClick: function onClick(e) {
             e.stopPropagation();
@@ -266,14 +269,14 @@ var ActionButton = function ActionButton(props) {
           return customClick(_onClick, index);
         }
       }, _confirmProps), {}, {
-        children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+        children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
           type: "text",
           onClick: function onClick(e) {
             return e.stopPropagation();
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
         type: "text",
         onClick: function onClick(e) {

package/lib/ProForm/components/combination/FormList/components/LineFields.js

@@ -68,7 +68,8 @@ var LineFields = function LineFields(props) {
       ref: setActivatorNodeRef,
       children: (0, _jsxRuntime.jsx)(_ProIcon.default, {
         className: "drag-icon",
-        type: "drag"
+        type: "drag",
+        buttonIcon: false
       })
     })), (0, _jsxRuntime.jsx)(_antd.Row, {
       gutter: isLess ? 0 : 24,

package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -18,6 +18,7 @@ var _react = require("react");
 var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
+/* eslint-disable react/no-array-index-key */
 var actions = {
   add: {
     onClick: function onClick(value, _ref) {
@@ -31,6 +32,7 @@ var actions = {
 var defaultActionProps = [{
   type: 'add'
 }];
+var filterKeys = ['actionType'];
 var ToolbarButton = function ToolbarButton(props) {
   var namePath = props.namePath,
     form = props.form,
@@ -132,7 +134,7 @@ var ToolbarButton = function ToolbarButton(props) {
         if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[type]), rest), {}, {
+        return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[type]), (0, _lodash.omit)(rest, filterKeys)), {}, {
           type: "link",
           onClick: function onClick() {
             return handleClick(internalOnClick, _onClick, item);
@@ -140,7 +142,7 @@ var ToolbarButton = function ToolbarButton(props) {
           children: label || defaultLabel
         }), "".concat(type).concat(index));
       }
-      return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+      return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
         type: "link",
         onClick: function onClick() {
           return customClick(_onClick2, item);

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

@@ -101,7 +101,7 @@ var FormList = function FormList(props, ref) {
       }),
       strategy: _sortable.verticalListSortingStrategy,
       children: [_fields.map(function (field, index) {
-        var namePath = [].concat((0, _toConsumableArray2.default)(_namePath), [index]);
+        var namePath = [].concat((0, _toConsumableArray2.default)(_namePath), [field.name]);
         var _columns = processColumns(index, namePath);
         return mode === 'block' ? (0, _jsxRuntime.jsx)(_BlockFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
           columns: _columns,

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

@@ -22,7 +22,7 @@ var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ = _interopRequireDefault(require("../../.."));
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder"];
+var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent"];
 var Text = _antd.Typography.Text;
 var defaultFieldNames = {
   label: 'name',
@@ -87,6 +87,7 @@ var ProCascader = function ProCascader(props) {
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '/' : _props$separator,
     detailPlaceholder = props.detailPlaceholder,
+    scrollFollowParent = props.scrollFollowParent,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref3 = _.default.useFieldProps() || {},
     isViewCon = _ref3.isView,
@@ -273,8 +274,11 @@ var ProCascader = function ProCascader(props) {
         filter: handlefilter,
         limit: 1000
       },
-      onChange: handleChange
-    }, (0, _lodash.omit)(otherProps, 'otherProps'))), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      onChange: handleChange,
+      getPopupContainer: function getPopupContainer(trigger) {
+        return scrollFollowParent ? trigger.parentElement : document.body;
+      }
+    }, (0, _lodash.omit)(otherProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: detail,
       children: (0, _jsxRuntime.jsx)("span", {
         className: "pro-address-detail",