@zat-design/sisyphus-react 3.10.2 → 3.10.3-beta.2

package/es/ProEditTable/utils/diffOriginal.js

@@ -31,13 +31,13 @@ var filterObject = function filterObject(data) {
 export var diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
     value = params.value,
-    equalWith = params.equalWith,
+    onDiff = params.onDiff,
     originRecord = params.originRecord,
     record = params.record,
     index = params.index;
   // 支持传入自定义比较事件
-  if (isFunction(equalWith)) {
-    var diffRes = equalWith({
+  if (isFunction(onDiff)) {
+    var diffRes = onDiff({
       originValue: originalValue,
       originRecord: originRecord,
       value: value,

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

@@ -27,7 +27,7 @@ import { SearchOutlined } from '@ant-design/icons';
 import { useDebounceEffect, useDeepCompareEffect, useMount, useSetState } from 'ahooks';
 import { debounce, isArray, isEqual, isFunction, omit } from 'lodash';
 import { ReactSVG } from 'react-svg';
-import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
+import React, { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
 import { ProForm, ProDrawerForm, ProTable, useProConfig, ProSelect } from '../../../../index';
 import Container from '../../Container';
 import viewSvg from '../../../../assets/view.svg';
@@ -604,7 +604,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
     }
   });
-  useDebounceEffect(function () {
+  useEffect(function () {
     if (onOff && !visible) {
       var _useRequest$options6;
       if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {

package/es/ProForm/components/render/ChangedWrapper.d.ts

@@ -9,7 +9,7 @@ interface Props {
     namesStr?: string;
     diffConfig?: DiffConfigProps;
     form: FormInstance;
-    equalWith?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['onDiff'];
     valuePropName?: string;
     [name: string]: any;
 }

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

@@ -6,7 +6,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
+var _excluded = ["name", "names", "namesStr", "form", "onDiff", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { get } from 'lodash';
@@ -21,7 +21,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     names = props.names,
     namesStr = props.namesStr,
     form = props.form,
-    equalWith = props.equalWith,
+    onDiff = props.onDiff,
     children = props.children,
     type = props.type,
     diffConfig = props.diffConfig,
@@ -43,7 +43,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return get(originalValues, name);
   }) : get(originalValues, name);
-  var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
+  var noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   var diffType = useMemo(function () {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
@@ -58,10 +58,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      equalWith: equalWith
+      onDiff: onDiff
       // name: namesStr || name,
     });
-  }, [isWatch, noChange, props[valuePropName], originalValue, _typeof(equalWith)]);
+  }, [isWatch, noChange, props[valuePropName], originalValue, _typeof(onDiff)]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
   var tipContent = useMemo(function () {
@@ -86,7 +86,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
     }, children.props), rest));
   }
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  // const isFocus = useFocus(contentRef.current);
   var tipOpenCalc = function tipOpenCalc() {
     if (!toolTip) return false;
     // 传入undefined 鼠标移入显示移出隐藏 获得焦点时不显示气泡

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

@@ -46,7 +46,7 @@ var Render = function Render(props) {
     formDisabled = props.formDisabled,
     type = props.type,
     isSelect = props.isSelect,
-    equalWith = props.equalWith,
+    onDiff = props.onDiff,
     requiredOnView = props.requiredOnView,
     confirm = props.confirm,
     globalControl = props.globalControl,
@@ -447,9 +447,10 @@ var Render = function Render(props) {
         namesStr: namesStr,
         diffConfig: diffConfig,
         form: form,
-        equalWith: equalWith,
+        onDiff: onDiff,
         type: type,
         onChange: handleChange,
+        onBlur: handleBlur,
         valuePropName: _otherFormItemProps.valuePropName,
         normalize: _otherFormItemProps.normalize,
         getValueProps: _otherFormItemProps.getValueProps,

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

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "onDiff", "clearNotShow", "required", "confirm", "desensitization"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { isBoolean, isFunction, union, isString } from 'lodash';
@@ -69,7 +69,6 @@ var RenderFields = function RenderFields(props) {
       formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
-      equalWith = column.equalWith,
       onDiff = column.onDiff,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
@@ -212,7 +211,7 @@ var RenderFields = function RenderFields(props) {
         fieldProps: isFunction(fieldProps) ? fieldProps : null,
         isSelect: _isSelect,
         diffConfig: diffConfig,
-        equalWith: onDiff || equalWith,
+        onDiff: onDiff,
         requiredOnView: requiredOnView,
         globalControl: globalControl,
         viewRender: viewRender,

package/es/ProForm/components/render/propsType.d.ts

@@ -206,8 +206,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     upperCase?: boolean;
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
-    equalWith?: DiffOriginalParams['equalWith'];
-    onDiff?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['onDiff'];
     required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;

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

@@ -1,8 +1,8 @@
-export declare const useChanged: ({ name, names, namesStr, originalValues, form, equalWith }: {
+export declare const useChanged: ({ name, names, namesStr, originalValues, form, onDiff }: {
     name: any;
     names: any;
     namesStr: any;
     originalValues: any;
     form: any;
-    equalWith: any;
+    onDiff: any;
 }) => any[];

package/es/ProForm/utils/_useChanged.js

@@ -8,18 +8,18 @@ export var useChanged = function useChanged(_ref) {
     namesStr = _ref.namesStr,
     originalValues = _ref.originalValues,
     form = _ref.form,
-    equalWith = _ref.equalWith;
+    onDiff = _ref.onDiff;
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return get(originalValues, name);
   }) : get(originalValues, name);
-  var notWatch = !equalWith && (!originalValues || originalValue === undefined);
+  var notWatch = !onDiff && (!originalValues || originalValue === undefined);
   if (notWatch) return [false];
   var value = _Form.useWatch(namesStr || name, form);
   var changed = diffOriginal({
     originalValue: originalValue,
     value: value,
     form: form,
-    equalWith: equalWith
+    onDiff: onDiff
   });
   return [changed, originalValue];
 };

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

@@ -10,7 +10,7 @@ interface Params {
     originalValues: any;
     form: FormInstance;
     rowKeyPath?: InternalNamePath;
-    equalWith?: (originalValue: any, currentValue: any) => boolean;
+    onDiff?: (originalValue: any, currentValue: any) => boolean;
 }
 export declare const useListChanged: (params: Params) => any[];
 export {};

package/es/ProForm/utils/_useListChanged.js

@@ -64,7 +64,7 @@ export var useListChanged = function useListChanged(params) {
     originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
     originalValues = params.originalValues,
     form = params.form,
-    equalWith = params.equalWith,
+    onDiff = params.onDiff,
     rowKeyPath = params.rowKeyPath;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
@@ -78,7 +78,7 @@ export var useListChanged = function useListChanged(params) {
     rowKeyPath: rowKeyPath,
     form: form
   }) : undefined;
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
+  var noChange = !onDiff && (!originalValues || originalValue === undefined);
   var _form = form;
   if (notWatch || noChange) return [false];
   var value = _Form.useWatch(namePath, _form);
@@ -86,7 +86,7 @@ export var useListChanged = function useListChanged(params) {
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith
+    onDiff: onDiff
     // name: isString(namesStr) ? namesStr : originalName || name,
   });
   return [changed, originalValue];

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

@@ -3,7 +3,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
-    equalWith?: (originalValue: any, currentValue: any) => DiffType | boolean | undefined;
+    onDiff?: (originalValue: any, currentValue: any) => DiffType | boolean | undefined;
 }
 export type DiffType = 'same' | 'add' | 'changed';
 export declare const diffOriginal: (params: DiffOriginalParams) => DiffType;

package/es/ProForm/utils/diffOriginal.js

@@ -30,10 +30,10 @@ var filterObject = function filterObject(data) {
 export var diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
     value = params.value,
-    equalWith = params.equalWith;
+    onDiff = params.onDiff;
   // 支持传入自定义比较事件
-  if (isFunction(equalWith)) {
-    var diffRes = equalWith(originalValue, value);
+  if (isFunction(onDiff)) {
+    var diffRes = onDiff(originalValue, value);
     // 如果返回undefined走内置比较逻辑
     if (diffRes !== undefined) {
       if (typeof diffRes === 'boolean') {

package/es/ProForm/utils/transformValue.js

@@ -15,21 +15,21 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       }
       names.forEach(function (name, index) {
         var _value2;
-        // @ts-ignore
         set(form.getFieldsValue(true), name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
       });
       return _value;
     },
-    getValueProps: function getValueProps(value, isOrg) {
+    getValueProps: function getValueProps(value, isOrigin) {
       var _curValue;
       var _value = [];
-      if (!isOrg) {
+      if (isOrigin) {
+        _value = value;
+      } else {
+        // 非比对names场景
         names.forEach(function (name, index) {
           var value = form.getFieldValue(name);
           _value[index] = value;
         });
-      } else {
-        _value = value;
       }
       // 支持外部传入转换函数
       var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
@@ -43,8 +43,10 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       })) {
         curValue = undefined;
       }
-      // @ts-ignore
-      set(form.getFieldsValue(true), fieldName, curValue);
+      // 如果来源是比对且有names场景, 则不更新表单值
+      if (!isOrigin) {
+        set(form.getFieldsValue(true), fieldName, curValue);
+      }
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
       return _objectSpread(_objectSpread({}, res), {}, {
         value: curValue

package/es/ProStep/components/Anchor/index.js

@@ -1,3 +1,5 @@
+import "antd/es/badge/style";
+import _Badge from "antd/es/badge";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import cn from 'classnames';
 import { handleScroll } from '../../utils';
@@ -44,7 +46,7 @@ export var MenuItem = function MenuItem(props) {
   var renderMenuIcon = function renderMenuIcon() {
     if (isCurrentStep) {
       return _jsx("span", {
-        className: cn('dot-icon', {
+        className: cn('pro-step-dot-icon', {
           errored: !!errorNum,
           disabled: isDisabled
         }),
@@ -65,14 +67,14 @@ export var MenuItem = function MenuItem(props) {
       });
     }
     return _jsx("div", {
-      className: cn('dot', {
+      className: cn('pro-step-dot', {
         errored: !!errorNum,
         disabled: isDisabled
       })
     });
   };
   return _jsxs("div", {
-    className: cn('com-menu-item', {
+    className: cn('pro-step-com-menu-item', {
       errored: !!errorNum,
       disabled: isDisabled,
       current: isCurrentStep && onOff
@@ -84,22 +86,22 @@ export var MenuItem = function MenuItem(props) {
       });
     },
     children: [_jsxs("div", {
-      className: "menu-item",
+      className: "pro-step-menu-item",
       children: [_jsx("div", {
-        className: "menu-icon",
+        className: "pro-step-menu-icon",
         children: renderMenuIcon()
       }), onOff && _jsx("div", {
-        className: cn('menu-name', {
+        className: cn('pro-step-menu-name', {
           disabled: isDisabled
         }),
         children: name
       })]
     }), !isDisabled && onOff && _jsxs("div", {
-      className: "checked-status",
+      className: "pro-step-checked-status",
       children: [isChecked && _jsx(SuccessSvg, {}), errorNum > 0 && _jsx("div", {
-        className: "errorDot",
-        children: _jsx("span", {
-          children: errorNum <= 3 ? errorNum : '!'
+        className: "pro-step-error-dot",
+        children: _jsx(_Badge, {
+          count: errorNum
         })
       })]
     })]

package/es/ProStep/components/Listener/index.js

@@ -6,6 +6,26 @@ var _excluded = ["children", "delayTime", "excludes"];
 import { throttle } from 'lodash';
 import React from 'react';
 import { useStep } from '../../index';
+var checkErrorList = function checkErrorList(arr) {
+  for (var i = 0; i < arr.length; i++) {
+    if (arr[i].className.includes('errored')) {
+      return {
+        errorDom: arr[i],
+        index: i
+      };
+    }
+  }
+  return null;
+};
+var findFirstErrorDom = function findFirstErrorDom() {
+  var errorList = document.querySelectorAll('.pro-step-com-menu-item') || [];
+  var hasErrorItem = document.querySelectorAll('.pro-step-com-menu-item .errored');
+  var hasFormError = document.querySelector('.ant-form-item-explain-error');
+  if ((hasErrorItem === null || hasErrorItem === void 0 ? void 0 : hasErrorItem.length) && !hasFormError) {
+    return checkErrorList(errorList);
+  }
+  return null;
+};
 export default (function (_ref) {
   var children = _ref.children,
     delayTime = _ref.delayTime,
@@ -28,6 +48,11 @@ export default (function (_ref) {
             values = _context.sent;
             setTimeout(function () {
               var localData = localStorage.getItem('cache-pro-step');
+              var _ref3 = findFirstErrorDom() || {},
+                errorDom = _ref3.errorDom;
+              if (errorDom) {
+                errorDom.click();
+              }
               if (localData !== 'false') {
                 var _children$props, _children$props$onCli;
                 children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : (_children$props$onCli = _children$props.onClick) === null || _children$props$onCli === void 0 ? void 0 : _children$props$onCli.call(_children$props, values);

package/es/ProStep/components/Step/index.js

@@ -59,10 +59,10 @@ export var Step = function Step(_ref) {
     onMouseEnter: handleMouseEnter,
     onMouseLeave: handleMouseLeave,
     children: [_jsxs("div", {
-      className: "step-menu",
+      className: "pro-step-menu",
       children: [_jsx(ProIcon, {
         src: catalogSvg,
-        className: "menu-icon",
+        className: "pro-step-menu-icon",
         actionMap: {}
       }), onOff && _jsx("div", {
         children: locale === null || locale === void 0 ? void 0 : (_locale$ProStep = locale.ProStep) === null || _locale$ProStep === void 0 ? void 0 : _locale$ProStep.catalogue

package/es/ProStep/style/index.less

@@ -20,7 +20,7 @@
   cursor: pointer;
   transition: width 0.2s;
 
-  > .step-menu {
+  > .pro-step-menu {
     display: flex;
     align-items: center;
     width: 100%;
@@ -33,7 +33,7 @@
       justify-content: center;
       width: 48px;
       height: 24px;
-      > .menu-icon {
+      > .pro-step-menu-icon {
         width: auto !important;
         height: auto !important;
         font-size: var(--zaui-font-size-lg-title, 24px);
@@ -49,7 +49,7 @@
       > button {
         width: auto !important;
         height: auto !important;
-        > .menu-icon {
+        > .pro-step-menu-icon {
           width: auto !important;
           height: auto !important;
           font-size: var(--zaui-font-size-lg-title, 24px);
@@ -79,7 +79,7 @@
     }
   }
 
-  .menu-content {
+  .pro-step-menu-content {
     overflow: hidden;
 
     &:hover {
@@ -87,7 +87,7 @@
     }
   }
 
-  .com-menu-item {
+  .pro-step-com-menu-item {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -107,11 +107,11 @@
       }
     }
 
-    > .menu-item {
+    > .pro-step-menu-item {
       display: flex;
       align-items: center;
 
-      > .menu-icon {
+      > .pro-step-menu-icon {
         display: flex;
         align-items: center;
         justify-content: center;
@@ -122,14 +122,19 @@
           fill: var(--zaui-brand, #006aff);
         }
 
-        > .dot {
+        > .pro-step-dot {
           width: 6px;
           height: 6px;
           background: var(--zaui-brand, #006aff);
           border-radius: 3px;
 
+          
+
           &.errored {
+            width: 12px;
+            height: 12px;
             background: #ff5050;
+            border-radius: 50%;
             fill: #ff5050;
           }
 
@@ -139,7 +144,7 @@
           }
         }
 
-        .dot-icon {
+        .pro-step-dot-icon {
           display: flex;
           align-items: center;
           justify-content: center;
@@ -162,7 +167,7 @@
         }
       }
 
-      > .menu-name {
+      > .pro-step-menu-name {
         color: #0a0a0a;
 
         &.disabled {
@@ -171,21 +176,28 @@
       }
     }
 
-    > .checked-status {
+    > .pro-step-checked-status {
       height: 18px;
 
       > svg {
         fill: var(--zaui-brand, #006aff);
       }
 
-      .errorDot {
+      .pro-step-error-dot {
         display: flex;
         align-items: center;
         justify-content: center;
-        width: 16px;
-        height: 16px;
-        background: rgba(255, 80, 80, 0.2);
-        border-radius: 8px;
+
+        .@{ant-prefix}-badge{
+          .@{ant-prefix}-badge-count{
+             background: rgba(255, 80, 80, 0.15);
+             color: #ff5050;
+             .@{ant-prefix}-scroll-number-only-unit, .@{ant-prefix}-scroll-number{
+              font-weight: 600;
+             }
+          }
+        
+        }
 
         > span {
           color: #ff5050;

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

@@ -341,11 +341,6 @@ export var formatColumn = function formatColumn(_ref2) {
       if (!originalValue) {
         originalRenderValue = '-';
       }
-      if (originalObj && renderValue !== originalRenderValue) {
-        otherProps.isChanged = true;
-      } else {
-        otherProps.isChanged = false;
-      }
       var node = _jsxs(_Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]