@flatbiz/antd 5.0.21 → 5.0.22

package/dist/form-item-wrapper/index.d.ts

@@ -1,4 +1,4 @@
-import { TAny } from '@flatbiz/utils';
+import { TAny, TPlainObject } from '@flatbiz/utils';
 import { FormItemProps } from 'antd';
 import { ReactElement, ReactNode } from 'react';
 
@@ -20,7 +20,7 @@ export type TFormItemLayoutPreClassNameProps = {
 	 */
 	className?: string;
 };
-export type FormItemWrapperProps = FormItemProps & TFormItemLayoutPreClassNameProps & {
+export type FormItemWrapperProps = Omit<FormItemProps, "hidden"> & TFormItemLayoutPreClassNameProps & {
 	wrapper?: (children: ReactNode) => ReactElement;
 	/** 设置wrapper后，before、after失效 */
 	before?: ReactNode;
@@ -33,12 +33,25 @@ export type FormItemWrapperProps = FormItemProps & TFormItemLayoutPreClassNamePr
 	 * 如果设置 normalize 属性，outputNormalize将失效
 	 */
 	outputNormalize?: (value?: TAny) => TAny;
-	/** 是否清除 Form.Item  */
-	isClear?: boolean;
+	/**
+	 * 隐藏 Form.Item，同时清除 Form.Item 值
+	 * ```
+	 * 1.与 dependencies 属性配合使用，可实现当前FormItemWrapper的显示隐藏
+	 * ```
+	 */
+	isClear?: boolean | ((formValues: TPlainObject) => boolean);
+	/**
+	 * 隐藏 Form.Item，不会清除 Form.Item 值
+	 * ```
+	 * 1.与 dependencies 属性配合使用，可实现当前FormItemWrapper的显示隐藏
+	 * ```
+	 */
+	hidden?: boolean | ((formValues: TPlainObject) => boolean);
 	/**
 	 * 栅格占位格数，最大值：24
 	 * ```
-	 * 1. 当 FormItemWrapper 处在 EasyForm 直接子节点中有效，即FormItemWrapper在EasyForm栅格中的占位格数；
+	 * 1. 当前FormItemWrapper处在 EasyForm 直接子节点中有效，即FormItemWrapper在EasyForm栅格中的占位格数；
+	 * 2. 父节点使用属性值，当前节点不使用属性值
 	 * ```
 	 */
 	span?: number;
@@ -49,8 +62,8 @@ export type FormItemWrapperProps = FormItemProps & TFormItemLayoutPreClassNamePr
  * 1. 为 children 增加 before、after
  * 2. 对输入、输出数据进行序列化处理
  * 3. 内置布局样式使用 preDefinedClassName.formItem
- * 4. 设置隐藏域（不清除字段值） 使用hidden
- * 5. 设置隐藏域（清除字段值）使用isClear
+ * 4. 设置隐藏域（不清除字段值） 使用hidden，存在依赖逻辑，可与dependencies属性配合使用
+ * 5. 设置隐藏域（清除字段值）使用isClear，存在依赖逻辑，可与dependencies属性配合使用
  * ```
  */
 export declare const FormItemWrapper: {

package/dist/form-item-wrapper/index.js

@@ -4,7 +4,7 @@ import './../pre-defined-class-name/index.css';
 import './index.css';
 /*! @flatjs/forge MIT @flatbiz/antd */
 
-export { F as FormItemWrapper } from '../form-item-wrapper-DHRbunEm.js';
+export { F as FormItemWrapper } from '../form-item-wrapper-CcXZVf_r.js';
 import '../_rollupPluginBabelHelpers-BYm17lo8.js';
 import 'react';
 import 'antd';

package/dist/{form-item-wrapper-DHRbunEm.js → form-item-wrapper-CcXZVf_r.js}

@@ -9,7 +9,7 @@ import { preDefinedClassName } from './pre-defined-class-name/index.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
 
 var _excluded = ["wrapper", "children", "inputNormalize", "isClear"],
-  _excluded2 = ["wrapper", "isClear", "labelWidth", "labelItemVertical", "labelAlign", "children", "before", "after", "inputNormalize", "outputNormalize", "className"];
+  _excluded2 = ["wrapper", "isClear", "labelWidth", "labelItemVertical", "labelAlign", "children", "before", "after", "inputNormalize", "outputNormalize", "className", "dependencies", "hidden"];
 var FormItemWrapperChildren = function FormItemWrapperChildren(props) {
   var wrapper = props.wrapper,
     children = props.children,
@@ -64,8 +64,8 @@ var FormItemWrapperChildren = function FormItemWrapperChildren(props) {
  * 1. 为 children 增加 before、after
  * 2. 对输入、输出数据进行序列化处理
  * 3. 内置布局样式使用 preDefinedClassName.formItem
- * 4. 设置隐藏域（不清除字段值） 使用hidden
- * 5. 设置隐藏域（清除字段值）使用isClear
+ * 4. 设置隐藏域（不清除字段值） 使用hidden，存在依赖逻辑，可与dependencies属性配合使用
+ * 5. 设置隐藏域（清除字段值）使用isClear，存在依赖逻辑，可与dependencies属性配合使用
  * ```
  */
 var FormItemWrapper = function FormItemWrapper(props) {
@@ -74,13 +74,16 @@ var FormItemWrapper = function FormItemWrapper(props) {
     labelWidth = props.labelWidth,
     labelItemVertical = props.labelItemVertical,
     labelAlign = props.labelAlign,
-    children = props.children,
+    _children2 = props.children,
     before = props.before,
     after = props.after,
     inputNormalize = props.inputNormalize,
     outputNormalize = props.outputNormalize,
     className = props.className,
+    dependencies = props.dependencies,
+    hidden = props.hidden,
     rest = _objectWithoutProperties(props, _excluded2);
+  var form = Form.useFormInstance();
   var innerClassName = useMemo(function () {
     return preDefinedClassName.getFormItemLayoutClassName({
       labelWidth: labelWidth,
@@ -89,22 +92,53 @@ var FormItemWrapper = function FormItemWrapper(props) {
       className: className
     });
   }, [labelWidth, labelItemVertical, labelAlign, className]);
+  if (dependencies && (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) > 0) {
+    return /*#__PURE__*/jsx(Form.Item, {
+      dependencies: dependencies,
+      noStyle: true,
+      children: function children(innerForm) {
+        var innerHidden = typeof hidden === 'function' ? hidden === null || hidden === void 0 ? void 0 : hidden(innerForm.getFieldsValue()) : hidden;
+        var innerIsClear = typeof isClear === 'function' ? isClear === null || isClear === void 0 ? void 0 : isClear(innerForm.getFieldsValue()) : isClear;
+        var rules = rest.rules;
+        if (innerIsClear || innerHidden) {
+          rules = [];
+        }
+        return /*#__PURE__*/jsx(Form.Item, _objectSpread2(_objectSpread2({
+          normalize: outputNormalize
+        }, rest), {}, {
+          className: innerClassName,
+          hidden: innerIsClear || innerHidden,
+          rules: rules,
+          children: /*#__PURE__*/isValidElement(_children2) ? /*#__PURE__*/jsx(FormItemWrapperChildren, {
+            wrapper: wrapper,
+            before: before,
+            after: after,
+            inputNormalize: inputNormalize,
+            isClear: innerIsClear,
+            children: _children2
+          }) : _children2
+        }));
+      }
+    });
+  }
+  var innerHidden = typeof hidden === 'function' ? hidden(form.getFieldsValue()) : hidden;
+  var innerIsClear = typeof isClear === 'function' ? isClear(form.getFieldsValue()) : isClear;
   return /*#__PURE__*/jsx(Form.Item, _objectSpread2(_objectSpread2({
     normalize: outputNormalize
   }, rest), {}, {
     className: innerClassName,
-    hidden: rest.hidden || isClear,
-    children: /*#__PURE__*/isValidElement(children) ? /*#__PURE__*/jsx(FormItemWrapperChildren, {
+    hidden: innerHidden || innerIsClear,
+    children: /*#__PURE__*/isValidElement(_children2) ? /*#__PURE__*/jsx(FormItemWrapperChildren, {
       wrapper: wrapper,
       before: before,
       after: after,
       inputNormalize: inputNormalize,
-      isClear: isClear,
-      children: children
-    }) : children
+      isClear: innerIsClear,
+      children: _children2
+    }) : _children2
   }));
 };
 FormItemWrapper['domTypeName'] = 'FormItemWrapper';
 
 export { FormItemWrapper as F };
-//# sourceMappingURL=form-item-wrapper-DHRbunEm.js.map
+//# sourceMappingURL=form-item-wrapper-CcXZVf_r.js.map

package/dist/form-item-wrapper-CcXZVf_r.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-item-wrapper-CcXZVf_r.js","sources":["@flatbiz/antd/src/form-item-wrapper/form-item-wrapper.tsx"],"sourcesContent":["import type { ReactElement, ReactNode } from 'react';\nimport { cloneElement, isValidElement, useMemo } from 'react';\nimport type { FormItemProps } from 'antd';\nimport { Form } from 'antd';\nimport type { TAny, TPlainObject } from '@flatbiz/utils';\nimport { composeProps, isUndefinedOrNull } from '@flatbiz/utils';\nimport { fbaHooks } from '../fba-hooks/index.js';\nimport type { TFormItemLayoutPreClassNameProps } from '../pre-defined-class-name/form/index.jsx';\nimport { preDefinedClassName } from '../pre-defined-class-name/index.js';\nexport type FormItemWrapperProps = Omit<FormItemProps, 'hidden'> &\n  TFormItemLayoutPreClassNameProps & {\n    wrapper?: (children: ReactNode) => ReactElement;\n    /** 设置wrapper后，before、after失效 */\n    before?: ReactNode;\n    /** 设置wrapper后，before、after失效 */\n    after?: ReactNode;\n    /** value 序列化处理 */\n    inputNormalize?: (value?: TAny) => TAny;\n    /**\n     * onChange 参数序列化处理\n     * 如果设置 normalize 属性，outputNormalize将失效\n     */\n    outputNormalize?: (value?: TAny) => TAny;\n    /**\n     * 隐藏 Form.Item，同时清除 Form.Item 值\n     * ```\n     * 1.与 dependencies 属性配合使用，可实现当前FormItemWrapper的显示隐藏\n     * ```\n     */\n    isClear?: boolean | ((formValues: TPlainObject) => boolean);\n    /**\n     * 隐藏 Form.Item，不会清除 Form.Item 值\n     * ```\n     * 1.与 dependencies 属性配合使用，可实现当前FormItemWrapper的显示隐藏\n     * ```\n     */\n    hidden?: boolean | ((formValues: TPlainObject) => boolean);\n    /**\n     * 栅格占位格数，最大值：24\n     * ```\n     * 1. 当前FormItemWrapper处在 EasyForm 直接子节点中有效，即FormItemWrapper在EasyForm栅格中的占位格数；\n     * 2. 父节点使用属性值，当前节点不使用属性值\n     * ```\n     */\n    span?: number;\n  };\n\ntype FormItemWrapperChildrenProps = Pick<\n  FormItemWrapperProps,\n  'wrapper' | 'after' | 'before' | 'inputNormalize' | 'isClear'\n> & {\n  children: ReactElement;\n  value?: any;\n  onChange?: (value?: any) => any;\n};\n\nconst FormItemWrapperChildren = (props: FormItemWrapperChildrenProps) => {\n  const { wrapper, children, inputNormalize, isClear, ...rest } = props;\n  // composeProps 合并执行 Form.Item 传的 onChange 以及组件本身的方法\n  const hasValue = Object.prototype.hasOwnProperty.call(rest, 'value');\n  if (hasValue && inputNormalize) {\n    rest['value'] = inputNormalize(rest['value']);\n  }\n  const _children = cloneElement(\n    children,\n    composeProps(children.props, rest, true)\n  );\n\n  fbaHooks.useEffectCustom(() => {\n    if (isClear && !isUndefinedOrNull(props.value)) {\n      props.onChange?.(undefined);\n    }\n  }, [isClear, props.value]);\n\n  if (wrapper) {\n    return wrapper(_children);\n  }\n  if (props.before || props.after) {\n    return (\n      <div style={{ display: 'flex', alignItems: 'center' }}>\n        {props.before ? (\n          <span style={{ marginRight: 10 }}>{props.before}</span>\n        ) : null}\n        <div style={{ flex: 1 }}>{_children}</div>\n        {props.after ? (\n          <span style={{ marginLeft: 10 }}>{props.after}</span>\n        ) : null}\n      </div>\n    );\n  }\n  return _children;\n};\n\n/**\n * 对 Form.Item 包装处理\n * ```\n * 1. 为 children 增加 before、after\n * 2. 对输入、输出数据进行序列化处理\n * 3. 内置布局样式使用 preDefinedClassName.formItem\n * 4. 设置隐藏域（不清除字段值） 使用hidden，存在依赖逻辑，可与dependencies属性配合使用\n * 5. 设置隐藏域（清除字段值）使用isClear，存在依赖逻辑，可与dependencies属性配合使用\n * ```\n */\nexport const FormItemWrapper = (props: FormItemWrapperProps) => {\n  const {\n    wrapper,\n    isClear,\n    labelWidth,\n    labelItemVertical,\n    labelAlign,\n    children,\n    before,\n    after,\n    inputNormalize,\n    outputNormalize,\n    className,\n    dependencies,\n    hidden,\n    ...rest\n  } = props;\n  const form = Form.useFormInstance();\n  const innerClassName = useMemo(() => {\n    return preDefinedClassName.getFormItemLayoutClassName({\n      labelWidth,\n      labelItemVertical,\n      labelAlign,\n      className,\n    });\n  }, [labelWidth, labelItemVertical, labelAlign, className]);\n\n  if (dependencies && dependencies?.length > 0) {\n    return (\n      <Form.Item dependencies={dependencies} noStyle>\n        {(innerForm) => {\n          const innerHidden =\n            typeof hidden === 'function'\n              ? hidden?.(innerForm.getFieldsValue())\n              : hidden;\n          const innerIsClear =\n            typeof isClear === 'function'\n              ? isClear?.(innerForm.getFieldsValue())\n              : isClear;\n          let rules = rest.rules;\n          if (innerIsClear || innerHidden) {\n            rules = [];\n          }\n          return (\n            <Form.Item\n              normalize={outputNormalize}\n              {...rest}\n              className={innerClassName}\n              hidden={innerIsClear || innerHidden}\n              rules={rules}\n            >\n              {isValidElement(children) ? (\n                <FormItemWrapperChildren\n                  wrapper={wrapper}\n                  before={before}\n                  after={after}\n                  inputNormalize={inputNormalize}\n                  isClear={innerIsClear}\n                >\n                  {children}\n                </FormItemWrapperChildren>\n              ) : (\n                children\n              )}\n            </Form.Item>\n          );\n        }}\n      </Form.Item>\n    );\n  }\n\n  const innerHidden =\n    typeof hidden === 'function' ? hidden(form.getFieldsValue()) : hidden;\n  const innerIsClear =\n    typeof isClear === 'function' ? isClear(form.getFieldsValue()) : isClear;\n\n  return (\n    <Form.Item\n      normalize={outputNormalize}\n      {...rest}\n      className={innerClassName}\n      hidden={innerHidden || innerIsClear}\n    >\n      {isValidElement(children) ? (\n        <FormItemWrapperChildren\n          wrapper={wrapper}\n          before={before}\n          after={after}\n          inputNormalize={inputNormalize}\n          isClear={innerIsClear}\n        >\n          {children}\n        </FormItemWrapperChildren>\n      ) : (\n        children\n      )}\n    </Form.Item>\n  );\n};\n\nFormItemWrapper['domTypeName'] = 'FormItemWrapper';\n"],"names":["FormItemWrapperChildren","props","wrapper","children","inputNormalize","isClear","rest","_objectWithoutProperties","_excluded","hasValue","Object","prototype","hasOwnProperty","call","_children","cloneElement","composeProps","fbaHooks","useEffectCustom","isUndefinedOrNull","value","_props$onChange","onChange","undefined","before","after","_jsxs","style","display","alignItems","_jsx","marginRight","flex","marginLeft","FormItemWrapper","labelWidth","labelItemVertical","labelAlign","outputNormalize","className","dependencies","hidden","_excluded2","form","Form","useFormInstance","innerClassName","useMemo","preDefinedClassName","getFormItemLayoutClassName","length","Item","noStyle","innerForm","innerHidden","getFieldsValue","innerIsClear","rules","_objectSpread","normalize","isValidElement"],"mappings":"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"}

package/dist/index.d.ts

@@ -374,6 +374,14 @@ export type BoxColProps = {
 	xl?: number;
 	/** 屏幕 ≥ 1600px */
 	xxl?: number;
+	/**
+	 * 是否移除 外部包装div
+	 * ```
+	 * 1. 如果children 为数组，则此配置不生效
+	 * 2. 如果移除，会在children中添加style和className（所以children组件必须要有style、className属性）
+	 * ```
+	 */
+	removeWrapper?: boolean;
 };
 export declare const BoxGrid: {
 	/**
@@ -996,7 +1004,7 @@ export type TFormItemLayoutPreClassNameProps = {
 	 */
 	className?: string;
 };
-export type FormItemWrapperProps = FormItemProps & TFormItemLayoutPreClassNameProps & {
+export type FormItemWrapperProps = Omit<FormItemProps, "hidden"> & TFormItemLayoutPreClassNameProps & {
 	wrapper?: (children: ReactNode) => ReactElement;
 	/** 设置wrapper后，before、after失效 */
 	before?: ReactNode;
@@ -1009,12 +1017,25 @@ export type FormItemWrapperProps = FormItemProps & TFormItemLayoutPreClassNamePr
 	 * 如果设置 normalize 属性，outputNormalize将失效
 	 */
 	outputNormalize?: (value?: TAny) => TAny;
-	/** 是否清除 Form.Item  */
-	isClear?: boolean;
+	/**
+	 * 隐藏 Form.Item，同时清除 Form.Item 值
+	 * ```
+	 * 1.与 dependencies 属性配合使用，可实现当前FormItemWrapper的显示隐藏
+	 * ```
+	 */
+	isClear?: boolean | ((formValues: TPlainObject) => boolean);
+	/**
+	 * 隐藏 Form.Item，不会清除 Form.Item 值
+	 * ```
+	 * 1.与 dependencies 属性配合使用，可实现当前FormItemWrapper的显示隐藏
+	 * ```
+	 */
+	hidden?: boolean | ((formValues: TPlainObject) => boolean);
 	/**
 	 * 栅格占位格数，最大值：24
 	 * ```
-	 * 1. 当 FormItemWrapper 处在 EasyForm 直接子节点中有效，即FormItemWrapper在EasyForm栅格中的占位格数；
+	 * 1. 当前FormItemWrapper处在 EasyForm 直接子节点中有效，即FormItemWrapper在EasyForm栅格中的占位格数；
+	 * 2. 父节点使用属性值，当前节点不使用属性值
 	 * ```
 	 */
 	span?: number;
@@ -1025,8 +1046,8 @@ export type FormItemWrapperProps = FormItemProps & TFormItemLayoutPreClassNamePr
  * 1. 为 children 增加 before、after
  * 2. 对输入、输出数据进行序列化处理
  * 3. 内置布局样式使用 preDefinedClassName.formItem
- * 4. 设置隐藏域（不清除字段值） 使用hidden
- * 5. 设置隐藏域（清除字段值）使用isClear
+ * 4. 设置隐藏域（不清除字段值） 使用hidden，存在依赖逻辑，可与dependencies属性配合使用
+ * 5. 设置隐藏域（清除字段值）使用isClear，存在依赖逻辑，可与dependencies属性配合使用
  * ```
  */
 export declare const FormItemWrapper: {
@@ -1408,6 +1429,14 @@ export type EasyFormProps = Omit<FormWrapperProps, "children"> & {
 	 * true: 当前EasyForm组件不使用Antd Form包裹，可在Form、EasyForm、FormWrapper内部使用
 	 */
 	nonuseFormWrapper?: boolean;
+	/**
+	 * 栅格占位格数，最大值：24
+	 * ```
+	 * 1. 当前EasyForm处在 EasyForm 直接子节点中有效，即当前EasyForm在EasyForm栅格中的占位格数；
+	 * 2. 父节点使用属性值，当前节点不使用属性值
+	 * ```
+	 */
+	span?: number;
 };
 /**
  * 简单Form布局，可自定义网格布局
@@ -1457,7 +1486,10 @@ export type EasyFormProps = Omit<FormWrapperProps, "children"> & {
  * </EasyForm>
  * ```
  */
-export declare const EasyForm: (props: EasyFormProps) => import("react").JSX.Element;
+export declare const EasyForm: {
+	(props: EasyFormProps): import("react").JSX.Element;
+	domTypeName: string;
+};
 export type EditableCardDataIndex = string | string[];
 export interface EditableCardOperation {
 	index: number;
@@ -3582,6 +3614,8 @@ export declare const FormItemGroup: {
 };
 export type FormItemHiddenProps = {
 	name: FormItemProps["name"];
+	className?: string;
+	style?: CSSProperties;
 };
 export declare const FormItemHidden: {
 	(props: FormItemHiddenProps): import("react").JSX.Element;
@@ -3590,6 +3624,8 @@ export declare const FormItemHidden: {
 export type FormItemSpanProps = {
 	span?: number;
 	children?: ReactNode;
+	className?: string;
+	style?: CSSProperties;
 };
 /**
  * 包裹EasyForm children item元素, 设置自定义栅格占位格数（使用在EasyForm一级子节点下生效）
@@ -3693,44 +3729,6 @@ export declare const FormItemText: {
 	(props: FormItemTextProps): import("react").JSX.Element;
 	domTypeName: string;
 };
-export type FormItemWrapperDependenciesProps = Omit<FormItemWrapperProps, "hidden" | "isClear"> & {
-	hidden?: (values: TPlainObject, form: FormInstance) => boolean;
-	isClear?: (values: TPlainObject, form: FormInstance) => boolean;
-};
-/**
- * 与 FormItemWrapper 使用相同，多一个 dependencies 包装能力；多用于表单项的显示隐藏逻辑中
- * ```
- * 1. 需要设置dependencies属性，实现显示隐藏能力
- * 2. dependencies表示依赖于谁
- * 3. 结果有两种情况
- *    3.1. 只想隐藏字段，不想清除字段值；使用hidden
- *    3.2. 隐藏字段，同时清除字段值；使用 isClear
- *
- * 使用示例（当 用户类型 选择【选项2】时，备注隐藏）
- *  <FormItemWrapper name={'xx1'} label="用户类型">
- *    <RadioGroupWrapper
- *      options={[
- *        { label: '选项1', value: '1' },
- *        { label: '选项2', value: '2' },
- *      ]}
- *    />
- *  </FormItemWrapper>
- *  <FormItemWrapperDependencies
- *    dependencies={['xx1']}
- *    hidden={(values) => {
- *      return values.xx1 === '2';
- *    }}
- *    name={'xx2'}
- *    label="备注"
- *  >
- *    <Input.TextArea placeholder="请输入" />
- *  </FormItemWrapperDependencies>
- * ```
- */
-export declare const FormItemWrapperDependencies: {
-	(props: FormItemWrapperDependenciesProps): import("react").JSX.Element;
-	domTypeName: string;
-};
 export type FormListWrapperContentProps = {
 	/** Form.List item fieldData */
 	formListFieldData: FormListFieldData;

package/dist/index.js

@@ -62,7 +62,6 @@ import './form-item-group/index.css';
 import './form-item-hidden/index.css';
 import './form-item-span/index.css';
 import './form-item-text/index.css';
-import './form-item-wrapper-dependencies/index.css';
 import './form-item-wrapper/index.css';
 import './form-list-wrapper/index.css';
 import './form-wrapper/index.css';
@@ -157,7 +156,7 @@ export { C as CssNodeHover } from './css-node-hover-CsHQgf77.js';
 export { D as DataRender } from './data-render-U7RkK7OY.js';
 export { D as DatePickerWrapper } from './date-picker-wrapper-Cs-HoJ6K.js';
 export { D as DateRangePickerWrapper } from './date-range-picker-wrapper-COuR09V1.js';
-export { D as DateRangePickerWrapperFormItem } from './date-range-picker-wrapper-form-item-BPc8iK10.js';
+export { D as DateRangePickerWrapperFormItem } from './date-range-picker-wrapper-form-item-CVdR6o1K.js';
 export { D as DeleteNode } from './delete-node-D46iKrXs.js';
 export { d as dialogAlert } from './dialog-alert-qO-Ea-MY.js';
 export { d as dialogConfirm } from './dialog-confirm-BqB8wyB6.js';
@@ -168,20 +167,20 @@ export { d as dialogModal } from './dialog-modal-xt2uoEa-.js';
 export { d as dialogPreviewImage } from './preview-image-DP4umDzQ.js';
 export { D as DragCollapse } from './drag-collapse-wL7wIgVO.js';
 export { D as DragCollapseFormList } from './drag-collapse-DU_JhQTz.js';
-export { D as DragEditableCard } from './editable-card-CT6GEcp6.js';
-export { D as DragEditableTable } from './drag-D_u-98wL.js';
-export { D as DragEditableTablePro } from './drag-DOhz_ox7.js';
+export { D as DragEditableCard } from './editable-card-DUMTbVEH.js';
+export { D as DragEditableTable } from './drag-Cf-uGR4g.js';
+export { D as DragEditableTablePro } from './drag-CdynEXy3.js';
 export { D as DragFormList } from './drag-form-list-BGqbBKJM.js';
 export { D as DragTable } from './drag-table-By85hEGF.js';
 export { D as DropdownMenuWrapper } from './dropdown-menu-wrapper-CSzVvlcO.js';
 export { d as dynamicNode } from './dynamic-node-B_An5owN.js';
-export { E as EasyForm } from './form-w7uoh7-7.js';
+export { E as EasyForm } from './form-CNTtsktC.js';
 export { EasyTable } from './easy-table/index.js';
-export { E as EditableCard } from './editable-card-Deo3SUjG.js';
+export { E as EditableCard } from './editable-card-C5TJSyK1.js';
 export { E as EditableField } from './editable-field-XVZ1Rqdm.js';
 export { E as EditableFieldProvider } from './editable-field-provider-DqKcZQYP.js';
-export { E as EditableTable } from './editable-table-tiF4vQG9.js';
-export { E as EditableTablePro } from './editable-table-pro-jkHndPRi.js';
+export { E as EditableTable } from './editable-table-DTDlVNKW.js';
+export { E as EditableTablePro } from './editable-table-pro-Cf7q_mZy.js';
 export { E as ErrorBoundaryWrapper } from './error-boundary-DtShAEtQ.js';
 export { FbaApp } from './fba-app/index.js';
 export { fbaHooks } from './fba-hooks/index.js';
@@ -192,11 +191,10 @@ export { F as FileSelect } from './file-select-C56tgs1o.js';
 export { F as FlexLayout } from './flex-layout-BaDncU_Z.js';
 export { FormGrid } from './form-grid/index.js';
 export { FormItemGroup } from './form-item-group/index.js';
-export { F as FormItemHidden } from './form-item-hidden-B9afZdSe.js';
-export { F as FormItemSpan } from './span-_AZUf9Zw.js';
-export { F as FormItemText } from './form-item-text-0Z3jfmVa.js';
-export { F as FormItemWrapper } from './form-item-wrapper-DHRbunEm.js';
-export { F as FormItemWrapperDependencies } from './dependencies-C23wp0ou.js';
+export { F as FormItemHidden } from './form-item-hidden-BtQvJEx7.js';
+export { F as FormItemSpan } from './span-D99Im_jS.js';
+export { F as FormItemText } from './form-item-text-BYdgh9j8.js';
+export { F as FormItemWrapper } from './form-item-wrapper-CcXZVf_r.js';
 export { F as FormListWrapper } from './form-list-wrapper-DdhJ2Pv3.js';
 export { F as FormWrapper } from './form-wrapper-DSnBmyFu.js';
 export { G as Gap } from './gap-C1UNo7Wz.js';
@@ -210,7 +208,7 @@ export { LocalLoading } from './local-loading/index.js';
 export { M as MentionEditor } from './mention-editor-GK6I91p1.js';
 export { M as MentionsWrapper } from './mentions-CZv5lHej.js';
 export { M as ModalAction } from './modal-action-eYHh8gcR.js';
-export { N as NumberRangeFormItem } from './number-range-DoBW86wx.js';
+export { N as NumberRangeFormItem } from './number-range-DFh_eoMX.js';
 export { P as PageFixedFooter } from './page-fixed-footer-BHBJsfnh.js';
 export { P as Page404 } from './page404-CVcO-6Fc.js';
 export { P as PaginationWrapper } from './pagination-BNbiyV-n.js';
@@ -252,7 +250,7 @@ export { T as TextOverflow } from './text-overflow-Bk9MC6Cg.js';
 export { T as TextSymbolWrapper } from './symbol-CX0y_DJ4.js';
 export { T as TimePickerWrapper } from './time-picker-wrapper-Dx69Z9kc.js';
 export { T as TimeRangePickerWrapper } from './time-range-picker-wrapper-BpQQjbcu.js';
-export { T as TimeRangePickerWrapperFormItem } from './time-range-picker-wrapper-form-item-CZSB-Rzh.js';
+export { T as TimeRangePickerWrapperFormItem } from './time-range-picker-wrapper-form-item-56NaMNMS.js';
 export { T as TipsTitle } from './tips-title-DWwc8kJv.js';
 export { T as TipsWrapper } from './tips-wrapper-Bf9nfZq3.js';
 export { TreeModal } from './tree-modal/index.js';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/{number-range-DoBW86wx.js → number-range-DFh_eoMX.js}

@@ -5,7 +5,7 @@ import { useMemo } from 'react';
 import { InputNumber } from 'antd';
 import { isNotEmptyArray, isEmptyArray, isUndefinedOrNull } from '@flatbiz/utils';
 import { F as FlexLayout } from './flex-layout-BaDncU_Z.js';
-import { F as FormItemWrapper } from './form-item-wrapper-DHRbunEm.js';
+import { F as FormItemWrapper } from './form-item-wrapper-CcXZVf_r.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
 
 var _excluded = ["minFormItemName", "maxFormItemName", "required", "requiredRuleMessage", "rangeRuleMessage", "minInputNumberProps", "maxInputNumberProps", "isInputEqual"];
@@ -130,4 +130,4 @@ var NumberRangeFormItem = function NumberRangeFormItem(props) {
 };
 
 export { NumberRangeFormItem as N };
-//# sourceMappingURL=number-range-DoBW86wx.js.map
+//# sourceMappingURL=number-range-DFh_eoMX.js.map

package/dist/{number-range-DoBW86wx.js.map → number-range-DFh_eoMX.js.map}

@@ -1 +1 @@
-{"version":3,"file":"number-range-DoBW86wx.js","sources":["@flatbiz/antd/src/number-range-form-item/number-range.tsx"],"sourcesContent":["import { useMemo } from 'react';\nimport { type GetProps, InputNumber } from 'antd';\nimport {\n  isEmptyArray,\n  isNotEmptyArray,\n  isUndefinedOrNull,\n} from '@flatbiz/utils';\nimport { FlexLayout } from '../flex-layout/flex-layout.jsx';\nimport {\n  FormItemWrapper,\n  type FormItemWrapperProps,\n} from '../form-item-wrapper/index.js';\nimport type { FormItemNamePath } from '../types/index.js';\n\ntype InputNumberProps = GetProps<typeof InputNumber>;\n\nexport type NumberRangeFormItemProps = Omit<\n  FormItemWrapperProps,\n  'name' | 'rules'\n> & {\n  minFormItemName: FormItemNamePath;\n  maxFormItemName: FormItemNamePath;\n  /** 是否必填 */\n  required?: boolean;\n  /** 必填验证异常文案 */\n  requiredRuleMessage?: string | [string, string];\n  /** 范围验证异常文案 */\n  rangeRuleMessage?: string | [string, string];\n  minInputNumberProps?: Omit<InputNumberProps, 'value'>;\n  maxInputNumberProps?: Omit<InputNumberProps, 'value'>;\n  /** 最小值与最大值输入是否可以相同 */\n  isInputEqual?: boolean;\n};\n/**\n * 数字输入范围组件\n */\nexport const NumberRangeFormItem = (props: NumberRangeFormItemProps) => {\n  const {\n    minFormItemName,\n    maxFormItemName,\n    required,\n    requiredRuleMessage,\n    rangeRuleMessage,\n    minInputNumberProps,\n    maxInputNumberProps,\n    isInputEqual,\n    ...otherProps\n  } = props;\n\n  const rangeRuleMessageList = useMemo(() => {\n    if (!rangeRuleMessage)\n      return ['最小值输入不能超过最大值', '最大值输入不能低于最小值'];\n    if (isNotEmptyArray(rangeRuleMessage)) {\n      return [rangeRuleMessage[0], rangeRuleMessage[1] || rangeRuleMessage[0]];\n    }\n    return [rangeRuleMessage, rangeRuleMessage] as string[];\n  }, [rangeRuleMessage]);\n\n  const requiredRuleMessageList = useMemo(() => {\n    if (!requiredRuleMessage || isEmptyArray(requiredRuleMessage)) return [];\n    if (isNotEmptyArray(requiredRuleMessage)) {\n      return [\n        requiredRuleMessage[0],\n        requiredRuleMessage[1] || requiredRuleMessage[0],\n      ];\n    }\n    return [requiredRuleMessage, requiredRuleMessage] as string[];\n  }, [requiredRuleMessage]);\n\n  const minRules = [\n    { required: required, message: requiredRuleMessageList[0] || '' },\n    ({ getFieldValue }) => ({\n      validator(_, value) {\n        if (isUndefinedOrNull(value)) {\n          return Promise.resolve();\n        }\n        const maxValue = getFieldValue(maxFormItemName);\n        if (isUndefinedOrNull(maxValue)) {\n          return Promise.resolve();\n        }\n        if (isInputEqual) {\n          if (value <= maxValue) {\n            return Promise.resolve();\n          }\n        } else {\n          if (value < maxValue) {\n            return Promise.resolve();\n          }\n        }\n        return Promise.reject(new Error(rangeRuleMessageList[0]));\n      },\n    }),\n  ];\n\n  const maxRules = [\n    { required: required, message: requiredRuleMessageList[1] || '' },\n    ({ getFieldValue }) => ({\n      validator(_, value) {\n        if (isUndefinedOrNull(value)) {\n          return Promise.resolve();\n        }\n        const minValue = getFieldValue(minFormItemName);\n        if (isUndefinedOrNull(minValue)) {\n          return Promise.resolve();\n        }\n\n        if (isInputEqual) {\n          if (value >= minValue) {\n            return Promise.resolve();\n          }\n        } else {\n          if (value > minValue) {\n            return Promise.resolve();\n          }\n        }\n        return Promise.reject(new Error(rangeRuleMessageList[1]));\n      },\n    }),\n  ];\n\n  return (\n    <FormItemWrapper {...otherProps} required={required}>\n      <FlexLayout fullIndex={[0, 1]} direction=\"horizontal\" gap={10}>\n        <FormItemWrapper\n          name={minFormItemName}\n          dependencies={[maxFormItemName]}\n          rules={minRules}\n          style={{ margin: 0 }}\n        >\n          <InputNumber\n            placeholder=\"请输入\"\n            {...minInputNumberProps}\n            style={{ width: '100%', ...minInputNumberProps?.style }}\n          />\n        </FormItemWrapper>\n        <FormItemWrapper\n          name={maxFormItemName}\n          dependencies={[minFormItemName]}\n          rules={maxRules}\n          style={{ margin: 0 }}\n        >\n          <InputNumber\n            placeholder=\"请输入\"\n            {...maxInputNumberProps}\n            style={{ width: '100%', ...maxInputNumberProps?.style }}\n          />\n        </FormItemWrapper>\n      </FlexLayout>\n    </FormItemWrapper>\n  );\n};\n"],"names":["NumberRangeFormItem","props","minFormItemName","maxFormItemName","required","requiredRuleMessage","rangeRuleMessage","minInputNumberProps","maxInputNumberProps","isInputEqual","otherProps","_objectWithoutProperties","_excluded","rangeRuleMessageList","useMemo","isNotEmptyArray","requiredRuleMessageList","isEmptyArray","minRules","message","_ref","getFieldValue","validator","_","value","isUndefinedOrNull","Promise","resolve","maxValue","reject","Error","maxRules","_ref2","minValue","_jsx","FormItemWrapper","_objectSpread","children","_jsxs","FlexLayout","fullIndex","direction","gap","name","dependencies","rules","style","margin","InputNumber","placeholder","width"],"mappings":"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"}
+{"version":3,"file":"number-range-DFh_eoMX.js","sources":["@flatbiz/antd/src/number-range-form-item/number-range.tsx"],"sourcesContent":["import { useMemo } from 'react';\nimport { type GetProps, InputNumber } from 'antd';\nimport {\n  isEmptyArray,\n  isNotEmptyArray,\n  isUndefinedOrNull,\n} from '@flatbiz/utils';\nimport { FlexLayout } from '../flex-layout/flex-layout.jsx';\nimport {\n  FormItemWrapper,\n  type FormItemWrapperProps,\n} from '../form-item-wrapper/index.js';\nimport type { FormItemNamePath } from '../types/index.js';\n\ntype InputNumberProps = GetProps<typeof InputNumber>;\n\nexport type NumberRangeFormItemProps = Omit<\n  FormItemWrapperProps,\n  'name' | 'rules'\n> & {\n  minFormItemName: FormItemNamePath;\n  maxFormItemName: FormItemNamePath;\n  /** 是否必填 */\n  required?: boolean;\n  /** 必填验证异常文案 */\n  requiredRuleMessage?: string | [string, string];\n  /** 范围验证异常文案 */\n  rangeRuleMessage?: string | [string, string];\n  minInputNumberProps?: Omit<InputNumberProps, 'value'>;\n  maxInputNumberProps?: Omit<InputNumberProps, 'value'>;\n  /** 最小值与最大值输入是否可以相同 */\n  isInputEqual?: boolean;\n};\n/**\n * 数字输入范围组件\n */\nexport const NumberRangeFormItem = (props: NumberRangeFormItemProps) => {\n  const {\n    minFormItemName,\n    maxFormItemName,\n    required,\n    requiredRuleMessage,\n    rangeRuleMessage,\n    minInputNumberProps,\n    maxInputNumberProps,\n    isInputEqual,\n    ...otherProps\n  } = props;\n\n  const rangeRuleMessageList = useMemo(() => {\n    if (!rangeRuleMessage)\n      return ['最小值输入不能超过最大值', '最大值输入不能低于最小值'];\n    if (isNotEmptyArray(rangeRuleMessage)) {\n      return [rangeRuleMessage[0], rangeRuleMessage[1] || rangeRuleMessage[0]];\n    }\n    return [rangeRuleMessage, rangeRuleMessage] as string[];\n  }, [rangeRuleMessage]);\n\n  const requiredRuleMessageList = useMemo(() => {\n    if (!requiredRuleMessage || isEmptyArray(requiredRuleMessage)) return [];\n    if (isNotEmptyArray(requiredRuleMessage)) {\n      return [\n        requiredRuleMessage[0],\n        requiredRuleMessage[1] || requiredRuleMessage[0],\n      ];\n    }\n    return [requiredRuleMessage, requiredRuleMessage] as string[];\n  }, [requiredRuleMessage]);\n\n  const minRules = [\n    { required: required, message: requiredRuleMessageList[0] || '' },\n    ({ getFieldValue }) => ({\n      validator(_, value) {\n        if (isUndefinedOrNull(value)) {\n          return Promise.resolve();\n        }\n        const maxValue = getFieldValue(maxFormItemName);\n        if (isUndefinedOrNull(maxValue)) {\n          return Promise.resolve();\n        }\n        if (isInputEqual) {\n          if (value <= maxValue) {\n            return Promise.resolve();\n          }\n        } else {\n          if (value < maxValue) {\n            return Promise.resolve();\n          }\n        }\n        return Promise.reject(new Error(rangeRuleMessageList[0]));\n      },\n    }),\n  ];\n\n  const maxRules = [\n    { required: required, message: requiredRuleMessageList[1] || '' },\n    ({ getFieldValue }) => ({\n      validator(_, value) {\n        if (isUndefinedOrNull(value)) {\n          return Promise.resolve();\n        }\n        const minValue = getFieldValue(minFormItemName);\n        if (isUndefinedOrNull(minValue)) {\n          return Promise.resolve();\n        }\n\n        if (isInputEqual) {\n          if (value >= minValue) {\n            return Promise.resolve();\n          }\n        } else {\n          if (value > minValue) {\n            return Promise.resolve();\n          }\n        }\n        return Promise.reject(new Error(rangeRuleMessageList[1]));\n      },\n    }),\n  ];\n\n  return (\n    <FormItemWrapper {...otherProps} required={required}>\n      <FlexLayout fullIndex={[0, 1]} direction=\"horizontal\" gap={10}>\n        <FormItemWrapper\n          name={minFormItemName}\n          dependencies={[maxFormItemName]}\n          rules={minRules}\n          style={{ margin: 0 }}\n        >\n          <InputNumber\n            placeholder=\"请输入\"\n            {...minInputNumberProps}\n            style={{ width: '100%', ...minInputNumberProps?.style }}\n          />\n        </FormItemWrapper>\n        <FormItemWrapper\n          name={maxFormItemName}\n          dependencies={[minFormItemName]}\n          rules={maxRules}\n          style={{ margin: 0 }}\n        >\n          <InputNumber\n            placeholder=\"请输入\"\n            {...maxInputNumberProps}\n            style={{ width: '100%', ...maxInputNumberProps?.style }}\n          />\n        </FormItemWrapper>\n      </FlexLayout>\n    </FormItemWrapper>\n  );\n};\n"],"names":["NumberRangeFormItem","props","minFormItemName","maxFormItemName","required","requiredRuleMessage","rangeRuleMessage","minInputNumberProps","maxInputNumberProps","isInputEqual","otherProps","_objectWithoutProperties","_excluded","rangeRuleMessageList","useMemo","isNotEmptyArray","requiredRuleMessageList","isEmptyArray","minRules","message","_ref","getFieldValue","validator","_","value","isUndefinedOrNull","Promise","resolve","maxValue","reject","Error","maxRules","_ref2","minValue","_jsx","FormItemWrapper","_objectSpread","children","_jsxs","FlexLayout","fullIndex","direction","gap","name","dependencies","rules","style","margin","InputNumber","placeholder","width"],"mappings":"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"}

package/dist/number-range-form-item/index.d.ts

@@ -1,4 +1,4 @@
-import { TAny } from '@flatbiz/utils';
+import { TAny, TPlainObject } from '@flatbiz/utils';
 import { FormItemProps, GetProps, InputNumber } from 'antd';
 import { ReactElement, ReactNode } from 'react';
 
@@ -20,7 +20,7 @@ export type TFormItemLayoutPreClassNameProps = {
 	 */
 	className?: string;
 };
-export type FormItemWrapperProps = FormItemProps & TFormItemLayoutPreClassNameProps & {
+export type FormItemWrapperProps = Omit<FormItemProps, "hidden"> & TFormItemLayoutPreClassNameProps & {
 	wrapper?: (children: ReactNode) => ReactElement;
 	/** 设置wrapper后，before、after失效 */
 	before?: ReactNode;
@@ -33,12 +33,25 @@ export type FormItemWrapperProps = FormItemProps & TFormItemLayoutPreClassNamePr
 	 * 如果设置 normalize 属性，outputNormalize将失效
 	 */
 	outputNormalize?: (value?: TAny) => TAny;
-	/** 是否清除 Form.Item  */
-	isClear?: boolean;
+	/**
+	 * 隐藏 Form.Item，同时清除 Form.Item 值
+	 * ```
+	 * 1.与 dependencies 属性配合使用，可实现当前FormItemWrapper的显示隐藏
+	 * ```
+	 */
+	isClear?: boolean | ((formValues: TPlainObject) => boolean);
+	/**
+	 * 隐藏 Form.Item，不会清除 Form.Item 值
+	 * ```
+	 * 1.与 dependencies 属性配合使用，可实现当前FormItemWrapper的显示隐藏
+	 * ```
+	 */
+	hidden?: boolean | ((formValues: TPlainObject) => boolean);
 	/**
 	 * 栅格占位格数，最大值：24
 	 * ```
-	 * 1. 当 FormItemWrapper 处在 EasyForm 直接子节点中有效，即FormItemWrapper在EasyForm栅格中的占位格数；
+	 * 1. 当前FormItemWrapper处在 EasyForm 直接子节点中有效，即FormItemWrapper在EasyForm栅格中的占位格数；
+	 * 2. 父节点使用属性值，当前节点不使用属性值
 	 * ```
 	 */
 	span?: number;

package/dist/number-range-form-item/index.js

@@ -5,7 +5,7 @@ import './../pre-defined-class-name/index.css';
 import './index.css';
 /*! @flatjs/forge MIT @flatbiz/antd */
 
-export { N as NumberRangeFormItem } from '../number-range-DoBW86wx.js';
+export { N as NumberRangeFormItem } from '../number-range-DFh_eoMX.js';
 import '../_rollupPluginBabelHelpers-BYm17lo8.js';
 import 'react';
 import 'antd';
@@ -13,7 +13,7 @@ import '@flatbiz/utils';
 import '../flex-layout-BaDncU_Z.js';
 import '@dimjs/utils/class-names/class-names';
 import 'react/jsx-runtime';
-import '../form-item-wrapper-DHRbunEm.js';
+import '../form-item-wrapper-CcXZVf_r.js';
 import '../fba-hooks/index.js';
 import '@wove/react/hooks';
 import '../use-responsive-point-Bp3D3lZT.js';

package/dist/pre-defined-class-name/index.css

@@ -1 +1 @@
-.form-item-label-70.ant-form-item .ant-form-item-label{width:70px}.form-item-label-80.ant-form-item .ant-form-item-label{width:80px}.form-item-label-90.ant-form-item .ant-form-item-label{width:90px}.form-item-label-100.ant-form-item .ant-form-item-label{width:100px}.form-item-label-110.ant-form-item .ant-form-item-label{width:110px}.form-item-label-120.ant-form-item .ant-form-item-label{width:120px}.form-item-label-130.ant-form-item .ant-form-item-label{width:130px}.form-item-label-140.ant-form-item .ant-form-item-label{width:140px}.form-item-label-150.ant-form-item .ant-form-item-label{width:150px}.form-item-label-160.ant-form-item .ant-form-item-label{width:160px}.form-item-label-170.ant-form-item .ant-form-item-label{width:170px}.form-item-label-180.ant-form-item .ant-form-item-label{width:180px}.form-item-label-190.ant-form-item .ant-form-item-label{width:190px}.form-item-label-200.ant-form-item .ant-form-item-label{width:200px}.form-item-label-auto.ant-form-item .ant-form-item-row{flex-direction:row!important}.form-item-label-auto.ant-form-item .ant-form-item-label{width:auto!important}.form-item-label-auto.ant-form-item .ant-form-item-control{flex:1}.form-item-label-align-left.ant-form-item .ant-form-item-label{text-align:left}.form-item-label-align-right.ant-form-item .ant-form-item-label{text-align:right}.ant-form-item.form-item-label-value-vertical>.ant-form-item-row{flex-direction:column}.ant-form-item.form-item-label-value-vertical>.ant-form-item-row>.ant-form-item-label{text-align:left;width:100%}.ant-form-item.form-item-label-value-vertical>.ant-form-item-row>.ant-form-item-control{flex:initial}.form-label-70 .ant-form-item-label{width:70px}.form-label-80 .ant-form-item-label{width:80px}.form-label-90 .ant-form-item-label{width:90px}.form-label-100 .ant-form-item-label{width:100px}.form-label-110 .ant-form-item-label{width:110px}.form-label-120 .ant-form-item-label{width:120px}.form-label-130 .ant-form-item-label{width:130px}.form-label-140 .ant-form-item-label{width:140px}.form-label-150 .ant-form-item-label{width:150px}.form-label-160 .ant-form-item-label{width:160px}.form-label-170 .ant-form-item-label{width:170px}.form-label-180 .ant-form-item-label{width:180px}.form-label-190 .ant-form-item-label{width:190px}.form-label-200 .ant-form-item-label{width:200px}.form-label-auto .ant-form-item-label{width:auto}.form-label-align-left .ant-form-item-label{text-align:left}.form-label-align-right .ant-form-item-label{text-align:right}.form-label-value-vertical .ant-form-item:not(.form-item-label-auto) .ant-form-item-row{flex-direction:column}.form-label-value-vertical .ant-form-item:not(.form-item-label-auto) .ant-form-item-label{text-align:left;width:100%}.form-label-value-vertical .ant-form-item:not(.form-item-label-auto) .ant-form-item-control{flex:initial}.form-formitem-gap-24{margin-bottom:-24px}.form-formitem-gap-24 .ant-form-item{margin-bottom:24px}.form-formitem-gap-15{margin-bottom:-15px}.form-formitem-gap-15 .ant-form-item{margin-bottom:15px}.form-formitem-gap-8{margin-bottom:-8px}.form-formitem-gap-8 .ant-form-item{margin-bottom:8px}.form-formitem-gap-5{margin-bottom:-5px}.form-formitem-gap-5 .ant-form-item{margin-bottom:5px}.form-formitem-gap-0,.form-formitem-gap-0 .ant-form-item{margin-bottom:0}
+.form-item-label-70.ant-form-item .ant-form-item-label{width:70px}.form-item-label-80.ant-form-item .ant-form-item-label{width:80px}.form-item-label-90.ant-form-item .ant-form-item-label{width:90px}.form-item-label-100.ant-form-item .ant-form-item-label{width:100px}.form-item-label-110.ant-form-item .ant-form-item-label{width:110px}.form-item-label-120.ant-form-item .ant-form-item-label{width:120px}.form-item-label-130.ant-form-item .ant-form-item-label{width:130px}.form-item-label-140.ant-form-item .ant-form-item-label{width:140px}.form-item-label-150.ant-form-item .ant-form-item-label{width:150px}.form-item-label-160.ant-form-item .ant-form-item-label{width:160px}.form-item-label-170.ant-form-item .ant-form-item-label{width:170px}.form-item-label-180.ant-form-item .ant-form-item-label{width:180px}.form-item-label-190.ant-form-item .ant-form-item-label{width:190px}.form-item-label-200.ant-form-item .ant-form-item-label{width:200px}.form-item-label-auto.ant-form-item .ant-form-item-row{flex-direction:row!important}.form-item-label-auto.ant-form-item .ant-form-item-label{width:auto!important}.form-item-label-auto.ant-form-item .ant-form-item-control{flex:1}.form-item-label-align-left.ant-form-item .ant-form-item-label{text-align:left}.form-item-label-align-right.ant-form-item .ant-form-item-label{text-align:right}.ant-form-item.form-item-label-value-vertical>.ant-form-item-row{flex-direction:column}.ant-form-item.form-item-label-value-vertical>.ant-form-item-row>.ant-form-item-label{text-align:left;width:100%}.ant-form-item.form-item-label-value-vertical>.ant-form-item-row>.ant-form-item-control{flex:initial}.form-label-70 .ant-form-item-label{width:70px}.form-label-80 .ant-form-item-label{width:80px}.form-label-90 .ant-form-item-label{width:90px}.form-label-100 .ant-form-item-label{width:100px}.form-label-110 .ant-form-item-label{width:110px}.form-label-120 .ant-form-item-label{width:120px}.form-label-130 .ant-form-item-label{width:130px}.form-label-140 .ant-form-item-label{width:140px}.form-label-150 .ant-form-item-label{width:150px}.form-label-160 .ant-form-item-label{width:160px}.form-label-170 .ant-form-item-label{width:170px}.form-label-180 .ant-form-item-label{width:180px}.form-label-190 .ant-form-item-label{width:190px}.form-label-200 .ant-form-item-label{width:200px}.form-label-auto .ant-form-item-label{width:auto}.form-label-align-left .ant-form-item-label{text-align:left}.form-label-align-right .ant-form-item-label{text-align:right}.form-label-value-vertical .ant-form-item:not(.form-item-label-auto) .ant-form-item-row{flex-direction:column}.form-label-value-vertical .ant-form-item:not(.form-item-label-auto) .ant-form-item-label{text-align:left;width:100%}.form-label-value-vertical .ant-form-item:not(.form-item-label-auto) .ant-form-item-control{flex:initial}.form-formitem-gap-24 .ant-form-item{margin-bottom:24px}.form-formitem-gap-15 .ant-form-item{margin-bottom:15px}.form-formitem-gap-8 .ant-form-item{margin-bottom:8px}.form-formitem-gap-5 .ant-form-item{margin-bottom:5px}.form-formitem-gap-0 .ant-form-item{margin-bottom:0}

package/dist/{span-_AZUf9Zw.js → span-D99Im_jS.js}

@@ -1,5 +1,6 @@
 /*! @flatjs/forge MIT @flatbiz/antd */
 
+import { b as _objectSpread2 } from './_rollupPluginBabelHelpers-BYm17lo8.js';
 import { BoxGrid } from './box-grid/index.js';
 import { jsx } from 'react/jsx-runtime';
 
@@ -29,12 +30,9 @@ import { jsx } from 'react/jsx-runtime';
  * ```
  */
 var FormItemSpan = function FormItemSpan(props) {
-  return /*#__PURE__*/jsx(BoxGrid.Col, {
-    span: props.span,
-    children: props.children
-  });
+  return /*#__PURE__*/jsx(BoxGrid.Col, _objectSpread2({}, props));
 };
 FormItemSpan['domTypeName'] = 'FormItemSpan';
 
 export { FormItemSpan as F };
-//# sourceMappingURL=span-_AZUf9Zw.js.map
+//# sourceMappingURL=span-D99Im_jS.js.map

package/dist/span-D99Im_jS.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"span-D99Im_jS.js","sources":["@flatbiz/antd/src/form-item-span/span.tsx"],"sourcesContent":["import { BoxGrid } from '../box-grid/index.js';\nexport type FormItemSpanProps = {\n  span?: number;\n  children?: React.ReactNode;\n  className?: string;\n  style?: React.CSSProperties;\n};\n\n/**\n * 包裹EasyForm children item元素, 设置自定义栅格占位格数（使用在EasyForm一级子节点下生效）\n * ```\n * EasyForm中自定义栅格占位格数方式\n * 1. 设置 FormItemWrapper、FormItemText 的 span 属性（支持移动端小屏幕span强制转为24逻辑）\n * 2. 使用 <BoxGrid.Col span={24} ></BoxGrid.Col> 包裹，设置 span 属性（不支持移动端小屏幕span强制转为24逻辑）\n * 3. 使用 <FormItemSpan span={24} ></FormItemSpan> 包裹，设置 span 属性（支持移动端小屏幕span强制转为24逻辑）\n *   <EasyForm>\n *    <FormItemSpan span={24}>\n *      <CardLayout title={'基本信息'}>\n *        <EasyForm nonuseFormWrapper>\n *          <FormItemWrapper></FormItemWrapper>\n *        </EasyForm>\n *      </CardLayout>\n *    </FormItemSpan>\n *    <FormItemSpan span={24}>\n *      <CardLayout title={'紧急联系人信息'}>\n *        <EasyForm nonuseFormWrapper>\n *          <FormItemWrapper></FormItemWrapper>\n *        </EasyForm>\n *      </CardLayout>\n *    </FormItemSpan>\n *  </EasyForm>\n * ```\n */\nexport const FormItemSpan = (props: FormItemSpanProps) => {\n  return <BoxGrid.Col {...props} />;\n};\n\nFormItemSpan['domTypeName'] = 'FormItemSpan';\n"],"names":["FormItemSpan","props","_jsx","BoxGrid","Col","_objectSpread"],"mappings":";;;;;;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;IACaA,YAAY,GAAG,SAAfA,YAAYA,CAAIC,KAAwB,EAAK;EACxD,oBAAOC,GAAA,CAACC,OAAO,CAACC,GAAG,EAAAC,cAAA,CAAA,EAAA,EAAKJ,KAAK,CAAG,CAAC;AACnC;AAEAD,YAAY,CAAC,aAAa,CAAC,GAAG,cAAc;;;;"}

package/dist/styles/index.css

@@ -1 +1 @@
-.num-ff{font-family:var(--v-font-family-number)}p,ul{margin:0;padding:0}.hide{display:none}.clear-fix:after{clear:both;content:" ";display:block;font-size:0;height:0;visibility:hidden}.ant-btn-variant-dashed:disabled,.ant-btn-variant-link:disabled,.ant-btn-variant-solid:disabled,.ant-checkbox-disabled+span,.ant-input-number-outlined.ant-input-number-disabled,.ant-input[disabled],.ant-picker-disabled input[disabled],.ant-radio-wrapper-disabled,.ant-select-disabled .ant-select-selector,.ant-select-multiple.ant-select-disabled .ant-select-selection-item,.ant-select-outlined.ant-select-disabled:not(.ant-select-customize-input) .ant-select-selector{color:rgba(0,0,0,.6)!important}.ant-radio-disabled .ant-radio-inner:after{background-color:rgba(0,0,0,.5)!important}.ant-checkbox-disabled .ant-checkbox-inner:after{border-color:rgba(0,0,0,.6)!important}
+.num-ff{font-family:var(--v-font-family-number)}p,ul{margin:0;padding:0}.hide{display:none}.clear-fix:after{clear:both;content:" ";display:block;font-size:0;height:0;visibility:hidden}.ant-btn-dashed:disabled,.ant-btn-variant-dashed:disabled,.ant-btn-variant-link:disabled,.ant-btn-variant-solid:disabled,.ant-checkbox-disabled+span,.ant-input-number-outlined.ant-input-number-disabled,.ant-input[disabled],.ant-picker-disabled input[disabled],.ant-radio-wrapper-disabled,.ant-select-disabled .ant-select-selector,.ant-select-multiple.ant-select-disabled .ant-select-selection-item,.ant-select-outlined.ant-select-disabled:not(.ant-select-customize-input) .ant-select-selector{color:rgba(0,0,0,.6)!important}.ant-radio-disabled .ant-radio-inner:after{background-color:rgba(0,0,0,.5)!important}.ant-checkbox-disabled .ant-checkbox-inner:after{border-color:rgba(0,0,0,.6)!important}