@zat-design/sisyphus-react 3.3.3-beta.6 → 3.3.3-beta.8

package/es/ProConfigProvider/index.d.ts

@@ -20,7 +20,7 @@ interface ConfigContext {
 export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
-export declare function useContextForm(): Record<string, FormInstance<any>>;
+export declare function useContextForms(): Record<string, FormInstance<any>>;
 type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic';
 interface Actions {
     type: ActionsType;

package/es/ProConfigProvider/index.js

@@ -24,7 +24,7 @@ export function useProConfig(name) {
   var config = useContext(ProConfigContext);
   return name ? config.state[name] : config;
 }
-export function useContextForm() {
+export function useContextForms() {
   var _config$state;
   var config = useContext(ProConfigContext);
   return (_config$state = config.state) === null || _config$state === void 0 ? void 0 : _config$state.forms;

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

@@ -739,6 +739,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       visible: visible
     }, restModalProps), {}, {
       children: [_jsx(ProForm, {
+        submitOnEnter: true,
         form: form,
         columns: formColumns,
         onFinish: handleSearch,

package/es/ProForm/index.js

@@ -20,7 +20,7 @@ import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { isObject, isString, merge } from 'lodash';
 import { FormFooter, InputRange, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeSelect, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
-import { useProConfig, useContextForm } from '../ProConfigProvider';
+import { useProConfig, useContextForms } from '../ProConfigProvider';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
 import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
@@ -310,7 +310,7 @@ var ProFormProvider = function ProFormProvider(props) {
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = useFieldProps; // 获取每个字段的其他参数  -otherProps
-ProFormForward.useContextForm = useContextForm; // 获取 ProConfigProvider中的表单实例map
+ProFormForward.useContextForms = useContextForms; // 获取 ProConfigProvider中的表单实例map
 // 内置组合
 ProFormForward.ProAddressBar = ProAddressBar;
 ProFormForward.ProCombination = ProCombination;

package/es/ProForm/utils/useRules.js

@@ -56,10 +56,9 @@ var useRules = function useRules(props) {
           return Promise.resolve();
         }
       };
-      if (type === 'Group' && Array.isArray(names) && !required) {
-        customRequired = null;
+      if (!(type === 'Group' && Array.isArray(names) && !required)) {
+        internalRule.rules.push(customRequired);
       }
-      internalRule.rules.push(customRequired);
     }
   }, [internalRule]);
   return internalRule;

package/es/ProForm/utils/useShouldUpdate.js

@@ -168,10 +168,13 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearInterval(timerRef.current);
         }
       }
-      // 当校验规则改变的时候  重新执行校验
-      if (_required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun)) {
-        form.validateFields([name]);
-      }
+      // // 当校验规则改变的时候  重新执行校验 导致: 第一次进页面直接触发校验
+      // if (
+      //   _required !== requiredRef.current ||
+      //   !isEqualWith(rulesRef.current, _rules, customEqualForFun)
+      // ) {
+      //   form.validateFields([name]);
+      // }
       if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun) || !isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) || !isEqualWith(originComponentRef.current, _component, customEqualForFun) || equalDependencies(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;
         disabledRef.current = _disabled;

package/lib/ProConfigProvider/index.d.ts

@@ -20,7 +20,7 @@ interface ConfigContext {
 export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
-export declare function useContextForm(): Record<string, FormInstance<any>>;
+export declare function useContextForms(): Record<string, FormInstance<any>>;
 type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic';
 interface Actions {
     type: ActionsType;

package/lib/ProConfigProvider/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProConfigProvider = exports.ProConfigContext = void 0;
-exports.useContextForm = useContextForm;
+exports.useContextForms = useContextForms;
 exports.useProConfig = useProConfig;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -33,7 +33,7 @@ function useProConfig(name) {
   var config = (0, _react.useContext)(ProConfigContext);
   return name ? config.state[name] : config;
 }
-function useContextForm() {
+function useContextForms() {
   var _config$state;
   var config = (0, _react.useContext)(ProConfigContext);
   return (_config$state = config.state) === null || _config$state === void 0 ? void 0 : _config$state.forms;

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

@@ -740,6 +740,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       visible: visible
     }, restModalProps), {}, {
       children: [(0, _jsxRuntime.jsx)(_index.ProForm, {
+        submitOnEnter: true,
         form: form,
         columns: formColumns,
         onFinish: handleSearch,

package/lib/ProForm/index.js

@@ -311,7 +311,7 @@ var ProFormProvider = function ProFormProvider(props) {
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字段的其他参数  -otherProps
-ProFormForward.useContextForm = _ProConfigProvider.useContextForm; // 获取 ProConfigProvider中的表单实例map
+ProFormForward.useContextForms = _ProConfigProvider.useContextForms; // 获取 ProConfigProvider中的表单实例map
 // 内置组合
 ProFormForward.ProAddressBar = _components.ProAddressBar;
 ProFormForward.ProCombination = _components.ProCombination;

package/lib/ProForm/utils/useRules.js

@@ -63,10 +63,9 @@ var useRules = function useRules(props) {
           return Promise.resolve();
         }
       };
-      if (type === 'Group' && Array.isArray(names) && !required) {
-        customRequired = null;
+      if (!(type === 'Group' && Array.isArray(names) && !required)) {
+        internalRule.rules.push(customRequired);
       }
-      internalRule.rules.push(customRequired);
     }
   }, [internalRule]);
   return internalRule;

package/lib/ProForm/utils/useShouldUpdate.js

@@ -175,10 +175,13 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearInterval(timerRef.current);
         }
       }
-      // 当校验规则改变的时候  重新执行校验
-      if (_required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun)) {
-        form.validateFields([name]);
-      }
+      // // 当校验规则改变的时候  重新执行校验 导致: 第一次进页面直接触发校验
+      // if (
+      //   _required !== requiredRef.current ||
+      //   !isEqualWith(rulesRef.current, _rules, customEqualForFun)
+      // ) {
+      //   form.validateFields([name]);
+      // }
       if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(originComponentRef.current, _component, _index.customEqualForFun) || (0, _index.equalDependencies)(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;
         disabledRef.current = _disabled;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.3.3-beta.6",
+  "version": "3.3.3-beta.8",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",