fan-standard-comp 4.0.6 → 4.0.8

package/es/StandardContent/WrapperContent.js

@@ -1,38 +1,85 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React from 'react';
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import React, { forwardRef, useContext, useImperativeHandle, useLayoutEffect, useRef, useState } from 'react';
 import classNames from 'classnames';
 import { Spin } from 'antd';
 import "./styles/index.less";
 import useStyle from "./styles/Wrapper";
-var WrapperContent = function WrapperContent(props) {
-  var children = props.children,
-    light = props.light,
-    className = props.className,
-    style = props.style,
-    _props$noMargin = props.noMargin,
-    noMargin = _props$noMargin === void 0 ? false : _props$noMargin,
-    _props$loading = props.loading,
-    loading = _props$loading === void 0 ? false : _props$loading,
-    loadingTip = props.loadingTip;
+import { FanContext } from "../ConfigContext";
+import ContentHeader from "./ContentHeader";
+var WrapperContent = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _proLayoutProps$heade, _proLayoutProps$heade2;
+  var InitFanContext = useContext(FanContext);
+  var providerConfig = InitFanContext['SubfieldContent'] || {}; // 使用上下文（全局配置）设置扩展的配置项
+  var proLayoutProps = InitFanContext['proLayoutProps'] || {};
+  var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
+    children = _providerConfig$props.children,
+    light = _providerConfig$props.light,
+    className = _providerConfig$props.className,
+    style = _providerConfig$props.style,
+    _providerConfig$props2 = _providerConfig$props.noMargin,
+    noMargin = _providerConfig$props2 === void 0 ? false : _providerConfig$props2,
+    _providerConfig$props3 = _providerConfig$props.loading,
+    loading = _providerConfig$props3 === void 0 ? false : _providerConfig$props3,
+    loadingTip = _providerConfig$props.loadingTip,
+    header = _providerConfig$props.header;
   var componentName = 'spec-wrapper-content';
   var _useStyle = useStyle(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
     wrapSSR = _useStyle2[0],
     hashId = _useStyle2[1];
-  return wrapSSR( /*#__PURE__*/React.createElement(Spin, {
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    headerHeight = _useState2[0],
+    setHeaderHeight = _useState2[1];
+  var contentRef = useRef();
+  useImperativeHandle(ref, function () {
+    return contentRef === null || contentRef === void 0 ? void 0 : contentRef.current;
+  });
+  // useImperativeHandle 是一个 React 钩子，它可以用来自定义使用 ref 时暴露给父组件的属性。如果你在自定义组件中使用 useImperativeHandle 来暴露一个方法，并且这个方法依赖于组件的 DOM 节点，比如 clientHeight，那么你可能会遇到在组件挂载之初调用这个方法时取不到 clientHeight 的问题，因为 DOM 节点可能还没有被渲染。
+  // 解决这个问题的方法是确保在调用这个方法之前 DOM 节点已经被渲染。你可以通过使用 useLayoutEffect 来确保你的方法在 DOM 更新后执行，例如
+  useLayoutEffect(function () {
+    if (contentRef.current) {
+      // 确保在 DOM 更新后执行的逻辑
+      // console.log('更新后执行的逻辑', contentRef.current)
+    }
+  });
+  return wrapSSR( /*#__PURE__*/React.createElement("div", {
+    className: classNames(componentName, className, noMargin ? 'has-margin' : '', hashId),
+    style: style,
+    ref: contentRef
+  }, proLayoutProps !== null && proLayoutProps !== void 0 && proLayoutProps.header || header ? /*#__PURE__*/React.createElement(ContentHeader, _extends({
+    getClientHeight: setHeaderHeight,
+    className: classNames('spec-wrapper-content-header', proLayoutProps !== null && proLayoutProps !== void 0 && (_proLayoutProps$heade = proLayoutProps.header) !== null && _proLayoutProps$heade !== void 0 && _proLayoutProps$heade.fixed || header !== null && header !== void 0 && header.fixed ? 'spec-wrapper-content-header-fixed' : '')
+  }, (proLayoutProps === null || proLayoutProps === void 0 ? void 0 : proLayoutProps.header) || {}, header || {})) : null, light ? /*#__PURE__*/React.createElement("div", {
+    className: "spec-wrapper-content-block light-block"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: 'spec-wrapper-content-body'
+  }, /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
     tip: loadingTip,
     wrapperClassName: 'spec-wrapper-content-spinning'
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classNames(componentName, className, noMargin ? 'has-margin' : '', hashId),
-    style: style
-  }, light ? /*#__PURE__*/React.createElement("div", {
-    className: "light-block"
-  }, " ", children) : children)));
-};
+  }, "  ", children))) : /*#__PURE__*/React.createElement("div", {
+    className: 'spec-wrapper-content-body',
+    style: proLayoutProps !== null && proLayoutProps !== void 0 && (_proLayoutProps$heade2 = proLayoutProps.header) !== null && _proLayoutProps$heade2 !== void 0 && _proLayoutProps$heade2.fixed || header !== null && header !== void 0 && header.fixed ? {
+      height: "calc(100% - ".concat(headerHeight ? headerHeight + 20 : 0, "px)"),
+      overflow: 'auto'
+    } : {}
+  }, /*#__PURE__*/React.createElement(Spin, {
+    spinning: loading,
+    tip: loadingTip,
+    wrapperClassName: 'spec-wrapper-content-spinning'
+  }, " ", children, " "))));
+});
 export default WrapperContent;

package/es/StandardContent/styles/Header.d.ts

@@ -0,0 +1,6 @@
+import { GlobalToken } from "antd";
+export interface SubfieldContentTokenType extends GlobalToken {
+    [k: string]: any;
+}
+declare const SubfieldContentStyleFunc: (prefix: string) => any;
+export default SubfieldContentStyleFunc;

package/es/StandardContent/styles/Header.js

@@ -0,0 +1,51 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { createStyleHook } from "../../theme/utils/genStyleHook";
+var SubfieldContentStyleFunc = function SubfieldContentStyleFunc(prefix) {
+  var prepareComponentToken = function prepareComponentToken(token) {
+    return {
+      // fontWeight: 400,
+    };
+  };
+  return createStyleHook(prefix, function (token) {
+    var prefixCls = ".".concat(prefix);
+    // console.log(' new TinyColor(token.colorPrimary).setAlpha(0.1)' ,new TinyColor(token.colorPrimary).setAlpha(0.1).toRgbString(), )
+    return [_defineProperty({}, prefixCls, {
+      // marginBottom: token.marginMD,
+      '&.spec-content-header-no-title': {
+        '.spec-content-header-breadcrumb': {
+          marginBottom: token.marginMD
+        }
+      },
+      '.spec-content-header-breadcrumb': {
+        height: '22px',
+        '& +.spec-content-header-title': {
+          marginTop: token.marginXS
+          // marginTop: token.margin
+        }
+      },
+      '.spec-content-header-title': {
+        marginBottom: token.marginMD,
+        display: 'flex',
+        alignItems: 'center'
+      },
+      '.spec-content-header-title-name': {
+        fontSize: token.fontSizeLG,
+        fontWeight: 'bold',
+        lineHeight: '20px',
+        flex: 1,
+        '& + .spec-content-header-title-extra': {
+          paddingLeft: token.paddingMD
+        }
+      },
+      '.spec-content-header-title-extra': {
+        // flex: 1,
+        textAlign: 'right'
+      }
+    })];
+  }, prepareComponentToken // 当前组件扩展的变量
+  );
+};
+export default SubfieldContentStyleFunc;

package/es/StandardContent/styles/Subfield.js

@@ -15,15 +15,33 @@ var SubfieldContentStyleFunc = function SubfieldContentStyleFunc(prefix) {
   return createStyleHook(prefix, function (token) {
     var prefixCls = ".".concat(prefix);
     // console.log(' new TinyColor(token.colorPrimary).setAlpha(0.1)' ,new TinyColor(token.colorPrimary).setAlpha(0.1).toRgbString(), )
-    return [_defineProperty({}, prefixCls, {
+    return [_defineProperty({}, prefixCls, _objectSpread(_objectSpread({}, scrollBar(token)), {}, {
+      '.spec-grid-content-header + .spec-grid-content-body': {
+        // height: `calc(100% - 60px)`
+      },
+      '.spec-grid-content-body': {
+        display: 'flex',
+        position: 'relative',
+        height: '100%'
+      },
+      '.spec-grid-left-cont': _objectSpread({
+        width: '100%',
+        height: '100%',
+        overflow: 'auto'
+      }, scrollBar(token)),
       '& .spec-grid-left': _objectSpread({
+        height: '100%',
+        // overflow: 'hidden',
+        overflow: 'auto',
         padding: token.paddingMD,
-        background: token.colorBgBase
+        background: token.colorBgBase,
+        boxSizing: 'border-box'
       }, scrollBar(token)),
       '& .spec-grid-right': _objectSpread({
-        padding: token.paddingMD
+        padding: 0,
+        marginLeft: token.marginMD
       }, scrollBar(token))
-    })];
+    }))];
   }, prepareComponentToken // 当前组件扩展的变量
   );
 };

package/es/StandardContent/styles/Wrapper.js

@@ -1,8 +1,11 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { createStyleHook } from "../../theme/utils/genStyleHook";
+import { scrollBar } from "../../theme/index";
 var WrapperContentStyleFunc = function WrapperContentStyleFunc(prefix) {
   var prepareComponentToken = function prepareComponentToken(token) {
     return {
@@ -11,17 +14,19 @@ var WrapperContentStyleFunc = function WrapperContentStyleFunc(prefix) {
   };
   return createStyleHook(prefix, function (token) {
     var prefixCls = ".".concat(prefix);
-    return [_defineProperty({}, prefixCls, {
+    return [_defineProperty(_defineProperty(_defineProperty({}, prefixCls, _objectSpread(_objectSpread({
       position: 'relative',
       padding: token.paddingMD,
+      margin: -token.marginMD,
       background: token.colorBgLayout,
       height: '100%',
-      overflow: 'auto',
+      overflow: 'auto'
+    }, scrollBar(token)), {}, {
       '& .light-block': {
         padding: token.paddingMD,
         background: token.colorBgBase
       }
-    })];
+    })), '.spec-wrapper-content-header', {}), '.spec-wrapper-content-body', {})];
   }, prepareComponentToken // 当前组件扩展的变量
   );
 };

package/es/StandardContent/styles/index.less

@@ -19,10 +19,10 @@
   //background: @background-color-base;
   height: 100%;
   overflow: auto;
-  box-sizing: border-box;
+  //box-sizing: border-box;
 
   & * {
-    box-sizing: border-box;
+    //box-sizing: border-box;
   }
 
   & .light-block {
@@ -34,21 +34,21 @@
 
 .spec-grid-content {
   position: relative;
-  display: flex;
+  // display: flex;
   //height: calc(100vh - @layout-header-height);
-  height: 100%;
+  //height: 100%;
   background: transparent; // @background-color-base;
-  box-sizing: border-box;
-
-  & * {
-    box-sizing: border-box;
-  }
+  //box-sizing: border-box;
+  //
+  //& * {
+  //  box-sizing: border-box;
+  //}
   .spec-grid-left {
     //height: calc(100vh - @layout-header-height);
-    height: 100%;
+    //height: 100%;
     //padding: @padding-md @padding-sm;
     //background: @layout-body-background;
-    overflow-y: auto;
+    //overflow-y: auto;
     //.scroll-bar();
     .ant-tree-list,
     .ant-tree {

package/es/StandardForm/index.js

@@ -1,5 +1,5 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _excluded = ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "confirmButtonProps", "cancelButtonProps", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize", "displayLayout", "itemGroupConfig"];
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -7,13 +7,13 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useContext, useEffect, useMemo } from 'react';
 import { Form, Button } from 'antd';
 import classNames from 'classnames';
@@ -26,38 +26,38 @@ import { FanContext } from "../ConfigContext";
 var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var InitFanContext = useContext(FanContext);
   var providerConfig = InitFanContext['StandardForm'] || {}; // 使用上下文（全局配置）设置扩展的配置项
-  var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
-    _providerConfig$props2 = _providerConfig$props.formItemGroup,
-    formItemGroup = _providerConfig$props2 === void 0 ? [] : _providerConfig$props2,
-    className = _providerConfig$props.className,
-    initialValues = _providerConfig$props.initialValues,
-    _providerConfig$props3 = _providerConfig$props.layout,
-    layout = _providerConfig$props3 === void 0 ? 'horizontal' : _providerConfig$props3,
-    _providerConfig$props4 = _providerConfig$props.grid,
-    grid = _providerConfig$props4 === void 0 ? 1 : _providerConfig$props4,
-    getFormFields = _providerConfig$props.getFormFields,
-    fieldStatus = _providerConfig$props.fieldStatus,
-    onSubmit = _providerConfig$props.onSubmit,
-    _providerConfig$props5 = _providerConfig$props.confirmText,
-    confirmText = _providerConfig$props5 === void 0 ? '确认' : _providerConfig$props5,
-    onCancel = _providerConfig$props.onCancel,
-    _providerConfig$props6 = _providerConfig$props.cancelText,
-    cancelText = _providerConfig$props6 === void 0 ? '取消' : _providerConfig$props6,
-    _providerConfig$props7 = _providerConfig$props.confirmButtonProps,
-    confirmButtonProps = _providerConfig$props7 === void 0 ? {} : _providerConfig$props7,
-    _providerConfig$props8 = _providerConfig$props.cancelButtonProps,
-    cancelButtonProps = _providerConfig$props8 === void 0 ? {} : _providerConfig$props8,
-    actionAlign = _providerConfig$props.actionAlign,
-    actionGroup = _providerConfig$props.actionGroup,
-    onFinishFailed = _providerConfig$props.onFinishFailed,
-    children = _providerConfig$props.children,
-    prefix = _providerConfig$props.prefix,
-    postfix = _providerConfig$props.postfix,
-    fieldSize = _providerConfig$props.fieldSize,
-    displayLayout = _providerConfig$props.displayLayout,
-    _providerConfig$props9 = _providerConfig$props.itemGroupConfig,
-    itemGroupConfig = _providerConfig$props9 === void 0 ? {} : _providerConfig$props9,
-    baseProps = _objectWithoutProperties(_providerConfig$props, _excluded);
+  var ConcatFormProps = _objectSpread(_objectSpread({}, providerConfig), props);
+  var _ConcatFormProps$form = ConcatFormProps.formItemGroup,
+    formItemGroup = _ConcatFormProps$form === void 0 ? [] : _ConcatFormProps$form,
+    className = ConcatFormProps.className,
+    initialValues = ConcatFormProps.initialValues,
+    _ConcatFormProps$layo = ConcatFormProps.layout,
+    layout = _ConcatFormProps$layo === void 0 ? 'horizontal' : _ConcatFormProps$layo,
+    _ConcatFormProps$grid = ConcatFormProps.grid,
+    grid = _ConcatFormProps$grid === void 0 ? 1 : _ConcatFormProps$grid,
+    getFormFields = ConcatFormProps.getFormFields,
+    fieldStatus = ConcatFormProps.fieldStatus,
+    onSubmit = ConcatFormProps.onSubmit,
+    _ConcatFormProps$conf = ConcatFormProps.confirmText,
+    confirmText = _ConcatFormProps$conf === void 0 ? '确认' : _ConcatFormProps$conf,
+    onCancel = ConcatFormProps.onCancel,
+    _ConcatFormProps$canc = ConcatFormProps.cancelText,
+    cancelText = _ConcatFormProps$canc === void 0 ? '取消' : _ConcatFormProps$canc,
+    _ConcatFormProps$conf2 = ConcatFormProps.confirmButtonProps,
+    confirmButtonProps = _ConcatFormProps$conf2 === void 0 ? {} : _ConcatFormProps$conf2,
+    _ConcatFormProps$canc2 = ConcatFormProps.cancelButtonProps,
+    cancelButtonProps = _ConcatFormProps$canc2 === void 0 ? {} : _ConcatFormProps$canc2,
+    actionAlign = ConcatFormProps.actionAlign,
+    actionGroup = ConcatFormProps.actionGroup,
+    onFinishFailed = ConcatFormProps.onFinishFailed,
+    children = ConcatFormProps.children,
+    prefix = ConcatFormProps.prefix,
+    postfix = ConcatFormProps.postfix,
+    fieldSize = ConcatFormProps.fieldSize,
+    displayLayout = ConcatFormProps.displayLayout,
+    _ConcatFormProps$item = ConcatFormProps.itemGroupConfig,
+    itemGroupConfig = _ConcatFormProps$item === void 0 ? {} : _ConcatFormProps$item,
+    baseProps = _objectWithoutProperties(ConcatFormProps, _excluded);
   var componentName = 'spec-standard-form';
   var _useStyle = useStyle(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
@@ -130,7 +130,7 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
           list: actionGroup,
           form: initForm,
           align: actionAlign,
-          other: props
+          other: ConcatFormProps
         }));
       }
       return actionGroup;

package/es/StandardForm/style/index.less

@@ -32,7 +32,7 @@
 
       > label {
         //min-height: @input-height-base;
-        height: auto;
+        //height: auto;
 
         &.ant-form-item-required {
           padding-left: 8px;