fan-standard-comp 4.0.5 → 4.0.7

package/es/ButtonGroup/index.d.ts

@@ -35,6 +35,8 @@ interface ButtonGroupProps {
     dropdownConfig?: Object;
     moreText?: string;
     moreIcon?: React.ReactNode | string | number;
+    size?: any;
+    showTextIcon?: boolean;
 }
 declare const ButtonGroup: (props: ButtonGroupProps) => any;
 export default ButtonGroup;

package/es/ButtonGroup/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["code", "fn", "exName", "name", "children", "icon"],
+var _excluded = ["code", "fn", "exName", "name", "children", "icon", "confirmText", "confirmConfig", "render"],
   _excluded2 = ["exName", "name", "type", "icon", "ghost", "danger", "disabled", "loading", "fn", "code", "rowParams", "isHide"],
   _excluded3 = ["code", "fn", "exName", "name", "children", "icon", "confirmText", "confirmConfig"];
 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); }
@@ -51,7 +51,11 @@ var ButtonGroup = function ButtonGroup(props) {
     dropdownConfig = _providerConfig$props4 === void 0 ? {} : _providerConfig$props4,
     _providerConfig$props5 = _providerConfig$props.moreText,
     moreText = _providerConfig$props5 === void 0 ? '更多' : _providerConfig$props5,
-    moreIcon = _providerConfig$props.moreIcon;
+    _providerConfig$props6 = _providerConfig$props.size,
+    size = _providerConfig$props6 === void 0 ? 'default' : _providerConfig$props6,
+    moreIcon = _providerConfig$props.moreIcon,
+    _providerConfig$props7 = _providerConfig$props.showTextIcon,
+    showTextIcon = _providerConfig$props7 === void 0 ? false : _providerConfig$props7;
   var _props$options = props.options,
     options = _props$options === void 0 ? [] : _props$options,
     _props$min = props.min,
@@ -87,6 +91,9 @@ var ButtonGroup = function ButtonGroup(props) {
         name = vItem.name,
         children = vItem.children,
         icon = vItem.icon,
+        confirmText = vItem.confirmText,
+        confirmConfig = vItem.confirmConfig,
+        render = vItem.render,
         others = _objectWithoutProperties(vItem, _excluded);
       return _objectSpread(_objectSpread({}, others), {}, {
         key: code ? code + i : i,
@@ -156,7 +163,9 @@ var ButtonGroup = function ButtonGroup(props) {
         },
         placement: "bottomRight"
       }, (item === null || item === void 0 ? void 0 : item.dropdownConfig) || dropdownConfig || {}), /*#__PURE__*/React.createElement(Button, {
-        type: "primary"
+        type: "primary",
+        size: size
+        // icon={item?.icon ? <IconNode icon={item?.icon}/> : null}
       }, item.exName || item.name, " ", /*#__PURE__*/React.createElement(SpecIcon, {
         name: "down"
       })));
@@ -168,7 +177,8 @@ var ButtonGroup = function ButtonGroup(props) {
       loading: loading,
       onClick: fn ? function () {
         return fn(item);
-      } : null
+      } : null,
+      size: size
     }, others, {
       icon: icon ? /*#__PURE__*/React.createElement(IconNode, {
         icon: icon
@@ -261,10 +271,12 @@ var ButtonGroup = function ButtonGroup(props) {
     }));
   };
   // 自定义渲染显示的文本
-  var renderCustomLabel = function renderCustomLabel(gItem) {
+  var renderCustomLabel = function renderCustomLabel(gItem, hideIcon) {
     return gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
       return rowParams[pItem];
-    }))) : /*#__PURE__*/React.createElement(React.Fragment, null, gItem.icon ? ' ' : '', gItem.exName || gItem.name);
+    }))) : /*#__PURE__*/React.createElement(React.Fragment, null, !hideIcon && gItem.icon && showTextIcon ? /*#__PURE__*/React.createElement(IconNode, {
+      icon: gItem.icon
+    }) : '', " ", gItem.exName || gItem.name);
   };
   // 递归转换原来的数组结构
   var deepTransTextMenus = function deepTransTextMenus(groupArray) {
@@ -285,7 +297,13 @@ var ButtonGroup = function ButtonGroup(props) {
         danger: others.danger,
         disabled: btnIsDisabled(others.disabled, rowParams),
         key: code ? code + i : i,
-        // icon: <IconNode icon={icon}/>, // 不显示图标
+        icon: icon && showTextIcon ? /*#__PURE__*/React.createElement(IconNode, {
+          icon: icon,
+          style: {
+            marginRight: '4px'
+          }
+        }) : null,
+        // 不显示图标
         label: /*#__PURE__*/React.createElement("a", {
           onClick: function onClick() {
             // 配置二次确认
@@ -298,7 +316,7 @@ var ButtonGroup = function ButtonGroup(props) {
               })));
             }
           }
-        }, renderCustomLabel(vItem)),
+        }, renderCustomLabel(vItem, true)),
         title: vItem.exName || vItem.name,
         children: children && children.length > 0 ? deepTransTextMenus(children) : undefined
       };
@@ -315,9 +333,7 @@ var ButtonGroup = function ButtonGroup(props) {
         placement: "bottomRight"
       }, (item === null || item === void 0 ? void 0 : item.dropdownConfig) || dropdownConfig || {}), /*#__PURE__*/React.createElement("a", {
         className: 'spec-button-group-text'
-      }, item.render ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
-        return rowParams[pItem];
-      }))) : item.exName || item.name, " ", /*#__PURE__*/React.createElement(SpecIcon, {
+      }, renderCustomLabel(item, true), " ", /*#__PURE__*/React.createElement(SpecIcon, {
         name: "down"
       })));
     }
@@ -356,9 +372,7 @@ var ButtonGroup = function ButtonGroup(props) {
       // @ts-ignore
       ,
       disabled: btnIsDisabled(item.disabled, rowParams)
-    }, item.render ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
-      return rowParams[pItem];
-    }))) : item.exName || item.name)) : /*#__PURE__*/React.createElement("a", {
+    }, renderCustomLabel(item))) : /*#__PURE__*/React.createElement("a", {
       className: 'spec-button-group-text',
       title: item.exName || item.name,
       key: item.index
@@ -370,9 +384,7 @@ var ButtonGroup = function ButtonGroup(props) {
           return rowParams[pItem];
         })));
       } : undefined
-    }, item.render ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
-      return rowParams[pItem];
-    }))) : item.exName || item.name));
+    }, renderCustomLabel(item)));
   };
   var RenderCustomNode = function RenderCustomNode(item) {
     var render = item.render,
@@ -432,7 +444,8 @@ var ButtonGroup = function ButtonGroup(props) {
         },
         placement: "bottomRight"
       }, dropdownConfig), /*#__PURE__*/React.createElement(Button, {
-        type: "primary"
+        type: "primary",
+        size: size
       }, moreText || '更多', moreIcon || /*#__PURE__*/React.createElement(DownOutlined, null))) : /*#__PURE__*/React.createElement(Popconfirm, _extends({
         placement: "topRight",
         open: popVisibleIndex === rowParams.rowIndex,

package/es/ButtonGroup/styles/index.js

@@ -48,13 +48,21 @@ var SpecButtonGroupStyleFunc = function SpecButtonGroupStyleFunc(prefix) {
     return [_defineProperty({}, prefixCls, _objectSpread({
       display: 'inline-block',
       verticalAlign: 'middle',
+      alignItems: 'center',
       '> *': {
         marginLeft: token.marginSM,
         '&:first-child': {
           marginLeft: 0
         }
       }
-    }, SpecButtonGroupTextStyle(prefixCls, SpecButtonGroupToken)))];
+    }, SpecButtonGroupTextStyle(prefixCls, SpecButtonGroupToken))), {
+      '.ant-dropdown-menu-item': {
+        background: '#f00',
+        '.spec-icon + .ant-dropdown-menu-title-content': {
+          marginLeft: token.marginSM
+        }
+      }
+    }];
   }, prepareComponentToken // 当前组件扩展的变量
   );
 };

package/es/DragContent/index.js

@@ -143,7 +143,7 @@ var DragContent = function DragContent(props) {
   };
   return wrapSSR( /*#__PURE__*/React.createElement("div", {
     ref: divRef,
-    className: classNames(componentName, hashId, className),
+    className: classNames(className, componentName, hashId),
     style: style
   }, children, direction && direction.map(function (item, idx) {
     return /*#__PURE__*/React.createElement(DragBar, {

package/es/DragContent/index.less

@@ -8,16 +8,15 @@
 
   .spec-grid-dragbar-left-horizontal{
     height: 100%;
-    width: 5px;
+    width: 10px;
     position: absolute;
     left: 0;
     top: 0;
     cursor: col-resize;
-
   }
   .spec-grid-dragbar-right-horizontal{
     height: 100%;
-    width: 5px;
+    width: 10px;
     position: absolute;
     right: 0;
     top: 0;

package/es/FormComp/RenderItemGroup/index.d.ts

@@ -35,6 +35,7 @@ interface ItemGroupProps {
     doUpdateFormFields?: () => void;
     className?: string;
     columnCount?: 1 | 2 | 3 | 4;
+    parentNode?: string;
     [k: string]: any;
 }
 declare const RenderItemGroup: (props: ItemGroupProps) => any;

package/es/FormComp/RenderItemGroup/index.js

@@ -37,7 +37,8 @@ var RenderItemGroup = function RenderItemGroup(props) {
     _props$layout = props.layout,
     layout = _props$layout === void 0 ? "horizontal" : _props$layout,
     gutter = props.gutter,
-    columnCount = props.columnCount;
+    columnCount = props.columnCount,
+    parentNode = props.parentNode;
   var componentName = 'spec-item-group';
   var _useStyle = useStyle(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
@@ -87,6 +88,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
   // 优先级：若有displayLayout.block 则直接使用 general > displayLayout
   // 还需要判断 layout为vertical还是horizontal
   var calculateFormLayout = useCallback(function (itemData) {
+    var _general$modalSize$md, _general$modalSize$md2, _general$modalSize$lg, _general$modalSize$lg2;
     var formLayout = {};
     // 当布局为 'inline' 时，不配置栅格结构
     if (layout === 'inline') {
@@ -101,11 +103,11 @@ var RenderItemGroup = function RenderItemGroup(props) {
         }
       };
     } else {
-      var _general$modalSize;
+      var _general$modalSize, _general$modalSize2;
       // @ts-ignore
-      var sizeFormLayout = (_general$modalSize = general.modalSize) === null || _general$modalSize === void 0 ? void 0 : _general$modalSize[size].formLayout;
+      var sizeFormLayout = (_general$modalSize = general.modalSize) === null || _general$modalSize === void 0 || (_general$modalSize = _general$modalSize[size]) === null || _general$modalSize === void 0 ? void 0 : _general$modalSize[parentNode === 'standardFilter' && (size === 'md' || size === 'lg' || size === 'xlg') ? 'filterFormLayout' : 'formLayout'];
       // @ts-ignore
-      var sizeFormBlockLayout = general.modalSize[size].formBlockLayout;
+      var sizeFormBlockLayout = (_general$modalSize2 = general.modalSize) === null || _general$modalSize2 === void 0 || (_general$modalSize2 = _general$modalSize2[size]) === null || _general$modalSize2 === void 0 ? void 0 : _general$modalSize2[parentNode === 'standardFilter' && (size === 'md' || size === 'lg' || size === 'xlg') ? 'filterFormBlockLayout' : 'formBlockLayout'];
       // 优先级 displayLayout.side > displayLayout > general
       // 优先级：若有displayLayout.block 则直接使用 general > displayLayout
       // 还需要判断 layout为vertical还是horizontal
@@ -117,12 +119,12 @@ var RenderItemGroup = function RenderItemGroup(props) {
             sizeFormBlockLayout = general.modalSize.sm.formBlockLayout;
             break;
           case 2:
-            sizeFormLayout = general.modalSize.md.formLayout;
-            sizeFormBlockLayout = general.modalSize.md.formBlockLayout;
+            sizeFormLayout = (_general$modalSize$md = general.modalSize.md) === null || _general$modalSize$md === void 0 ? void 0 : _general$modalSize$md[parentNode === 'standardFilter' ? 'filterFormLayout' : 'formLayout'];
+            sizeFormBlockLayout = (_general$modalSize$md2 = general.modalSize.md) === null || _general$modalSize$md2 === void 0 ? void 0 : _general$modalSize$md2[parentNode === 'standardFilter' ? 'filterFormBlockLayout' : 'formBlockLayout'];
             break;
           case 3:
-            sizeFormLayout = general.modalSize.lg.formLayout;
-            sizeFormBlockLayout = general.modalSize.lg.formBlockLayout;
+            sizeFormLayout = (_general$modalSize$lg = general.modalSize.lg) === null || _general$modalSize$lg === void 0 ? void 0 : _general$modalSize$lg[parentNode === 'standardFilter' ? 'filterFormLayout' : 'formLayout'];
+            sizeFormBlockLayout = (_general$modalSize$lg2 = general.modalSize.lg) === null || _general$modalSize$lg2 === void 0 ? void 0 : _general$modalSize$lg2[parentNode === 'standardFilter' ? 'filterFormBlockLayout' : 'formBlockLayout'];
             break;
           case 4:
             sizeFormLayout = general.modalSize.xxlg.formLayout;
@@ -146,7 +148,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
       }
     }
     return formLayout;
-  }, [size, layout, columnCount]);
+  }, [size, layout, columnCount, parentNode]);
 
   // 渲染表单控件
   var renderFormField = function renderFormField(field) {

package/es/StandardContent/ContentHeader.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+export interface ContentHeaderProps {
+    title?: string | React.ReactNode;
+    breadcrumb?: object;
+    componentName?: string;
+    [key: string]: any;
+}
+declare const ContentHeader: React.ForwardRefExoticComponent<Omit<ContentHeaderProps, "ref"> & React.RefAttributes<unknown>>;
+export default ContentHeader;

package/es/StandardContent/ContentHeader.js

@@ -0,0 +1,79 @@
+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, { forwardRef, useImperativeHandle, useRef, useEffect, useState } from 'react';
+import { Breadcrumb } from "antd";
+import classNames from 'classnames';
+import useStyle from "./styles/Header";
+var Child = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    count = _useState2[0],
+    setCount = _useState2[1];
+  useImperativeHandle(ref, function () {
+    return {
+      getCurrentCount: function getCurrentCount() {
+        return count;
+      }
+    };
+  }, [count]);
+  return /*#__PURE__*/React.createElement("div", null, "Count: ", count);
+});
+var ContentHeader = /*#__PURE__*/forwardRef(function (props, ref) {
+  var breadcrumb = props.breadcrumb,
+    className = props.className,
+    title = props.title,
+    getClientHeight = props.getClientHeight;
+  var componentName = 'spec-content-header';
+  var _useStyle = useStyle(componentName),
+    _useStyle2 = _slicedToArray(_useStyle, 2),
+    wrapSSR = _useStyle2[0],
+    hashId = _useStyle2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    visible = _useState4[0],
+    setVisible = _useState4[1];
+  var _useState5 = useState(0),
+    _useState6 = _slicedToArray(_useState5, 2),
+    clientHeight = _useState6[0],
+    setClientHeight = _useState6[1];
+  var headerRef = useRef(null);
+  useEffect(function () {
+    if (title || breadcrumb) {
+      setVisible(true);
+    }
+  }, [title, breadcrumb]);
+  useImperativeHandle(ref, function () {
+    return {
+      getClientHeight: function getClientHeight() {
+        return clientHeight;
+      }
+    };
+  }, [clientHeight]);
+  useEffect(function () {
+    if (visible && headerRef.current) {
+      setClientHeight(headerRef.current.clientHeight);
+      // 使用 clientHeight
+    }
+  }, [visible]);
+  useEffect(function () {
+    getClientHeight && getClientHeight(clientHeight);
+  }, [clientHeight]);
+  // ref 的转发
+  // 将需要暴露给父组件的属性或方法定义在这个函数中
+  // useImperativeHandle(ref, () => headerRef.current, [headerRef, breadcrumb, title]);
+
+  // @ts-ignore
+  return wrapSSR( /*#__PURE__*/React.createElement("div", {
+    className: classNames(className, componentName, hashId),
+    ref: headerRef
+  }, breadcrumb ? /*#__PURE__*/React.createElement("div", {
+    className: componentName + '-breadcrumb'
+  }, /*#__PURE__*/React.createElement(Breadcrumb, breadcrumb || {})) : null, title ? /*#__PURE__*/React.createElement("div", {
+    className: componentName + '-title'
+  }, title) : null));
+});
+export default ContentHeader;

package/es/StandardContent/SubfieldContent.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { ContentHeaderProps } from './ContentHeader';
 import './styles/index.less';
 interface SubfieldContentProps {
     leftSiderWidth?: number;
@@ -12,6 +13,7 @@ interface SubfieldContentProps {
     leftSiderDragDirection?: string[];
     leftSiderMoveMaxWidth?: number;
     leftSiderMoveMaxHeight?: number;
+    header?: ContentHeaderProps;
     [k: string]: any;
 }
 declare const SubfieldContent: (props: SubfieldContentProps) => any;

package/es/StandardContent/SubfieldContent.js

@@ -1,41 +1,64 @@
+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, { useContext, useState } from 'react';
 import classNames from 'classnames';
 import { Spin } from 'antd';
 import DragContent from "../DragContent";
+import ContentHeader from "./ContentHeader";
 import useStyle from "./styles/Subfield";
 import "./styles/index.less";
+import { FanContext } from "../ConfigContext";
 var SubfieldContent = function SubfieldContent(props) {
-  var _props$leftSiderWidth = props.leftSiderWidth,
-    leftSiderWidth = _props$leftSiderWidth === void 0 ? 180 : _props$leftSiderWidth,
-    leftSiderNode = props.leftSiderNode,
-    children = props.children,
-    className = props.className,
-    style = props.style,
-    leftSiderClassName = props.leftSiderClassName,
-    _props$loading = props.loading,
-    loading = _props$loading === void 0 ? false : _props$loading,
-    loadingTip = props.loadingTip,
-    leftSiderDragDirection = props.leftSiderDragDirection,
-    leftSiderMoveMaxWidth = props.leftSiderMoveMaxWidth,
-    leftSiderMoveMaxHeight = props.leftSiderMoveMaxHeight;
+  var _proLayoutProps$heade;
+  var InitFanContext = useContext(FanContext);
+  var providerConfig = InitFanContext['SubfieldContent'] || {}; // 使用上下文（全局配置）设置扩展的配置项
+  var proLayoutProps = InitFanContext['proLayoutProps'] || {};
+  var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
+    _providerConfig$props2 = _providerConfig$props.leftSiderWidth,
+    leftSiderWidth = _providerConfig$props2 === void 0 ? 180 : _providerConfig$props2,
+    leftSiderNode = _providerConfig$props.leftSiderNode,
+    children = _providerConfig$props.children,
+    className = _providerConfig$props.className,
+    style = _providerConfig$props.style,
+    leftSiderClassName = _providerConfig$props.leftSiderClassName,
+    _providerConfig$props3 = _providerConfig$props.loading,
+    loading = _providerConfig$props3 === void 0 ? false : _providerConfig$props3,
+    loadingTip = _providerConfig$props.loadingTip,
+    leftSiderDragDirection = _providerConfig$props.leftSiderDragDirection,
+    leftSiderMoveMaxWidth = _providerConfig$props.leftSiderMoveMaxWidth,
+    leftSiderMoveMaxHeight = _providerConfig$props.leftSiderMoveMaxHeight,
+    header = _providerConfig$props.header;
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    headerHeight = _useState2[0],
+    setHeaderHeight = _useState2[1];
   var componentName = 'spec-grid-content';
   var _useStyle = useStyle(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
     wrapSSR = _useStyle2[0],
     hashId = _useStyle2[1];
-  return wrapSSR( /*#__PURE__*/React.createElement(Spin, {
-    spinning: loading,
-    tip: loadingTip,
-    wrapperClassName: 'spec-grid-content-spinning'
-  }, /*#__PURE__*/React.createElement("div", {
+  return wrapSSR( /*#__PURE__*/React.createElement("div", {
     className: classNames(componentName, className, hashId),
     style: style
+  }, proLayoutProps !== null && proLayoutProps !== void 0 && proLayoutProps.header || header ? /*#__PURE__*/React.createElement(ContentHeader, _extends({
+    getClientHeight: setHeaderHeight,
+    className: classNames('spec-grid-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-grid-content-header-fixed' : '')
+  }, (proLayoutProps === null || proLayoutProps === void 0 ? void 0 : proLayoutProps.header) || {}, header || {})) : null, /*#__PURE__*/React.createElement("div", {
+    className: 'spec-grid-content-body',
+    style: {
+      height: "calc(100% - ".concat(headerHeight ? headerHeight + 20 : 0, "px")
+    }
   }, /*#__PURE__*/React.createElement(DragContent, {
     direction: leftSiderDragDirection,
     className: classNames('spec-grid-left', leftSiderClassName),
@@ -46,6 +69,10 @@ var SubfieldContent = function SubfieldContent(props) {
     moveMaxHeight: leftSiderMoveMaxHeight
   }, leftSiderNode), /*#__PURE__*/React.createElement("div", {
     className: "spec-grid-right"
-  }, children))));
+  }, /*#__PURE__*/React.createElement(Spin, {
+    spinning: loading,
+    tip: loadingTip,
+    wrapperClassName: 'spec-grid-content-spinning'
+  }, children)))));
 };
 export default SubfieldContent;

package/es/StandardContent/WrapperContent.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import './styles/index.less';
+import { ContentHeaderProps } from './ContentHeader';
 interface WrapperContentProps {
     className?: string;
     loading?: boolean;
@@ -8,6 +9,7 @@ interface WrapperContentProps {
     style?: React.CSSProperties;
     noMargin?: boolean;
     light?: boolean;
+    header?: ContentHeaderProps;
 }
 declare const WrapperContent: (props: WrapperContentProps) => any;
 export default WrapperContent;

package/es/StandardContent/WrapperContent.js

@@ -1,38 +1,73 @@
+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, { useContext, useRef, useState } from 'react';
 import classNames from 'classnames';
 import { Spin } from 'antd';
 import "./styles/index.less";
 import useStyle from "./styles/Wrapper";
+import { FanContext } from "../ConfigContext";
+import ContentHeader from "./ContentHeader";
 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;
+  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 headerRef = useRef();
+  return wrapSSR( /*#__PURE__*/React.createElement("div", {
+    className: classNames(componentName, className, noMargin ? 'has-margin' : '', hashId),
+    style: style
+  }, proLayoutProps !== null && proLayoutProps !== void 0 && proLayoutProps.header || header ? /*#__PURE__*/React.createElement(ContentHeader, _extends({
+    ref: headerRef,
+    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: {
+      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)") : ''
+    }
+  }, /*#__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,33 @@
+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-breadcrumb': {
+        height: '24px',
+        '& +.spec-content-header-title': {
+          marginTop: token.marginXS
+          // marginTop: token.margin
+        }
+      },
+      '.spec-content-header-title': {
+        fontSize: token.fontSizeLG,
+        fontWeight: 'bold',
+        lineHeight: '20px'
+      }
+    })];
+  }, prepareComponentToken // 当前组件扩展的变量
+  );
+};
+export default SubfieldContentStyleFunc;