@flatbiz/antd 5.0.21 → 5.0.23

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" | "children" | "noStyle"> & TFormItemLayoutPreClassNameProps & {
 	wrapper?: (children: ReactNode) => ReactElement;
 	/** 设置wrapper后，before、after失效 */
 	before?: ReactNode;
@@ -33,15 +33,37 @@ 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;
+	/** 不支持函数式写法，如果需要使用dependencies获取表单值，可使用FormItemWrapperDependencies 组件  */
+	children?: ReactNode;
+	/**
+	 * ```
+	 * 1. 设置noStyle后，可能会导致 FromItemWrapper 在 EasyFrom 内部渲染网格布局时出现异常
+	 * 2. 在FormItemWrapper中使用 dependencies 逻辑不需要设置 noStyle
+	 * ```
+	 */
+	noStyle?: boolean;
 };
 /**
  * 对 Form.Item 包装处理
@@ -49,8 +71,24 @@ export type FormItemWrapperProps = FormItemProps & TFormItemLayoutPreClassNamePr
  * 1. 为 children 增加 before、after
  * 2. 对输入、输出数据进行序列化处理
  * 3. 内置布局样式使用 preDefinedClassName.formItem
- * 4. 设置隐藏域（不清除字段值） 使用hidden
- * 5. 设置隐藏域（清除字段值）使用isClear
+ * 4. 设置隐藏域（不清除字段值） 使用hidden，存在依赖逻辑，可与dependencies属性配合使用
+ * 5. 设置隐藏域（清除字段值）使用isClear，存在依赖逻辑，可与dependencies属性配合使用
+ * 6. 不支持noStyle属性、children不支持函数写法、如果需要获取依赖字段值，可使用 FormItemWrapperDependencies 组件
+ * 7. 设置noStyle后，可能会导致 FromItemWrapper 在 EasyFrom 内部渲染网格布局时出现异常
+ *
+ *
+ * ** 依赖其他字段 自身切换显示隐藏 **
+ * <FormItemWrapper
+ *  label="label"
+ *  name="xx1"
+ *  dependencies={['type']}
+ *  isClear={(values)  => {
+ *    return values.type == 1
+ *  }}>
+ *  <Input placeholder="请输入" />
+ * </FormItemWrapper>
+ *
+ * 如果只是想获取依赖字段值，可使用 FormItemWrapperDependencies 组件
  * ```
  */
 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-BUQoMpEv.js';
 import '../_rollupPluginBabelHelpers-BYm17lo8.js';
 import 'react';
 import 'antd';

package/dist/{form-item-wrapper-DHRbunEm.js → form-item-wrapper-BUQoMpEv.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,24 @@ var FormItemWrapperChildren = function FormItemWrapperChildren(props) {
  * 1. 为 children 增加 before、after
  * 2. 对输入、输出数据进行序列化处理
  * 3. 内置布局样式使用 preDefinedClassName.formItem
- * 4. 设置隐藏域（不清除字段值） 使用hidden
- * 5. 设置隐藏域（清除字段值）使用isClear
+ * 4. 设置隐藏域（不清除字段值） 使用hidden，存在依赖逻辑，可与dependencies属性配合使用
+ * 5. 设置隐藏域（清除字段值）使用isClear，存在依赖逻辑，可与dependencies属性配合使用
+ * 6. 不支持noStyle属性、children不支持函数写法、如果需要获取依赖字段值，可使用 FormItemWrapperDependencies 组件
+ * 7. 设置noStyle后，可能会导致 FromItemWrapper 在 EasyFrom 内部渲染网格布局时出现异常
+ *
+ *
+ * ** 依赖其他字段 自身切换显示隐藏 **
+ * <FormItemWrapper
+ *  label="label"
+ *  name="xx1"
+ *  dependencies={['type']}
+ *  isClear={(values)  => {
+ *    return values.type == 1
+ *  }}>
+ *  <Input placeholder="请输入" />
+ * </FormItemWrapper>
+ *
+ * 如果只是想获取依赖字段值，可使用 FormItemWrapperDependencies 组件
  * ```
  */
 var FormItemWrapper = function FormItemWrapper(props) {
@@ -74,13 +90,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 +108,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-BUQoMpEv.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"form-item-wrapper-BUQoMpEv.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<\n  FormItemProps,\n  'hidden' | 'children' | 'noStyle'\n> &\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    /** 不支持函数式写法，如果需要使用dependencies获取表单值，可使用FormItemWrapperDependencies 组件  */\n    children?: ReactNode;\n\n    /**\n     * ```\n     * 1. 设置noStyle后，可能会导致 FromItemWrapper 在 EasyFrom 内部渲染网格布局时出现异常\n     * 2. 在FormItemWrapper中使用 dependencies 逻辑不需要设置 noStyle\n     * ```\n     */\n    noStyle?: boolean;\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 * 6. 不支持noStyle属性、children不支持函数写法、如果需要获取依赖字段值，可使用 FormItemWrapperDependencies 组件\n * 7. 设置noStyle后，可能会导致 FromItemWrapper 在 EasyFrom 内部渲染网格布局时出现异常\n *\n *\n * ** 依赖其他字段 自身切换显示隐藏 **\n * <FormItemWrapper\n *  label=\"label\"\n *  name=\"xx1\"\n *  dependencies={['type']}\n *  isClear={(values)  => {\n *    return values.type == 1\n *  }}>\n *  <Input placeholder=\"请输入\" />\n * </FormItemWrapper>\n *\n * 如果只是想获取依赖字段值，可使用 FormItemWrapperDependencies 组件\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\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\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/form-item-wrapper-dependencies/index.d.ts

@@ -1,85 +1,41 @@
-import { TAny, TPlainObject } from '@flatbiz/utils';
-import { FormInstance, FormItemProps } from 'antd';
-import { ReactElement, ReactNode } from 'react';
+import { FormInstance } from 'antd';
+import { CSSProperties, ReactElement } from 'react';
 
-export type TFormItemLayoutPreClassNameProps = {
-	/**
-	 * label宽度，Form内部所有FormItem label都生效
-	 * ```
-	 * 1. 可设置数值
-	 * 2. 可设置`auto`自适应
-	 * ```
-	 */
-	labelWidth?: "auto" | "70" | "80" | "90" | "100" | "110" | "120" | "130" | "140" | "150" | "160" | "170" | "180" | "190" | "200";
-	/** labelItem 竖直布局 */
-	labelItemVertical?: boolean;
-	/** label 对齐方式 */
-	labelAlign?: "left" | "right";
-	/**
-	 * className 中可能会包含 preDefinedClassName.formItem.xx，优先级大于 labelWidth、labelItemVertical、labelAlign
-	 */
+export type FormItemWrapperDependenciesProps = {
+	children?: (form: FormInstance, otherProps: {
+		style?: CSSProperties;
+		className?: string;
+	}) => ReactElement;
+	dependencies: any[];
 	className?: string;
-};
-export type FormItemWrapperProps = FormItemProps & TFormItemLayoutPreClassNameProps & {
-	wrapper?: (children: ReactNode) => ReactElement;
-	/** 设置wrapper后，before、after失效 */
-	before?: ReactNode;
-	/** 设置wrapper后，before、after失效 */
-	after?: ReactNode;
-	/** value 序列化处理 */
-	inputNormalize?: (value?: TAny) => TAny;
-	/**
-	 * onChange 参数序列化处理
-	 * 如果设置 normalize 属性，outputNormalize将失效
-	 */
-	outputNormalize?: (value?: TAny) => TAny;
-	/** 是否清除 Form.Item  */
-	isClear?: boolean;
-	/**
-	 * 栅格占位格数，最大值：24
-	 * ```
-	 * 1. 当 FormItemWrapper 处在 EasyForm 直接子节点中有效，即FormItemWrapper在EasyForm栅格中的占位格数；
-	 * ```
-	 */
-	span?: number;
-};
-export type FormItemWrapperDependenciesProps = Omit<FormItemWrapperProps, "hidden" | "isClear"> & {
-	hidden?: (values: TPlainObject, form: FormInstance) => boolean;
-	isClear?: (values: TPlainObject, form: FormInstance) => boolean;
+	style?: CSSProperties;
 };
 /**
- * 与 FormItemWrapper 使用相同，多一个 dependencies 包装能力；多用于表单项的显示隐藏逻辑中
- * ```
- * 1. 需要设置dependencies属性，实现显示隐藏能力
- * 2. dependencies表示依赖于谁
- * 3. 结果有两种情况
- *    3.1. 只想隐藏字段，不想清除字段值；使用hidden
- *    3.2. 隐藏字段，同时清除字段值；使用 isClear
+ * FormItem依赖写法包装，当处在EasyForm内部时，不支持  <Form.Item dependencies={['xxx']} noStyle /> 此写法，使用 <FormItemWrapperDependencies dependencies={['xxx']} /> 代替
  *
- * 使用示例（当 用户类型 选择【选项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';
+ * ```
+ * 例如：（其中 otherProps 中 style、className透传是必要的）
+ *  <FormItemWrapperDependencies dependencies={['xx2']}>
+ *    {(_form, otherProps) => {
+ *      return (
+ *        <FormItemWrapper
+ *          name="xxxxx"
+ *          label="xx1"
+ *          style={otherProps.style}
+ *          className={otherProps.className}
+ *        >
+ *          <Input />
+ *        </FormItemWrapper>
+ *      );
  *    }}
- *    name={'xx2'}
- *    label="备注"
- *  >
- *    <Input.TextArea placeholder="请输入" />
  *  </FormItemWrapperDependencies>
+ *
+ *
+ * 说明：
+ * 透传style、className 是因为在EasyForm内部的BoxGrid组件下发的style、className在配置了noStyle后Form.Item不接收导致的
+ *
  * ```
  */
-export declare const FormItemWrapperDependencies: {
-	(props: FormItemWrapperDependenciesProps): import("react").JSX.Element;
-	domTypeName: string;
-};
+export declare const FormItemWrapperDependencies: (props: FormItemWrapperDependenciesProps) => import("react").JSX.Element;
 
 export {};

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

@@ -1,19 +1,9 @@
 /* eslint-disable */
-import './../fba-hooks/index.css';
-import './../pre-defined-class-name/index.css';
 import './index.css';
 /*! @flatjs/forge MIT @flatbiz/antd */
 
-export { F as FormItemWrapperDependencies } from '../dependencies-C23wp0ou.js';
+export { F as FormItemWrapperDependencies } from '../dependencies-DbCKAltG.js';
 import '../_rollupPluginBabelHelpers-BYm17lo8.js';
-import '../form-item-wrapper-DHRbunEm.js';
-import 'react';
 import 'antd';
-import '@flatbiz/utils';
-import '../fba-hooks/index.js';
-import '@wove/react/hooks';
-import '../use-responsive-point-Bp3D3lZT.js';
-import '../pre-defined-class-name/index.js';
-import '@dimjs/utils/class-names/class-names';
 import 'react/jsx-runtime';
 //# sourceMappingURL=index.js.map

package/dist/form-item-wrapper-dependencies/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/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" | "children" | "noStyle"> & TFormItemLayoutPreClassNameProps & {
 	wrapper?: (children: ReactNode) => ReactElement;
 	/** 设置wrapper后，before、after失效 */
 	before?: ReactNode;
@@ -1009,15 +1017,37 @@ 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;
+	/** 不支持函数式写法，如果需要使用dependencies获取表单值，可使用FormItemWrapperDependencies 组件  */
+	children?: ReactNode;
+	/**
+	 * ```
+	 * 1. 设置noStyle后，可能会导致 FromItemWrapper 在 EasyFrom 内部渲染网格布局时出现异常
+	 * 2. 在FormItemWrapper中使用 dependencies 逻辑不需要设置 noStyle
+	 * ```
+	 */
+	noStyle?: boolean;
 };
 /**
  * 对 Form.Item 包装处理
@@ -1025,8 +1055,24 @@ export type FormItemWrapperProps = FormItemProps & TFormItemLayoutPreClassNamePr
  * 1. 为 children 增加 before、after
  * 2. 对输入、输出数据进行序列化处理
  * 3. 内置布局样式使用 preDefinedClassName.formItem
- * 4. 设置隐藏域（不清除字段值） 使用hidden
- * 5. 设置隐藏域（清除字段值）使用isClear
+ * 4. 设置隐藏域（不清除字段值） 使用hidden，存在依赖逻辑，可与dependencies属性配合使用
+ * 5. 设置隐藏域（清除字段值）使用isClear，存在依赖逻辑，可与dependencies属性配合使用
+ * 6. 不支持noStyle属性、children不支持函数写法、如果需要获取依赖字段值，可使用 FormItemWrapperDependencies 组件
+ * 7. 设置noStyle后，可能会导致 FromItemWrapper 在 EasyFrom 内部渲染网格布局时出现异常
+ *
+ *
+ * ** 依赖其他字段 自身切换显示隐藏 **
+ * <FormItemWrapper
+ *  label="label"
+ *  name="xx1"
+ *  dependencies={['type']}
+ *  isClear={(values)  => {
+ *    return values.type == 1
+ *  }}>
+ *  <Input placeholder="请输入" />
+ * </FormItemWrapper>
+ *
+ * 如果只是想获取依赖字段值，可使用 FormItemWrapperDependencies 组件
  * ```
  */
 export declare const FormItemWrapper: {
@@ -1408,6 +1454,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 +1511,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 +3639,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 +3649,10 @@ export declare const FormItemHidden: {
 export type FormItemSpanProps = {
 	span?: number;
 	children?: ReactNode;
+	className?: string;
+	style?: CSSProperties;
+	/** 是否移除 */
+	hidden?: boolean;
 };
 /**
  * 包裹EasyForm children item元素, 设置自定义栅格占位格数（使用在EasyForm一级子节点下生效）
@@ -3614,6 +3677,7 @@ export type FormItemSpanProps = {
  *      </CardLayout>
  *    </FormItemSpan>
  *  </EasyForm>
+ * 4. 处在EasyFrom直接子节点时hidden、span属性生效
  * ```
  */
 export declare const FormItemSpan: {
@@ -3693,44 +3757,42 @@ 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;
+export type FormItemWrapperDependenciesProps = {
+	children?: (form: FormInstance, otherProps: {
+		style?: CSSProperties;
+		className?: string;
+	}) => ReactElement;
+	dependencies: any[];
+	className?: string;
+	style?: CSSProperties;
 };
 /**
- * 与 FormItemWrapper 使用相同，多一个 dependencies 包装能力；多用于表单项的显示隐藏逻辑中
- * ```
- * 1. 需要设置dependencies属性，实现显示隐藏能力
- * 2. dependencies表示依赖于谁
- * 3. 结果有两种情况
- *    3.1. 只想隐藏字段，不想清除字段值；使用hidden
- *    3.2. 隐藏字段，同时清除字段值；使用 isClear
+ * FormItem依赖写法包装，当处在EasyForm内部时，不支持  <Form.Item dependencies={['xxx']} noStyle /> 此写法，使用 <FormItemWrapperDependencies dependencies={['xxx']} /> 代替
  *
- * 使用示例（当 用户类型 选择【选项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';
+ * ```
+ * 例如：（其中 otherProps 中 style、className透传是必要的）
+ *  <FormItemWrapperDependencies dependencies={['xx2']}>
+ *    {(_form, otherProps) => {
+ *      return (
+ *        <FormItemWrapper
+ *          name="xxxxx"
+ *          label="xx1"
+ *          style={otherProps.style}
+ *          className={otherProps.className}
+ *        >
+ *          <Input />
+ *        </FormItemWrapper>
+ *      );
  *    }}
- *    name={'xx2'}
- *    label="备注"
- *  >
- *    <Input.TextArea placeholder="请输入" />
  *  </FormItemWrapperDependencies>
+ *
+ *
+ * 说明：
+ * 透传style、className 是因为在EasyForm内部的BoxGrid组件下发的style、className在配置了noStyle后Form.Item不接收导致的
+ *
  * ```
  */
-export declare const FormItemWrapperDependencies: {
-	(props: FormItemWrapperDependenciesProps): import("react").JSX.Element;
-	domTypeName: string;
-};
+export declare const FormItemWrapperDependencies: (props: FormItemWrapperDependenciesProps) => import("react").JSX.Element;
 export type FormListWrapperContentProps = {
 	/** Form.List item fieldData */
 	formListFieldData: FormListFieldData;