fan-standard-comp 4.1.1 → 4.1.2

package/es/ButtonGroup/index.d.ts

@@ -39,6 +39,7 @@ interface ButtonGroupProps {
     showTextIcon?: boolean;
     className?: string;
     style?: object;
+    [k: string]: any;
 }
 declare const ButtonGroup: (props: ButtonGroupProps) => any;
 export default ButtonGroup;

package/es/ButtonGroup/styles/index.js

@@ -46,8 +46,10 @@ var SpecButtonGroupStyleFunc = function SpecButtonGroupStyleFunc(prefix) {
     });
     var prefixCls = ".".concat(prefix);
     return [_defineProperty({}, prefixCls, _objectSpread({
-      display: 'inline-block',
+      // display: 'inline-block',
+      display: 'inline-flex',
       verticalAlign: 'middle',
+      flexWrap: 'wrap',
       alignItems: 'center',
       '> *': {
         marginLeft: token.marginSM,

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

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const ExtensionField: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+export default ExtensionField;

package/es/FormComp/FieldComponent/ExtensionField.js

@@ -0,0 +1,18 @@
+var _excluded = ["type", "extendType"];
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import React, { useContext, forwardRef } from 'react';
+import { FanContext } from "../../ConfigContext";
+var ExtensionField = /*#__PURE__*/forwardRef(function (props, ref) {
+  var InitFanContext = useContext(FanContext);
+  var providerConfig = InitFanContext['Field'] || {}; // 使用上下文（全局配置）设置扩展的配置项
+  var type = props.type,
+    extendType = props.extendType,
+    fieldProps = _objectWithoutProperties(props, _excluded);
+  var MatchType = ((providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.extendComponents) || []).find(function (tItem) {
+    return tItem.extendType === extendType;
+  });
+  var MatchTypeComponent = (MatchType === null || MatchType === void 0 ? void 0 : MatchType.component) || null;
+  return typeof MatchTypeComponent === 'function' ? /*#__PURE__*/React.createElement(MatchTypeComponent, fieldProps) : MatchTypeComponent;
+});
+export default ExtensionField;

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

@@ -8,10 +8,16 @@ interface OptionNameProps {
     children?: string;
     [k: string]: any;
 }
+export interface FieldExtendsTypeType {
+    type: string;
+    component: (cProps: any) => React.ReactNode | React.ReactNode | any;
+    [k: string]: any;
+}
 export interface FieldComponentProps {
     label?: any;
     type?: string;
     filedName?: string;
+    fieldName?: string;
     value?: any;
     protoConfig?: any;
     onChange?: (value?: any, option?: any) => void | any;
@@ -33,6 +39,9 @@ export interface FieldComponentProps {
         value: string;
     }[];
     rules?: any;
+    defaultStyle?: React.CSSProperties;
+    extendComponents?: FieldExtendsTypeType[];
+    [k: string]: any;
 }
-declare const FieldComponent: React.ForwardRefExoticComponent<FieldComponentProps & React.RefAttributes<unknown>>;
+declare const FieldComponent: React.ForwardRefExoticComponent<Omit<FieldComponentProps, "ref"> & React.RefAttributes<unknown>>;
 export default FieldComponent;

package/es/FormComp/FieldComponent/index.js

@@ -16,6 +16,7 @@ import RefactorTreeSelect from "./RefactorTreeSelect";
 import { setSelectValue, setDatePickerValue, setTimePickerValue, setCascaderValue } from "./setReadonlyValues";
 import TitleNode from "./TitleNode";
 import ReUpload from "./ReUpload";
+import ExtensionField from "./ExtensionField";
 // import UploaderViewer from './UploaderViewer'
 import { FanContext } from "../../ConfigContext";
 var TextArea = Input.TextArea,
@@ -23,42 +24,50 @@ var TextArea = Input.TextArea,
 var Option = Select.Option;
 var RangePicker = DatePicker.RangePicker;
 // 表单组件类型
+// @ts-ignore
 var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var type = props.type,
-    _onChange = props.onChange,
-    value = props.value,
-    style = props.style,
-    placeholder = props.placeholder,
-    protoConfig = props.protoConfig,
-    _props$treeData = props.treeData,
-    treeData = _props$treeData === void 0 ? [] : _props$treeData,
-    filedName = props.filedName,
-    _props$selectOptionNa = props.selectOptionName,
-    selectOptionName = _props$selectOptionNa === void 0 ? {
+  var InitFanContext = useContext(FanContext);
+  var providerConfig = InitFanContext['Field'] || {}; // 使用上下文（全局配置）设置扩展的配置项
+  var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
+    type = _providerConfig$props.type,
+    _onChange = _providerConfig$props.onChange,
+    value = _providerConfig$props.value,
+    style = _providerConfig$props.style,
+    placeholder = _providerConfig$props.placeholder,
+    protoConfig = _providerConfig$props.protoConfig,
+    _providerConfig$props2 = _providerConfig$props.treeData,
+    treeData = _providerConfig$props2 === void 0 ? [] : _providerConfig$props2,
+    filedName = _providerConfig$props.filedName,
+    fieldName = _providerConfig$props.fieldName,
+    _providerConfig$props3 = _providerConfig$props.selectOptionName,
+    selectOptionName = _providerConfig$props3 === void 0 ? {
       value: 'value',
       label: 'label',
       disabled: 'disabled',
       title: 'title'
-    } : _props$selectOptionNa,
-    _props$treeOptionName = props.treeOptionName,
-    treeOptionName = _props$treeOptionName === void 0 ? {
+    } : _providerConfig$props3,
+    _providerConfig$props4 = _providerConfig$props.treeOptionName,
+    treeOptionName = _providerConfig$props4 === void 0 ? {
       title: 'title',
       value: 'value',
       children: 'children',
       disabled: 'disabled'
-    } : _props$treeOptionName,
-    _props$fieldStatus = props.fieldStatus,
-    fieldStatus = _props$fieldStatus === void 0 ? 'default' : _props$fieldStatus,
-    _props$size = props.size,
-    size = _props$size === void 0 ? 'middle' : _props$size,
-    showFullLevel = props.showFullLevel,
-    separator = props.separator,
-    disabledFields = props.disabledFields,
-    selectOptionRender = props.selectOptionRender,
-    render = props.render;
-  var selectOptions = props.selectOptions;
-  var InitFanContext = useContext(FanContext);
-  var providerConfig = (InitFanContext === null || InitFanContext === void 0 ? void 0 : InitFanContext[type || '']) || {}; // 使用上下文（全局配置）设置扩展的配置项
+    } : _providerConfig$props4,
+    _providerConfig$props5 = _providerConfig$props.fieldStatus,
+    fieldStatus = _providerConfig$props5 === void 0 ? 'default' : _providerConfig$props5,
+    _providerConfig$props6 = _providerConfig$props.size,
+    size = _providerConfig$props6 === void 0 ? 'middle' : _providerConfig$props6,
+    showFullLevel = _providerConfig$props.showFullLevel,
+    separator = _providerConfig$props.separator,
+    disabledFields = _providerConfig$props.disabledFields,
+    selectOptionRender = _providerConfig$props.selectOptionRender,
+    render = _providerConfig$props.render,
+    _providerConfig$props7 = _providerConfig$props.defaultStyle,
+    defaultStyle = _providerConfig$props7 === void 0 ? {} : _providerConfig$props7,
+    extendConfig = _providerConfig$props.extendConfig;
+  var _providerConfig$props8 = _objectSpread(_objectSpread({}, providerConfig), props),
+    selectOptions = _providerConfig$props8.selectOptions;
+  var providerProtoConfig = (InitFanContext === null || InitFanContext === void 0 ? void 0 : InitFanContext[type || '']) || {}; // 使用上下文（全局配置）设置控件扩展的配置项
   var compContent;
   if (selectOptionName && selectOptions) {
     // 将传值的数据进行转换
@@ -78,12 +87,12 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     render: render,
     size: size,
     ref: ref
-  }, providerConfig), protoConfig);
+  }, providerProtoConfig), protoConfig);
   if (fieldStatus === 'disabled') {
     defaultProps.disabled = true;
   }
   var sortLimitRule = {}; // 排序字段长度限制
-  if (filedName === 'sorts' || filedName === 'sort' || filedName === 'indexSort' || filedName === 'sorta' || filedName === 'categorySort') {
+  if (filedName === 'sorts' || filedName === 'sort' || filedName === 'indexSort' || filedName === 'sorta' || filedName === 'categorySort' || fieldName === 'sorts' || fieldName === 'sort' || fieldName === 'indexSort' || fieldName === 'sorta' || fieldName === 'categorySort') {
     sortLimitRule = {
       min: 0,
       max: 999999999,
@@ -92,6 +101,7 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }
   // 设置纯展示模式下的“下拉树”控件返回值
   var viewOnly = fieldStatus === 'viewOnly'; // 是否纯展示
+
   switch (type) {
     case 'input':
       compContent = viewOnly ? value || '-' : /*#__PURE__*/React.createElement(Input, _extends({
@@ -105,27 +115,33 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
             evt.preventDefault(); // 禁止默认行为
           }
         }
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
+      }));
       break;
     case 'password':
       compContent = viewOnly ? value ? "\u25CF\u25CF\u25CF\u25CF\u25CF\u25CF" : '-' : /*#__PURE__*/React.createElement(Password, _extends({
         autoComplete: "off",
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请输入',
         maxLength: defaultProps.maxLength || 50
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
+      }));
       break;
     case 'textarea':
       compContent = viewOnly ? value || '-' : /*#__PURE__*/React.createElement(TextArea, _extends({
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请输入',
         maxLength: defaultProps.maxLength || 500,
         title: fieldStatus === 'disabled' || defaultProps.disabled ? value : null
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
+      }));
       break;
     case 'inputNumber':
       compContent = viewOnly ? value || 0 : /*#__PURE__*/React.createElement(InputNumber, _extends({
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请输入数字'
       }, sortLimitRule, defaultProps, {
-        style: _objectSpread({
+        style: _objectSpread(_objectSpread({}, defaultStyle), {}, {
           width: '120px'
         }, defaultProps.style)
       }));
@@ -164,7 +180,9 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
           return (defaultProps === null || defaultProps === void 0 || (_defaultProps$optionR = defaultProps.optionRender) === null || _defaultProps$optionR === void 0 ? void 0 : _defaultProps$optionR.call(defaultProps, _objectSpread(_objectSpread({}, option.data), option), info)) || (selectOptionRender === null || selectOptionRender === void 0 ? void 0 : selectOptionRender(_objectSpread(_objectSpread({}, option.data), option), info)) || option.label;
         }
       }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
         // onChange返回参数：累加当前选中包括其他字段值的数据
+        ,
         onChange: function onChange(value, Option) {
           return _onChange && _onChange(value, resetResultOption(Option));
         } // 数据为对象
@@ -181,7 +199,9 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
         protoTreeNode: protoConfig && protoConfig.TreeNode || {},
         fieldStatus: fieldStatus,
         disabledFields: disabledFields
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
+      }));
       break;
     case 'checkbox':
       delete defaultProps.ref;
@@ -191,7 +211,7 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
         defaultProps: defaultProps,
         separator: separator
       }) : /*#__PURE__*/React.createElement(Checkbox.Group, _extends({}, defaultProps, {
-        style: _objectSpread({
+        style: _objectSpread(_objectSpread({}, defaultStyle), {}, {
           width: 'auto'
         }, defaultProps.style)
       }), selectOptions && selectOptions.map(function (val, index) {
@@ -223,7 +243,7 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
           });
         })
       }, defaultProps, {
-        style: _objectSpread({
+        style: _objectSpread(_objectSpread({}, defaultStyle), {}, {
           width: 'auto'
         }, defaultProps.style)
       }));
@@ -237,9 +257,9 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
         showTime: defaultProps.showTime || type === 'dateTimePicker',
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请选择'
       }, defaultProps, {
-        style: _objectSpread({
-          'minWidth': 'auto'
-        }, defaultProps.style)
+        style: _objectSpread(_objectSpread({
+          width: 'auto'
+        }, defaultStyle), defaultProps.style)
       }));
       break;
     case 'rangePicker':
@@ -252,9 +272,8 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
         showTime: defaultProps.showTime || type === 'rangeTimePicker',
         allowEmpty: true
       }, defaultProps, {
-        style: _objectSpread({
-          width: type === 'rangeTimePicker' ? 'auto' : '100%'
-        }, defaultProps.style)
+        // style={{  width: type === 'rangeTimePicker' ? 'auto' : '100%', ...defaultStyle,...defaultProps.style }}
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
       }));
       break;
     case 'timePicker':
@@ -263,9 +282,7 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
         type: type,
         protoConfig: protoConfig
       }) : /*#__PURE__*/React.createElement(TimePicker, _extends({}, defaultProps, {
-        style: _objectSpread(_objectSpread({
-          'minWidth': 'auto'
-        }, defaultProps.style), {}, {
+        style: _objectSpread(_objectSpread(_objectSpread({}, defaultStyle), defaultProps.style), {}, {
           width: 'auto'
         })
       }));
@@ -279,11 +296,7 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }) : /*#__PURE__*/React.createElement(TimePicker.RangePicker, _extends({
         allowEmpty: true
       }, defaultProps, {
-        style: _objectSpread(_objectSpread({
-          'minWidth': 'auto'
-        }, defaultProps.style), {}, {
-          width: 'auto'
-        })
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
       }));
       break;
     case 'upload':
@@ -317,7 +330,9 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
         allowClear: true,
         fieldNames: (defaultProps === null || defaultProps === void 0 ? void 0 : defaultProps.fieldNames) || selectOptionName,
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请选择'
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
+      }));
       break;
     case 'switch':
       compContent = /*#__PURE__*/React.createElement(Switch, _extends({}, defaultProps, {
@@ -331,7 +346,7 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       break;
     case 'slider':
       compContent = viewOnly ? value : /*#__PURE__*/React.createElement(Slider, _extends({}, defaultProps, {
-        style: _objectSpread({}, defaultProps.style)
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
       }));
       break;
     case 'mentions':
@@ -342,20 +357,72 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
             label: selectOptionRender ? selectOptionRender(val) : val.label
           });
         })
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
+      }));
       break;
     case 'rate':
       compContent = /*#__PURE__*/React.createElement(Rate, _extends({
         disabled: viewOnly || defaultProps.disabled
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), {}, {
+          width: 'auto'
+        }, defaultProps.style)
+      }));
       break;
     case 'custom':
       compContent = defaultProps.render && defaultProps.render(props) || defaultProps.customRender && defaultProps.customRender(props) || null;
       break;
+    // case 'extends':
+    //   compContent =  <ExtensionField {...props} {...defaultProps}/>
+    //   break;
     default:
-      compContent = value;
+      // 扩展组件
+      if (((providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.extendComponents) || []).some(function (tItem) {
+        return tItem.extendType === props.type;
+      })) {
+        compContent = /*#__PURE__*/React.createElement(ExtensionField, _extends({}, props, defaultProps, {
+          extendType: type
+        }));
+        // const MatchType = (extendComponents || []).find((tItem: FieldExtendsTypeType) => tItem.extendType === type)
+        // const MatchTypeComponent = MatchType?.component
+        // // const { type, ...fieldProps } = { ...props }
+        // console.log('fieldProps',  props, defaultProps)
+        // return typeof MatchTypeComponent === 'function'
+        //   ? <MatchTypeComponent ref={ref} fieldProps={props} proptoConfig={protoConfig} extendConfig={Object.assign(extendConfig || {}, MatchType?.extendConfig || {})}/>
+        //   : MatchTypeComponent
+        //
+        // const MatchType = (providerConfig?.extendComponents || []).find((tItem: FieldExtendsTypeType) => tItem.extendType === props.type)
+        // const MatchTypeComponent = MatchType?.component
+        // const { type, ...fieldProps } = props
+        // compContent = typeof MatchTypeComponent === 'function'
+        //   ? <MatchTypeComponent {...fieldProps}/>
+        //   : MatchTypeComponent
+      } else {
+        compContent = value;
+      }
       break;
   }
   return compContent;
 });
-export default FieldComponent;
+export default FieldComponent;
+//
+// // 高阶组件
+// const withLibraryInjection = (LibraryComponent) => (WrappedComponent) => {
+//   return class InjectedComponent extends React.Component {
+//     render() {
+//       return (
+//         <>
+//           <LibraryComponent {...this.props} children={<WrappedComponent {...this.props} />}/>
+//         </>
+//       );
+//     }
+//   };
+// };
+//
+//
+// // 应用HOC
+// const MyComponentWithLibrary = withLibraryInjection(FieldComponent)(ExtensionField);
+//
+//
+// export default MyComponentWithLibrary

package/es/FormComp/RenderItemGroup/index.js

@@ -157,16 +157,21 @@ var RenderItemGroup = function RenderItemGroup(props) {
 
   // 渲染表单控件
   var renderFormField = function renderFormField(field) {
+    var _general$inlineFormIt;
     var componentStyle = field.componentStyle,
       extra = field.extra,
       preExtra = field.preExtra; // 当前可传参的配置值
+    // 表单控件样式默认最小宽，如有单独配置width时，则不配置
+    // @ts-ignore
+    var FieldDefaultWidth = layout === 'inline' ? _objectSpread({}, (_general$inlineFormIt = general.inlineFormItemStyle) === null || _general$inlineFormIt === void 0 ? void 0 : _general$inlineFormIt[size]) : _objectSpread({}, general.inlineFormItemStyle.wide); // componentStyle?.width ? {} : { width: layout === 'inline' ? general.formItemStyle?.[size].width : general.formItemStyle.wide.width }
     // 带前缀或后缀控件渲染
     if (preExtra || extra) {
       return /*#__PURE__*/React.createElement(Space, null, preExtra ? preExtra(field, form) : '', /*#__PURE__*/React.createElement(FormItem, {
         noStyle: true,
         rules: field.rules || (field.fieldOptions ? field.fieldOptions.rules : []),
-        name: field.filedName
+        name: field.filedName || field.fieldName
       }, /*#__PURE__*/React.createElement(Field, _extends({}, field, {
+        // @ts-ignore
         onChange: function onChange(eOrValue) {
           updateFormFields();
           for (var _len = arguments.length, otherParams = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -175,17 +180,24 @@ var RenderItemGroup = function RenderItemGroup(props) {
           if (field.onChange) field.onChange.apply(field, [eOrValue].concat(otherParams));
         },
         fieldStatus: field.fieldStatus || fieldStatus,
-        size: field.protoConfig && field.protoConfig.size || field.size || fieldSize,
-        style: componentStyle || _objectSpread({}, general.formItemStyle.wide)
+        size: field.protoConfig && field.protoConfig.size || field.size || fieldSize
+        // @ts-ignore
+        ,
+        style: componentStyle || {}
+        //      style={componentStyle || { ...general.formItemStyle.wide }}
+        //      style={componentStyle || ( layout === 'inline' ? { ...general.inlineFormItemStyle?.[size] } : {...general.inlineFormItemStyle.wide})}
+        ,
+        defaultStyle: componentStyle ? {} : FieldDefaultWidth
       }))), extra ? extra(field, form) : '');
     } else {
       return /*#__PURE__*/React.createElement(Field, _extends({}, field, {
+        // @ts-ignore
         onChange: function onChange(eOrValue) {
           // let updateValue = val
           // if (field.type === 'input' || field.type === 'textarea' || field.type === 'radio' || field.type === 'password') {
           //   updateValue = val.target.value
           // }
-          // updateFormFields({ [field.filedName]: updateValue })
+          // updateFormFields({ [field.filedName || field.fieldName]: updateValue })
           updateFormFields();
           // if (field.onChange) field.onChange(val, form)
           for (var _len2 = arguments.length, otherParams = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
@@ -195,7 +207,11 @@ var RenderItemGroup = function RenderItemGroup(props) {
         },
         fieldStatus: field.fieldStatus || fieldStatus,
         size: field.protoConfig && field.protoConfig.size || field.size || fieldSize,
-        style: componentStyle || _objectSpread({}, general.formItemStyle.wide)
+        style: componentStyle || {}
+        // style={componentStyle || { ...general.formItemStyle.wide }}
+        // style={componentStyle || ( layout === 'inline' ? { ...general.inlineFormItemStyle?.[size] } : {...general.inlineFormItemStyle.wide})}
+        ,
+        defaultStyle: componentStyle ? {} : FieldDefaultWidth
       }));
     }
   };
@@ -204,14 +220,15 @@ var RenderItemGroup = function RenderItemGroup(props) {
       description = item.description,
       type = item.type,
       customRender = item.customRender,
-      filedName = item.filedName; // 当前可传参的配置值
+      filedName = item.filedName,
+      fieldName = item.fieldName; // 当前可传参的配置值
     if (layout === "horizontal" || layout === "vertical") {
       return /*#__PURE__*/React.createElement(Col, _extends({
         key: index,
         span: item.colSpan || setColSpan(item.display, size, columnCount),
         style: item.style
       }, item.protoCol), /*#__PURE__*/React.createElement(FormItem, _extends({
-        name: type !== 'custom' && filedName,
+        name: type !== 'custom' && (filedName || fieldName),
         className: classNames(fieldStatus === 'viewOnly' ? 'form-item-view-only' : '', 'spec-item-group-form-item'),
         label: description ? /*#__PURE__*/React.createElement("span", null, label, /*#__PURE__*/React.createElement(Tooltip, {
           title: description
@@ -226,7 +243,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
     } else {
       return /*#__PURE__*/React.createElement(FormItem, _extends({
         key: index,
-        name: type !== 'custom' && filedName,
+        name: type !== 'custom' && (filedName || fieldName),
         className: classNames(fieldStatus === 'viewOnly' ? 'form-item-view-only' : '', 'spec-item-group-form-item'),
         label: description ? /*#__PURE__*/React.createElement("span", null, label, /*#__PURE__*/React.createElement(Tooltip, {
           title: description

package/es/NavLeafScroll/Main.js

@@ -48,7 +48,7 @@ var NavLeafScroll = /*#__PURE__*/function (_Component) {
       // const isEnough = wrapHeight % baseItemHeight === 0; // 剩余的是否足够容纳一个单元格
       var isInsideEnoughWidth = navList.length * baseItemWidth <= _this.mainWrap.current.clientWidth;
       var wrapWidth = _this.mainWrap.current.clientWidth - (isInsideEnoughWidth ? 0 : 30 * 2);
-      console.log('this.mainWrap.current.clientWidth', _this.mainWrap.current.clientWidth, wrapWidth, isInsideEnoughWidth);
+      // console.log('this.mainWrap.current.clientWidth', this.mainWrap.current.clientWidth, wrapWidth, isInsideEnoughWidth)
       var floorWidth = _this.leafNav.current.clientWidth; // 所有楼层占用的宽度
       if (type === 'horizontal') {
         // 判断有效区域与单元格高度：若小于，则直接使用单元格高度，否则将内容区高度去除不足一个单元格高度
@@ -286,7 +286,7 @@ var NavLeafScroll = /*#__PURE__*/function (_Component) {
         floorWidth = _this$state3$floorRel.floorWidth,
         stepSize = _this$state3.stepSize;
       if (type === 'horizontal') {}
-      if (JSON.stringify(navList) !== JSON.stringify(prevProps.navList) || (type === 'horizontal' ? baseItemWidth !== prevProps.baseItemWidth : baseItemHeight !== prevProps.baseItemHeight) || align !== prevProps.align) {
+      if (navList !== prevProps.navList || (type === 'horizontal' ? baseItemWidth !== prevProps.baseItemWidth : baseItemHeight !== prevProps.baseItemHeight) || align !== prevProps.align) {
         this.initFloorValues();
       }
       if (forbidScroll !== prevProps.forbidScroll) {

package/es/StandardDragModal/ChangeStandardModal.js

@@ -295,7 +295,7 @@ var StandardModal = function StandardModal(props) {
         // console.log('执行下一步骤，需要优先进行校验')
         var currentFields = (formItemGroup || [])[current].fields;
         var validatorGroup = currentFields && Array.isArray(currentFields) ? currentFields.map(function (fItem) {
-          return fItem.rules ? fItem.filedName : null;
+          return fItem.rules ? fItem.filedName || fItem.fieldName : null;
         }) : [];
         formChild.validateFields(validatorGroup).then(function () {
           // if (stepClick) stepClick(type, formChild, values);

package/es/StandardFilter/index.js

@@ -52,16 +52,19 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
     cancelButtonProps = _providerConfig$props6 === void 0 ? {} : _providerConfig$props6,
     filterButtonColSpan = _providerConfig$props.filterButtonColSpan,
     filterButtonConfig = _providerConfig$props.filterButtonConfig,
-    formLayout = _providerConfig$props.formLayout,
-    _providerConfig$props7 = _providerConfig$props.gridLayout,
-    gridLayout = _providerConfig$props7 === void 0 ? 'inline' : _providerConfig$props7,
+    _providerConfig$props7 = _providerConfig$props.formLayout,
+    formLayout = _providerConfig$props7 === void 0 ? 'inline' : _providerConfig$props7,
+    _providerConfig$props8 = _providerConfig$props.gridLayout,
+    gridLayout = _providerConfig$props8 === void 0 ? 'inline' : _providerConfig$props8,
+    _providerConfig$props9 = _providerConfig$props.buttonGroupPlacement,
+    buttonGroupPlacement = _providerConfig$props9 === void 0 ? 'left' : _providerConfig$props9,
     filterFormStyle = _providerConfig$props.filterFormStyle,
     filterBtnsStyle = _providerConfig$props.filterBtnsStyle,
-    _providerConfig$props8 = _providerConfig$props.colon,
-    colon = _providerConfig$props8 === void 0 ? true : _providerConfig$props8,
+    _providerConfig$props10 = _providerConfig$props.colon,
+    colon = _providerConfig$props10 === void 0 ? true : _providerConfig$props10,
     dateFormatter = _providerConfig$props.dateFormatter,
-    _providerConfig$props9 = _providerConfig$props.collapseable,
-    collapseable = _providerConfig$props9 === void 0 ? false : _providerConfig$props9;
+    _providerConfig$props11 = _providerConfig$props.collapseable,
+    collapseable = _providerConfig$props11 === void 0 ? false : _providerConfig$props11;
   var filterFormRef = useRef();
   // ref 的转发
   useImperativeHandle(ref, function () {
@@ -299,7 +302,7 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
   // 判断是否隐藏结构, display:'none'
   var setItemHiddenNode = function setItemHiddenNode(item, index, collapsed, showItemNumber) {
     // console.log('判断是否隐藏结构==>当前执行序号', index, showItemNumber)
-    if (item.filedName === 'filterAction') {
+    if (item.filedName === 'filterAction' || item.fieldName === 'filterAction') {
       return {
         isHidden: false
       };
@@ -394,7 +397,7 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
   };
   var renderButtonGroup = function renderButtonGroup() {
     return buttonGroup && buttonGroup.length > 0 ? /*#__PURE__*/React.createElement("div", {
-      className: "filter-btns filter-btns-".concat(gridLayout),
+      className: "filter-btns filter-btns-".concat(gridLayout, " filter-btns-").concat(gridLayout, "-").concat(buttonGroupPlacement),
       style: filterBtnsStyle
     }, /*#__PURE__*/React.createElement(ButtonGroup, _extends({
       options: buttonGroup,

package/es/StandardFilter/style/FilterStyle.js

@@ -28,7 +28,7 @@ var StandardFilterStyleFunc = function StandardFilterStyleFunc(prefix) {
         },
         '.filter-btns .ant-btn': {
           marginLeft: token.paddingXS,
-          marginTop: token.paddingXS,
+          // marginTop: token.paddingXS,
           // marginBottom: token.paddingMD,
           marginBottom: token.paddingXS
         },
@@ -36,9 +36,18 @@ var StandardFilterStyleFunc = function StandardFilterStyleFunc(prefix) {
           // lineHeight: token.controlHeight - 2 + 'px' // 去除样式
         },
         '&.filter-grid-horizontal': {
-          '.filter-btn': {
-            '.spec-button-group': {
-              paddingTop: token.paddingMD
+          // '.filter-btn': {
+          //   '.spec-button-group': {
+          //     paddingTop: token.paddingMD
+          //   },
+          //
+          // },
+          '.filter-btns-horizontal': {
+            '&.filter-btns-horizontal-right .spec-button-group': {
+              justifyContent: 'end'
+            },
+            '&.filter-btns-horizontal-left .spec-button-group': {
+              justifyContent: 'start'
             }
           }
         }

package/es/StandardFilter/style/index.less

@@ -33,10 +33,17 @@
       text-align: left;
 
       .spec-button-group {
-        display: block;
+        display: flex;
+        flex-wrap: wrap;
         padding-left: 0;
         //padding-top: @padding-md;
-
+        //&:before {
+        //  content: '';
+        //  float: left;
+        //}
+        //&:after {
+        //  clear: both;
+        //}
         .ant-btn:first-child {
           margin-left: 0;
         }

package/es/StandardForm/StepForm.js

@@ -90,7 +90,7 @@ var StepForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
         var valitorGroup = curentFields && Array.isArray(curentFields) ? curentFields.filter(function (fItem) {
           return fItem.rules;
         }).map(function (matchItem) {
-          return matchItem.filedName;
+          return matchItem.filedName || matchItem.fieldName;
         }) : [];
         formChild && formChild.validateFields(valitorGroup).then(function (values) {
           if (stepClick) stepClick(type, formChild, values);

package/es/StandardModal/index.js

@@ -307,7 +307,7 @@ var StandardModal = function StandardModal(props) {
         // console.log('执行下一步骤，需要优先进行校验')
         var currentFields = (formItemGroup || [])[current].fields;
         var validatorGroup = currentFields && Array.isArray(currentFields) ? currentFields.map(function (fItem) {
-          return fItem.rules ? fItem.filedName : null;
+          return fItem.rules ? fItem.filedName || fItem.filedName : null;
         }) : [];
         formChild.validateFields(validatorGroup).then(function () {
           // if (stepClick) stepClick(type, formChild, values);