@zat-design/sisyphus-react 3.9.5-beta.2 → 3.9.5-beta.3

package/es/ProConfigProvider/index.js

@@ -9,7 +9,6 @@ import enUS from 'antd/es/locale/en_US';
 import merge from 'lodash/merge';
 import useEnumRequest from '../ProEnum/hooks/useEnumRequest';
 import { setLanguage } from '../locale';
-import FormsProvider from './FormsContext';
 var initialState = {
   ProEnum: {
     dics: {}
@@ -101,10 +100,8 @@ export var ProConfigProvider = function ProConfigProvider(props) {
     },
     children: _jsx(_ConfigProvider, {
       locale: antdLangMap[lang],
-      children: _jsx(FormsProvider, {
-        children: _jsx("div", {
-          children: props.children
-        })
+      children: _jsx("div", {
+        children: props.children
       })
     })
   });

package/es/ProForm/index.js

@@ -25,7 +25,7 @@ import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
 import locale from '../locale';
 import useWatch from './utils/useWatch';
-import { useContextForms, useForms } from '../ProConfigProvider/FormsContext';
+import { useContextForms, useForms } from '../FormsProvider';
 var ProForm = function ProForm(props, ref) {
   var _localStorage, _ref;
   var _props$mode = props.mode,
@@ -299,8 +299,8 @@ export var ProFormProvider = function ProFormProvider(props) {
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = useFieldProps; // 获取每个字段的其他参数  -otherProps
-ProFormForward.useForms = useForms; // 获取上下文中的指定表单实例 如果不存在则会创建
-ProFormForward.useContextForms = useContextForms; // 获取 ProConfigProvider中的表单实例map
+ProFormForward.useForms = useForms; // 获取上下文中的共享的表单实例map
+ProFormForward.useContextForms = useContextForms; // 获取上下文中的共享的表单实例map
 // 内置组合
 ProFormForward.ProCascader = ProCascader;
 ProFormForward.ProCombination = ProCombination;

package/es/ProForm/utils/useForm.js

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useContext } from 'react';
 import { filterInternalFields } from './index';
 import { handleScrollToError } from '../../ProEditTable/utils/tools';
-import { FormsContext } from '../../ProConfigProvider/FormsContext';
+import { FormsContext } from '../../FormsProvider';
 export var useForm = function useForm(originForm, options) {
   // 如果没有form实例可以直接把options放在第一个参数位置
   // @ts-ignore

package/lib/ProConfigProvider/index.js

@@ -17,7 +17,6 @@ var _en_US = _interopRequireDefault(require("antd/es/locale/en_US"));
 var _merge = _interopRequireDefault(require("lodash/merge"));
 var _useEnumRequest = _interopRequireDefault(require("../ProEnum/hooks/useEnumRequest"));
 var _locale = require("../locale");
-var _FormsContext = _interopRequireDefault(require("./FormsContext"));
 var initialState = {
   ProEnum: {
     dics: {}
@@ -109,10 +108,8 @@ var ProConfigProvider = exports.ProConfigProvider = function ProConfigProvider(p
     },
     children: (0, _jsxRuntime.jsx)(_antd.ConfigProvider, {
       locale: antdLangMap[lang],
-      children: (0, _jsxRuntime.jsx)(_FormsContext.default, {
-        children: (0, _jsxRuntime.jsx)("div", {
-          children: props.children
-        })
+      children: (0, _jsxRuntime.jsx)("div", {
+        children: props.children
       })
     })
   });

package/lib/ProForm/index.js

@@ -25,7 +25,7 @@ var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
 var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
-var _FormsContext = require("../ProConfigProvider/FormsContext");
+var _FormsProvider = require("../FormsProvider");
 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", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize"];
 var ProForm = function ProForm(props, ref) {
   var _localStorage, _ref;
@@ -300,8 +300,8 @@ var ProFormProvider = exports.ProFormProvider = function ProFormProvider(props)
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字段的其他参数  -otherProps
-ProFormForward.useForms = _FormsContext.useForms; // 获取上下文中的指定表单实例 如果不存在则会创建
-ProFormForward.useContextForms = _FormsContext.useContextForms; // 获取 ProConfigProvider中的表单实例map
+ProFormForward.useForms = _FormsProvider.useForms; // 获取上下文中的共享的表单实例map
+ProFormForward.useContextForms = _FormsProvider.useContextForms; // 获取上下文中的共享的表单实例map
 // 内置组合
 ProFormForward.ProCascader = _components.ProCascader;
 ProFormForward.ProCombination = _components.ProCombination;

package/lib/ProForm/utils/useForm.js

@@ -14,7 +14,7 @@ var _antd = require("antd");
 var _react = require("react");
 var _index = require("./index");
 var _tools = require("../../ProEditTable/utils/tools");
-var _FormsContext = require("../../ProConfigProvider/FormsContext");
+var _FormsProvider = require("../../FormsProvider");
 var useForm = exports.useForm = function useForm(originForm, options) {
   // 如果没有form实例可以直接把options放在第一个参数位置
   // @ts-ignore
@@ -28,7 +28,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
     optimize = _ref.optimize,
     formKey = _ref.formKey;
   // formKey全局共享逻辑
-  var forms = (0, _react.useContext)(_FormsContext.FormsContext);
+  var forms = (0, _react.useContext)(_FormsProvider.FormsContext);
   var _Form$useForm = _antd.Form.useForm(forms[formKey] || _originForm),
     _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
     form = _Form$useForm2[0];

package/package.json

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