@zat-design/sisyphus-react 3.2.1 → 3.2.2-beta.2

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

@@ -20,6 +20,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var _useControlled3 = _interopRequireDefault(require("./hooks/useControlled"));
 var _ProRangeLimit = _interopRequireDefault(require("../ProRangeLimit"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType", "otherProps"],
   _excluded2 = ["mode"];
 // 永久有效默认值
@@ -34,9 +35,10 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     valueType = _props$valueType === void 0 ? 'format' : _props$valueType,
     otherProps = props.otherProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var _useMemo = (0, _react.useMemo)(function () {
       var foreverMoment = foreverTime ? (0, _moment.default)(foreverTime, format) : (0, _moment.default)('9999-01-01', 'YYYY-MM-DD');
       var foreverString = foreverTime || foreverMoment.format(format);

package/lib/ProForm/components/old/InputRange/index.js

@@ -13,6 +13,7 @@ var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable no-param-reassign */
+
 var positiveInteger = {
   formatter: function formatter(value) {
     return value.replace(/[^0-9]/g, '');

package/lib/ProForm/components/old/ProCertValidity/index.js

@@ -11,7 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
-var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
+var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
 var RangePicker = _antd.DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
 var defaultPopupContainer = function defaultPopupContainer(triggerNode) {

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

@@ -11,6 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
@@ -23,11 +24,10 @@ var _index = require("../../utils/index");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _transformNames = _interopRequireDefault(require("../../utils/transformNames"));
 var _valueType = _interopRequireDefault(require("../../utils/valueType"));
-var _useChanged = require("../../utils/useChanged");
+var _useChanged3 = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
-/* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
   var _classNames, _otherProps$names2;
@@ -46,7 +46,8 @@ var Render = function Render(props) {
     isSelect = props.isSelect,
     originalValues = props.originalValues,
     equalWith = props.equalWith,
-    requiredOnView = props.requiredOnView;
+    requiredOnView = props.requiredOnView,
+    originalTip = props.originalTip;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -67,7 +68,6 @@ var Render = function Render(props) {
       disabled: componentProps.disabled,
       rules: rules,
       required: required,
-      componentProps: componentProps,
       fieldProps: fieldProps,
       component: component,
       originComponent: originComponent,
@@ -78,7 +78,6 @@ var Render = function Render(props) {
     _disabled = _useShouldUpdate.disabled,
     _rules = _useShouldUpdate.rules,
     _required = _useShouldUpdate.required,
-    _componentProps = _useShouldUpdate.componentProps,
     _fieldProps = _useShouldUpdate.fieldProps,
     AutoComponent = _useShouldUpdate.component;
   otherFormItemProps.shouldUpdate = shouldUpdate;
@@ -96,7 +95,17 @@ var Render = function Render(props) {
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
   // 判断当前字段是否变更
-  var changed = (0, _useChanged.useChanged)(formItemProps.name, otherProps.names, namesStr, originalValues, form, equalWith);
+  var _useChanged = (0, _useChanged3.useChanged)({
+      name: formItemProps.name,
+      names: otherProps.names,
+      namesStr: namesStr,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
+    _useChanged2 = (0, _slicedToArray2.default)(_useChanged, 2),
+    changed = _useChanged2[0],
+    originalValue = _useChanged2[1];
   var internalRule = (0, _useRules.default)({
     names: otherProps.names,
     label: otherFormItemProps.label,
@@ -351,7 +360,9 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    var filterFormItemKey = ['onFieldChange',
+    // 'shouldUpdate',
+    'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
@@ -376,26 +387,46 @@ var Render = function Render(props) {
       });
     }
     // 当存在shouldUpdate时补货所有form变更（防止表单onchange设置form值时无法更新的问题）
-    if (_otherFormItemProps.shouldUpdate) {
-      return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
-        shouldUpdate: _otherFormItemProps.shouldUpdate,
-        noStyle: true,
-        children: function children() {
-          return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
-            // @ts-ignore
-            _internalItemRender: internalItemRender,
-            className: _className,
-            children: child
-          }));
-        }
-      });
-    }
-    return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+    // if (_otherFormItemProps.shouldUpdate) {
+    //   return (
+    //     <Form.Item shouldUpdate={_otherFormItemProps.shouldUpdate} noStyle>
+    //       {() => {
+    //         return (
+    //           <Form.Item
+    //             {...omit(_otherFormItemProps, filterFormItemKey)}
+    //             // @ts-ignore
+    //             _internalItemRender={internalItemRender}
+    //             className={_className}
+    //           >
+    //             {child}
+    //           </Form.Item>
+    //         );
+    //       }}
+    //     </Form.Item>
+    //   );
+    // }
+    var formItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
+    // 不渲染tooltip
+    if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
+      return formItem;
+    }
+    var title = (0, _jsxRuntime.jsxs)(_antd.Space, {
+      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.cloneElement(child, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+        isView: true,
+        value: originalValue,
+        checked: type === 'Switch' ? originalValue : undefined
+      }))]
+    });
+    return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      title: title,
+      visible: changed ? undefined : false,
+      children: formItem
+    });
   };
   var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {

package/lib/ProForm/components/render/RenderFields.d.ts

@@ -17,6 +17,7 @@ interface Props<T = any> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     required?: boolean | (() => boolean);
+    originalTip?: boolean;
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

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

@@ -32,7 +32,8 @@ var RenderFields = function RenderFields(props) {
     originalValues = props.originalValues,
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
-    required = props.required;
+    required = props.required,
+    originalTip = props.originalTip;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
@@ -127,10 +128,10 @@ var RenderFields = function RenderFields(props) {
       }
     }
     var label = formItemChildProps.label,
-      comDisabled = formItemChildProps.disabled,
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
+    var comDisabled = formItemChildProps.disabled || fieldProps.disabled || disabled;
     var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
     // 当前组件是不是一个选择组件
     var _isSelect = (0, _utils.isSelect)({
@@ -139,17 +140,16 @@ var RenderFields = function RenderFields(props) {
     });
     var _placeholder = placeholder || "".concat(_isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(label || formLabel || '');
     // 表单组件Props 兼容2.0版本
-    var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      disabled: disabled
-    }, formItemChildProps), fieldProps);
+    var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemChildProps), fieldProps);
     if ((0, _lodash.isBoolean)(formDisabled)) {
       _fieldProps.disabled = formDisabled;
     }
-    var componentProps = (0, _objectSpread2.default)({
-      disabled: _disabled,
-      placeholder: _placeholder,
-      disabledStrictly: true
-    }, _fieldProps);
+    var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      disabledStrictly: true,
+      placeholder: _placeholder
+    }, _fieldProps), {}, {
+      disabled: _disabled
+    });
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
       _formItemProps.valuePropName = 'checked';
@@ -167,7 +167,7 @@ var RenderFields = function RenderFields(props) {
     var otherProps = {
       label: _formItemProps.label,
       name: _formItemProps.name,
-      disabled: formDisabled,
+      disabled: _disabled,
       isView: _isView,
       viewEmpty: viewEmpty,
       valueType: valueType,
@@ -202,7 +202,8 @@ var RenderFields = function RenderFields(props) {
         isSelect: _isSelect,
         originalValues: originalValues,
         equalWith: equalWith,
-        requiredOnView: requiredOnView
+        requiredOnView: requiredOnView,
+        originalTip: originalTip
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

package/lib/ProForm/index.js

@@ -25,7 +25,7 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip"];
 var ProForm = function ProForm(props, ref) {
   var _localStorage;
   var _props$mode = props.mode,
@@ -64,6 +64,8 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
+    _props$originalTip = props.originalTip,
+    originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useForm = (0, _useForm3.useForm)(originForm),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
@@ -222,7 +224,8 @@ var ProForm = function ProForm(props, ref) {
         originalValues: originalValues,
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
-        required: required
+        required: required,
+        originalTip: originalTip
       }), children, footerRender()]
     }))
   }));

package/lib/ProForm/propsType.d.ts

@@ -66,6 +66,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     requiredOnView?: boolean;
     formId?: string;
     required?: boolean;
+    originalTip?: boolean;
 }
 export interface Transform<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

package/lib/ProForm/style/index.less

@@ -17,11 +17,11 @@
     }
 
     .pro-form-custom-footer {
-      display      : flex;
-      align-items  : center;
+      display: flex;
+      align-items: center;
+      height: auto;
       margin-bottom: 0;
-      height       : auto;
-      padding-top  : 6px;
+      padding-top: 6px;
 
       .ant-space-align-center {
         align-items: normal;
@@ -45,17 +45,17 @@
   }
 
   span.ant-input-clear-icon {
-    display   : unset;
+    display: unset;
     visibility: hidden;
   }
 
   .ant-input-affix-wrapper:hover span.ant-input-clear-icon {
-    display   : unset;
+    display: unset;
     visibility: unset;
   }
 
   .ant-input-affix-wrapper:hover span.ant-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
-    display   : unset;
+    display: unset;
     visibility: hidden;
   }
 
@@ -90,7 +90,7 @@
   // 展开折叠按钮
   .expand-button {
     line-height: 32px;
-    cursor     : pointer;
+    cursor: pointer;
 
     .rotate-to-top {
       transform: rotate(90deg);
@@ -116,24 +116,32 @@
 
     .ant-form-item-tooltip {
       svg {
-        width         : 14px;
-        height        : 14px;
+        width: 14px;
+        height: 14px;
         vertical-align: bottom;
-        fill          : @zaui-aide-text;
+        fill: @zaui-aide-text;
       }
     }
 
     // 比较原始值场景下  不同时候的样式
     &.pro-form-item-changed {
-
       span.ant-input-affix-wrapper,
       .ant-select-selector,
       .ant-picker {
-        background: @zaui-contract-bg;
+        background: @zaui-contract-bg !important;
 
         input {
           background: @zaui-contract-bg;
         }
+        .ant-select-selection-placeholder {
+          z-index: 9;
+        }
+      }
+
+      .ant-form-item-control-input-content > span {
+        background: @zaui-contract-bg;
+        padding: 4px 8px;
+        border-radius: 4px;
       }
     }
 
@@ -168,9 +176,9 @@
         }
 
         .range-right {
-          width                    : 100%;
-          border                   : 1px solid @zaui-form-control-line;
-          border-top-left-radius   : 0;
+          width: 100%;
+          border: 1px solid @zaui-form-control-line;
+          border-top-left-radius: 0;
           border-bottom-left-radius: 0;
         }
       }
@@ -182,7 +190,7 @@
   }
 
   .ant-form-item-label {
-    >label {
+    > label {
       white-space: pre-wrap;
     }
   }
@@ -193,7 +201,7 @@
 
   .ant-form-item-has-error {
     .group-separator {
-      color       : var(--ant-error-color);
+      color: var(--ant-error-color);
       border-color: var(--ant-error-color);
     }
 
@@ -203,10 +211,9 @@
   }
 
   .site-input-group-wrapper {
-
     // 范围值表单样式
     & .site-input-split {
-      text-align      : center;
+      text-align: center;
       background-color: @zaui-table-strip-bg;
 
       &.site-input-split-disabled {
@@ -252,33 +259,33 @@
       }
     }
 
-    &.ant-input-group.ant-input-group-compact>*:not(:last-child) {
+    &.ant-input-group.ant-input-group-compact > *:not(:last-child) {
       margin-right: 0;
     }
 
-    >*:first-child {
-      border-top-right-radius   : 0 !important;
+    > *:first-child {
+      border-top-right-radius: 0 !important;
       border-bottom-right-radius: 0 !important;
 
-      >.ant-select-selector {
-        border-top-right-radius   : 0 !important;
+      > .ant-select-selector {
+        border-top-right-radius: 0 !important;
         border-bottom-right-radius: 0 !important;
       }
     }
 
-    >*:last-child {
-      border-top-left-radius   : 0 !important;
+    > *:last-child {
+      border-top-left-radius: 0 !important;
       border-bottom-left-radius: 0 !important;
 
-      >.ant-select-selector {
-        border-top-left-radius   : 0 !important;
+      > .ant-select-selector {
+        border-top-left-radius: 0 !important;
         border-bottom-left-radius: 0 !important;
       }
     }
   }
 
-  .ant-input-group.ant-input-group-compact>* {
-    float         : none;
+  .ant-input-group.ant-input-group-compact > * {
+    float: none;
     vertical-align: top;
   }
 
@@ -287,17 +294,17 @@
   }
 
   .noDisabled {
-    color           : @zaui-disabled-text;
-    font-size       : var(--zaui-font-size, 14px);
+    color: @zaui-disabled-text;
+    font-size: var(--zaui-font-size, 14px);
     background-color: transparent;
-    border          : none;
-    cursor          : default;
-    opacity         : 1;
+    border: none;
+    cursor: default;
+    opacity: 1;
   }
 
   div.pro-form-custom-footer {
-    width        : unset !important;
-    height       : 32px;
+    width: unset !important;
+    height:32px;
     margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
 
     &.pro-form-custom-footer-hidden {
@@ -306,14 +313,14 @@
   }
 
   .pro-form-view-container {
-    display   : inline-block;
-    color     : var(--zaui-text, #343434);
+    display: inline-block;
+    color: var(--zaui-text, #343434);
     word-break: break-all;
   }
 
   .pro-form-view-container_nowrap {
-    overflow     : hidden;
-    white-space  : nowrap;
+    overflow: hidden;
+    white-space: nowrap;
     text-overflow: ellipsis;
   }
 

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

@@ -1 +1,10 @@
-export declare const contrastOriginal: (name: any, names: any, originValues: any, currentValue: any, fun: any) => any;
+import { FormInstance } from 'antd';
+interface Params {
+    originalValues: any;
+    originalValue: any;
+    value: any;
+    form: FormInstance;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const contrastOriginal: (params: Params) => boolean;
+export {};

package/lib/ProForm/utils/contrastOriginal.js

@@ -6,29 +6,26 @@ Object.defineProperty(exports, "__esModule", {
 exports.contrastOriginal = void 0;
 var _lodash = require("lodash");
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-var contrastOriginal = exports.contrastOriginal = function contrastOriginal(name, names, originValues, currentValue, fun) {
+var contrastOriginal = exports.contrastOriginal = function contrastOriginal(params) {
+  var originalValue = params.originalValue,
+    originalValues = params.originalValues,
+    value = params.value,
+    equalWith = params.equalWith;
   // 支持传入自定义比较事件
-  if ((0, _lodash.isFunction)(fun)) {
-    if (names === null || names === void 0 ? void 0 : names.length) {
-      var originVal = names.map(function (key) {
-        return (0, _lodash.get)(originValues, key);
-      });
-      return !fun(originVal, currentValue);
-    }
-    return !fun((0, _lodash.get)(originValues, name), currentValue);
+  if ((0, _lodash.isFunction)(equalWith)) {
+    return !equalWith(originalValue, value);
   }
-  if (names === null || names === void 0 ? void 0 : names.length) {
-    return names.some(function (nameItem, index) {
-      var originalValue = (0, _lodash.get)(originValues, nameItem);
-      if (!nullValue.includes(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index]) || !nullValue.includes(originalValue)) {
-        return !(0, _lodash.isEqual)(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index], (0, _lodash.get)(originValues, nameItem));
+  if (Array.isArray(originalValue)) {
+    return originalValue.some(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
+        return !(0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
       }
       return false;
     });
   }
-  var originalValue = (0, _lodash.get)(originValues, name);
-  if (!nullValue.includes(currentValue) || !nullValue.includes(originalValue)) {
-    return !(0, _lodash.isEqual)(currentValue, (0, _lodash.get)(originValues, name));
+  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
+    return !(0, _lodash.isEqual)(value, originalValue);
   }
   return false;
 };

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

@@ -1 +1,15 @@
-export declare const useChanged: (name: any, names: any, nameStr: any, originalValues: any, form: any, fun: any) => any;
+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;
+    originalValues: any;
+    form: FormInstance;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const useChanged: (params: Params) => any[];
+export {};

package/lib/ProForm/utils/useChanged.js

@@ -7,13 +7,32 @@ exports.useChanged = void 0;
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _contrastOriginal = require("./contrastOriginal");
-var useChanged = exports.useChanged = function useChanged(name, names, nameStr, originalValues, form, fun) {
+var useChanged = exports.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;
-  if (!originalValues || (0, _lodash.get)(originalValues, nameStr || name) === undefined) {
-    _form = [];
-    return false;
-  }
-  var value = _antd.Form.useWatch(nameStr || name, _form);
-  var changed = (0, _contrastOriginal.contrastOriginal)(name, names, originalValues, value, fun);
-  return changed;
+  var 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);
+  var notWatch = !originalValues || originalValue === undefined;
+  // @ts-ignore
+  if (notWatch) _form = [];
+  var value = _antd.Form.useWatch(namesStr || name, _form);
+  if (notWatch) return [false];
+  var changed = (0, _contrastOriginal.contrastOriginal)({
+    value: value,
+    originalValue: originalValue,
+    originalValues: originalValues,
+    form: form,
+    equalWith: equalWith
+  });
+  return [changed, originalValue];
 };

package/lib/ProLayout/components/ProFooter/style/index.less

@@ -1,10 +1,11 @@
 .pro-footer {
-  position  : fixed;
-  bottom    : 0;
-  right     : 0;
-  width     : 100%;
-  padding   : var(--zaui-space-size-md, 16px) var(--zaui-space-size-lg, 32px);
+  position: fixed;
+  right: 0;
+  bottom: 0;
+  z-index: 101;
+  width: 100%;
+  padding: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1))
+    var(--zaui-space-size-lg, 32px);
   background: var(--zaui-base-bg, #ffffff);
-  box-shadow: 3px 2px 12px 0 hsla(0, 0%, 59.2%, .32);
-  z-index   : 101;
+  box-shadow: 3px 2px 12px 0 hsla(0, 0%, 59.2%, 0.32);
 }

package/lib/ProLayout/components/ProHeader/index.js

@@ -371,6 +371,7 @@ var ProHeader = function ProHeader(props) {
     'pro-header-fixed': fixedTop,
     'pro-header-shadow': showShadow,
     'pro-header-no-back': !backState,
+    'pro-header-has-describe': !(0, _lodash.isEmpty)(_subDescribeColumns) || !(0, _lodash.isEmpty)(describeColumns) || !(0, _lodash.isEmpty)(describeColumns),
     'pro-header-no-describe': (0, _lodash.isEmpty)(_subDescribeColumns) && (0, _lodash.isEmpty)(describeColumns) || (0, _lodash.isEmpty)(describeColumns)
   }, "".concat(className), className));
   if (title && !(0, _lodash.isEmpty)(_breadcrumbColumns)) {