@zat-design/sisyphus-react 3.3.1 → 3.3.2-beta.1

package/dist/index.esm.css

@@ -751,6 +751,9 @@
 .pro-collapse.pro-collapse-level2 .pro-collapse-level2-collapse .ant-collapse-expand-icon {
   display: block;
 }
+.pro-collapse.pro-collapse-level2 .pro-collapse-level2-no-collapse .ant-collapse-expand-icon {
+  display: none;
+}
 .pro-collapse .ant-collapse-extra .extra-info {
   margin-right: 24px;
 }
@@ -1634,6 +1637,7 @@
 }
 .pro-table .ant-table-body .ant-table-tbody .ant-table-row:nth-child(odd).new-cell td {
   background: #d2fff4 !important;
+  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
 }
 .pro-table .ant-table-body .ant-table-cell .varied-cell {
   margin-left: -8px;
@@ -2248,16 +2252,25 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   display: none;
 }
 .pro-group .ant-space-compact {
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-      -ms-flex-align: center;
-          align-items: center;
   -webkit-box-flex: 1;
   -webkit-flex: auto;
       -ms-flex: auto;
           flex: auto;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
   width: 100%;
 }
+.pro-group .ant-space-compact > .ant-input-number:first-child {
+  border-end-end-radius: 0;
+  border-start-end-radius: 0;
+}
+.pro-group .ant-space-compact > .ant-input-number:last-child {
+  border-start-start-radius: 0;
+  border-end-start-radius: 0;
+  margin-left: -1px;
+}
 .pro-group .ant-space-compact .ant-form-item {
   margin-bottom: 0 !important;
 }
@@ -2269,6 +2282,13 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-start-start-radius: 0;
   border-end-start-radius: 0;
 }
+.pro-group .ant-space-compact .pro-modal-select {
+  margin-left: -1px;
+}
+.pro-group .ant-space-compact .pro-modal-select .ant-input {
+  border-start-start-radius: 0;
+  border-end-start-radius: 0;
+}
 .pro-group .ant-space-compact .ant-input-affix-wrapper,
 .pro-group .ant-space-compact .ant-select {
   border-start-end-radius: 0;
@@ -2276,8 +2296,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-start-start-radius: 0;
   border-end-start-radius: 0;
 }
-.pro-group .ant-space-compact .ant-input-affix-wrapper:nth-child(n+2),
-.pro-group .ant-space-compact .ant-select:nth-child(n+2) {
+.pro-group .ant-space-compact .ant-input-affix-wrapper:nth-child(n + 2),
+.pro-group .ant-space-compact .ant-select:nth-child(n + 2) {
   -webkit-margin-start: -1px;
           margin-inline-start: -1px;
 }
@@ -2306,8 +2326,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-end-end-radius: var(--zaui-border-radius, 4px);
 }
 .pro-group .ant-space-compact .ant-input-affix-wrapper-status-error ~ .group-separator {
-  border-color: var(--ant-error-color);
   color: var(--ant-error-color);
+  border-color: var(--ant-error-color);
 }
 .pro-container.pro-container-diy .pro-container-content {
   display: -webkit-box;
@@ -2561,9 +2581,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder {
   z-index: 9;
 }
-.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > span {
-  background: var(--zaui-contract-bg, #fffaa1);
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-form-view-container {
   padding: 4px 8px;
+  background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
 }
 .pro-form .ant-form-item .ant-row {
@@ -4183,6 +4203,12 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table .ant-table-pagination .ant-pagination-options .ant-select.ant-select-in-form-item {
   width: auto;
 }
+.pro-edit-table .is-new-row td,
+.pro-edit-table .is-new-row.ant-table-row:hover td,
+.pro-edit-table .is-new-row .ant-table-cell-row-hover,
+.pro-edit-table .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
+  background: var(--ant-primary-2) !important;
+}
 .pro-edit-table-header {
   margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
 }

package/es/ProDownload/utils.js

@@ -4,6 +4,8 @@ import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+/* eslint-disable no-empty */
+/* eslint-disable prefer-promise-reject-errors */
 import { isFunction, get } from 'lodash';
 import locale from '../locale';
 var stringify = function stringify(data) {

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

@@ -25,7 +25,7 @@ import * as componentMap from '../../../ProForm/components';
 import Container from '../../../ProForm/components/Container';
 import transformNames from '../../../ProForm/utils/transformNames';
 import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
-import { useChanged } from '../../../ProForm/utils/useChanged';
+import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect } from '../../../ProForm/utils';
 import locale from '../../../locale';
@@ -129,7 +129,7 @@ var RenderField = function RenderField(_ref) {
     names: names,
     label: label,
     labelRequired: labelRequired,
-    required: _required,
+    required: !isView && _required,
     rules: isEditing ? _rules : [],
     isSelect: isSelect({
       dataSource: (_fieldProps4 = _fieldProps) === null || _fieldProps4 === void 0 ? void 0 : _fieldProps4.dataSource,
@@ -452,19 +452,20 @@ var RenderField = function RenderField(_ref) {
     };
   }();
   // 判断当前字段是否变更
-  var _useChanged = useChanged({
+  var _useListChanged = useListChanged({
       name: cellName,
       names: names,
       namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),
+      rowKeyPath: [].concat(_toConsumableArray(baseName), [index, 'rowKey']),
       originalName: originalName,
       originalNames: originalNames,
       originalValues: originalValues,
       form: form,
       equalWith: equalWith
     }),
-    _useChanged2 = _slicedToArray(_useChanged, 2),
-    changed = _useChanged2[0],
-    originalValue = _useChanged2[1];
+    _useListChanged2 = _slicedToArray(_useListChanged, 2),
+    changed = _useListChanged2[0],
+    originalValue = _useListChanged2[1];
   var componentProps = _objectSpread(_objectSpread(_objectSpread({
     form: form,
     name: cellName,

package/es/ProEditTable/index.js

@@ -13,7 +13,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip", "rowKey"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from 'react';
-import { isArray } from 'lodash';
+import { get, isArray } from 'lodash';
 import { useDebounceEffect, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { transformColumns } from './utils';
@@ -106,6 +106,15 @@ 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 config = {
     form: form,
     mode: mode,
@@ -142,6 +151,10 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   var _rowClassName = function _rowClassName(record) {
     var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
     var className = isEdit ? 'is-editing' : '';
+    var originalArr = get(originalValues, name);
+    if (!isEdit && IsNew(originalArr, record)) {
+      return "is-new-row ".concat(className);
+    }
     return className;
   };
   // 复选框
@@ -246,11 +259,16 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     var _value$;
     // 初始化默认生成row-key
     if ((value === null || value === void 0 ? void 0 : value.length) && !(value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey)) {
+      var _originalArr$forEach;
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
           rowKey: getRowKey(item)
         });
       });
+      var originalArr = get(originalValues, name);
+      originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
+        item.rowKey = getRowKey(item);
+      });
       onChange(nextValues);
       if (virtualKey) {
         form.setFieldValue(virtualRowName, nextValues);

package/es/ProEditTable/style/index.less

@@ -296,6 +296,11 @@
     }
   }
 
+  .is-new-row, .is-new-row.@{ant-prefix}-table-row:hover {
+    td, .@{ant-prefix}-table-cell-row-hover {
+      background: var(--ant-primary-2) !important;
+    }
+  }
 }
 
 .pro-edit-table-header {

package/es/ProEnum/hooks/useEnumRequest.js

@@ -72,6 +72,18 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
               case 9:
                 res.data = response;
               case 10:
+                if (!(_typeof(response) !== 'object' || response === null)) {
+                  _context.next = 12;
+                  break;
+                }
+                throw Error('response enum data must be object');
+              case 12:
+                if (!(Object.keys(response).length === 0)) {
+                  _context.next = 14;
+                  break;
+                }
+                throw Error('Please return valid enumeration data');
+              case 14:
                 // 只返回fieldNames对象的key
                 if (clear) {
                   // 忽略清洗的 codes
@@ -106,7 +118,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                   }, 10000);
                 }
                 return _context.abrupt("return", res);
-              case 17:
+              case 21:
               case "end":
                 return _context.stop();
             }

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

@@ -9,7 +9,7 @@ import { useMemo } from 'react';
 import { omit } from 'lodash';
 import classnames from 'classnames';
 import RenderFields from '../../render/RenderFields';
-import { insertSeparator, parseName } from './utils';
+import { insertSeparator } from './utils';
 import ProForm from '../../../../ProForm';
 var Group = function Group(props) {
   var columns = props.children,
@@ -27,7 +27,6 @@ var Group = function Group(props) {
   if (!Array.isArray(names)) {
     console.error('Warning: Composite form components whose type is Group must be configured with names');
   }
-  var _parentNames = parseName(id);
   var data = useMemo(function () {
     var fieldList = [];
     var result = columns.map(function (item) {
@@ -35,7 +34,7 @@ var Group = function Group(props) {
         disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
       }, item), {}, {
         noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
-        parentNames: _parentNames
+        parentNames: id
       });
     });
     var node = _jsx(_Button, {
@@ -46,7 +45,7 @@ var Group = function Group(props) {
       columns: insertSeparator(result, space, node, otherProps),
       fieldList: fieldList
     };
-  }, [name, columns, space, props]);
+  }, [name, columns, space, props, names]);
   var _className = classnames(_defineProperty({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {

package/es/ProForm/components/combination/Group/style/index.less

@@ -2,20 +2,20 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .border-radius(@start-end: 0, @end-end: 0, @start-start: 0, @end-start: 0) {
-  border-start-end-radius  : @start-end;
-  border-end-end-radius    : @end-end;
+  border-start-end-radius: @start-end;
+  border-end-end-radius: @end-end;
   border-start-start-radius: @start-start;
-  border-end-start-radius  : @end-start;
+  border-end-start-radius: @end-start;
 }
 
 .start-radius() {
   border-start-start-radius: var(--zaui-border-radius, 4px);
-  border-end-start-radius  : var(--zaui-border-radius, 4px);
+  border-end-start-radius: var(--zaui-border-radius, 4px);
 }
 
 .end-radius() {
   border-start-end-radius: var(--zaui-border-radius, 4px);
-  border-end-end-radius  : var(--zaui-border-radius, 4px);
+  border-end-end-radius: var(--zaui-border-radius, 4px);
 }
 
 .pro-group {
@@ -39,7 +39,6 @@
     }
 
     .@{ant-prefix}-form-item {
-
       margin-bottom: 0 !important;
     }
   }
@@ -49,19 +48,38 @@
   }
 
   .@{ant-prefix}-space-compact {
+    flex: auto;
     align-items: center;
-    flex       : auto;
-    width      : 100%;
+    width: 100%;
+
+    &>.@{ant-prefix}-input-number{
+      &:first-child{
+        border-end-end-radius: 0;
+        border-start-end-radius: 0;
+      }
+      &:last-child{
+        border-start-start-radius: 0;
+        border-end-start-radius: 0;
+        margin-left: -1px;
+      }
+    }
 
     .@{ant-prefix}-form-item {
       margin-bottom: 0 !important;
     }
 
     .group-separator {
-      margin-inline-end        : -2px;
-      margin-inline-start      : -1px;
+      margin-inline-end: -2px;
+      margin-inline-start: -1px;
       border-start-start-radius: 0;
-      border-end-start-radius  : 0;
+      border-end-start-radius: 0;
+    }
+    .pro-modal-select {
+      margin-left: -1px;
+      .@{ant-prefix}-input{
+        border-start-start-radius: 0;
+        border-end-start-radius: 0;
+      }
     }
 
     // 定制内敛合并样式
@@ -69,16 +87,16 @@
     .@{ant-prefix}-select {
       .border-radius(0, 0, 0, 0);
 
-      &:nth-child(n+2) {
-        margin-inline-start: -1px
+      &:nth-child(n + 2) {
+        margin-inline-start: -1px;
       }
 
       &:first-child {
-        .start-radius()
+        .start-radius();
       }
 
       &:last-child {
-        .end-radius()
+        .end-radius();
       }
     }
 
@@ -89,22 +107,21 @@
 
       &:first-child {
         .@{ant-prefix}-select-selector {
-          .start-radius()
+          .start-radius();
         }
       }
 
       &:last-child {
         .@{ant-prefix}-select-selector {
-          .end-radius()
+          .end-radius();
         }
       }
-
     }
 
     // 报错样式定制
-    .@{ant-prefix}-input-affix-wrapper-status-error~.group-separator {
+    .@{ant-prefix}-input-affix-wrapper-status-error ~ .group-separator {
+      color: var(--ant-error-color);
       border-color: var(--ant-error-color);
-      color       : var(--ant-error-color);
     }
   }
-}
+}

package/es/ProForm/components/combination/Group/utils.d.ts

@@ -6,5 +6,3 @@ import { SpaceType } from './propsType';
 * @returns
 */
 export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
-/** 解析name */
-export declare const parseName: (name: string) => any[];

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

@@ -33,17 +33,4 @@ export var insertSeparator = function insertSeparator(columns, space, separatorN
     }
     return result;
   }, []);
-};
-/** 解析name */
-export var parseName = function parseName(name) {
-  var result = [];
-  var parts = name.split('_');
-  parts.forEach(function (part) {
-    if (!Number.isNaN(Number(part))) {
-      result.push(Number(part));
-    } else {
-      result.push(part);
-    }
-  });
-  return result;
 };

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

@@ -18,7 +18,7 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { CloseOutlined, SearchOutlined } from '@ant-design/icons';
 import { useMount, useSetState } from 'ahooks';
-import { cloneDeep, isArray, isEqual, isFunction } from 'lodash';
+import { cloneDeep, isArray, isEqual, isFunction, omit } from 'lodash';
 import { ReactSVG } from 'react-svg';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
 import { ProForm, ProDrawerForm, ProTable, useProConfig } from '../../../../index';
@@ -652,7 +652,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       disabled: disabled,
       addonAfter: forceAddonAfterRender(),
       autoComplete: "off"
-    }, restInputProps)), _jsx(_Input, {
+    }, omit(restInputProps, ['otherProps']))), _jsx(_Input, {
       type: "hidden",
       value: value
     })]

package/es/ProForm/components/render/Render.js

@@ -33,7 +33,7 @@ import tipSvg from '../../../assets/tip.svg';
 import useRules from '../../utils/useRules';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _classNames, _otherProps$names2;
+  var _ref2, _classNames, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -163,8 +163,8 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
-  // 优先取formDisabled（全局），其次取disabled函数返回值，最后取fieldProps函数返回的disabled
-  var lastDisabled = componentProps.disabledStrictly ? formDisabled || _disabled || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) : false;
+  // 优先取组件上的disabled, 最后取formDisabled（全局
+  var lastDisabled = componentProps.disabledStrictly ? (_ref2 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled : false;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -192,8 +192,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = _toConsumableArray(args);
-    var _ref2 = otherProps || {},
-      valueType = _ref2.valueType;
+    var _ref3 = otherProps || {},
+      valueType = _ref3.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -251,9 +251,10 @@ var Render = function Render(props) {
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat(_toConsumableArray(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat(_toConsumableArray(_args))));
       return false;
     }
-    // Group默认校验, 延时校验解决值未同步最新的问题
+    // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
       setTimeout(function () {
+        form.setFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames, form.getFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames));
         form.validateFields([formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames]);
       }, 60);
     }
@@ -268,7 +269,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len2,
         args,
         _key2,
@@ -295,7 +296,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
@@ -403,7 +404,12 @@ var Render = function Render(props) {
         shouldUpdate: _otherFormItemProps.shouldUpdate,
         noStyle: true,
         children: function children() {
-          return orgFormItem;
+          return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+            // @ts-ignore
+            _internalItemRender: internalItemRender,
+            className: _className,
+            children: child
+          }));
         }
       });
     }

package/es/ProForm/components/render/RenderFields.js

@@ -44,6 +44,7 @@ var RenderFields = function RenderFields(props) {
     });
   }
   var comList = columns.flatMap(function (column, index) {
+    var _ref, _formItemProps$disabl;
     if (!!expand && !openState) {
       // expand为Number时 过滤掉大于expand 且 非fixed的column
       if (typeof expand === 'number') {
@@ -122,7 +123,7 @@ var RenderFields = function RenderFields(props) {
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
-    var comDisabled = formItemChildProps.disabled || fieldProps.disabled || disabled;
+    var comDisabled = (_ref = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled) !== null && _ref !== void 0 ? _ref : disabled;
     var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
     // 当前组件是不是一个选择组件
     var _isSelect = isSelect({

package/es/ProForm/style/index.less

@@ -56,7 +56,8 @@
     visibility: unset;
   }
 
-  .@{ant-prefix}-input-affix-wrapper:hover span.@{ant-prefix}-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
+  .@{ant-prefix}-input-affix-wrapper:hover
+    span.@{ant-prefix}-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
     display: unset;
     visibility: hidden;
   }
@@ -140,9 +141,9 @@
         }
       }
 
-      .@{ant-prefix}-form-item-control-input-content > span {
-        background: @zaui-contract-bg;
+      .@{ant-prefix}-form-item-control-input-content > .pro-form-view-container {
         padding: 4px 8px;
+        background: @zaui-contract-bg;
         border-radius: 4px;
       }
     }
@@ -306,7 +307,7 @@
 
   div.pro-form-custom-footer {
     width: unset !important;
-    height:32px;
+    height: 32px;
     margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
 
     &.pro-form-custom-footer-hidden {

package/es/ProForm/utils/contrastOriginal.d.ts

@@ -1,6 +1,5 @@
 import { FormInstance } from 'antd';
 interface Params {
-    originalValues: any;
     originalValue: any;
     value: any;
     form: FormInstance;

package/es/ProForm/utils/contrastOriginal.js

@@ -2,7 +2,6 @@ import { isEqual, isFunction } from 'lodash';
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
 export var contrastOriginal = function contrastOriginal(params) {
   var originalValue = params.originalValue,
-    originalValues = params.originalValues,
     value = params.value,
     equalWith = params.equalWith;
   // 支持传入自定义比较事件

package/es/ProForm/utils/useChanged.d.ts

@@ -1,15 +1,8 @@
-import { FormInstance } from 'antd';
-import { NamePath } from 'antd/lib/form/interface';
-interface Params {
-    name?: NamePath;
-    names?: NamePath[];
-    namesStr?: NamePath;
-    originalName?: NamePath;
-    originalNames?: NamePath[];
-    originalNameStr?: NamePath;
+export declare const useChanged: ({ name, names, namesStr, originalValues, form, equalWith }: {
+    name: any;
+    names: any;
+    namesStr: any;
     originalValues: any;
-    form: FormInstance;
-    equalWith?: (originalValue: any, currentValue: any) => boolean;
-}
-export declare const useChanged: (params: Params) => any[];
-export {};
+    form: any;
+    equalWith: any;
+}) => any[];

package/es/ProForm/utils/useChanged.js

@@ -2,30 +2,23 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import { get } from 'lodash';
 import { contrastOriginal } from './contrastOriginal';
-export var useChanged = function useChanged(params) {
-  var name = params.name,
-    names = params.names,
-    namesStr = params.namesStr,
-    _params$originalName = params.originalName,
-    originalName = _params$originalName === void 0 ? name : _params$originalName,
-    _params$originalNames = params.originalNames,
-    originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
-    originalValues = params.originalValues,
-    form = params.form,
-    equalWith = params.equalWith;
-  var _form = form;
-  var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-    return get(originalValues, originalName);
-  }) : get(originalValues, originalName);
+export var useChanged = function useChanged(_ref) {
+  var name = _ref.name,
+    names = _ref.names,
+    namesStr = _ref.namesStr,
+    originalValues = _ref.originalValues,
+    form = _ref.form,
+    equalWith = _ref.equalWith;
+  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
+    return get(originalValues, name);
+  }) : get(originalValues, name);
   var notWatch = !originalValues || originalValue === undefined;
-  // @ts-ignore
-  if (notWatch) _form = [];
-  var value = _Form.useWatch(namesStr || name, _form);
+  if (notWatch) form = [];
+  var value = _Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];
   var changed = contrastOriginal({
-    value: value,
     originalValue: originalValue,
-    originalValues: originalValues,
+    value: value,
     form: form,
     equalWith: equalWith
   });