fan-standard-comp 3.0.13 → 3.1.0-beta

package/es/ButtonGroup/index.js

@@ -27,6 +27,7 @@ function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+import { __rest } from "tslib";
 import React, { useState, useEffect } from "react";
 import { IconNode } from "../components/index";
 import SpecIcon from "../SpecIcon/index";
@@ -114,6 +115,19 @@ var ButtonGroup = function ButtonGroup(props) {
 
 
   var RenderButtonList = function RenderButtonList(item) {
+    var exName = item.exName,
+        name = item.name,
+        type = item.type,
+        icon = item.icon,
+        ghost = item.ghost,
+        danger = item.danger,
+        disabled = item.disabled,
+        loading = item.loading,
+        fn = item.fn,
+        code = item.code,
+        rowParams = item.rowParams,
+        others = __rest(item, ["exName", "name", "type", "icon", "ghost", "danger", "disabled", "loading", "fn", "code", "rowParams"]);
+
     if (Array.isArray(item.children) && item.children.length > 0) {
       return /*#__PURE__*/React.createElement(_Dropdown, {
         overlay: buttonMenu(item.children),
@@ -125,17 +139,19 @@ var ButtonGroup = function ButtonGroup(props) {
       })));
     }
 
-    return /*#__PURE__*/React.createElement(_Button, {
-      type: item.type ? item.type : 'primary',
-      danger: item.danger,
+    return /*#__PURE__*/React.createElement(_Button, Object.assign({
+      type: type || 'primary',
+      danger: danger,
+      ghost: ghost,
+      onClick: fn ? function () {
+        return fn(item);
+      } : null
+    }, others, {
       icon: /*#__PURE__*/React.createElement(IconNode, {
-        icon: item.icon
+        icon: icon
       }),
-      disabled: btnIsDisabled(item.disabled, rowParams),
-      onClick: item.fn ? function () {
-        return item.fn(item);
-      } : null
-    }, item.exName || item.name);
+      disabled: btnIsDisabled(disabled, rowParams)
+    }), exName || name);
   }; // 渲染文本形式多级菜单列表（用于表格）
 
 
@@ -261,14 +277,16 @@ var ButtonGroup = function ButtonGroup(props) {
 
 
   var renderDisplayButton = function renderDisplayButton(item, index) {
+    /*渲染自定义*/
     if (item.render) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, typeof item.render === 'function' ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
         return rowParams[pItem];
       }))) : item.render);
     }
+    /*渲染按钮形式*/
+
 
     if (type === 'button') {
-      /*渲染按钮形式*/
       return /*#__PURE__*/React.createElement(RenderButtonList, Object.assign({
         key: index
       }, item, {

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

@@ -6,6 +6,7 @@ interface OptionNameProps {
     disabled?: string;
     title?: string;
     children?: string;
+    [k: string]: any;
 }
 export interface FieldComponentProps {
     label?: any;
@@ -16,6 +17,7 @@ export interface FieldComponentProps {
     onChange?: (value?: any, option?: any) => void;
     selectOptions?: PropTypes.ReactNodeArray;
     selectOptionName?: OptionNameProps;
+    fieldNames?: OptionNameProps;
     treeData?: PropTypes.ReactNodeArray;
     treeOptionName?: OptionNameProps;
     placeholder?: string;

package/es/FormComp/FieldComponent/index.js

@@ -1,3 +1,7 @@
+import "antd/es/rate/style";
+import _Rate from "antd/es/rate";
+import "antd/es/mentions/style";
+import _Mentions from "antd/es/mentions";
 import "antd/es/slider/style";
 import _Slider from "antd/es/slider";
 import "antd/es/switch/style";
@@ -49,6 +53,12 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     disabled: 'disabled',
     title: 'title'
   } : _props$selectOptionNa,
+      _props$fieldNames = props.fieldNames,
+      fieldNames = _props$fieldNames === void 0 ? {
+    label: 'label',
+    value: 'value',
+    children: 'children'
+  } : _props$fieldNames,
       _props$treeOptionName = props.treeOptionName,
       treeOptionName = _props$treeOptionName === void 0 ? {
     title: 'title',
@@ -169,7 +179,8 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
         filterOption: function filterOption(inputValue, option) {
           return defaultProps.showSearch ? option.children.toLowerCase().indexOf(inputValue.toLowerCase()) >= 0 : false;
         },
-        value: value
+        value: value,
+        fieldNames: fieldNames || selectOptionName
       }, defaultProps, {
         // onChange返回参数：累加当前选中包括其他字段值的数据
         onChange: function onChange(value, Option) {
@@ -355,6 +366,7 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }) : /*#__PURE__*/React.createElement(_Cascader, Object.assign({
         options: selectOptions,
         allowClear: true,
+        fieldNames: fieldNames || selectOptionName,
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请选择'
       }, defaultProps));
       break;
@@ -376,6 +388,23 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }));
       break;
 
+    case 'mentions':
+      compContent = viewOnly ? value : /*#__PURE__*/React.createElement(_Mentions, Object.assign({
+        placeholder: "\u8BF7\u8F93\u5165 ".concat(defaultProps.prefix || '@', " \u9009\u62E9")
+      }, defaultProps), selectOptions.map(function (val) {
+        return /*#__PURE__*/React.createElement(Option, {
+          value: val.value,
+          key: val.value
+        }, selectOptionRender ? selectOptionRender(val) : val.label);
+      }));
+      break;
+
+    case 'rate':
+      compContent = /*#__PURE__*/React.createElement(_Rate, Object.assign({
+        disabled: viewOnly || defaultProps.disabled
+      }, defaultProps));
+      break;
+
     case 'custom':
       compContent = defaultProps.render && defaultProps.render(props) || defaultProps.customRender && defaultProps.customRender(props) || null;
       break;

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

@@ -15,12 +15,20 @@ export interface FieldsItemProps extends FieldComponentProps {
     size?: 'large' | 'middle' | 'small' | string;
     componentStyle?: React.CSSProperties;
 }
+interface layoutProps {
+    labelCol?: any;
+    wrapperCol?: any;
+}
+interface displayLayoutProps extends layoutProps {
+    side?: layoutProps;
+    block?: layoutProps;
+}
 interface ItemGroupProps {
     itemGroup: any | FieldsItemProps[];
     size?: string;
     fieldStatus?: 'default' | 'viewOnly' | 'disabled';
     fieldSize?: 'large' | 'middle' | 'small' | any;
-    displayLayout?: object;
+    displayLayout?: displayLayoutProps;
     form?: any;
     layout?: string;
     doUpdateFormFields?: () => void;

package/es/FormComp/RenderItemGroup/index.js

@@ -159,14 +159,20 @@ var RenderItemGroup = function RenderItemGroup(props) {
       //   // 如果未配置，则使用以下配置值
       //   formLayout = { ...displayLayout }
       // }
+      // 优先级 displayLayout.side > displayLayout > general
+      // 优先级：若有displayLayout.block 则直接使用 general > displayLayout
 
-      formLayout = displayLayout || general.modalSize[size].formLayout;
+      formLayout = (displayLayout === null || displayLayout === void 0 ? void 0 : displayLayout.side) || ((displayLayout === null || displayLayout === void 0 ? void 0 : displayLayout.block) ? general.modalSize[size].formLayout : !displayLayout || JSON.stringify(displayLayout) === '{}' ? general.modalSize[size].formLayout : displayLayout);
 
       if (item.hasOwnProperty('display')) {
         if (typeof display === 'string') {
-          formLayout = display === 'block' ? general.modalSize[size].formBlockLayout : general.modalSize[size].formLayout;
+          if (display === 'block') {
+            formLayout = (displayLayout === null || displayLayout === void 0 ? void 0 : displayLayout.block) || general.modalSize[size].formBlockLayout;
+          } else {// 使用默认
+            // formLayout = displayLayout?.side || (displayLayout?.block ? general.modalSize[size].formLayout : displayLayout) || general.modalSize[size].formLayout
+          }
         } else {
-          formLayout = item.display; // 对象类型传值如： {labelCol: {span: 3},wrapperCol: {span: 8}}
+          formLayout = item.display; // 对象类型传值如： {labelCol: {span: 3},wrapperCol: {span: 8}} 优先级最高
         }
       } // 当布局为 'vertical'或'inline'时，不配置栅格结构
 

package/es/StandardForm/StepForm.d.ts

@@ -15,5 +15,5 @@ export interface StepFormProp extends StandardFormProps {
     stepClick?: (type?: string, formChild?: any, values?: any) => void;
     formItemGroup?: StepItemGroupProps[];
 }
-declare const StepForm: React.ForwardRefExoticComponent<StepFormProp & React.RefAttributes<unknown>>;
+declare const StepForm: React.ForwardRefExoticComponent<Pick<StepFormProp, string | number> & React.RefAttributes<unknown>>;
 export default StepForm;

package/es/StandardForm/StepForm.js

@@ -42,7 +42,8 @@ var StepForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
       stepsConfig = _props$stepsConfig === void 0 ? {
     current: 0
   } : _props$stepsConfig,
-      stepClick = props.stepClick;
+      stepClick = props.stepClick,
+      displayLayout = props.displayLayout;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -215,6 +216,7 @@ var StepForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
     ref: ref,
     fieldSize: fieldSize,
     initialValues: initialValues,
+    // @ts-ignore
     getFormFields: function getFormFields(fields, form) {
       setFormChildFields(fields);
       setFormChild(form);
@@ -245,6 +247,7 @@ var StepForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
       form: formChild,
       fieldStatus: fieldStatus,
       size: formGridSize,
+      displayLayout: displayLayout,
       // doUpdateFormFields={() => console.log('强制渲染表单')}
       itemGroup: item.fields
     }) : item.fields, !actionHide && /*#__PURE__*/React.createElement(_Col, {

package/es/StandardForm/TabForm.d.ts

@@ -15,5 +15,5 @@ export interface TabFormProp extends StandardFormProps {
     actionHide?: boolean;
     formItemGroup?: TabItemGroupProps[];
 }
-declare const TabForm: React.ForwardRefExoticComponent<TabFormProp & React.RefAttributes<unknown>>;
+declare const TabForm: React.ForwardRefExoticComponent<Pick<TabFormProp, string | number> & React.RefAttributes<unknown>>;
 export default TabForm;

package/es/StandardForm/TabForm.js

@@ -36,7 +36,8 @@ var TabForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
       fieldSize = _props$fieldSize === void 0 ? "middle" : _props$fieldSize,
       onSubmit = props.onSubmit,
       initialValues = props.initialValues,
-      tabsConfig = props.tabsConfig;
+      tabsConfig = props.tabsConfig,
+      displayLayout = props.displayLayout;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -73,6 +74,7 @@ var TabForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
     actionGroup: [],
     ref: ref,
     fieldSize: fieldSize,
+    // @ts-ignore
     getFormFields: function getFormFields(fields, form) {
       setFormChildFields(fields);
       setFormChild(form);
@@ -101,6 +103,7 @@ var TabForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
       form: formChild,
       fieldStatus: fieldStatus,
       size: formGridSize,
+      displayLayout: displayLayout,
       // doUpdateFormFields={() => forceUpdateForm()}
       itemGroup: fields
     }) : fields, !actionHide && actions && /*#__PURE__*/React.createElement(_Col, {

package/es/StandardForm/index.d.ts

@@ -25,6 +25,8 @@ export interface StandardFormProps {
     children?: React.ReactNode;
     postfix?: React.ReactNode;
     prefix?: React.ReactNode;
+    displayLayout?: any;
+    [k: string]: any;
 }
-declare const StandardForm: React.ForwardRefExoticComponent<StandardFormProps & React.RefAttributes<unknown>>;
+declare const StandardForm: React.ForwardRefExoticComponent<Pick<StandardFormProps, string | number> & React.RefAttributes<unknown>>;
 export default StandardForm;

package/es/StandardForm/index.js

@@ -46,7 +46,8 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
       prefix = props.prefix,
       postfix = props.postfix,
       fieldSize = props.fieldSize,
-      baseProps = __rest(props, ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize"]);
+      displayLayout = props.displayLayout,
+      baseProps = __rest(props, ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize", "displayLayout"]);
 
   var _Form$useForm = _Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -159,6 +160,7 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }), prefix, children, /*#__PURE__*/React.createElement(React.Fragment, null, formItemGroup.length > 0 ? /*#__PURE__*/React.createElement(RenderItemGroup, {
     itemGroup: formItemGroup,
     fieldSize: fieldSize,
+    displayLayout: displayLayout,
     // doUpdateFormFields={() => forceUpdateForm()}
     size: gridSize,
     layout: layout,

package/es/StandardModal/index.d.ts

@@ -30,7 +30,7 @@ export interface StandardModalProps extends ModalProps {
     hideFooter?: Boolean;
     footerButtonGroup?: ((modalForm?: any, props?: StandardModalProps) => React.ReactNode | PropTypes.ReactNodeArray | any) | any;
     footer?: any;
-    displayLayout?: object;
+    displayLayout?: any;
     confirmLoading?: boolean;
     okText?: string;
     okButtonProps?: any;

package/es/StandardModal/index.js

@@ -57,7 +57,8 @@ var StandardModal = function StandardModal(props) {
       formLayout = _props$formLayout === void 0 ? 'horizontal' : _props$formLayout,
       tabsConfig = props.tabsConfig,
       stepsConfig = props.stepsConfig,
-      otherProps = __rest(props, ["children", "className", "style", "size", "type", "formItemGroup", "title", "visible", "formPrefix", "formPostfix", "initialValues", "hideRequiredMark", "bodyStyle", "footer", "footerButtonGroup", "hideFooter", "getFormFields", "fieldStatus", "formLayout", "tabsConfig", "stepsConfig"]);
+      displayLayout = props.displayLayout,
+      otherProps = __rest(props, ["children", "className", "style", "size", "type", "formItemGroup", "title", "visible", "formPrefix", "formPostfix", "initialValues", "hideRequiredMark", "bodyStyle", "footer", "footerButtonGroup", "hideFooter", "getFormFields", "fieldStatus", "formLayout", "tabsConfig", "stepsConfig", "displayLayout"]);
 
   var _Form$useForm = _Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -257,8 +258,7 @@ var StandardModal = function StandardModal(props) {
     var fieldStatus = props.fieldStatus,
         formItemGroup = props.formItemGroup,
         _props$size2 = props.size,
-        size = _props$size2 === void 0 ? 'md' : _props$size2,
-        displayLayout = props.displayLayout;
+        size = _props$size2 === void 0 ? 'md' : _props$size2;
 
     if (Array.isArray(formItemGroup)) {
       return /*#__PURE__*/React.createElement(RenderItemGroup, {
@@ -324,22 +324,34 @@ var StandardModal = function StandardModal(props) {
 
     if (footerButtonGroup) {
       if (Array.isArray(footerButtonGroup)) {
-        if (footerButtonGroup.length === 0) return /*#__PURE__*/React.createElement("div", null, "\u6309\u94AE\u7EC4\u5408\u914D\u7F6E\u4E3A\u7A7A");
+        if (footerButtonGroup.length === 0) return null; // <div>按钮组合配置为空</div>
+
         return /*#__PURE__*/React.createElement(React.Fragment, null, footerButtonGroup.map(function (item) {
           if (_typeof(item) === 'object') {
-            return /*#__PURE__*/React.createElement(_Button, {
-              key: item.name,
-              type: item.type ? item.type : 'primary',
+            if (item.isHide) return null;
+
+            var name = item.name,
+                _type = item.type,
+                icon = item.icon,
+                ghost = item.ghost,
+                disabled = item.disabled,
+                loading = item.loading,
+                fn = item.fn,
+                others = __rest(item, ["name", "type", "icon", "ghost", "disabled", "loading", "fn"]);
+
+            return /*#__PURE__*/React.createElement(_Button, Object.assign({
+              key: name,
+              type: _type || 'primary',
               icon: /*#__PURE__*/React.createElement(IconNode, {
-                icon: item.icon
+                icon: icon
               }),
-              ghost: item.ghost,
-              disabled: item.disabled,
-              loading: item.loading,
-              onClick: item.fn ? function (e) {
-                return item.fn(item, modalForm, props, e);
+              ghost: ghost,
+              disabled: disabled,
+              loading: loading,
+              onClick: fn ? function (e) {
+                return fn(item, modalForm, props, e);
               } : null
-            }, item.name);
+            }, others), name);
           } else {
             return item; // 如果是DOM，则直接渲染
           }
@@ -425,6 +437,7 @@ var StandardModal = function StandardModal(props) {
     layout: formLayout,
     fieldStatus: fieldStatus,
     actionHide: true,
+    // @ts-ignore
     getFormFields: function getFormFields(fields, form) {
       setFormChild(form);
       _getFormFields && _getFormFields(fields, form);
@@ -432,20 +445,23 @@ var StandardModal = function StandardModal(props) {
     formItemGroup: formItemGroup,
     tabsConfig: tabsConfig,
     onSubmit: handleSubmit,
-    initialValues: Object.assign({}, initialValues)
+    initialValues: Object.assign({}, initialValues),
+    displayLayout: displayLayout
   }), type === 'stepForm' && /*#__PURE__*/React.createElement(StepForm, {
     grid: size,
     layout: formLayout,
     fieldStatus: fieldStatus,
     actionHide: true,
+    // @ts-ignore
     getFormFields: function getFormFields(fields, form) {
       setFormChild(form);
       _getFormFields && _getFormFields(fields, form);
     },
     formItemGroup: formItemGroup,
     stepsConfig: stepsConfig,
+    onSubmit: handleSubmit,
     initialValues: Object.assign({}, initialValues),
-    onSubmit: handleSubmit
+    displayLayout: displayLayout
   }));
 };
 

package/lib/ButtonGroup/index.js

@@ -23,6 +23,8 @@ require("antd/es/menu/style");
 
 var _menu = _interopRequireDefault(require("antd/es/menu"));
 
+var _tslib = require("tslib");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _index = require("../components/index");
@@ -143,6 +145,19 @@ var ButtonGroup = function ButtonGroup(props) {
 
 
   var RenderButtonList = function RenderButtonList(item) {
+    var exName = item.exName,
+        name = item.name,
+        type = item.type,
+        icon = item.icon,
+        ghost = item.ghost,
+        danger = item.danger,
+        disabled = item.disabled,
+        loading = item.loading,
+        fn = item.fn,
+        code = item.code,
+        rowParams = item.rowParams,
+        others = (0, _tslib.__rest)(item, ["exName", "name", "type", "icon", "ghost", "danger", "disabled", "loading", "fn", "code", "rowParams"]);
+
     if (Array.isArray(item.children) && item.children.length > 0) {
       return /*#__PURE__*/_react.default.createElement(_dropdown.default, {
         overlay: buttonMenu(item.children),
@@ -154,17 +169,19 @@ var ButtonGroup = function ButtonGroup(props) {
       })));
     }
 
-    return /*#__PURE__*/_react.default.createElement(_button.default, {
-      type: item.type ? item.type : 'primary',
-      danger: item.danger,
+    return /*#__PURE__*/_react.default.createElement(_button.default, Object.assign({
+      type: type || 'primary',
+      danger: danger,
+      ghost: ghost,
+      onClick: fn ? function () {
+        return fn(item);
+      } : null
+    }, others, {
       icon: /*#__PURE__*/_react.default.createElement(_index.IconNode, {
-        icon: item.icon
+        icon: icon
       }),
-      disabled: (0, _filterPermission.btnIsDisabled)(item.disabled, rowParams),
-      onClick: item.fn ? function () {
-        return item.fn(item);
-      } : null
-    }, item.exName || item.name);
+      disabled: (0, _filterPermission.btnIsDisabled)(disabled, rowParams)
+    }), exName || name);
   }; // 渲染文本形式多级菜单列表（用于表格）
 
 
@@ -290,14 +307,16 @@ var ButtonGroup = function ButtonGroup(props) {
 
 
   var renderDisplayButton = function renderDisplayButton(item, index) {
+    /*渲染自定义*/
     if (item.render) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, typeof item.render === 'function' ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
         return rowParams[pItem];
       }))) : item.render);
     }
+    /*渲染按钮形式*/
+
 
     if (type === 'button') {
-      /*渲染按钮形式*/
       return /*#__PURE__*/_react.default.createElement(RenderButtonList, Object.assign({
         key: index
       }, item, {

package/lib/FormComp/FieldComponent/index.d.ts

@@ -6,6 +6,7 @@ interface OptionNameProps {
     disabled?: string;
     title?: string;
     children?: string;
+    [k: string]: any;
 }
 export interface FieldComponentProps {
     label?: any;
@@ -16,6 +17,7 @@ export interface FieldComponentProps {
     onChange?: (value?: any, option?: any) => void;
     selectOptions?: PropTypes.ReactNodeArray;
     selectOptionName?: OptionNameProps;
+    fieldNames?: OptionNameProps;
     treeData?: PropTypes.ReactNodeArray;
     treeOptionName?: OptionNameProps;
     placeholder?: string;

package/lib/FormComp/FieldComponent/index.js

@@ -5,6 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+require("antd/es/rate/style");
+
+var _rate = _interopRequireDefault(require("antd/es/rate"));
+
+require("antd/es/mentions/style");
+
+var _mentions = _interopRequireDefault(require("antd/es/mentions"));
+
 require("antd/es/slider/style");
 
 var _slider = _interopRequireDefault(require("antd/es/slider"));
@@ -87,6 +95,12 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     disabled: 'disabled',
     title: 'title'
   } : _props$selectOptionNa,
+      _props$fieldNames = props.fieldNames,
+      fieldNames = _props$fieldNames === void 0 ? {
+    label: 'label',
+    value: 'value',
+    children: 'children'
+  } : _props$fieldNames,
       _props$treeOptionName = props.treeOptionName,
       treeOptionName = _props$treeOptionName === void 0 ? {
     title: 'title',
@@ -207,7 +221,8 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         filterOption: function filterOption(inputValue, option) {
           return defaultProps.showSearch ? option.children.toLowerCase().indexOf(inputValue.toLowerCase()) >= 0 : false;
         },
-        value: value
+        value: value,
+        fieldNames: fieldNames || selectOptionName
       }, defaultProps, {
         // onChange返回参数：累加当前选中包括其他字段值的数据
         onChange: function onChange(value, Option) {
@@ -393,6 +408,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       }) : /*#__PURE__*/_react.default.createElement(_cascader.default, Object.assign({
         options: selectOptions,
         allowClear: true,
+        fieldNames: fieldNames || selectOptionName,
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请选择'
       }, defaultProps));
       break;
@@ -414,6 +430,23 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       }));
       break;
 
+    case 'mentions':
+      compContent = viewOnly ? value : /*#__PURE__*/_react.default.createElement(_mentions.default, Object.assign({
+        placeholder: "\u8BF7\u8F93\u5165 ".concat(defaultProps.prefix || '@', " \u9009\u62E9")
+      }, defaultProps), selectOptions.map(function (val) {
+        return /*#__PURE__*/_react.default.createElement(Option, {
+          value: val.value,
+          key: val.value
+        }, selectOptionRender ? selectOptionRender(val) : val.label);
+      }));
+      break;
+
+    case 'rate':
+      compContent = /*#__PURE__*/_react.default.createElement(_rate.default, Object.assign({
+        disabled: viewOnly || defaultProps.disabled
+      }, defaultProps));
+      break;
+
     case 'custom':
       compContent = defaultProps.render && defaultProps.render(props) || defaultProps.customRender && defaultProps.customRender(props) || null;
       break;

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

@@ -15,12 +15,20 @@ export interface FieldsItemProps extends FieldComponentProps {
     size?: 'large' | 'middle' | 'small' | string;
     componentStyle?: React.CSSProperties;
 }
+interface layoutProps {
+    labelCol?: any;
+    wrapperCol?: any;
+}
+interface displayLayoutProps extends layoutProps {
+    side?: layoutProps;
+    block?: layoutProps;
+}
 interface ItemGroupProps {
     itemGroup: any | FieldsItemProps[];
     size?: string;
     fieldStatus?: 'default' | 'viewOnly' | 'disabled';
     fieldSize?: 'large' | 'middle' | 'small' | any;
-    displayLayout?: object;
+    displayLayout?: displayLayoutProps;
     form?: any;
     layout?: string;
     doUpdateFormFields?: () => void;

package/lib/FormComp/RenderItemGroup/index.js

@@ -179,14 +179,20 @@ var RenderItemGroup = function RenderItemGroup(props) {
       //   // 如果未配置，则使用以下配置值
       //   formLayout = { ...displayLayout }
       // }
+      // 优先级 displayLayout.side > displayLayout > general
+      // 优先级：若有displayLayout.block 则直接使用 general > displayLayout
 
-      formLayout = displayLayout || _data.general.modalSize[size].formLayout;
+      formLayout = (displayLayout === null || displayLayout === void 0 ? void 0 : displayLayout.side) || ((displayLayout === null || displayLayout === void 0 ? void 0 : displayLayout.block) ? _data.general.modalSize[size].formLayout : !displayLayout || JSON.stringify(displayLayout) === '{}' ? _data.general.modalSize[size].formLayout : displayLayout);
 
       if (item.hasOwnProperty('display')) {
         if (typeof display === 'string') {
-          formLayout = display === 'block' ? _data.general.modalSize[size].formBlockLayout : _data.general.modalSize[size].formLayout;
+          if (display === 'block') {
+            formLayout = (displayLayout === null || displayLayout === void 0 ? void 0 : displayLayout.block) || _data.general.modalSize[size].formBlockLayout;
+          } else {// 使用默认
+            // formLayout = displayLayout?.side || (displayLayout?.block ? general.modalSize[size].formLayout : displayLayout) || general.modalSize[size].formLayout
+          }
         } else {
-          formLayout = item.display; // 对象类型传值如： {labelCol: {span: 3},wrapperCol: {span: 8}}
+          formLayout = item.display; // 对象类型传值如： {labelCol: {span: 3},wrapperCol: {span: 8}} 优先级最高
         }
       } // 当布局为 'vertical'或'inline'时，不配置栅格结构
 

package/lib/StandardForm/StepForm.d.ts

@@ -15,5 +15,5 @@ export interface StepFormProp extends StandardFormProps {
     stepClick?: (type?: string, formChild?: any, values?: any) => void;
     formItemGroup?: StepItemGroupProps[];
 }
-declare const StepForm: React.ForwardRefExoticComponent<StepFormProp & React.RefAttributes<unknown>>;
+declare const StepForm: React.ForwardRefExoticComponent<Pick<StepFormProp, string | number> & React.RefAttributes<unknown>>;
 export default StepForm;

package/lib/StandardForm/StepForm.js

@@ -68,7 +68,8 @@ var StepForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       stepsConfig = _props$stepsConfig === void 0 ? {
     current: 0
   } : _props$stepsConfig,
-      stepClick = props.stepClick;
+      stepClick = props.stepClick,
+      displayLayout = props.displayLayout;
 
   var _useState = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -241,6 +242,7 @@ var StepForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     ref: ref,
     fieldSize: fieldSize,
     initialValues: initialValues,
+    // @ts-ignore
     getFormFields: function getFormFields(fields, form) {
       setFormChildFields(fields);
       setFormChild(form);
@@ -271,6 +273,7 @@ var StepForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       form: formChild,
       fieldStatus: fieldStatus,
       size: formGridSize,
+      displayLayout: displayLayout,
       // doUpdateFormFields={() => console.log('强制渲染表单')}
       itemGroup: item.fields
     }) : item.fields, !actionHide && /*#__PURE__*/_react.default.createElement(_col.default, {