@zat-design/sisyphus-react 3.12.0-beta.1 → 3.12.0-beta.2

package/es/ProDrawerForm/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 import { FormInstance } from 'antd/es/form/Form';
+export declare const useProDrawerFormContext: () => any;
 declare const ProDrawerForm: React.ForwardRefExoticComponent<import("./propsType").ProDrawerFormPropsType & React.RefAttributes<FormInstance<any>>>;
 export default ProDrawerForm;

package/es/ProDrawerForm/index.js

@@ -1,12 +1,16 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _locale$ProDrawerForm3;
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { forwardRef, useImperativeHandle, useMemo } from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createContext, forwardRef, useContext, useImperativeHandle, useMemo } from 'react';
 import { ProDrawer, ProModal } from './components';
 import ProForm from '../ProForm';
 import { transformBySize } from './utils';
 import locale from '../locale';
+var ProDrawerFormContext = /*#__PURE__*/createContext(null);
+export var useProDrawerFormContext = function useProDrawerFormContext() {
+  return useContext(ProDrawerFormContext);
+};
 var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
   var _okText, _locale$ProDrawerForm, _locale$ProDrawerForm2;
   var visible = props.visible,
@@ -51,7 +55,10 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
       Modal: ProModal
     }[showType];
   }, [showType]);
-  return _jsx(_Fragment, {
+  return _jsx(ProDrawerFormContext.Provider, {
+    value: {
+      source: 'ProDrawerForm'
+    },
     children: visible ? _jsx(Com, _objectSpread(_objectSpread({}, props), {}, {
       isView: isView,
       visible: visible,

package/es/ProEditTable/utils/tools.js

@@ -182,11 +182,11 @@ export var getDisabled = function getDisabled(_ref2) {
  */
 export var handleScrollToError = function handleScrollToError() {
   setTimeout(function () {
-    var errorDom = document.querySelector('.ant-form-item-has-error');
+    var errorDom = document.querySelector('[class*="form-item-has-error"]');
     if (errorDom) {
-      var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
-      var tableCell = errorDom.closest('.ant-table-cell');
-      var tableRow = errorDom.closest('.ant-table-row');
+      var tableBody = errorDom.closest('[class*="table-content"]') || errorDom.closest('[class*="table-body"]');
+      var tableCell = errorDom.closest('[class*="table-cell"]');
+      var tableRow = errorDom.closest('[class*="table-row"]');
       if (tableBody && tableCell) {
         var previousSibling = tableCell.previousElementSibling;
         var childOffsetLeft = 0;

package/es/ProForm/index.js

@@ -20,6 +20,7 @@ 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 } from '../ProConfigProvider';
+import { useProDrawerFormContext } from '../ProDrawerForm';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames, filterInternalFields } from './utils/index';
 import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
@@ -27,7 +28,7 @@ import locale from '../locale';
 import useWatch from './utils/useWatch';
 import FormsProvider, { useContextForms, useForms } from '../FormsProvider';
 var ProForm = function ProForm(props, ref) {
-  var _localStorage, _ref;
+  var _localStorage, _ref2;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -74,11 +75,14 @@ var ProForm = function ProForm(props, ref) {
     otherProps = _objectWithoutProperties(props, _excluded);
   var config = useProConfig('ProForm');
   // source: 用于区分是哪个组件调用，用于错误提示
+  var _ref = useProDrawerFormContext() || {},
+    _ref$source = _ref.source,
+    source = _ref$source === void 0 ? '' : _ref$source;
   var _useForm = useForm(originForm, {
       scrollToError: scrollToError,
       optimize: optimize,
       formKey: formKey,
-      source: 'ProForm'
+      source: source || 'ProForm'
     }),
     _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];
@@ -216,7 +220,7 @@ var ProForm = function ProForm(props, ref) {
     className: cls,
     form: form
   }, formProps), omit(config, ['isDiffAll'])), otherProps), {}, {
-    labelAlign: (_ref = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref !== void 0 ? _ref : 'left',
+    labelAlign: (_ref2 = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref2 !== void 0 ? _ref2 : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,

package/lib/ProDrawerForm/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 import { FormInstance } from 'antd/es/form/Form';
+export declare const useProDrawerFormContext: () => any;
 declare const ProDrawerForm: React.ForwardRefExoticComponent<import("./propsType").ProDrawerFormPropsType & React.RefAttributes<FormInstance<any>>>;
 export default ProDrawerForm;

package/lib/ProDrawerForm/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.useProDrawerFormContext = exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -14,6 +14,10 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _utils = require("./utils");
 var _locale = _interopRequireDefault(require("../locale"));
 var _locale$ProDrawerForm3;
+var ProDrawerFormContext = /*#__PURE__*/(0, _react.createContext)(null);
+var useProDrawerFormContext = exports.useProDrawerFormContext = function useProDrawerFormContext() {
+  return (0, _react.useContext)(ProDrawerFormContext);
+};
 var ProDrawerForm = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _okText, _locale$ProDrawerForm, _locale$ProDrawerForm2;
   var visible = props.visible,
@@ -58,7 +62,10 @@ var ProDrawerForm = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       Modal: _components.ProModal
     }[showType];
   }, [showType]);
-  return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+  return (0, _jsxRuntime.jsx)(ProDrawerFormContext.Provider, {
+    value: {
+      source: 'ProDrawerForm'
+    },
     children: visible ? (0, _jsxRuntime.jsx)(Com, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
       isView: isView,
       visible: visible,

package/lib/ProEditTable/utils/tools.js

@@ -191,11 +191,11 @@ var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
  */
 var handleScrollToError = exports.handleScrollToError = function handleScrollToError() {
   setTimeout(function () {
-    var errorDom = document.querySelector('.ant-form-item-has-error');
+    var errorDom = document.querySelector('[class*="form-item-has-error"]');
     if (errorDom) {
-      var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
-      var tableCell = errorDom.closest('.ant-table-cell');
-      var tableRow = errorDom.closest('.ant-table-row');
+      var tableBody = errorDom.closest('[class*="table-content"]') || errorDom.closest('[class*="table-body"]');
+      var tableCell = errorDom.closest('[class*="table-cell"]');
+      var tableRow = errorDom.closest('[class*="table-row"]');
       if (tableBody && tableCell) {
         var previousSibling = tableCell.previousElementSibling;
         var childOffsetLeft = 0;

package/lib/ProForm/index.js

@@ -20,6 +20,7 @@ var _lodash = require("lodash");
 var _components = require("./components");
 var _RenderFields = _interopRequireDefault(require("./components/render/RenderFields"));
 var _ProConfigProvider = require("../ProConfigProvider");
+var _ProDrawerForm = require("../ProDrawerForm");
 var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
@@ -28,7 +29,7 @@ var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
 var _FormsProvider = _interopRequireWildcard(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", "desensitizationKey"];
 var ProForm = function ProForm(props, ref) {
-  var _localStorage, _ref;
+  var _localStorage, _ref2;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -75,11 +76,14 @@ var ProForm = function ProForm(props, ref) {
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var config = (0, _ProConfigProvider.useProConfig)('ProForm');
   // source: 用于区分是哪个组件调用，用于错误提示
+  var _ref = (0, _ProDrawerForm.useProDrawerFormContext)() || {},
+    _ref$source = _ref.source,
+    source = _ref$source === void 0 ? '' : _ref$source;
   var _useForm = (0, _useForm3.useForm)(originForm, {
       scrollToError: scrollToError,
       optimize: optimize,
       formKey: formKey,
-      source: 'ProForm'
+      source: source || 'ProForm'
     }),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
     form = _useForm2[0];
@@ -217,7 +221,7 @@ var ProForm = function ProForm(props, ref) {
     className: cls,
     form: form
   }, formProps), (0, _lodash.omit)(config, ['isDiffAll'])), otherProps), {}, {
-    labelAlign: (_ref = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref !== void 0 ? _ref : 'left',
+    labelAlign: (_ref2 = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref2 !== void 0 ? _ref2 : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,

package/package.json

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