@zat-design/sisyphus-react 3.6.0 → 3.6.1-beta.2

package/dist/index.esm.css

@@ -3473,6 +3473,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   width: 0;
   height: 0;
 }
+.pro-tree-modal-box .pro-tree-modal-tree-warp ::-webkit-scrollbar {
+  width: 16px;
+  height: auto;
+}
 .pro-tree-modal-cascader-box {
   width: 592px;
 }

package/dist/less.esm.css

@@ -3473,6 +3473,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   width: 0;
   height: 0;
 }
+.pro-tree-modal-box .pro-tree-modal-tree-warp ::-webkit-scrollbar {
+  width: 16px;
+  height: auto;
+}
 .pro-tree-modal-cascader-box {
   width: 592px;
 }

package/es/ProConfigProvider/index.d.ts

@@ -29,5 +29,6 @@ interface Actions {
 export declare const ProConfigProvider: FC<{
     value?: ProConfigState;
     locale?: string;
+    onSuccess?: (data: any, params: any) => void;
 }>;
 export default ProConfigProvider;

package/es/ProConfigProvider/index.js

@@ -75,7 +75,7 @@ export var ProConfigProvider = function ProConfigProvider(props) {
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
-  useEnumRequest(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
+  var enumRes = useEnumRequest(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
   useEffect(function () {
     // 本地配置取出
     var localConfigStr = localStorage.getItem('localConfig');
@@ -93,6 +93,11 @@ export var ProConfigProvider = function ProConfigProvider(props) {
     // 设置默认语言
     setLanguage(props === null || props === void 0 ? void 0 : props.locale);
   }
+  useEffect(function () {
+    if (enumRes === null || enumRes === void 0 ? void 0 : enumRes.data) {
+      (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(enumRes === null || enumRes === void 0 ? void 0 : enumRes.data, enumRes === null || enumRes === void 0 ? void 0 : enumRes.params));
+    }
+  }, [enumRes === null || enumRes === void 0 ? void 0 : enumRes.loading]);
   return _jsx(ProConfigContext.Provider, {
     value: {
       state: merge(state, props.value),

package/es/ProEditTable/index.js

@@ -276,7 +276,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return transformColumns(columns, config);
   }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
   useEffect(function () {
-    var isAllHasKey = value.every(function (item) {
+    var _value$every;
+    var isAllHasKey = value === null || value === void 0 ? void 0 : (_value$every = value.every) === null || _value$every === void 0 ? void 0 : _value$every.call(value, function (item) {
       return item.rowKey;
     });
     // 初始化默认生成row-key

package/es/ProEditTable/utils/config.js

@@ -204,9 +204,13 @@ export var actions = {
               top: insertType === 'before' ? -10000 : 10000,
               behavior: 'smooth'
             });
-            _context2.next = 14;
+            if (!virtualKey) {
+              _context2.next = 15;
+              break;
+            }
+            _context2.next = 15;
             return form.validateFields([name]);
-          case 14:
+          case 15:
           case "end":
             return _context2.stop();
         }

package/es/ProEnum/hooks/useEnumRequest.d.ts

@@ -1,4 +1,4 @@
 import { ProEnumConfig } from '../propsType';
 import '../utils/eventCenter';
-declare const useEnumRequest: (props: ProEnumConfig, dispatch: any) => void;
+declare const useEnumRequest: (props: ProEnumConfig, dispatch: any) => import("ahooks/lib/useRequest/src/types").Result<any, any>;
 export default useEnumRequest;

package/es/ProEnum/hooks/useEnumRequest.js

@@ -45,120 +45,119 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       console.info('proEnum：', msg);
     }
   };
-  var _useRequestFunc = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
-      manual: true,
-      cacheKey: cacheKey,
-      cacheTime: -1,
-      staleTime: 6e4 * 60
-    }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
-      setCache: function () {
-        var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
-          var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                response = res.data;
-                if (!(transformResponse && typeof transformResponse === 'function')) {
-                  _context.next = 10;
-                  break;
-                }
-                _context.next = 4;
-                return transformResponse(res.data);
-              case 4:
-                response = _context.sent;
-                if (!(_typeof(response) !== 'object' || response == null)) {
-                  _context.next = 9;
-                  break;
-                }
-                throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
-              case 9:
-                res.data = response;
-              case 10:
-                if (!(_typeof(response) !== 'object' || response === null)) {
-                  _context.next = 12;
-                  break;
-                }
-                throw Error('response enum data must be object');
-              case 12:
-                if (!(Object.keys(response).length === 0)) {
-                  _context.next = 14;
-                  break;
-                }
-                throw Error('Please return valid enumeration data');
-              case 14:
-                // 只返回fieldNames对象的key
-                if (clear) {
-                  // 忽略清洗的 codes
-                  ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
-                  Object.keys(response).forEach(function (key) {
-                    var options = _toConsumableArray(response[key]) || [];
-                    if (ignoreCodes.includes(key)) {
-                      response[key] = options;
-                    } else {
-                      response[key] = options.map(function (item) {
-                        return cacheFieldNames(fieldNames, item);
-                      });
-                    }
-                  });
-                  res.data = response;
-                }
-                cacheData = getEnumData(storage, cacheKey, baseEnumStorage) || {
-                  data: {}
-                }; // 合并缓存数据
-                res.data = _objectSpread(_objectSpread({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
-                setEnumData(storage, cacheKey, res);
-                // 同步数据到全局
-                dispatch({
-                  type: 'setProEnumDic',
-                  payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res.data)
+  var enumRes = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
+    manual: true,
+    cacheKey: cacheKey,
+    cacheTime: -1,
+    staleTime: 6e4 * 60
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+    setCache: function () {
+      var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+        var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              response = res.data;
+              if (!(transformResponse && typeof transformResponse === 'function')) {
+                _context.next = 10;
+                break;
+              }
+              _context.next = 4;
+              return transformResponse(res.data);
+            case 4:
+              response = _context.sent;
+              if (!(_typeof(response) !== 'object' || response == null)) {
+                _context.next = 9;
+                break;
+              }
+              throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
+            case 9:
+              res.data = response;
+            case 10:
+              if (!(_typeof(response) !== 'object' || response === null)) {
+                _context.next = 12;
+                break;
+              }
+              throw Error('response enum data must be object');
+            case 12:
+              if (!(Object.keys(response).length === 0)) {
+                _context.next = 14;
+                break;
+              }
+              throw Error('Please return valid enumeration data');
+            case 14:
+              // 只返回fieldNames对象的key
+              if (clear) {
+                // 忽略清洗的 codes
+                ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
+                Object.keys(response).forEach(function (key) {
+                  var options = _toConsumableArray(response[key]) || [];
+                  if (ignoreCodes.includes(key)) {
+                    response[key] = options;
+                  } else {
+                    response[key] = options.map(function (item) {
+                      return cacheFieldNames(fieldNames, item);
+                    });
+                  }
                 });
-                if (main) {
-                  setTimeout(function () {
-                    var _locale$ProEnum3;
-                    window.eventCenter.publish('zat-design-pro-component-event', res.data);
-                    logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
-                  }, 10000);
-                }
-                return _context.abrupt("return", res);
-              case 21:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }));
-        function setCache(_x) {
-          return _setCache.apply(this, arguments);
-        }
-        return setCache;
-      }(),
-      getCache: function getCache() {
-        var res = getEnumData(storage, cacheKey, baseEnumStorage) || {
-          data: {}
-        };
-        dispatch({
-          type: 'setProEnumDic',
-          payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res === null || res === void 0 ? void 0 : res.data)
-        });
-        if (main) {
-          setTimeout(function () {
-            var _locale$ProEnum4;
-            window.eventCenter.publish('zat-design-pro-component-event', res.data);
-            logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
-          }, 10000);
-        }
-        return res;
-      },
-      onSuccess: function onSuccess(res) {
-        var _res$status = res.status,
-          status = _res$status === void 0 ? 200 : _res$status,
-          msg = res.message;
-        if (status !== 200) {
-          var _locale$ProEnum5;
-          throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum5 = locale.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
-        }
+                res.data = response;
+              }
+              cacheData = getEnumData(storage, cacheKey, baseEnumStorage) || {
+                data: {}
+              }; // 合并缓存数据
+              res.data = _objectSpread(_objectSpread({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
+              setEnumData(storage, cacheKey, res);
+              // 同步数据到全局
+              dispatch({
+                type: 'setProEnumDic',
+                payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res.data)
+              });
+              if (main) {
+                setTimeout(function () {
+                  var _locale$ProEnum3;
+                  window.eventCenter.publish('zat-design-pro-component-event', res.data);
+                  logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
+                }, 10000);
+              }
+              return _context.abrupt("return", res);
+            case 21:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function setCache(_x) {
+        return _setCache.apply(this, arguments);
       }
-    })),
-    run = _useRequestFunc.run;
+      return setCache;
+    }(),
+    getCache: function getCache() {
+      var res = getEnumData(storage, cacheKey, baseEnumStorage) || {
+        data: {}
+      };
+      dispatch({
+        type: 'setProEnumDic',
+        payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res === null || res === void 0 ? void 0 : res.data)
+      });
+      if (main) {
+        setTimeout(function () {
+          var _locale$ProEnum4;
+          window.eventCenter.publish('zat-design-pro-component-event', res.data);
+          logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
+        }, 10000);
+      }
+      return res;
+    },
+    onSuccess: function onSuccess(res) {
+      var _res$status = res.status,
+        status = _res$status === void 0 ? 200 : _res$status,
+        msg = res.message;
+      if (status !== 200) {
+        var _locale$ProEnum5;
+        throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum5 = locale.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
+      }
+    }
+  }));
   var mergeData = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
@@ -258,7 +257,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         window.localStorage.removeItem(cacheKey);
         window.sessionStorage.removeItem(cacheKey);
       }
-      run(defaultParams);
+      enumRes.run(defaultParams);
       // TODO 这段代码目前看起来是没啥用的、没起到作用
       mergeData();
     } else if (Object.keys(dataSource)) {
@@ -304,5 +303,6 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       window.eventCenter.unsubscribe('zat-design-pro-component-event', shareProEnumDic);
     };
   }, []);
+  return enumRes;
 };
 export default useEnumRequest;

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

@@ -709,7 +709,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         } : queryBean;
         var nextParams = transformParams ? transformParams(params) : params;
         run(nextParams);
-      }, 2000),
+      }, 1000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }

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

@@ -129,7 +129,10 @@ var ProNumberRange = function ProNumberRange(props) {
       case 'amount':
         valueProps = {
           formatter: function formatter(value) {
-            return "".concat(value).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+            return typeof value === 'number' || value ? Number(value).toLocaleString('zh-CN', {
+              minimumFractionDigits: precision !== null && precision !== void 0 ? precision : null,
+              maximumFractionDigits: precision !== null && precision !== void 0 ? precision : 9
+            }) : value;
           },
           parser: function parser(value) {
             return value.replace(/\$\s?|(,*)/g, '');

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

@@ -353,7 +353,13 @@ var Render = function Render(props) {
       mark: 'pro_table_render',
       render: function render(inputProps, doms) {
         return _jsxs(_Fragment, {
-          children: [_jsxs("div", {
+          children: [_jsx(_Space, {
+            size: 0,
+            style: {
+              marginTop: 8
+            },
+            children: formItemProps.above
+          }), _jsxs("div", {
             style: {
               display: 'flex',
               alignItems: 'center'
@@ -383,7 +389,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, lastComponentPropsFilter)), {}, {
+    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
       otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,

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

@@ -186,12 +186,6 @@ var RenderFields = function RenderFields(props) {
       globalControl: globalControl,
       formDisabled: formDisabled
     };
-    if (outerClearNotShow !== false && show === false && (column === null || column === void 0 ? void 0 : column.name) && form.getFieldValue(column === null || column === void 0 ? void 0 : column.name)) {
-      setTimeout(function () {
-        form.resetFields([column === null || column === void 0 ? void 0 : column.name]);
-      }, 200);
-      return null;
-    }
     return _jsx(FieldProvider, {
       value: otherProps,
       children: _jsx(Render, {

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

@@ -214,6 +214,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     before?: string | React.ReactNode;
     /** 表单后缀信息 */
     after?: string | React.ReactNode;
+    /** 表单上方辅助信息 */
+    above?: string | React.ReactNode;
     /** 表单下方辅助信息 */
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
@@ -244,6 +246,8 @@ export interface RenderProps<Values = any> {
         before?: string | React.ReactNode;
         /** 表单后缀信息 */
         after?: string | React.ReactNode;
+        /** 表单上方辅助信息 */
+        above?: string | React.ReactNode;
         /** 表单下方辅助信息 */
         extra?: string | React.ReactNode;
         parentNames?: string;

package/es/ProForm/index.js

@@ -11,7 +11,7 @@ import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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", "originalDiffTip", "formKey", "globalControl", "scrollToError"];
+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", "originalDiffTip", "formKey", "globalControl", "scrollToError", "optimize"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
@@ -67,6 +67,8 @@ var ProForm = function ProForm(props, ref) {
     globalControl = props.globalControl,
     _props$scrollToError = props.scrollToError,
     scrollToError = _props$scrollToError === void 0 ? true : _props$scrollToError,
+    _props$optimize = props.optimize,
+    optimize = _props$optimize === void 0 ? false : _props$optimize,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig(),
     state = _useProConfig.state,
@@ -74,7 +76,8 @@ var ProForm = function ProForm(props, ref) {
   var config = state.ProForm,
     forms = state.forms;
   var _useForm = useForm((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm, {
-      scrollToError: scrollToError
+      scrollToError: scrollToError,
+      optimize: optimize
     }),
     _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];
@@ -167,7 +170,7 @@ var ProForm = function ProForm(props, ref) {
     // 暂时通过'-'区分组合组件字段和普通字段
     var keys = Object.keys(changedValue);
     if (!keys.length) {
-      onValuesChange(filterInternalFields(changedValue), form.getFieldsValue());
+      onValuesChange(filterInternalFields(changedValue, optimize), form.getFieldsValue());
     } else {
       var values = keys.map(function (key) {
         if (key.includes('-')) {
@@ -179,7 +182,7 @@ var ProForm = function ProForm(props, ref) {
         }
         return {};
       });
-      onValuesChange(filterInternalFields(merge.apply(void 0, [changedValue].concat(_toConsumableArray(values)))), form.getFieldsValue());
+      onValuesChange(filterInternalFields(merge.apply(void 0, [changedValue].concat(_toConsumableArray(values))), optimize), form.getFieldsValue());
     }
   };
   // 包装一层兼容 names 改变

package/es/ProForm/propsType.d.ts

@@ -76,6 +76,10 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     required?: boolean | boolean[];
     originalDiffTip?: boolean;
     scrollToError?: boolean;
+    /** 性能模式，谨慎使用，默认不开启
+     * 1. 开启不过滤names的中间态值
+     */
+    optimize?: boolean;
 }
 export interface Transform<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

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

@@ -28,7 +28,7 @@ export declare const isUpperCase: (type: string, upperCase: boolean) => any;
 export declare const weedOutProps: (data: Record<string, any>, keys: string[]) => {}[];
 export declare const diffField: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
 export declare const splitNameStr: (name: string) => string[][];
-export declare const filterInternalFields: (values: any) => any;
+export declare const filterInternalFields: (values: any, optimize?: boolean) => any;
 export declare const getAllNamePath: (object: Record<string, any>, currentPath?: InternalNamePath) => InternalNamePath[];
 export declare const isNullValue: (value: any) => boolean;
 /**

package/es/ProForm/utils/index.js

@@ -4,8 +4,8 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
-import _, { isObject, isFunction, cloneDeep, get, set, omit, isNaN } from 'lodash';
 import moment from 'moment';
+import _, { isObject, isFunction, cloneDeep, get, set, omit, isNaN } from 'lodash';
 export var getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -121,7 +121,10 @@ export var splitNameStr = function splitNameStr(name) {
   });
 };
 // 过滤掉字段名中包含 '-' 的字段
-export var filterInternalFields = function filterInternalFields(values) {
+export var filterInternalFields = function filterInternalFields(values, optimize) {
+  if (optimize) {
+    return values;
+  }
   var nextValues = values;
   // fix: braft-editor对象不可遍历 Moment不过滤
   if ((values === null || values === void 0 ? void 0 : values._immutable) || moment.isMoment(values)) {

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

@@ -1,9 +1,15 @@
 import { FormInstance } from 'antd';
+import { NamePath } from 'antd/es/form/interface';
+import { ValuedNotifyInfo } from 'rc-field-form/es/interface';
 type ModifiedFormInstance<T> = FormInstance<T> & {
     isModified?: boolean;
+    /** 默认清空设置值的报错状态 */
+    setFieldValue: (name: NamePath, value: any, info?: ValuedNotifyInfo) => void;
+    _init?: boolean;
 };
 interface FormInstanceOption {
     scrollToError?: boolean;
+    optimize?: boolean;
 }
-export declare const useForm: <T>(originForm: ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
+export declare const useForm: <T>(originForm?: FormInstanceOption | ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
 export {};

package/es/ProForm/utils/useForm.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
@@ -7,22 +8,32 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { filterInternalFields } from './index';
 import { handleScrollToError } from '../../ProEditTable/utils/tools';
 export var useForm = function useForm(originForm, options) {
-  var _ref = options || {},
+  // 如果没有form实例可以直接把options放在第一个参数位置
+  // @ts-ignore
+  var _originForm = (originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined;
+  var _options =
+  // @ts-ignore
+  options || originForm && !(originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined;
+  var _ref = _options || {},
     _ref$scrollToError = _ref.scrollToError,
-    scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError;
-  var _Form$useForm = _Form.useForm(originForm),
+    scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError,
+    optimize = _ref.optimize;
+  var _Form$useForm = _Form.useForm(_originForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,
     validateFields = form.validateFields,
-    isModified = form.isModified;
+    isModified = form.isModified,
+    setFields = form.setFields,
+    getFieldsError = form.getFieldsError,
+    setFieldsValue = form.setFieldsValue;
   if (isModified) return [form];
   // @ts-ignore
   var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
     // 全部查询
     if (nameList !== true) {
       var values = getFieldsValue(nameList || true, filterFunc);
-      return filterInternalFields(values);
+      return filterInternalFields(values, optimize);
     }
     return getFieldsValue(nameList, filterFunc);
   };
@@ -70,7 +81,7 @@ export var useForm = function useForm(originForm, options) {
             // delete rest[0].recursive;
             _context.next = 11;
             return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
-              return filterInternalFields(values);
+              return filterInternalFields(values, optimize);
             });
           case 11:
             return _context.abrupt("return", _context.sent);
@@ -102,6 +113,48 @@ export var useForm = function useForm(originForm, options) {
       return _ref2.apply(this, arguments);
     };
   }();
+  var _setFieldValue = function _setFieldValue(name, value, info) {
+    if (info) {
+      setFields([_objectSpread({
+        name: name,
+        value: value
+      }, info)]);
+    } else {
+      setFields([{
+        name: name,
+        value: value,
+        errors: [],
+        warnings: []
+      }]);
+    }
+  };
+  var _setFieldsValue = function _setFieldsValue(values) {
+    var errors = getFieldsError();
+    var errorNames = errors.reduce(function (acc, entry) {
+      if (entry.errors.length > 0) {
+        acc.push(entry.name[0]);
+      }
+      return acc;
+    }, []) || [];
+    if (errorNames.length) {
+      errorNames.forEach(function (errorName) {
+        // 只处理names的报错
+        if (errorName.includes('-')) {
+          setFields([{
+            name: errorName,
+            errors: [],
+            warnings: []
+          }]);
+        }
+      });
+      setFieldsValue(values);
+    } else {
+      setFieldsValue(values);
+    }
+  };
+  form.getFieldsValue = _getFieldsValue;
+  form.setFieldValue = _setFieldValue;
+  form.setFieldsValue = _setFieldsValue;
   form.getFieldsValue = _getFieldsValue;
   form.validateFields = _validateFields;
   form.isModified = true;