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

package/es/FormsProvider/index.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import { ModifiedFormInstance } from '../ProForm/utils/useForm';
+type Forms = Record<string, ModifiedFormInstance<any>>;
+export declare const FormsContext: React.Context<Forms>;
+/**
+ * @param formKey 表单实例key
+ * @param formIst form实例, 如果传了会把传入的实例存入全局
+ * @returns 没有入参: 返回表单实例但是不存入全局
+ *          有formKey: 取全局中的表单实例返回, 如果不存在则创建后返回
+ */
+export declare const useForms: () => Forms;
+/** 获取所有表单实例 */
+export declare const useContextForms: () => Forms;
+declare const FormsProvider: React.FC;
+export default FormsProvider;

package/es/FormsProvider/index.js

@@ -0,0 +1,32 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import React, { useContext, useEffect, useRef } from 'react';
+export var FormsContext = /*#__PURE__*/React.createContext({});
+/**
+ * @param formKey 表单实例key
+ * @param formIst form实例, 如果传了会把传入的实例存入全局
+ * @returns 没有入参: 返回表单实例但是不存入全局
+ *          有formKey: 取全局中的表单实例返回, 如果不存在则创建后返回
+ */
+export var useForms = function useForms() {
+  var forms = useContext(FormsContext);
+  return forms;
+};
+/** 获取所有表单实例 */
+export var useContextForms = function useContextForms() {
+  var forms = useContext(FormsContext);
+  return forms;
+};
+var FormsProvider = function FormsProvider(props) {
+  var formsRef = useRef({});
+  useEffect(function () {
+    // 销毁
+    return function () {
+      formsRef.current = {};
+    };
+  }, []);
+  return _jsx(FormsContext.Provider, {
+    value: formsRef.current,
+    children: props.children
+  });
+};
+export default FormsProvider;

package/es/ProConfigProvider/index.d.ts

@@ -20,7 +20,6 @@ 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 useContextForms(): Record<string, FormInstance<any>>;
 type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic' | 'setWithLocal';
 interface Actions {
     type: ActionsType;

package/es/ProConfigProvider/index.js

@@ -35,11 +35,6 @@ export function useProConfig(name) {
   var config = useContext(ProConfigContext);
   return name ? config.state[name] : config;
 }
-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;
-}
 var antdLangMap = {
   'zh-CN': zhCN,
   'en-US': enUS // en-US

package/es/ProForm/index.js

@@ -2,13 +2,13 @@ import "antd/es/row/style";
 import _Row from "antd/es/row";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/col/style";
 import _Col from "antd/es/col";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/space/style";
 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", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize"];
@@ -19,14 +19,15 @@ import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { isObject, merge, omit } from 'lodash';
 import { FormFooter, InputRange, ProAddress, ProCascader, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
-import { useProConfig, useContextForms } from '../ProConfigProvider';
+import { useProConfig } from '../ProConfigProvider';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames, filterInternalFields } from './utils/index';
 import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
 import locale from '../locale';
 import useWatch from './utils/useWatch';
+import { useContextForms, useForms } from '../FormsProvider';
 var ProForm = function ProForm(props, ref) {
-  var _forms$formKey, _localStorage, _ref;
+  var _localStorage, _ref;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -69,17 +70,15 @@ var ProForm = function ProForm(props, ref) {
     _props$optimize = props.optimize,
     optimize = _props$optimize === void 0 ? false : _props$optimize,
     otherProps = _objectWithoutProperties(props, _excluded);
-  var _useProConfig = useProConfig(),
-    state = _useProConfig.state,
-    dispatch = _useProConfig.dispatch;
-  var config = state.ProForm,
-    forms = state.forms;
-  var _useForm = useForm((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm, {
+  var config = useProConfig('ProForm');
+  var _useForm = useForm(originForm, {
       scrollToError: scrollToError,
-      optimize: optimize
+      optimize: optimize,
+      formKey: formKey
     }),
     _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];
+  // const form = useForms(formKey, originForm, { scrollToError, optimize, formKey });
   var _useControlled = useControlled({
       value: expandOpen,
       onChange: expandOpenChange
@@ -88,32 +87,22 @@ var ProForm = function ProForm(props, ref) {
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
   // 把表单实例存入表单组
-  useMemo(function () {
-    if (formKey && forms[formKey] !== form) {
-      forms[formKey] = form;
-      // fix:  Cannot update a component (`ProConfigProvider`) while rendering a different component (`ForwardRef(ProForm)`).
-      setTimeout(function () {
-        dispatch({
-          type: 'set',
-          payload: {
-            forms: _objectSpread({}, forms)
-          }
-        });
-      }, 300);
-    }
-    // 销毁
-    return function () {
-      if (formKey && forms[formKey]) {
-        delete forms[formKey];
-        dispatch({
-          type: 'set',
-          payload: {
-            forms: _objectSpread({}, forms)
-          }
-        });
-      }
-    };
-  }, [formKey, form]);
+  // useMemo(() => {
+  //   if (formKey && forms[formKey] !== form) {
+  //     forms[formKey] = form;
+  //     // fix:  Cannot update a component (`ProConfigProvider`) while rendering a different component (`ForwardRef(ProForm)`).
+  //     setTimeout(() => {
+  //       dispatch({ type: 'set', payload: { forms: { ...forms } } });
+  //     }, 300);
+  //   }
+  //   // 销毁
+  //   return () => {
+  //     if (formKey && forms[formKey]) {
+  //       delete forms[formKey];
+  //       dispatch({ type: 'set', payload: { forms: { ...forms } } });
+  //     }
+  //   };
+  // }, [formKey, form]);
   var _getLayout = getLayout({
       span: span,
       form: form
@@ -310,7 +299,8 @@ export var ProFormProvider = function ProFormProvider(props) {
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = useFieldProps; // 获取每个字段的其他参数  -otherProps
-ProFormForward.useContextForms = useContextForms; // 获取 ProConfigProvider中的表单实例map
+ProFormForward.useForms = useForms; // 获取上下文中的共享的表单实例map
+ProFormForward.useContextForms = useContextForms; // 获取上下文中的共享的表单实例map
 // 内置组合
 ProFormForward.ProCascader = ProCascader;
 ProFormForward.ProCombination = ProCombination;

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

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

package/es/ProForm/utils/useForm.js

@@ -5,8 +5,10 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 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 '../../FormsProvider';
 export var useForm = function useForm(originForm, options) {
   // 如果没有form实例可以直接把options放在第一个参数位置
   // @ts-ignore
@@ -17,10 +19,17 @@ export var useForm = function useForm(originForm, options) {
   var _ref = _options || {},
     _ref$scrollToError = _ref.scrollToError,
     scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError,
-    optimize = _ref.optimize;
-  var _Form$useForm = _Form.useForm(_originForm),
+    optimize = _ref.optimize,
+    formKey = _ref.formKey;
+  // formKey全局共享逻辑
+  var forms = useContext(FormsContext);
+  var _Form$useForm = _Form.useForm(forms[formKey] || _originForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  if (formKey && forms[formKey] !== form) {
+    forms[formKey] = form;
+    form.formKey = formKey;
+  }
   var getFieldsValue = form.getFieldsValue,
     validateFields = form.validateFields,
     isModified = form.isModified,

package/lib/FormsProvider/index.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import { ModifiedFormInstance } from '../ProForm/utils/useForm';
+type Forms = Record<string, ModifiedFormInstance<any>>;
+export declare const FormsContext: React.Context<Forms>;
+/**
+ * @param formKey 表单实例key
+ * @param formIst form实例, 如果传了会把传入的实例存入全局
+ * @returns 没有入参: 返回表单实例但是不存入全局
+ *          有formKey: 取全局中的表单实例返回, 如果不存在则创建后返回
+ */
+export declare const useForms: () => Forms;
+/** 获取所有表单实例 */
+export declare const useContextForms: () => Forms;
+declare const FormsProvider: React.FC;
+export default FormsProvider;

package/lib/FormsProvider/index.js

@@ -0,0 +1,39 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useForms = exports.useContextForms = exports.default = exports.FormsContext = void 0;
+var _jsxRuntime = require("react/jsx-runtime");
+var _react = _interopRequireWildcard(require("react"));
+var FormsContext = exports.FormsContext = /*#__PURE__*/_react.default.createContext({});
+/**
+ * @param formKey 表单实例key
+ * @param formIst form实例, 如果传了会把传入的实例存入全局
+ * @returns 没有入参: 返回表单实例但是不存入全局
+ *          有formKey: 取全局中的表单实例返回, 如果不存在则创建后返回
+ */
+var useForms = exports.useForms = function useForms() {
+  var forms = (0, _react.useContext)(FormsContext);
+  return forms;
+};
+/** 获取所有表单实例 */
+var useContextForms = exports.useContextForms = function useContextForms() {
+  var forms = (0, _react.useContext)(FormsContext);
+  return forms;
+};
+var FormsProvider = function FormsProvider(props) {
+  var formsRef = (0, _react.useRef)({});
+  (0, _react.useEffect)(function () {
+    // 销毁
+    return function () {
+      formsRef.current = {};
+    };
+  }, []);
+  return (0, _jsxRuntime.jsx)(FormsContext.Provider, {
+    value: formsRef.current,
+    children: props.children
+  });
+};
+var _default = exports.default = FormsProvider;

package/lib/ProConfigProvider/index.d.ts

@@ -20,7 +20,6 @@ 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 useContextForms(): Record<string, FormInstance<any>>;
 type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic' | 'setWithLocal';
 interface Actions {
     type: ActionsType;

package/lib/ProConfigProvider/index.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProConfigProvider = exports.ProConfigContext = void 0;
-exports.useContextForms = useContextForms;
 exports.useProConfig = useProConfig;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -44,11 +43,6 @@ function useProConfig(name) {
   var config = (0, _react.useContext)(ProConfigContext);
   return name ? config.state[name] : config;
 }
-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;
-}
 var antdLangMap = {
   'zh-CN': _zh_CN.default,
   'en-US': _en_US.default // en-US

package/lib/ProForm/index.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProFormProvider = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -25,9 +25,10 @@ var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
 var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
+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 _forms$formKey, _localStorage, _ref;
+  var _localStorage, _ref;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -70,17 +71,15 @@ var ProForm = function ProForm(props, ref) {
     _props$optimize = props.optimize,
     optimize = _props$optimize === void 0 ? false : _props$optimize,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
-    state = _useProConfig.state,
-    dispatch = _useProConfig.dispatch;
-  var config = state.ProForm,
-    forms = state.forms;
-  var _useForm = (0, _useForm3.useForm)((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm, {
+  var config = (0, _ProConfigProvider.useProConfig)('ProForm');
+  var _useForm = (0, _useForm3.useForm)(originForm, {
       scrollToError: scrollToError,
-      optimize: optimize
+      optimize: optimize,
+      formKey: formKey
     }),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
     form = _useForm2[0];
+  // const form = useForms(formKey, originForm, { scrollToError, optimize, formKey });
   var _useControlled = (0, _index.useControlled)({
       value: expandOpen,
       onChange: expandOpenChange
@@ -89,32 +88,22 @@ var ProForm = function ProForm(props, ref) {
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
   // 把表单实例存入表单组
-  (0, _react.useMemo)(function () {
-    if (formKey && forms[formKey] !== form) {
-      forms[formKey] = form;
-      // fix:  Cannot update a component (`ProConfigProvider`) while rendering a different component (`ForwardRef(ProForm)`).
-      setTimeout(function () {
-        dispatch({
-          type: 'set',
-          payload: {
-            forms: (0, _objectSpread2.default)({}, forms)
-          }
-        });
-      }, 300);
-    }
-    // 销毁
-    return function () {
-      if (formKey && forms[formKey]) {
-        delete forms[formKey];
-        dispatch({
-          type: 'set',
-          payload: {
-            forms: (0, _objectSpread2.default)({}, forms)
-          }
-        });
-      }
-    };
-  }, [formKey, form]);
+  // useMemo(() => {
+  //   if (formKey && forms[formKey] !== form) {
+  //     forms[formKey] = form;
+  //     // fix:  Cannot update a component (`ProConfigProvider`) while rendering a different component (`ForwardRef(ProForm)`).
+  //     setTimeout(() => {
+  //       dispatch({ type: 'set', payload: { forms: { ...forms } } });
+  //     }, 300);
+  //   }
+  //   // 销毁
+  //   return () => {
+  //     if (formKey && forms[formKey]) {
+  //       delete forms[formKey];
+  //       dispatch({ type: 'set', payload: { forms: { ...forms } } });
+  //     }
+  //   };
+  // }, [formKey, form]);
   var _getLayout = (0, _index.getLayout)({
       span: span,
       form: form
@@ -311,7 +300,8 @@ var ProFormProvider = exports.ProFormProvider = function ProFormProvider(props)
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字段的其他参数  -otherProps
-ProFormForward.useContextForms = _ProConfigProvider.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.d.ts

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

package/lib/ProForm/utils/useForm.js

@@ -11,8 +11,10 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _antd = require("antd");
+var _react = require("react");
 var _index = require("./index");
 var _tools = require("../../ProEditTable/utils/tools");
+var _FormsProvider = require("../../FormsProvider");
 var useForm = exports.useForm = function useForm(originForm, options) {
   // 如果没有form实例可以直接把options放在第一个参数位置
   // @ts-ignore
@@ -23,10 +25,17 @@ var useForm = exports.useForm = function useForm(originForm, options) {
   var _ref = _options || {},
     _ref$scrollToError = _ref.scrollToError,
     scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError,
-    optimize = _ref.optimize;
-  var _Form$useForm = _antd.Form.useForm(_originForm),
+    optimize = _ref.optimize,
+    formKey = _ref.formKey;
+  // formKey全局共享逻辑
+  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];
+  if (formKey && forms[formKey] !== form) {
+    forms[formKey] = form;
+    form.formKey = formKey;
+  }
   var getFieldsValue = form.getFieldsValue,
     validateFields = form.validateFields,
     isModified = form.isModified,

package/package.json

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

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "kisstkondoros.vscode-codemetrics"
-    ]
-}