fan-standard-comp 4.0.7 → 4.0.8

package/lib/StandardContent/WrapperContent.js

@@ -27,7 +27,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
-var WrapperContent = function WrapperContent(props) {
+var WrapperContent = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _proLayoutProps$heade, _proLayoutProps$heade2;
   var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
   var providerConfig = InitFanContext['SubfieldContent'] || {}; // 使用上下文（全局配置）设置扩展的配置项
@@ -52,12 +52,23 @@ var WrapperContent = function WrapperContent(props) {
     _useState2 = _slicedToArray(_useState, 2),
     headerHeight = _useState2[0],
     setHeaderHeight = _useState2[1];
-  var headerRef = (0, _react.useRef)();
+  var contentRef = (0, _react.useRef)();
+  (0, _react.useImperativeHandle)(ref, function () {
+    return contentRef === null || contentRef === void 0 ? void 0 : contentRef.current;
+  });
+  // useImperativeHandle 是一个 React 钩子，它可以用来自定义使用 ref 时暴露给父组件的属性。如果你在自定义组件中使用 useImperativeHandle 来暴露一个方法，并且这个方法依赖于组件的 DOM 节点，比如 clientHeight，那么你可能会遇到在组件挂载之初调用这个方法时取不到 clientHeight 的问题，因为 DOM 节点可能还没有被渲染。
+  // 解决这个问题的方法是确保在调用这个方法之前 DOM 节点已经被渲染。你可以通过使用 useLayoutEffect 来确保你的方法在 DOM 更新后执行，例如
+  (0, _react.useLayoutEffect)(function () {
+    if (contentRef.current) {
+      // 确保在 DOM 更新后执行的逻辑
+      // console.log('更新后执行的逻辑', contentRef.current)
+    }
+  });
   return wrapSSR( /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(componentName, className, noMargin ? 'has-margin' : '', hashId),
-    style: style
+    style: style,
+    ref: contentRef
   }, proLayoutProps !== null && proLayoutProps !== void 0 && proLayoutProps.header || header ? /*#__PURE__*/_react.default.createElement(_ContentHeader.default, _extends({
-    ref: headerRef,
     getClientHeight: setHeaderHeight,
     className: (0, _classnames.default)('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.default.createElement("div", {
@@ -70,13 +81,14 @@ var WrapperContent = function WrapperContent(props) {
     wrapperClassName: 'spec-wrapper-content-spinning'
   }, "  ", children))) : /*#__PURE__*/_react.default.createElement("div", {
     className: 'spec-wrapper-content-body',
-    style: {
-      height: proLayoutProps !== null && proLayoutProps !== void 0 && (_proLayoutProps$heade2 = proLayoutProps.header) !== null && _proLayoutProps$heade2 !== void 0 && _proLayoutProps$heade2.fixed || header !== null && header !== void 0 && header.fixed ? "calc(100% - ".concat(headerHeight ? headerHeight + 20 : 0, "px)") : ''
-    }
+    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.default.createElement(_antd.Spin, {
     spinning: loading,
     tip: loadingTip,
     wrapperClassName: 'spec-wrapper-content-spinning'
   }, " ", children, " "))));
-};
+});
 var _default = exports.default = WrapperContent;

package/lib/StandardContent/styles/Header.js

@@ -19,18 +19,36 @@ var SubfieldContentStyleFunc = function SubfieldContentStyleFunc(prefix) {
     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,
+      // marginBottom: token.marginMD,
+      '&.spec-content-header-no-title': {
+        '.spec-content-header-breadcrumb': {
+          marginBottom: token.marginMD
+        }
+      },
       '.spec-content-header-breadcrumb': {
-        height: '24px',
+        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'
+        lineHeight: '20px',
+        flex: 1,
+        '& + .spec-content-header-title-extra': {
+          paddingLeft: token.paddingMD
+        }
+      },
+      '.spec-content-header-title-extra': {
+        // flex: 1,
+        textAlign: 'right'
       }
     })];
   }, prepareComponentToken // 当前组件扩展的变量

package/lib/StandardContent/styles/Wrapper.js

@@ -23,6 +23,7 @@ var WrapperContentStyleFunc = function WrapperContentStyleFunc(prefix) {
     return [_defineProperty(_defineProperty(_defineProperty({}, prefixCls, _objectSpread(_objectSpread({
       position: 'relative',
       padding: token.paddingMD,
+      margin: -token.marginMD,
       background: token.colorBgLayout,
       height: '100%',
       overflow: 'auto'

package/lib/StandardForm/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -18,6 +17,7 @@ var _excluded = ["formItemGroup", "className", "initialValues", "layout", "grid"
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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."); }
@@ -25,48 +25,48 @@ 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; }
 var StandardForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var InitFanContext = (0, _react.useContext)(_ConfigContext.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 = (0, _index2.default)(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
@@ -139,7 +139,7 @@ var StandardForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
           list: actionGroup,
           form: initForm,
           align: actionAlign,
-          other: props
+          other: ConcatFormProps
         }));
       }
       return actionGroup;

package/lib/StandardModal/index.js

@@ -25,13 +25,13 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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 _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 _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; }
 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); }
@@ -47,38 +47,38 @@ var StandardModal = function StandardModal(props) {
     hashId = _useStyle2[1];
   var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
   var providerConfig = InitFanContext['StandardModal'] || {}; // 使用上下文（全局配置）设置扩展的配置项
-  var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
-    children = _providerConfig$props.children,
-    className = _providerConfig$props.className,
-    style = _providerConfig$props.style,
-    _providerConfig$props2 = _providerConfig$props.size,
-    size = _providerConfig$props2 === void 0 ? 'md' : _providerConfig$props2,
-    type = _providerConfig$props.type,
-    formItemGroup = _providerConfig$props.formItemGroup,
-    title = _providerConfig$props.title,
-    visible = _providerConfig$props.visible,
-    open = _providerConfig$props.open,
-    formPrefix = _providerConfig$props.formPrefix,
-    formPostfix = _providerConfig$props.formPostfix,
-    initialValues = _providerConfig$props.initialValues,
-    hideRequiredMark = _providerConfig$props.hideRequiredMark,
-    bodyStyle = _providerConfig$props.bodyStyle,
-    footer = _providerConfig$props.footer,
-    footerButtonGroup = _providerConfig$props.footerButtonGroup,
-    hideFooter = _providerConfig$props.hideFooter,
-    _getFormFields = _providerConfig$props.getFormFields,
-    _providerConfig$props3 = _providerConfig$props.fieldStatus,
-    fieldStatus = _providerConfig$props3 === void 0 ? 'default' : _providerConfig$props3,
-    _providerConfig$props4 = _providerConfig$props.formLayout,
-    formLayout = _providerConfig$props4 === void 0 ? 'horizontal' : _providerConfig$props4,
-    tabsConfig = _providerConfig$props.tabsConfig,
-    stepsConfig = _providerConfig$props.stepsConfig,
-    displayLayout = _providerConfig$props.displayLayout,
-    _providerConfig$props5 = _providerConfig$props.dragAble,
-    dragAble = _providerConfig$props5 === void 0 ? false : _providerConfig$props5,
-    _providerConfig$props6 = _providerConfig$props.itemGroupConfig,
-    itemGroupConfig = _providerConfig$props6 === void 0 ? {} : _providerConfig$props6,
-    otherProps = _objectWithoutProperties(_providerConfig$props, _excluded);
+  var ConcatModalProps = _objectSpread(_objectSpread({}, providerConfig), props);
+  var children = ConcatModalProps.children,
+    className = ConcatModalProps.className,
+    style = ConcatModalProps.style,
+    _ConcatModalProps$siz = ConcatModalProps.size,
+    size = _ConcatModalProps$siz === void 0 ? 'md' : _ConcatModalProps$siz,
+    type = ConcatModalProps.type,
+    formItemGroup = ConcatModalProps.formItemGroup,
+    title = ConcatModalProps.title,
+    visible = ConcatModalProps.visible,
+    open = ConcatModalProps.open,
+    formPrefix = ConcatModalProps.formPrefix,
+    formPostfix = ConcatModalProps.formPostfix,
+    initialValues = ConcatModalProps.initialValues,
+    hideRequiredMark = ConcatModalProps.hideRequiredMark,
+    bodyStyle = ConcatModalProps.bodyStyle,
+    footer = ConcatModalProps.footer,
+    footerButtonGroup = ConcatModalProps.footerButtonGroup,
+    hideFooter = ConcatModalProps.hideFooter,
+    _getFormFields = ConcatModalProps.getFormFields,
+    _ConcatModalProps$fie = ConcatModalProps.fieldStatus,
+    fieldStatus = _ConcatModalProps$fie === void 0 ? 'default' : _ConcatModalProps$fie,
+    _ConcatModalProps$for = ConcatModalProps.formLayout,
+    formLayout = _ConcatModalProps$for === void 0 ? 'horizontal' : _ConcatModalProps$for,
+    tabsConfig = ConcatModalProps.tabsConfig,
+    stepsConfig = ConcatModalProps.stepsConfig,
+    displayLayout = ConcatModalProps.displayLayout,
+    _ConcatModalProps$dra = ConcatModalProps.dragAble,
+    dragAble = _ConcatModalProps$dra === void 0 ? false : _ConcatModalProps$dra,
+    _ConcatModalProps$ite = ConcatModalProps.itemGroupConfig,
+    itemGroupConfig = _ConcatModalProps$ite === void 0 ? {} : _ConcatModalProps$ite,
+    otherProps = _objectWithoutProperties(ConcatModalProps, _excluded);
   var _Form$useForm = _antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     modalForm = _Form$useForm2[0];
@@ -121,7 +121,7 @@ var StandardModal = function StandardModal(props) {
         return false;
       }
       if (fieldStatus && fieldStatus !== 'default') {
-        if (props.hasOwnProperty('footerButtonGroup')) {
+        if (ConcatModalProps.hasOwnProperty('footerButtonGroup')) {
           // 如果有配置按钮组件，则还是要显示按钮
           return true;
         }
@@ -129,7 +129,7 @@ var StandardModal = function StandardModal(props) {
         // disabled/viewOnly都不显示按钮
         return false;
       }
-      if (props.hasOwnProperty('footerButtonGroup') && footerButtonGroup) {
+      if (ConcatModalProps.hasOwnProperty('footerButtonGroup') && footerButtonGroup) {
         var _footerButtonGroup;
         if (Array.isArray(footerButtonGroup) && footerButtonGroup.length === 0) {
           openLog && console.log('rule 4');
@@ -147,7 +147,7 @@ var StandardModal = function StandardModal(props) {
         // 显示
         return true;
       }
-      if (props.hasOwnProperty('footer') && !footer) {
+      if (ConcatModalProps.hasOwnProperty('footer') && !footer) {
         openLog && console.log('rule 8');
         return false;
       }
@@ -157,7 +157,7 @@ var StandardModal = function StandardModal(props) {
   }, [fieldStatus, hideFooter, footer, footerButtonGroup, type, tabsConfig, stepsConfig, formItemGroup]);
   // 设置限制弹窗高度
   var initBodyMaxHeight = function initBodyMaxHeight() {
-    var title = props.title;
+    var title = ConcatModalProps.title;
     // 最大高度基础值调整成页面视口高度
     var bodyHeight = document.documentElement.clientHeight; // document.body.offsetHeight
     var baseReduce = 80 + 32 + 16; // 默认需要减去的高度（上下空白间距150及内部内容间距16*2
@@ -189,9 +189,9 @@ var StandardModal = function StandardModal(props) {
     }
   }, [fieldStatus, title, visible, hideFooter, footer, footerButtonGroup]);
   var handleSubmit = function handleSubmit() {
-    var type = props.type,
-      formItemGroup = props.formItemGroup,
-      onSubmit = props.onSubmit;
+    var type = ConcatModalProps.type,
+      formItemGroup = ConcatModalProps.formItemGroup,
+      onSubmit = ConcatModalProps.onSubmit;
     if (type === 'form' || type === 'gridForm') {
       modalForm.validateFields().then(function (values) {
         if (Object.prototype.hasOwnProperty.call(values, 'false')) {
@@ -242,12 +242,12 @@ var StandardModal = function StandardModal(props) {
     modalForm.resetFields(); // 直接使用这个无效
   };
   var onAfterClose = function onAfterClose() {
-    var afterClose = props.afterClose;
+    var afterClose = ConcatModalProps.afterClose;
     if (type === 'form') clearAllFieldsValue();
     if (afterClose) afterClose();
   };
   var handleCancel = function handleCancel() {
-    var onCancel = props.onCancel;
+    var onCancel = ConcatModalProps.onCancel;
     if (onCancel) onCancel();
   };
 
@@ -256,11 +256,11 @@ var StandardModal = function StandardModal(props) {
     _getFormFields && _getFormFields(modalForm.getFieldsValue() || {}, modalForm);
   };
   var renderFormItemGroup = function renderFormItemGroup() {
-    var fieldStatus = props.fieldStatus,
-      formItemGroup = props.formItemGroup,
-      _props$size = props.size,
-      size = _props$size === void 0 ? 'md' : _props$size,
-      type = props.type;
+    var fieldStatus = ConcatModalProps.fieldStatus,
+      formItemGroup = ConcatModalProps.formItemGroup,
+      _ConcatModalProps$siz2 = ConcatModalProps.size,
+      size = _ConcatModalProps$siz2 === void 0 ? 'md' : _ConcatModalProps$siz2,
+      type = ConcatModalProps.type;
     if (Array.isArray(formItemGroup)) {
       if (type === 'gridForm') {
         // 栅格组
@@ -338,14 +338,14 @@ var StandardModal = function StandardModal(props) {
     }
   };
   var renderButtonGroup = function renderButtonGroup() {
-    var footerButtonGroup = props.footerButtonGroup,
-      confirmLoading = props.confirmLoading,
-      cancelText = props.cancelText,
-      confirmText = props.confirmText,
-      okText = props.okText,
-      okButtonProps = props.okButtonProps,
-      confirmButtonProps = props.confirmButtonProps,
-      cancelButtonProps = props.cancelButtonProps;
+    var footerButtonGroup = ConcatModalProps.footerButtonGroup,
+      confirmLoading = ConcatModalProps.confirmLoading,
+      cancelText = ConcatModalProps.cancelText,
+      confirmText = ConcatModalProps.confirmText,
+      okText = ConcatModalProps.okText,
+      okButtonProps = ConcatModalProps.okButtonProps,
+      confirmButtonProps = ConcatModalProps.confirmButtonProps,
+      cancelButtonProps = ConcatModalProps.cancelButtonProps;
     if (footerButtonGroup) {
       if (Array.isArray(footerButtonGroup)) {
         if (footerButtonGroup.length === 0) return null; // <div>按钮组合配置为空</div>
@@ -370,7 +370,7 @@ var StandardModal = function StandardModal(props) {
               disabled: disabled,
               loading: loading,
               onClick: fn ? function (e) {
-                return fn(item, modalForm, props, e);
+                return fn(item, modalForm, ConcatModalProps, e);
               } : null
             }, others), name);
           } else {
@@ -379,7 +379,7 @@ var StandardModal = function StandardModal(props) {
         }));
       }
       if (typeof footerButtonGroup === 'function') {
-        return footerButtonGroup(modalForm, props);
+        return footerButtonGroup(modalForm, ConcatModalProps);
       }
       return footerButtonGroup;
     }
@@ -405,7 +405,7 @@ var StandardModal = function StandardModal(props) {
         list: currentStepInfo.actions || [],
         onStep: handleStepType,
         form: formChild,
-        other: props
+        other: ConcatModalProps
       }) : null;
     }
     if (type === 'tabForm') {
@@ -416,7 +416,7 @@ var StandardModal = function StandardModal(props) {
       return (activeTabInfo === null || activeTabInfo === void 0 || (_activeTabInfo$action3 = activeTabInfo.actions) === null || _activeTabInfo$action3 === void 0 ? void 0 : _activeTabInfo$action3.length) > 0 ? /*#__PURE__*/_react.default.createElement(_ActionList.default, {
         list: (activeTabInfo === null || activeTabInfo === void 0 ? void 0 : activeTabInfo.actions) || [],
         form: formChild,
-        other: props
+        other: ConcatModalProps
       }) : null;
     }
     return hasFooterBar ? renderButtonGroup() : null;
@@ -437,7 +437,7 @@ var StandardModal = function StandardModal(props) {
       ,
       scrollToFirstError: true,
       className: "modalForm"
-    }, formPrefix && /*#__PURE__*/_react.default.createElement(_antd.Row, null, formPrefix(modalForm, props, forceUpdateForm)), formItemGroup ? renderFormItemGroup() : null, formPostfix && /*#__PURE__*/_react.default.createElement(_antd.Row, null, formPostfix(modalForm, props, forceUpdateForm), " ")), type === 'tabForm' && /*#__PURE__*/_react.default.createElement(_TabForm.default, {
+    }, formPrefix && /*#__PURE__*/_react.default.createElement(_antd.Row, null, formPrefix(modalForm, ConcatModalProps, forceUpdateForm)), formItemGroup ? renderFormItemGroup() : null, formPostfix && /*#__PURE__*/_react.default.createElement(_antd.Row, null, formPostfix(modalForm, ConcatModalProps, forceUpdateForm), " ")), type === 'tabForm' && /*#__PURE__*/_react.default.createElement(_TabForm.default, {
       grid: size,
       layout: formLayout,
       fieldStatus: fieldStatus,
@@ -509,7 +509,7 @@ var StandardModal = function StandardModal(props) {
     styles: {
       body: _objectSpread({
         maxHeight: bodyMaxHeight,
-        overflow: 'hidden',
+        overflowX: 'hidden',
         overflowY: 'scroll'
       }, bodyStyle)
     },

package/lib/StandardModal/style/index.js

@@ -22,7 +22,9 @@ var StandardPanelStyleFunc = function StandardPanelStyleFunc(prefix) {
     var prefixCls = ".".concat(prefix);
     return [_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, prefixCls, {
       '.ant-modal-body ': _objectSpread(_objectSpread({}, (0, _index.scrollBar)(token)), {}, {
-        padding: "".concat(token.paddingXS, "px 0")
+        padding: "".concat(token.paddingXS, "px 0"),
+        marginRight: "-".concat(token.marginXS, "px")
+        // padding: `${token.paddingXS}px ${token.paddingMD}px ${token.paddingXS}px 0 `,
       }),
       '&.ant-modal .ant-modal-footer  .ant-btn + .ant-btn': {
         marginInlineStart: token.marginXS

package/lib/StandardPanel/index.d.ts

@@ -11,6 +11,7 @@ interface StandardPanelProps {
     buttonConfig?: GroupListProps;
     type?: string;
     postfix?: React.ReactNode;
+    bodyStyle?: React.CSSProperties;
 }
 interface GroupListProps {
     activeKey?: string;

package/lib/StandardPanel/index.js

@@ -35,7 +35,8 @@ var StandardPanel = function StandardPanel(props) {
     cateConfig = props.cateConfig,
     buttonConfig = props.buttonConfig,
     type = props.type,
-    postfix = props.postfix;
+    postfix = props.postfix,
+    bodyStyle = props.bodyStyle;
   var componentName = 'spec-panel';
   var _useStyle = (0, _index2.default)(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
@@ -77,10 +78,10 @@ var StandardPanel = function StandardPanel(props) {
 
   // 是否显示提示框
   var popoverShow = function popoverShow() {
-    return title.content ? /*#__PURE__*/_react.default.createElement(_antd.Popover, {
+    return title !== null && title !== void 0 && title.content ? /*#__PURE__*/_react.default.createElement(_antd.Popover, {
       content: title.content,
-      placement: title.placement
-    }, " ", title.label, " ") : title;
+      placement: title === null || title === void 0 ? void 0 : title.placement
+    }, " ", title === null || title === void 0 ? void 0 : title.label, " ") : title;
   };
   var panelHeaderRef = (0, _react.useRef)();
   var bodyLimitStyle = (0, _react.useMemo)(function () {
@@ -102,7 +103,7 @@ var StandardPanel = function StandardPanel(props) {
     style: _objectSpread(_objectSpread({}, style), {}, {
       height: "".concat(height, "px")
     })
-  }, /*#__PURE__*/_react.default.createElement("div", {
+  }, title ? /*#__PURE__*/_react.default.createElement("div", {
     className: "spec-panel-header",
     ref: panelHeaderRef
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -130,9 +131,9 @@ var StandardPanel = function StandardPanel(props) {
     className: "spec-panel-buttons"
   }, buttonConfig)), postfix && /*#__PURE__*/_react.default.createElement("div", {
     className: "spec-panel-extra"
-  }, postfix)), /*#__PURE__*/_react.default.createElement("div", {
+  }, postfix)) : null, /*#__PURE__*/_react.default.createElement("div", {
     className: "spec-panel-body",
-    style: _objectSpread({}, bodyLimitStyle)
+    style: _objectSpread(_objectSpread({}, bodyLimitStyle), bodyStyle || {})
   }, children)));
 };
 var _default = exports.default = StandardPanel;

package/lib/StandardPanel/style/index.js

@@ -29,6 +29,8 @@ var StandardPanelStyleFunc = function StandardPanelStyleFunc(prefix) {
       '.spec-panel-header ': {
         padding: " ".concat(token.paddingSM, "px ").concat(token.paddingMD, "px"),
         background: token.headerBg,
+        borderTopRightRadius: token.borderRadius,
+        borderTopLeftRadius: token.borderRadius,
         '.spec-panel-title ': {
           paddingRight: token.paddingMD
         },
@@ -63,17 +65,22 @@ var StandardPanelStyleFunc = function StandardPanelStyleFunc(prefix) {
           '.anticon, .specfont, .specicon': {
             marginLeft: token.marginSM
           }
+        },
+        '+ .spec-panel-body ': {
+          paddingTop: 0
         }
       },
       '.spec-panel-body': _objectSpread({
-        padding: "0 ".concat(token.paddingMD, "px ").concat(token.paddingMD, "px")
+        padding: "".concat(token.padding, "px ").concat(token.paddingMD, "px ").concat(token.paddingMD, "px"),
+        borderBottomRightRadius: token.borderRadius,
+        borderBottomLeftRadius: token.borderRadius
       }, (0, _index.scrollBar)(token)),
       '&.spec-panel-border': {
         ' .spec-panel-body': {
           padding: token.paddingMD
         }
       },
-      ' &.spec-panel-reverse': {
+      '&.spec-panel-reverse': {
         '.spec-panel-header ': {
           padding: "0 ".concat(token.paddingMD, "px"),
           background: token.headerBg

package/lib/index.d.ts

@@ -15,6 +15,7 @@ export { default as StandardFilter } from './StandardFilter/';
 export { default as StandardModal } from './StandardModal';
 export { default as StandardDragModal } from './StandardDragModal/Modal';
 export { default as Uploader } from './FormComp/Uploader';
+export { default as VarTemplate } from './FormComp/VarTemplate';
 export { default as EditButton } from './FormComp/EditButton';
 export { default as FieldComponent } from './FormComp/FieldComponent';
 export { default as Field } from './FormComp/FieldComponent';

package/lib/index.js

@@ -21,6 +21,7 @@ var _exportNames = {
   StandardModal: true,
   StandardDragModal: true,
   Uploader: true,
+  VarTemplate: true,
   EditButton: true,
   FieldComponent: true,
   Field: true,
@@ -153,6 +154,12 @@ Object.defineProperty(exports, "Uploader", {
     return _Uploader.default;
   }
 });
+Object.defineProperty(exports, "VarTemplate", {
+  enumerable: true,
+  get: function get() {
+    return _VarTemplate.default;
+  }
+});
 Object.defineProperty(exports, "WrapperContent", {
   enumerable: true,
   get: function get() {
@@ -176,6 +183,7 @@ var _StandardFilter = _interopRequireDefault(require("./StandardFilter/"));
 var _StandardModal = _interopRequireDefault(require("./StandardModal"));
 var _Modal = _interopRequireDefault(require("./StandardDragModal/Modal"));
 var _Uploader = _interopRequireDefault(require("./FormComp/Uploader"));
+var _VarTemplate = _interopRequireDefault(require("./FormComp/VarTemplate"));
 var _EditButton = _interopRequireDefault(require("./FormComp/EditButton"));
 var _FieldComponent = _interopRequireDefault(require("./FormComp/FieldComponent"));
 var _RenderItemGroup = _interopRequireDefault(require("./FormComp/RenderItemGroup"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "4.0.7",
+  "version": "4.0.8",
   "description": "FZ standard-comp,basic of antd5.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",