@zat-design/sisyphus-react 3.3.3-beta.3 → 3.3.3-beta.5

package/dist/index.esm.css

@@ -5505,3 +5505,28 @@ input[type='button'] {
   width: -moz-max-content;
   width: max-content;
 }
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner {
+  color: #1d2129;
+  background-color: #fff;
+  -webkit-box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner::-moz-selection {
+  color: inherit !important;
+  background: rgba(24, 144, 255, 0.3) !important;
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner::selection {
+  color: inherit !important;
+  background: rgba(24, 144, 255, 0.3) !important;
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner > div::-moz-selection {
+  color: inherit !important;
+  background: rgba(24, 144, 255, 0.3) !important;
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner > div::selection {
+  color: inherit !important;
+  background: rgba(24, 144, 255, 0.3) !important;
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-arrow > .ant-tooltip-arrow-content {
+  --antd-arrow-background-color: linear-gradient(to right bottom, rgba(255, 255, 255, 0.95), #ffffff);
+}

package/es/ProConfigProvider/index.d.ts

@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+import { FormInstance } from 'antd';
 import { PropSelectProps } from '../ProSelect/propsType';
 import { ProModalSelectPropsType } from '../ProForm/components/combination/ProModalSelect/propsType';
 import { AddressProps } from '../ProForm/components/combination/ProAddressBar/propsType';
@@ -9,17 +10,24 @@ export interface ProConfigState {
     ProSelect?: Partial<PropSelectProps> & Record<string, any>;
     ProModalSelect?: Partial<ProModalSelectPropsType> & Record<string, any>;
     ProAddressBar?: Partial<AddressProps> & Record<string, any>;
+    forms: Record<string, FormInstance | undefined>;
     [key: string]: any;
 }
 interface ConfigContext {
     state: ProConfigState;
-    dispatch: React.Dispatch<ProConfigState>;
+    dispatch: React.Dispatch<Actions>;
 }
 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>>;
+type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic';
+interface Actions {
+    type: ActionsType;
+    payload: any;
+}
 export declare const ProConfigProvider: FC<{
-    value: ProConfigState;
+    value?: ProConfigState;
     locale?: string;
 }>;
 export default ProConfigProvider;

package/es/ProConfigProvider/index.js

@@ -9,12 +9,14 @@ import enUS from 'antd/es/locale/en_US';
 import merge from 'lodash/merge';
 import useEnumRequest from '../ProEnum/hooks/useEnumRequest';
 import { setLanguage } from '../locale';
-export var ProConfigContext = /*#__PURE__*/React.createContext({
-  state: {
-    ProEnum: {
-      dics: {}
-    }
+var initialState = {
+  ProEnum: {
+    dics: {}
   },
+  forms: {}
+};
+export var ProConfigContext = /*#__PURE__*/React.createContext({
+  state: initialState,
   dispatch: function dispatch() {}
 });
 // eslint-disable-next-line no-redeclare
@@ -22,6 +24,11 @@ export function useProConfig(name) {
   var config = useContext(ProConfigContext);
   return name ? config.state[name] : config;
 }
+export function useContextForm() {
+  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
@@ -47,7 +54,7 @@ var reducer = function reducer(state, action) {
 };
 export var ProConfigProvider = function ProConfigProvider(props) {
   var _props$value, _props$value2;
-  var _useReducer = useReducer(reducer, {}),
+  var _useReducer = useReducer(reducer, initialState),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];

package/es/ProForm/index.js

@@ -1,33 +1,32 @@
 import _toArray from "@babel/runtime/helpers/esm/toArray";
 import "antd/es/row/style";
 import _Row from "antd/es/row";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 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 "antd/es/form/style";
-import _Form from "antd/es/form";
 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", "originalTip", "groupName"];
+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", "originalTip", "formKey"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
-import React, { forwardRef, useContext, useImperativeHandle, useMemo } from 'react';
+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 } from '../ProConfigProvider';
+import { useProConfig, useContextForm } from '../ProConfigProvider';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
 import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
 import locale from '../locale';
-import { groupContext } from './components/ProFormGroup';
 var ProForm = function ProForm(props, ref) {
-  var _groupForm$groupName, _localStorage;
+  var _forms$formKey, _localStorage;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -66,13 +65,14 @@ var ProForm = function ProForm(props, ref) {
     required = props.required,
     _props$originalTip = props.originalTip,
     originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
-    groupName = props.groupName,
+    formKey = props.formKey,
     otherProps = _objectWithoutProperties(props, _excluded);
-  var _ref = useContext(groupContext) || [],
-    _ref2 = _slicedToArray(_ref, 2),
-    groupForm = _ref2[0],
-    setGroupForm = _ref2[1];
-  var _useForm = useForm((_groupForm$groupName = groupForm[groupName]) !== null && _groupForm$groupName !== void 0 ? _groupForm$groupName : originForm),
+  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),
     _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];
   var _useControlled = useControlled({
@@ -82,21 +82,30 @@ var ProForm = function ProForm(props, ref) {
     _useControlled2 = _slicedToArray(_useControlled, 2),
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
-  var config = useProConfig('ProForm');
   // 把表单实例存入表单组
   useMemo(function () {
-    if (groupName && groupForm[groupName] !== form) {
-      groupForm[groupName] = form;
-      setGroupForm(_objectSpread({}, groupForm));
+    if (formKey && forms[formKey] !== form) {
+      forms[formKey] = form;
+      dispatch({
+        type: 'set',
+        payload: {
+          forms: _objectSpread({}, forms)
+        }
+      });
     }
     // 销毁
     return function () {
-      if (groupName && groupForm[groupName]) {
-        delete _Form[groupName];
-        setGroupForm(_objectSpread({}, groupForm));
+      if (formKey && forms[formKey]) {
+        delete forms[formKey];
+        dispatch({
+          type: 'set',
+          payload: {
+            forms: _objectSpread({}, forms)
+          }
+        });
       }
     };
-  }, [groupName, form]);
+  }, [formKey, form]);
   var _getLayout = getLayout({
       span: span,
       form: form
@@ -301,6 +310,7 @@ var ProFormProvider = function ProFormProvider(props) {
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = useFieldProps; // 获取每个字段的其他参数  -otherProps
+ProFormForward.useContextForm = useContextForm; // 获取 ProConfigProvider中的表单实例map
 // 内置组合
 ProFormForward.ProAddressBar = ProAddressBar;
 ProFormForward.ProCombination = ProCombination;

package/es/ProForm/propsType.d.ts

@@ -43,7 +43,7 @@ export interface ProFormOtherProps {
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
     mode?: ModeEnum;
-    groupName?: string;
+    formKey?: string;
     /** 是否查看 */
     isView?: boolean;
     span?: number;

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

@@ -84,4 +84,8 @@ export declare const deleteForPath: (values: any, namePath: string | number | (s
  * @returns {}
  */
 export declare const findOptionByValue: (treeData: any[], value: string | number) => any;
+/**
+ * 对比依赖列表中的 值是否变更
+ */
+export declare const equalDependencies: (dependencies: any, prevValues: any, currentValues: any) => any;
 export {};

package/es/ProForm/utils/index.js

@@ -407,4 +407,17 @@ export var findOptionByValue = function findOptionByValue(treeData, value) {
       }
     }
   }
+};
+/**
+ * 对比依赖列表中的 值是否变更
+ */
+export var equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
+  if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
+    return dependencies.some(function (namePath) {
+      var prevValue = get(prevValues, namePath);
+      var currentValue = get(currentValues, namePath);
+      return prevValue !== currentValue;
+    });
+  }
+  return false;
 };

package/es/ProForm/utils/useShouldUpdate.js

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useState } from 'react';
 import { isFunction, isEqualWith } from 'lodash';
-import { customEqualForFun } from './index';
+import { customEqualForFun, equalDependencies } from './index';
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
 var useShouldUpdate = function useShouldUpdate(props) {
   var show = props.show,
@@ -20,7 +20,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
     clearNotShow = formItemProps.clearNotShow,
     index = formItemProps.index,
     namePath = formItemProps.namePath,
-    names = formItemProps.names;
+    names = formItemProps.names,
+    dependencies = formItemProps.dependencies;
   var timerRef = useRef();
   var showRef = useRef();
   var disabledRef = useRef();
@@ -171,7 +172,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
       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)) {
+      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;
         requiredRef.current = _required;

package/es/index.d.ts

@@ -8,7 +8,6 @@ export { default as ProViewer } from './ProViewer';
 export { default as ProEditTable } from './ProEditTable';
 export { default as ProDrawerForm } from './ProDrawerForm';
 export { default as ProEditLabel } from './ProEditLabel';
-export { ProFormGroup, useProFormGroup } from './ProForm/components/ProFormGroup';
 export { default as ProForm } from './ProForm';
 export * from './ProForm';
 export * from './ProForm/components';

package/es/index.js

@@ -12,7 +12,6 @@ export { default as ProEditTable } from './ProEditTable';
 export { default as ProDrawerForm } from './ProDrawerForm';
 export { default as ProEditLabel } from './ProEditLabel';
 // 表单
-export { ProFormGroup, useProFormGroup } from './ProForm/components/ProFormGroup';
 export { default as ProForm } from './ProForm';
 export * from './ProForm';
 export * from './ProForm/components'; // ProForm 中组件导出

package/es/style/theme/antd.less

@@ -93,7 +93,8 @@
 
 .@{ant-prefix}-input[disabled],
 .@{ant-prefix}-select-disabled,
-.@{ant-prefix}-select-disabled.@{ant-prefix}-select:not(.@{ant-prefix}-select-customize-input) .@{ant-prefix}-select-selector,
+.@{ant-prefix}-select-disabled.@{ant-prefix}-select:not(.@{ant-prefix}-select-customize-input)
+  .@{ant-prefix}-select-selector,
 .@{ant-prefix}-input-number-disabled,
 .@{ant-prefix}-picker-input > input[disabled],
 .@{ant-prefix}-select-disabled.@{ant-prefix}-select-multiple .@{ant-prefix}-select-selection-item {
@@ -218,7 +219,11 @@
     .@{ant-prefix}-table tfoot > tr > td {
       padding: calc(4px + var(--zaui-size) * 8px);
     }
-    .@{ant-prefix}-table-tbody > tr > td > .@{ant-prefix}-table-wrapper:only-child .@{ant-prefix}-table,
+    .@{ant-prefix}-table-tbody
+      > tr
+      > td
+      > .@{ant-prefix}-table-wrapper:only-child
+      .@{ant-prefix}-table,
     .@{ant-prefix}-table-tbody
       > tr
       > td
@@ -508,7 +513,8 @@
     border-radius: @zaui-border-radius;
   }
 
-  .@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input) .@{ant-prefix}-select-selector {
+  .@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input)
+    .@{ant-prefix}-select-selector {
     .set-text-color();
     .set-text-size();
     width: 100%;
@@ -523,8 +529,12 @@
     border-radius: @zaui-border-radius;
   }
 
-  .@{ant-prefix}-pagination-jump-prev .@{ant-prefix}-pagination-item-container .@{ant-prefix}-pagination-item-link-icon,
-  .@{ant-prefix}-pagination-jump-next .@{ant-prefix}-pagination-item-container .@{ant-prefix}-pagination-item-link-icon {
+  .@{ant-prefix}-pagination-jump-prev
+    .@{ant-prefix}-pagination-item-container
+    .@{ant-prefix}-pagination-item-link-icon,
+  .@{ant-prefix}-pagination-jump-next
+    .@{ant-prefix}-pagination-item-container
+    .@{ant-prefix}-pagination-item-link-icon {
     color: @zaui-brand;
   }
 }
@@ -705,3 +715,34 @@
 .@{ant-prefix}-popover {
   width: max-content;
 }
+
+// tooltip样式重载
+.@{ant-prefix}-tooltip {
+  > .ant-tooltip-content {
+    > .ant-tooltip-inner {
+      color: rgb(29, 33, 41);
+      background-color: #fff;
+      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),
+        0 9px 28px 8px rgba(0, 0, 0, 0.05);
+      &::selection {
+        color: inherit !important;
+        background: rgba(@primary-color, 0.3) !important;
+      }
+      > div {
+        &::selection {
+          color: inherit !important;
+          background: rgba(@primary-color, 0.3) !important;
+        }
+      }
+    }
+    > .ant-tooltip-arrow {
+      > .ant-tooltip-arrow-content {
+        --antd-arrow-background-color: linear-gradient(
+          to right bottom,
+          rgba(255, 255, 255, 0.95),
+          rgba(255, 255, 255, 1)
+        );
+      }
+    }
+  }
+}

package/lib/ProConfigProvider/index.d.ts

@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+import { FormInstance } from 'antd';
 import { PropSelectProps } from '../ProSelect/propsType';
 import { ProModalSelectPropsType } from '../ProForm/components/combination/ProModalSelect/propsType';
 import { AddressProps } from '../ProForm/components/combination/ProAddressBar/propsType';
@@ -9,17 +10,24 @@ export interface ProConfigState {
     ProSelect?: Partial<PropSelectProps> & Record<string, any>;
     ProModalSelect?: Partial<ProModalSelectPropsType> & Record<string, any>;
     ProAddressBar?: Partial<AddressProps> & Record<string, any>;
+    forms: Record<string, FormInstance | undefined>;
     [key: string]: any;
 }
 interface ConfigContext {
     state: ProConfigState;
-    dispatch: React.Dispatch<ProConfigState>;
+    dispatch: React.Dispatch<Actions>;
 }
 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>>;
+type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic';
+interface Actions {
+    type: ActionsType;
+    payload: any;
+}
 export declare const ProConfigProvider: FC<{
-    value: ProConfigState;
+    value?: ProConfigState;
     locale?: string;
 }>;
 export default ProConfigProvider;

package/lib/ProConfigProvider/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProConfigProvider = exports.ProConfigContext = void 0;
+exports.useContextForm = useContextForm;
 exports.useProConfig = useProConfig;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -17,12 +18,14 @@ 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 ProConfigContext = exports.ProConfigContext = /*#__PURE__*/_react.default.createContext({
-  state: {
-    ProEnum: {
-      dics: {}
-    }
+var initialState = {
+  ProEnum: {
+    dics: {}
   },
+  forms: {}
+};
+var ProConfigContext = exports.ProConfigContext = /*#__PURE__*/_react.default.createContext({
+  state: initialState,
   dispatch: function dispatch() {}
 });
 // eslint-disable-next-line no-redeclare
@@ -30,6 +33,11 @@ function useProConfig(name) {
   var config = (0, _react.useContext)(ProConfigContext);
   return name ? config.state[name] : config;
 }
+function useContextForm() {
+  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
@@ -55,7 +63,7 @@ var reducer = function reducer(state, action) {
 };
 var ProConfigProvider = exports.ProConfigProvider = function ProConfigProvider(props) {
   var _props$value, _props$value2;
-  var _useReducer = (0, _react.useReducer)(reducer, {}),
+  var _useReducer = (0, _react.useReducer)(reducer, initialState),
     _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];

package/lib/ProForm/index.js

@@ -25,10 +25,9 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
-var _ProFormGroup = require("./components/ProFormGroup");
-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", "originalTip", "groupName"];
+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", "originalTip", "formKey"];
 var ProForm = function ProForm(props, ref) {
-  var _groupForm$groupName, _localStorage;
+  var _forms$formKey, _localStorage;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -67,13 +66,14 @@ var ProForm = function ProForm(props, ref) {
     required = props.required,
     _props$originalTip = props.originalTip,
     originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
-    groupName = props.groupName,
+    formKey = props.formKey,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = (0, _react.useContext)(_ProFormGroup.groupContext) || [],
-    _ref2 = (0, _slicedToArray2.default)(_ref, 2),
-    groupForm = _ref2[0],
-    setGroupForm = _ref2[1];
-  var _useForm = (0, _useForm3.useForm)((_groupForm$groupName = groupForm[groupName]) !== null && _groupForm$groupName !== void 0 ? _groupForm$groupName : originForm),
+  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),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
     form = _useForm2[0];
   var _useControlled = (0, _index.useControlled)({
@@ -83,21 +83,30 @@ var ProForm = function ProForm(props, ref) {
     _useControlled2 = (0, _slicedToArray2.default)(_useControlled, 2),
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
-  var config = (0, _ProConfigProvider.useProConfig)('ProForm');
   // 把表单实例存入表单组
   (0, _react.useMemo)(function () {
-    if (groupName && groupForm[groupName] !== form) {
-      groupForm[groupName] = form;
-      setGroupForm((0, _objectSpread2.default)({}, groupForm));
+    if (formKey && forms[formKey] !== form) {
+      forms[formKey] = form;
+      dispatch({
+        type: 'set',
+        payload: {
+          forms: (0, _objectSpread2.default)({}, forms)
+        }
+      });
     }
     // 销毁
     return function () {
-      if (groupName && groupForm[groupName]) {
-        delete _antd.Form[groupName];
-        setGroupForm((0, _objectSpread2.default)({}, groupForm));
+      if (formKey && forms[formKey]) {
+        delete forms[formKey];
+        dispatch({
+          type: 'set',
+          payload: {
+            forms: (0, _objectSpread2.default)({}, forms)
+          }
+        });
       }
     };
-  }, [groupName, form]);
+  }, [formKey, form]);
   var _getLayout = (0, _index.getLayout)({
       span: span,
       form: form
@@ -302,6 +311,7 @@ var ProFormProvider = function ProFormProvider(props) {
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字段的其他参数  -otherProps
+ProFormForward.useContextForm = _ProConfigProvider.useContextForm; // 获取 ProConfigProvider中的表单实例map
 // 内置组合
 ProFormForward.ProAddressBar = _components.ProAddressBar;
 ProFormForward.ProCombination = _components.ProCombination;

package/lib/ProForm/propsType.d.ts

@@ -43,7 +43,7 @@ export interface ProFormOtherProps {
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
     mode?: ModeEnum;
-    groupName?: string;
+    formKey?: string;
     /** 是否查看 */
     isView?: boolean;
     span?: number;

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

@@ -84,4 +84,8 @@ export declare const deleteForPath: (values: any, namePath: string | number | (s
  * @returns {}
  */
 export declare const findOptionByValue: (treeData: any[], value: string | number) => any;
+/**
+ * 对比依赖列表中的 值是否变更
+ */
+export declare const equalDependencies: (dependencies: any, prevValues: any, currentValues: any) => any;
 export {};

package/lib/ProForm/utils/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.deleteForPath = exports.customEqualForFun = exports.contrast = void 0;
+exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.equalDependencies = exports.deleteForPath = exports.customEqualForFun = exports.contrast = void 0;
 exports.getArrayBeforeNumber = getArrayBeforeNumber;
 exports.hasRowKey = exports.getLayout = exports.getDecimalDigits = void 0;
 exports.initialValuesToNames = initialValuesToNames;
@@ -423,4 +423,17 @@ var findOptionByValue = exports.findOptionByValue = function findOptionByValue(t
       }
     }
   }
+};
+/**
+ * 对比依赖列表中的 值是否变更
+ */
+var equalDependencies = exports.equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
+  if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
+    return dependencies.some(function (namePath) {
+      var prevValue = (0, _lodash.get)(prevValues, namePath);
+      var currentValue = (0, _lodash.get)(currentValues, namePath);
+      return prevValue !== currentValue;
+    });
+  }
+  return false;
 };

package/lib/ProForm/utils/useShouldUpdate.js

@@ -27,7 +27,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
     clearNotShow = formItemProps.clearNotShow,
     index = formItemProps.index,
     namePath = formItemProps.namePath,
-    names = formItemProps.names;
+    names = formItemProps.names,
+    dependencies = formItemProps.dependencies;
   var timerRef = (0, _react.useRef)();
   var showRef = (0, _react.useRef)();
   var disabledRef = (0, _react.useRef)();
@@ -178,7 +179,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
       if (_required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.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)) {
+      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;
         requiredRef.current = _required;

package/lib/index.d.ts

@@ -8,7 +8,6 @@ export { default as ProViewer } from './ProViewer';
 export { default as ProEditTable } from './ProEditTable';
 export { default as ProDrawerForm } from './ProDrawerForm';
 export { default as ProEditLabel } from './ProEditLabel';
-export { ProFormGroup, useProFormGroup } from './ProForm/components/ProFormGroup';
 export { default as ProForm } from './ProForm';
 export * from './ProForm';
 export * from './ProForm/components';

package/lib/index.js

@@ -15,8 +15,6 @@ var _exportNames = {
   ProEditTable: true,
   ProDrawerForm: true,
   ProEditLabel: true,
-  ProFormGroup: true,
-  useProFormGroup: true,
   ProForm: true,
   ProSelect: true,
   ProEnum: true,
@@ -97,12 +95,6 @@ Object.defineProperty(exports, "ProForm", {
     return _ProForm.default;
   }
 });
-Object.defineProperty(exports, "ProFormGroup", {
-  enumerable: true,
-  get: function get() {
-    return _ProFormGroup.ProFormGroup;
-  }
-});
 Object.defineProperty(exports, "ProIcon", {
   enumerable: true,
   get: function get() {
@@ -169,12 +161,6 @@ Object.defineProperty(exports, "ProWaterMark", {
     return _ProWaterMark.default;
   }
 });
-Object.defineProperty(exports, "useProFormGroup", {
-  enumerable: true,
-  get: function get() {
-    return _ProFormGroup.useProFormGroup;
-  }
-});
 var _ProLayout = _interopRequireDefault(require("./ProLayout"));
 var _ProStep = _interopRequireDefault(require("./ProStep"));
 var _ProTabs = _interopRequireDefault(require("./ProTabs"));
@@ -184,7 +170,6 @@ var _ProViewer = _interopRequireDefault(require("./ProViewer"));
 var _ProEditTable = _interopRequireDefault(require("./ProEditTable"));
 var _ProDrawerForm = _interopRequireDefault(require("./ProDrawerForm"));
 var _ProEditLabel = _interopRequireDefault(require("./ProEditLabel"));
-var _ProFormGroup = require("./ProForm/components/ProFormGroup");
 var _ProForm = _interopRequireWildcard(require("./ProForm"));
 Object.keys(_ProForm).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/style/theme/antd.less

@@ -93,7 +93,8 @@
 
 .@{ant-prefix}-input[disabled],
 .@{ant-prefix}-select-disabled,
-.@{ant-prefix}-select-disabled.@{ant-prefix}-select:not(.@{ant-prefix}-select-customize-input) .@{ant-prefix}-select-selector,
+.@{ant-prefix}-select-disabled.@{ant-prefix}-select:not(.@{ant-prefix}-select-customize-input)
+  .@{ant-prefix}-select-selector,
 .@{ant-prefix}-input-number-disabled,
 .@{ant-prefix}-picker-input > input[disabled],
 .@{ant-prefix}-select-disabled.@{ant-prefix}-select-multiple .@{ant-prefix}-select-selection-item {
@@ -218,7 +219,11 @@
     .@{ant-prefix}-table tfoot > tr > td {
       padding: calc(4px + var(--zaui-size) * 8px);
     }
-    .@{ant-prefix}-table-tbody > tr > td > .@{ant-prefix}-table-wrapper:only-child .@{ant-prefix}-table,
+    .@{ant-prefix}-table-tbody
+      > tr
+      > td
+      > .@{ant-prefix}-table-wrapper:only-child
+      .@{ant-prefix}-table,
     .@{ant-prefix}-table-tbody
       > tr
       > td
@@ -508,7 +513,8 @@
     border-radius: @zaui-border-radius;
   }
 
-  .@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input) .@{ant-prefix}-select-selector {
+  .@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input)
+    .@{ant-prefix}-select-selector {
     .set-text-color();
     .set-text-size();
     width: 100%;
@@ -523,8 +529,12 @@
     border-radius: @zaui-border-radius;
   }
 
-  .@{ant-prefix}-pagination-jump-prev .@{ant-prefix}-pagination-item-container .@{ant-prefix}-pagination-item-link-icon,
-  .@{ant-prefix}-pagination-jump-next .@{ant-prefix}-pagination-item-container .@{ant-prefix}-pagination-item-link-icon {
+  .@{ant-prefix}-pagination-jump-prev
+    .@{ant-prefix}-pagination-item-container
+    .@{ant-prefix}-pagination-item-link-icon,
+  .@{ant-prefix}-pagination-jump-next
+    .@{ant-prefix}-pagination-item-container
+    .@{ant-prefix}-pagination-item-link-icon {
     color: @zaui-brand;
   }
 }
@@ -705,3 +715,34 @@
 .@{ant-prefix}-popover {
   width: max-content;
 }
+
+// tooltip样式重载
+.@{ant-prefix}-tooltip {
+  > .ant-tooltip-content {
+    > .ant-tooltip-inner {
+      color: rgb(29, 33, 41);
+      background-color: #fff;
+      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),
+        0 9px 28px 8px rgba(0, 0, 0, 0.05);
+      &::selection {
+        color: inherit !important;
+        background: rgba(@primary-color, 0.3) !important;
+      }
+      > div {
+        &::selection {
+          color: inherit !important;
+          background: rgba(@primary-color, 0.3) !important;
+        }
+      }
+    }
+    > .ant-tooltip-arrow {
+      > .ant-tooltip-arrow-content {
+        --antd-arrow-background-color: linear-gradient(
+          to right bottom,
+          rgba(255, 255, 255, 0.95),
+          rgba(255, 255, 255, 1)
+        );
+      }
+    }
+  }
+}

package/package.json

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

package/es/ProForm/components/ProFormGroup/index.d.ts

@@ -1,13 +0,0 @@
-import React from 'react';
-import { FormInstance } from 'antd';
-interface FormGroup {
-    [K: string]: FormInstance | undefined;
-}
-type ContextType = [FormGroup, (forms: FormGroup) => void];
-export declare const groupContext: React.Context<ContextType>;
-interface Props {
-    formGroup?: FormGroup;
-}
-export declare const useProFormGroup: () => FormGroup;
-export declare const ProFormGroup: React.FC<Props>;
-export {};

package/es/ProForm/components/ProFormGroup/index.js

@@ -1,27 +0,0 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useContext, useMemo, useState } from 'react';
-export var groupContext = /*#__PURE__*/React.createContext([{}, function () {
-  return undefined;
-}]);
-export var useProFormGroup = function useProFormGroup() {
-  var formGroup = useContext(groupContext);
-  return formGroup[0];
-};
-export var ProFormGroup = function ProFormGroup(props) {
-  var formGroup = props.formGroup,
-    children = props.children;
-  var Provider = groupContext.Provider;
-  var initialFormGroup = useMemo(function () {
-    return formGroup ? _objectSpread({}, formGroup) : {};
-  }, [formGroup]);
-  var _useState = useState(initialFormGroup),
-    _useState2 = _slicedToArray(_useState, 2),
-    forms = _useState2[0],
-    setForms = _useState2[1];
-  return _jsx(Provider, {
-    value: [forms, setForms],
-    children: children
-  });
-};

package/lib/ProForm/components/ProFormGroup/index.d.ts

@@ -1,13 +0,0 @@
-import React from 'react';
-import { FormInstance } from 'antd';
-interface FormGroup {
-    [K: string]: FormInstance | undefined;
-}
-type ContextType = [FormGroup, (forms: FormGroup) => void];
-export declare const groupContext: React.Context<ContextType>;
-interface Props {
-    formGroup?: FormGroup;
-}
-export declare const useProFormGroup: () => FormGroup;
-export declare const ProFormGroup: React.FC<Props>;
-export {};

package/lib/ProForm/components/ProFormGroup/index.js

@@ -1,35 +0,0 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useProFormGroup = exports.groupContext = exports.ProFormGroup = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _react = _interopRequireWildcard(require("react"));
-var groupContext = exports.groupContext = /*#__PURE__*/_react.default.createContext([{}, function () {
-  return undefined;
-}]);
-var useProFormGroup = exports.useProFormGroup = function useProFormGroup() {
-  var formGroup = (0, _react.useContext)(groupContext);
-  return formGroup[0];
-};
-var ProFormGroup = exports.ProFormGroup = function ProFormGroup(props) {
-  var formGroup = props.formGroup,
-    children = props.children;
-  var Provider = groupContext.Provider;
-  var initialFormGroup = (0, _react.useMemo)(function () {
-    return formGroup ? (0, _objectSpread2.default)({}, formGroup) : {};
-  }, [formGroup]);
-  var _useState = (0, _react.useState)(initialFormGroup),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    forms = _useState2[0],
-    setForms = _useState2[1];
-  return (0, _jsxRuntime.jsx)(Provider, {
-    value: [forms, setForms],
-    children: children
-  });
-};