fan-standard-comp 3.0.13 → 3.0.14

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, {
@@ -425,6 +425,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 +433,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/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, {

package/lib/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/lib/StandardForm/TabForm.js

@@ -61,7 +61,8 @@ var TabForm = /*#__PURE__*/_react.default.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 = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -98,6 +99,7 @@ var TabForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     actionGroup: [],
     ref: ref,
     fieldSize: fieldSize,
+    // @ts-ignore
     getFormFields: function getFormFields(fields, form) {
       setFormChildFields(fields);
       setFormChild(form);
@@ -125,6 +127,7 @@ var TabForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       form: formChild,
       fieldStatus: fieldStatus,
       size: formGridSize,
+      displayLayout: displayLayout,
       // doUpdateFormFields={() => forceUpdateForm()}
       itemGroup: fields
     }) : fields, !actionHide && actions && /*#__PURE__*/_react.default.createElement(_col.default, {

package/lib/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/lib/StandardForm/index.js

@@ -71,7 +71,8 @@ var StandardForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       prefix = props.prefix,
       postfix = props.postfix,
       fieldSize = props.fieldSize,
-      baseProps = (0, _tslib.__rest)(props, ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize"]);
+      displayLayout = props.displayLayout,
+      baseProps = (0, _tslib.__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.default.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -184,6 +185,7 @@ var StandardForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   }), prefix, children, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, formItemGroup.length > 0 ? /*#__PURE__*/_react.default.createElement(_RenderItemGroup.default, {
     itemGroup: formItemGroup,
     fieldSize: fieldSize,
+    displayLayout: displayLayout,
     // doUpdateFormFields={() => forceUpdateForm()}
     size: gridSize,
     layout: layout,

package/lib/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/lib/StandardModal/index.js

@@ -86,7 +86,8 @@ var StandardModal = function StandardModal(props) {
       formLayout = _props$formLayout === void 0 ? 'horizontal' : _props$formLayout,
       tabsConfig = props.tabsConfig,
       stepsConfig = props.stepsConfig,
-      otherProps = (0, _tslib.__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 = (0, _tslib.__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.default.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -286,8 +287,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.default.createElement(_RenderItemGroup.default, {
@@ -454,6 +454,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);
@@ -461,20 +462,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.default.createElement(_StepForm.default, {
     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/package.json

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