npm - @zat-design/sisyphus-react - Versions diffs - 3.13.14 → 3.13.15-beta.2 - Mend

@zat-design/sisyphus-react 3.13.14 → 3.13.15-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

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

@@ -1,6 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _omit from "lodash/omit";
 var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView", "viewRender"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
@@ -17,16 +18,17 @@ var wrapperMap = {
 // 增加middleware根据配置增加多层包裹
 var getComRender = function getComRender(component, props, componentProps) {
   var wrappers = Object.keys(wrapperMap);
-  var Com = component;
+  var renderComponent = component;
   wrappers.forEach(function (item) {
     if (item in props) {
       var Wrapper = wrapperMap[item];
-      Com = _jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
-        children: Com
+      // console.log(props[item]);
+      renderComponent = _jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
+        children: renderComponent
       }));
     }
   });
-  return Com;
+  return renderComponent;
 };
 /** 渲染组件 */
 var ComRender = function ComRender(props) {
@@ -49,8 +51,8 @@ var ComRender = function ComRender(props) {
   var mergedGetValueProps = getValueProps || function (val) {
     return _defineProperty({}, valuePropName, val);
   };
-  var _props = mergedGetValueProps(fieldProps.value);
-  var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
+  var nextProps = mergedGetValueProps(fieldProps.value);
+  var componentProps = _omit(_objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), nextProps), ['onFieldChange']);
   var isSeparator = (props === null || props === void 0 ? void 0 : (_props$component = props.component) === null || _props$component === void 0 ? void 0 : (_props$component$prop = _props$component.props) === null || _props$component$prop === void 0 ? void 0 : _props$component$prop.className) === 'group-separator';
   if (isSeparator && isView) {
     var _props$component2, _props$component2$pro;
@@ -69,14 +71,14 @@ var ComRender = function ComRender(props) {
     });
   }
   var Component = component ? (/*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
-  var Com = getComRender(Component, props, componentProps);
+  var renderComponent = getComRender(Component, props, componentProps);
   return _jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {
       valueType: valueType,
       type: type,
       isView: isView
     }),
-    children: Com
+    children: renderComponent
   });
 };
 export default ComRender;

package/es/ProForm/components/combination/Group/hooks/index.js CHANGED Viewed

@@ -37,9 +37,7 @@ export var useTransformColumns = function useTransformColumns(params) {
     var _ref = fieldProps || {},
       mode = _ref.mode,
       onChange = _ref.onChange,
-      onFieldChange = _ref.onFieldChange,
-      comDisabled = _ref.disabled,
-      onBlur = _ref.onBlur;
+      comDisabled = _ref.disabled;
     var _disabled = disabled || comDisabled;
     var columnName = names ? names[index] : [].concat(name, index);
     // 响应式字段改变后的回调
@@ -78,6 +76,10 @@ export var useTransformColumns = function useTransformColumns(params) {
         desensitization: desensitization
       });
     }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
+    // 从处理后的fieldProps中获取事件处理器
+    var _ref2 = reactiveProps.fieldProps || {},
+      onFieldChange = _ref2.onFieldChange,
+      onBlur = _ref2.onBlur;
     if (reactiveProps.show === false) {
       return [];
     }

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

@@ -39,13 +39,13 @@ var Group = function Group(props) {
     namePath = contextProps.namePath,
     index = contextProps.index,
     isView = contextProps.isView;
-  var _option = React.useRef([]);
+  var nextOption = React.useRef([]);
   // 组合onChange
   var handleChange = function handleChange(value, option, index) {
-    var _value = props.value ? _toConsumableArray(props.value) : [];
-    _value[index] = value;
-    _option.current[index] = option;
-    onChange(_value, _option.current);
+    var nextValue = props.value ? _toConsumableArray(props.value) : [];
+    nextValue[index] = value;
+    nextOption.current[index] = option;
+    onChange(nextValue, nextOption.current);
   };
   var columnsProps = useTransformColumns({
     columns: children,
@@ -61,7 +61,7 @@ var Group = function Group(props) {
     desensitizationKey: desensitizationKey
   });
   var columns = insertSeparator(columnsProps, space);
-  var _className = classnames(_defineProperty({
+  var nextClassName = classnames(_defineProperty({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {
       var _item$fieldProps, _item$fieldProps$styl;
@@ -72,7 +72,7 @@ var Group = function Group(props) {
     })
   }, "".concat(className), className));
   return _jsx("div", {
-    className: _className,
+    className: nextClassName,
     id: id,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
       children: columns.map(function (column, index) {

package/es/ProForm/components/combination/ProCascader/index.js CHANGED Viewed

@@ -3,8 +3,8 @@ import _Tooltip from "antd/es/tooltip";
 import "antd/es/cascader/style";
 import _Cascader from "antd/es/cascader";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import "antd/es/message/style";
+import _message from "antd/es/message";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
@@ -16,7 +16,8 @@ import _find2 from "lodash/find";
 import _omit from "lodash/omit";
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useState, memo, useMemo } from 'react';
+import { useEffect, useState, memo, useMemo, useCallback } from 'react';
+import { useRequest as useRequestFunc, useDeepCompareEffect } from 'ahooks';
 import { transformDataName } from './utils/index';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Input from '../../base/Input';
@@ -57,7 +58,7 @@ var getViewLabel = function getViewLabel(_ref) {
   return viewLabel;
 };
 var ProCascader = function ProCascader(props) {
-  var _props$otherProps, _value$slice, _ref5, _ref5$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _props$otherProps, _useRequest$options3, _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = useProConfig('ProAddressBar') || {},
     configDetailMaxLength = _ref2.detailMaxLength,
     configEnumCode = _ref2.enumCode,
@@ -120,10 +121,6 @@ var ProCascader = function ProCascader(props) {
     }
     return disabled;
   }, [disabled]);
-  var _useRequest = _objectSpread({}, useRequest),
-    service = _useRequest.service,
-    _useRequest$defaultPa = _useRequest.defaultParams,
-    defaultParams = _useRequest$defaultPa === void 0 ? {} : _useRequest$defaultPa;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     serviceData = _useState2[0],
@@ -132,53 +129,104 @@ var ProCascader = function ProCascader(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
-  var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _yield$service, data, newData, transFormData, serviceData;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return service(defaultParams);
-          case 2:
-            _yield$service = _context.sent;
-            data = _yield$service.data;
-            newData = data;
-            if (transformResponse) {
-              newData = transformResponse(data);
-            }
-            transFormData = transformDataName(newData, {
-              label: fieldNames.label,
-              value: fieldNames.value,
-              children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
-            });
-            serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
-            setServiceData(serviceData);
-          case 9:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function getFirstLevelOptions() {
-      return _ref4.apply(this, arguments);
-    };
-  }();
+  // 默认成功处理函数
+  var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
+    var _ref4 = res || {},
+      _ref4$status = _ref4.status,
+      status = _ref4$status === void 0 ? 200 : _ref4$status,
+      msg = _ref4.message,
+      data = _ref4.data;
+    if (status !== 200) {
+      _message.error(msg);
+      return;
+    }
+    var newData = data;
+    if (transformResponse) {
+      newData = transformResponse(data);
+    }
+    var transFormData = transformDataName(newData, {
+      label: fieldNames.label,
+      value: fieldNames.value,
+      children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
+    });
+    var serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
+    setServiceData(serviceData);
+  };
+  // 数据转换处理
+  var successTransformDataHandle = useCallback(function (res) {
+    if (transformResponse && typeof transformResponse === 'function') {
+      return transformResponse(res);
+    }
+    var _ref5 = res || {},
+      _ref5$status = _ref5.status,
+      status = _ref5$status === void 0 ? 200 : _ref5$status,
+      msg = _ref5.message,
+      data = _ref5.data;
+    if (status !== 200) {
+      _message.error(msg);
+      return;
+    }
+    return data;
+  }, [transformResponse]);
+  // 使用ahooks的useRequest
+  var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
+    manual: true,
+    debounceWait: 300
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+    onSuccess: function onSuccess(data) {
+      var _useRequest$options, _useRequest$options$o, _useRequest$options2;
+      if (transformResponse && typeof transformResponse === 'function') {
+        var responseData = transformResponse(data);
+        var transFormData = transformDataName(responseData, {
+          label: fieldNames.label,
+          value: fieldNames.value,
+          children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
+        });
+        var _serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
+        setServiceData(_serviceData);
+      } else {
+        defaultOnSuccessFun(data);
+      }
+      // 执行传入的onSuccess
+      useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : (_useRequest$options$o = _useRequest$options.onSuccess) === null || _useRequest$options$o === void 0 ? void 0 : _useRequest$options$o.call(_useRequest$options, data, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams);
+    }
+  }));
+  // 缓存数据处理
+  var cacheList = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.cacheKey) ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
   // 提取出来默认每次都执行
   if (transformResponse) {
     realDataSource = transformResponse(realDataSource);
   }
-  useEffect(function () {
-    if (service) {
-      // 传入useRequest时，初次加载级联第一级数据源
-      getFirstLevelOptions();
+  // 设置缓存数据
+  useDeepCompareEffect(function () {
+    var _useRequest$options4;
+    if (!(serviceData === null || serviceData === void 0 ? void 0 : serviceData.length) && (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.cacheKey)) {
+      if (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length) {
+        setServiceData(cacheList);
+      }
+    }
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
+  // 初始化请求数据
+  useDeepCompareEffect(function () {
+    var _useRequest$options5;
+    if (!(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service)) {
+      return;
+    }
+    var _ref6 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+      manual = _ref6.manual;
+    if (manual || (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length)) {
+      return;
     }
-  }, [service]);
+    // 向后兼容性：优先使用 options.defaultParams，fallback 到 useRequest.defaultParams
+    var defaultParams = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.defaultParams) || (useRequest === null || useRequest === void 0 ? void 0 : useRequest.defaultParams);
+    var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
+    fetchFunction.run(params);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   useEffect(function () {
     if (realIsView && value) {
       var _realDataSource;
       // 传入dataSource + 查看时初始化展示
-      if (service) {
+      if (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) {
         setDefaultLabel(getViewLabel({
           dataSource: serviceData,
           value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
@@ -217,9 +265,9 @@ var ProCascader = function ProCascader(props) {
   var addressValue = isAddressMode ? value && ((_value$slice = value.slice(0, realLevel)) === null || _value$slice === void 0 ? void 0 : _value$slice.some(function (item) {
     return !!item;
   })) ? value.slice(0, realLevel) : undefined : value;
-  var viewValue = isAddressMode ? ((_ref5 = [].concat(_toConsumableArray(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref5 === void 0 ? void 0 : (_ref5$filter = _ref5.filter(function (item) {
+  var viewValue = isAddressMode ? ((_ref7 = [].concat(_toConsumableArray(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref7 === void 0 ? void 0 : (_ref7$filter = _ref7.filter(function (item) {
     return !!item;
-  })) === null || _ref5$filter === void 0 ? void 0 : _ref5$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
+  })) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
   var _findSelectedOptions = function findSelectedOptions(options, value) {
@@ -250,8 +298,8 @@ var ProCascader = function ProCascader(props) {
     return null;
   };
   var _selectedOptions = useMemo(function () {
-    return _findSelectedOptions(service ? serviceData : realDataSource, addressValue);
-  }, [service, serviceData, realDataSource, addressValue]);
+    return _findSelectedOptions((useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) ? serviceData : realDataSource, addressValue);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
     if (onChange) {
@@ -276,8 +324,9 @@ var ProCascader = function ProCascader(props) {
       className: hasDetail ? '' : 'no-detail',
       placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar = locale.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,
-      options: service ? serviceData : realDataSource,
+      options: (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) ? serviceData : realDataSource,
       disabled: lastDisabled[0],
+      loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       displayRender: displayRender,
       showSearch: {
         filter: handlefilter,

package/es/ProForm/components/combination/ProCascader/propsType.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { DefaultOptionType } from 'rc-select/lib/Select';
-import { Service } from 'ahooks/lib/useRequest/src/types';
+import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 export interface FieldNamesType {
     label: string;
     value: string;
@@ -19,10 +19,18 @@ export interface ProCascaderType {
     fieldNames?: FieldNamesType;
     dataSource?: DefaultOptionType[];
     useRequest?: {
-        loadData?: boolean;
-        service: Service<any, any>;
+        /**
+         * @description 请求服务函数
+         */
+        service?: Service<any, any>;
+        /**
+         * @description 请求选项
+         */
+        options?: Options<any, any>;
+        /**
+         * @deprecated 保留向后兼容性，使用 options.defaultParams 替代
+         */
         defaultParams?: any;
-        parentKey?: string;
     };
     onChange?: (value: string[], selectedOptions?: any[]) => void;
     transformResponse?: (data: any[]) => any[];

package/es/ProStep/components/Item/index.js CHANGED Viewed

@@ -26,7 +26,8 @@ var ProStepItem = function ProStepItem(_ref) {
   var _useStep = useStep(),
     register = _useStep.register,
     collapse = _useStep.collapse,
-    globalLazyLoad = _useStep.lazyLoad;
+    globalLazyLoad = _useStep.lazyLoad,
+    unNotify = _useStep.unNotify;
   var lazyLoad = stepLazyLoad !== null && stepLazyLoad !== void 0 ? stepLazyLoad : globalLazyLoad;
   useEffect(function () {
     // Schedule registration to avoid re-render issues
@@ -39,6 +40,7 @@ var ProStepItem = function ProStepItem(_ref) {
       }, restProps));
     }, 0);
     return function () {
+      unNotify([id]);
       clearTimeout(timeoutId);
     };
   }, [id, title, order, lazyLoad, restProps, register]);

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

@@ -9,6 +9,7 @@ exports.default = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
 var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/render/ConfirmWrapper"));
@@ -25,16 +26,17 @@ var wrapperMap = {
 // 增加middleware根据配置增加多层包裹
 var getComRender = function getComRender(component, props, componentProps) {
   var wrappers = Object.keys(wrapperMap);
-  var Com = component;
+  var renderComponent = component;
   wrappers.forEach(function (item) {
     if (item in props) {
       var Wrapper = wrapperMap[item];
-      Com = (0, _jsxRuntime.jsx)(Wrapper, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, componentProps), (0, _defineProperty2.default)({}, item, props[item])), {}, {
-        children: Com
+      // console.log(props[item]);
+      renderComponent = (0, _jsxRuntime.jsx)(Wrapper, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, componentProps), (0, _defineProperty2.default)({}, item, props[item])), {}, {
+        children: renderComponent
       }));
     }
   });
-  return Com;
+  return renderComponent;
 };
 /** 渲染组件 */
 var ComRender = function ComRender(props) {
@@ -57,8 +59,8 @@ var ComRender = function ComRender(props) {
   var mergedGetValueProps = getValueProps || function (val) {
     return (0, _defineProperty2.default)({}, valuePropName, val);
   };
-  var _props = mergedGetValueProps(fieldProps.value);
-  var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), _props);
+  var nextProps = mergedGetValueProps(fieldProps.value);
+  var componentProps = (0, _omit2.default)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), nextProps), ['onFieldChange']);
   var isSeparator = (props === null || props === void 0 ? void 0 : (_props$component = props.component) === null || _props$component === void 0 ? void 0 : (_props$component$prop = _props$component.props) === null || _props$component$prop === void 0 ? void 0 : _props$component$prop.className) === 'group-separator';
   if (isSeparator && isView) {
     var _props$component2, _props$component2$pro;
@@ -77,14 +79,14 @@ var ComRender = function ComRender(props) {
     });
   }
   var Component = component ? (/*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
-  var Com = getComRender(Component, props, componentProps);
+  var renderComponent = getComRender(Component, props, componentProps);
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
       valueType: valueType,
       type: type,
       isView: isView
     }),
-    children: Com
+    children: renderComponent
   });
 };
 var _default = exports.default = ComRender;

package/lib/ProForm/components/combination/Group/hooks/index.js CHANGED Viewed

@@ -45,9 +45,7 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
     var _ref = fieldProps || {},
       mode = _ref.mode,
       onChange = _ref.onChange,
-      onFieldChange = _ref.onFieldChange,
-      comDisabled = _ref.disabled,
-      onBlur = _ref.onBlur;
+      comDisabled = _ref.disabled;
     var _disabled = disabled || comDisabled;
     var columnName = names ? names[index] : [].concat(name, index);
     // 响应式字段改变后的回调
@@ -86,6 +84,10 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
         desensitization: desensitization
       });
     }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
+    // 从处理后的fieldProps中获取事件处理器
+    var _ref2 = reactiveProps.fieldProps || {},
+      onFieldChange = _ref2.onFieldChange,
+      onBlur = _ref2.onBlur;
     if (reactiveProps.show === false) {
       return [];
     }

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

@@ -46,13 +46,13 @@ var Group = function Group(props) {
     namePath = contextProps.namePath,
     index = contextProps.index,
     isView = contextProps.isView;
-  var _option = _react.default.useRef([]);
+  var nextOption = _react.default.useRef([]);
   // 组合onChange
   var handleChange = function handleChange(value, option, index) {
-    var _value = props.value ? (0, _toConsumableArray2.default)(props.value) : [];
-    _value[index] = value;
-    _option.current[index] = option;
-    onChange(_value, _option.current);
+    var nextValue = props.value ? (0, _toConsumableArray2.default)(props.value) : [];
+    nextValue[index] = value;
+    nextOption.current[index] = option;
+    onChange(nextValue, nextOption.current);
   };
   var columnsProps = (0, _hooks.useTransformColumns)({
     columns: children,
@@ -68,7 +68,7 @@ var Group = function Group(props) {
     desensitizationKey: desensitizationKey
   });
   var columns = (0, _utils.insertSeparator)(columnsProps, space);
-  var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
+  var nextClassName = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {
       var _item$fieldProps, _item$fieldProps$styl;
@@ -79,7 +79,7 @@ var Group = function Group(props) {
     })
   }, "".concat(className), className));
   return (0, _jsxRuntime.jsx)("div", {
-    className: _className,
+    className: nextClassName,
     id: id,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? (0, _jsxRuntime.jsx)(_space.default.Compact, {
       children: columns.map(function (column, index) {

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

@@ -10,8 +10,8 @@ var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 require("antd/es/cascader/style");
 var _cascader = _interopRequireDefault(require("antd/es/cascader"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+require("antd/es/message/style");
+var _message2 = _interopRequireDefault(require("antd/es/message"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -23,6 +23,7 @@ var _find = _interopRequireDefault(require("lodash/find"));
 var _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
+var _ahooks = require("ahooks");
 var _index = require("./utils/index");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Input = _interopRequireDefault(require("../../base/Input"));
@@ -64,7 +65,7 @@ var getViewLabel = function getViewLabel(_ref) {
   return viewLabel;
 };
 var ProCascader = function ProCascader(props) {
-  var _props$otherProps, _value$slice, _ref5, _ref5$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _props$otherProps, _useRequest$options3, _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProAddressBar') || {},
     configDetailMaxLength = _ref2.detailMaxLength,
     configEnumCode = _ref2.enumCode,
@@ -127,10 +128,6 @@ var ProCascader = function ProCascader(props) {
     }
     return disabled;
   }, [disabled]);
-  var _useRequest = (0, _objectSpread3.default)({}, useRequest),
-    service = _useRequest.service,
-    _useRequest$defaultPa = _useRequest.defaultParams,
-    defaultParams = _useRequest$defaultPa === void 0 ? {} : _useRequest$defaultPa;
   var _useState = (0, _react.useState)([]),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     serviceData = _useState2[0],
@@ -139,53 +136,104 @@ var ProCascader = function ProCascader(props) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
-  var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-      var _yield$service, data, newData, transFormData, serviceData;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return service(defaultParams);
-          case 2:
-            _yield$service = _context.sent;
-            data = _yield$service.data;
-            newData = data;
-            if (transformResponse) {
-              newData = transformResponse(data);
-            }
-            transFormData = (0, _index.transformDataName)(newData, {
-              label: fieldNames.label,
-              value: fieldNames.value,
-              children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
-            });
-            serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
-            setServiceData(serviceData);
-          case 9:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function getFirstLevelOptions() {
-      return _ref4.apply(this, arguments);
-    };
-  }();
+  // 默认成功处理函数
+  var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
+    var _ref4 = res || {},
+      _ref4$status = _ref4.status,
+      status = _ref4$status === void 0 ? 200 : _ref4$status,
+      msg = _ref4.message,
+      data = _ref4.data;
+    if (status !== 200) {
+      _message2.default.error(msg);
+      return;
+    }
+    var newData = data;
+    if (transformResponse) {
+      newData = transformResponse(data);
+    }
+    var transFormData = (0, _index.transformDataName)(newData, {
+      label: fieldNames.label,
+      value: fieldNames.value,
+      children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
+    });
+    var serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
+    setServiceData(serviceData);
+  };
+  // 数据转换处理
+  var successTransformDataHandle = (0, _react.useCallback)(function (res) {
+    if (transformResponse && typeof transformResponse === 'function') {
+      return transformResponse(res);
+    }
+    var _ref5 = res || {},
+      _ref5$status = _ref5.status,
+      status = _ref5$status === void 0 ? 200 : _ref5$status,
+      msg = _ref5.message,
+      data = _ref5.data;
+    if (status !== 200) {
+      _message2.default.error(msg);
+      return;
+    }
+    return data;
+  }, [transformResponse]);
+  // 使用ahooks的useRequest
+  var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread3.default)((0, _objectSpread3.default)({
+    manual: true,
+    debounceWait: 300
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+    onSuccess: function onSuccess(data) {
+      var _useRequest$options, _useRequest$options$o, _useRequest$options2;
+      if (transformResponse && typeof transformResponse === 'function') {
+        var responseData = transformResponse(data);
+        var transFormData = (0, _index.transformDataName)(responseData, {
+          label: fieldNames.label,
+          value: fieldNames.value,
+          children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
+        });
+        var _serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
+        setServiceData(_serviceData);
+      } else {
+        defaultOnSuccessFun(data);
+      }
+      // 执行传入的onSuccess
+      useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : (_useRequest$options$o = _useRequest$options.onSuccess) === null || _useRequest$options$o === void 0 ? void 0 : _useRequest$options$o.call(_useRequest$options, data, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams);
+    }
+  }));
+  // 缓存数据处理
+  var cacheList = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.cacheKey) ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
   // 提取出来默认每次都执行
   if (transformResponse) {
     realDataSource = transformResponse(realDataSource);
   }
-  (0, _react.useEffect)(function () {
-    if (service) {
-      // 传入useRequest时，初次加载级联第一级数据源
-      getFirstLevelOptions();
+  // 设置缓存数据
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    var _useRequest$options4;
+    if (!(serviceData === null || serviceData === void 0 ? void 0 : serviceData.length) && (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.cacheKey)) {
+      if (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length) {
+        setServiceData(cacheList);
+      }
+    }
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
+  // 初始化请求数据
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    var _useRequest$options5;
+    if (!(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service)) {
+      return;
+    }
+    var _ref6 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+      manual = _ref6.manual;
+    if (manual || (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length)) {
+      return;
     }
-  }, [service]);
+    // 向后兼容性：优先使用 options.defaultParams，fallback 到 useRequest.defaultParams
+    var defaultParams = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.defaultParams) || (useRequest === null || useRequest === void 0 ? void 0 : useRequest.defaultParams);
+    var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
+    fetchFunction.run(params);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   (0, _react.useEffect)(function () {
     if (realIsView && value) {
       var _realDataSource;
       // 传入dataSource + 查看时初始化展示
-      if (service) {
+      if (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) {
         setDefaultLabel(getViewLabel({
           dataSource: serviceData,
           value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
@@ -224,9 +272,9 @@ var ProCascader = function ProCascader(props) {
   var addressValue = isAddressMode ? value && ((_value$slice = value.slice(0, realLevel)) === null || _value$slice === void 0 ? void 0 : _value$slice.some(function (item) {
     return !!item;
   })) ? value.slice(0, realLevel) : undefined : value;
-  var viewValue = isAddressMode ? ((_ref5 = [].concat((0, _toConsumableArray2.default)(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref5 === void 0 ? void 0 : (_ref5$filter = _ref5.filter(function (item) {
+  var viewValue = isAddressMode ? ((_ref7 = [].concat((0, _toConsumableArray2.default)(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref7 === void 0 ? void 0 : (_ref7$filter = _ref7.filter(function (item) {
     return !!item;
-  })) === null || _ref5$filter === void 0 ? void 0 : _ref5$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
+  })) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
   var _findSelectedOptions = function findSelectedOptions(options, value) {
@@ -257,8 +305,8 @@ var ProCascader = function ProCascader(props) {
     return null;
   };
   var _selectedOptions = (0, _react.useMemo)(function () {
-    return _findSelectedOptions(service ? serviceData : realDataSource, addressValue);
-  }, [service, serviceData, realDataSource, addressValue]);
+    return _findSelectedOptions((useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) ? serviceData : realDataSource, addressValue);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
     if (onChange) {
@@ -283,8 +331,9 @@ var ProCascader = function ProCascader(props) {
       className: hasDetail ? '' : 'no-detail',
       placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar = _locale.default.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,
-      options: service ? serviceData : realDataSource,
+      options: (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) ? serviceData : realDataSource,
       disabled: lastDisabled[0],
+      loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       displayRender: displayRender,
       showSearch: {
         filter: handlefilter,

package/lib/ProForm/components/combination/ProCascader/propsType.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { DefaultOptionType } from 'rc-select/lib/Select';
-import { Service } from 'ahooks/lib/useRequest/src/types';
+import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 export interface FieldNamesType {
     label: string;
     value: string;
@@ -19,10 +19,18 @@ export interface ProCascaderType {
     fieldNames?: FieldNamesType;
     dataSource?: DefaultOptionType[];
     useRequest?: {
-        loadData?: boolean;
-        service: Service<any, any>;
+        /**
+         * @description 请求服务函数
+         */
+        service?: Service<any, any>;
+        /**
+         * @description 请求选项
+         */
+        options?: Options<any, any>;
+        /**
+         * @deprecated 保留向后兼容性，使用 options.defaultParams 替代
+         */
         defaultParams?: any;
-        parentKey?: string;
     };
     onChange?: (value: string[], selectedOptions?: any[]) => void;
     transformResponse?: (data: any[]) => any[];

package/lib/ProStep/components/Item/index.js CHANGED Viewed

@@ -34,7 +34,8 @@ var ProStepItem = function ProStepItem(_ref) {
   var _useStep = (0, _index.useStep)(),
     register = _useStep.register,
     collapse = _useStep.collapse,
-    globalLazyLoad = _useStep.lazyLoad;
+    globalLazyLoad = _useStep.lazyLoad,
+    unNotify = _useStep.unNotify;
   var lazyLoad = stepLazyLoad !== null && stepLazyLoad !== void 0 ? stepLazyLoad : globalLazyLoad;
   (0, _react.useEffect)(function () {
     // Schedule registration to avoid re-render issues
@@ -47,6 +48,7 @@ var ProStepItem = function ProStepItem(_ref) {
       }, restProps));
     }, 0);
     return function () {
+      unNotify([id]);
       clearTimeout(timeoutId);
     };
   }, [id, title, order, lazyLoad, restProps, register]);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.14",
+  "version": "3.13.15-beta.2",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",

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

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

package/es/ProForm/utils/_useChanged.js DELETED Viewed

@@ -1,25 +0,0 @@
-import "antd/es/form/style";
-import _Form from "antd/es/form";
-import _get from "lodash/get";
-import { diffOriginal } from './diffOriginal';
-export var useChanged = function useChanged(_ref) {
-  var name = _ref.name,
-    names = _ref.names,
-    namesStr = _ref.namesStr,
-    originalValues = _ref.originalValues,
-    form = _ref.form,
-    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 = !onDiff && (!originalValues || originalValue === undefined);
-  if (notWatch) return [false];
-  var value = _Form.useWatch(namesStr || name, form);
-  var changed = diffOriginal({
-    originalValue: originalValue,
-    value: value,
-    form: form,
-    onDiff: onDiff
-  });
-  return [changed, originalValue];
-};

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

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

package/es/ProForm/utils/_useListChanged.js DELETED Viewed

@@ -1,93 +0,0 @@
-import "antd/es/form/style";
-import _Form from "antd/es/form";
-import _get from "lodash/get";
-import { diffOriginal } from './diffOriginal';
-var toNamePath = function toNamePath(name) {
-  if (Array.isArray(name)) {
-    return name;
-  }
-  return [name];
-};
-var toNamePaths = function toNamePaths(names) {
-  return names.map(function (name) {
-    return toNamePath(name);
-  });
-};
-var getOriginalValue = function getOriginalValue(_ref) {
-  var namePath = _ref.namePath,
-    originalName = _ref.originalName,
-    originalNames = _ref.originalNames,
-    originalValues = _ref.originalValues,
-    rowKeyPath = _ref.rowKeyPath,
-    form = _ref.form;
-  if (!originalValues) {
-    return undefined;
-  }
-  if (rowKeyPath) {
-    var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
-    var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
-    var rowValue = form.getFieldValue(rowValueNamePath);
-    if (!rowValue) return undefined;
-    var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
-    if (!keyValue) return undefined;
-    var originalValueList = _get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
-    var originalValueRow = originalValueList.find(function (item) {
-      return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
-    });
-    var originalValue;
-    if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
-      var originalNamesValue = originalNames.map(function (originalName) {
-        return _get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
-      });
-      // 有可能出现数组中全是undefined的情况  视为没有值
-      var fillUndefined = originalNamesValue.every(function (valItem) {
-        return valItem === undefined;
-      });
-      originalValue = fillUndefined ? undefined : originalNamesValue;
-    } else {
-      originalValue = _get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
-    }
-    return originalValue;
-  }
-  // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
-  return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-    return _get(originalValues, originalName);
-  }) : _get(originalValues, originalName);
-};
-export var useListChanged = function useListChanged(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,
-    onDiff = params.onDiff,
-    rowKeyPath = params.rowKeyPath;
-  var namePath = toNamePath(namesStr || name);
-  var originalNamePath = toNamePath(originalName);
-  var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var notWatch = !originalValues;
-  var originalValue = !notWatch ? getOriginalValue({
-    namePath: namePath,
-    originalName: originalNamePath,
-    originalNames: originalNamePaths,
-    originalValues: originalValues,
-    rowKeyPath: rowKeyPath,
-    form: form
-  }) : undefined;
-  var noChange = !onDiff && (!originalValues || originalValue === undefined);
-  var _form = form;
-  if (notWatch || noChange) return [false];
-  var value = _Form.useWatch(namePath, _form);
-  var changed = diffOriginal({
-    value: value,
-    originalValue: originalValue,
-    form: form,
-    onDiff: onDiff
-    // name: isString(namesStr) ? namesStr : originalName || name,
-  });
-  return [changed, originalValue];
-};

package/lib/ProForm/utils/_useChanged.d.ts DELETED Viewed

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

package/lib/ProForm/utils/_useChanged.js DELETED Viewed

@@ -1,32 +0,0 @@
-"use strict";
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useChanged = void 0;
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
-var _get2 = _interopRequireDefault(require("lodash/get"));
-var _diffOriginal = require("./diffOriginal");
-var useChanged = exports.useChanged = function useChanged(_ref) {
-  var name = _ref.name,
-    names = _ref.names,
-    namesStr = _ref.namesStr,
-    originalValues = _ref.originalValues,
-    form = _ref.form,
-    onDiff = _ref.onDiff;
-  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
-    return (0, _get2.default)(originalValues, name);
-  }) : (0, _get2.default)(originalValues, name);
-  var notWatch = !onDiff && (!originalValues || originalValue === undefined);
-  if (notWatch) return [false];
-  var value = _form.default.useWatch(namesStr || name, form);
-  var changed = (0, _diffOriginal.diffOriginal)({
-    originalValue: originalValue,
-    value: value,
-    form: form,
-    onDiff: onDiff
-  });
-  return [changed, originalValue];
-};

package/lib/ProForm/utils/_useListChanged.d.ts DELETED Viewed

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

package/lib/ProForm/utils/_useListChanged.js DELETED Viewed

@@ -1,100 +0,0 @@
-"use strict";
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useListChanged = void 0;
-require("antd/es/form/style");
-var _form2 = _interopRequireDefault(require("antd/es/form"));
-var _get2 = _interopRequireDefault(require("lodash/get"));
-var _diffOriginal = require("./diffOriginal");
-var toNamePath = function toNamePath(name) {
-  if (Array.isArray(name)) {
-    return name;
-  }
-  return [name];
-};
-var toNamePaths = function toNamePaths(names) {
-  return names.map(function (name) {
-    return toNamePath(name);
-  });
-};
-var getOriginalValue = function getOriginalValue(_ref) {
-  var namePath = _ref.namePath,
-    originalName = _ref.originalName,
-    originalNames = _ref.originalNames,
-    originalValues = _ref.originalValues,
-    rowKeyPath = _ref.rowKeyPath,
-    form = _ref.form;
-  if (!originalValues) {
-    return undefined;
-  }
-  if (rowKeyPath) {
-    var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
-    var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
-    var rowValue = form.getFieldValue(rowValueNamePath);
-    if (!rowValue) return undefined;
-    var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
-    if (!keyValue) return undefined;
-    var originalValueList = (0, _get2.default)(originalValues, originalName.slice(0, rowKeyPath.length - 2));
-    var originalValueRow = originalValueList.find(function (item) {
-      return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
-    });
-    var originalValue;
-    if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
-      var originalNamesValue = originalNames.map(function (originalName) {
-        return (0, _get2.default)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
-      });
-      // 有可能出现数组中全是undefined的情况  视为没有值
-      var fillUndefined = originalNamesValue.every(function (valItem) {
-        return valItem === undefined;
-      });
-      originalValue = fillUndefined ? undefined : originalNamesValue;
-    } else {
-      originalValue = (0, _get2.default)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
-    }
-    return originalValue;
-  }
-  // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
-  return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-    return (0, _get2.default)(originalValues, originalName);
-  }) : (0, _get2.default)(originalValues, originalName);
-};
-var useListChanged = exports.useListChanged = function useListChanged(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,
-    onDiff = params.onDiff,
-    rowKeyPath = params.rowKeyPath;
-  var namePath = toNamePath(namesStr || name);
-  var originalNamePath = toNamePath(originalName);
-  var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var notWatch = !originalValues;
-  var originalValue = !notWatch ? getOriginalValue({
-    namePath: namePath,
-    originalName: originalNamePath,
-    originalNames: originalNamePaths,
-    originalValues: originalValues,
-    rowKeyPath: rowKeyPath,
-    form: form
-  }) : undefined;
-  var noChange = !onDiff && (!originalValues || originalValue === undefined);
-  var _form = form;
-  if (notWatch || noChange) return [false];
-  var value = _form2.default.useWatch(namePath, _form);
-  var changed = (0, _diffOriginal.diffOriginal)({
-    value: value,
-    originalValue: originalValue,
-    form: form,
-    onDiff: onDiff
-    // name: isString(namesStr) ? namesStr : originalName || name,
-  });
-  return [changed, originalValue];
-};