@hw-component/form 1.9.3 → 1.9.5

package/es/Form/FormItem/BasicItem.js

@@ -21,7 +21,7 @@ import { useDefaultRender } from '../hooks/useDefaultRender.js';
 import { useDefaultComponents } from '../hooks/index.js';
 import { useFormConfigContext } from '../Context/FormConfigProvider.js';
 
-var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle"],
+var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle", "hidden"],
   _excluded2 = ["labelAlign", "itemProps"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -72,6 +72,7 @@ var Index = function Index(props) {
     colClassName = props.className,
     _props$noStyle = props.noStyle,
     noStyle = _props$noStyle === void 0 ? false : _props$noStyle,
+    hidden = props.hidden,
     oProps = _objectWithoutProperties(props, _excluded);
   var _props$labelAlign = props.labelAlign,
     align = _props$labelAlign === void 0 ? "right" : _props$labelAlign,
@@ -92,6 +93,10 @@ var Index = function Index(props) {
     hide: hide,
     form: form
   });
+  var disHide = useHide({
+    hide: hidden,
+    form: form
+  });
   var formItemLabel = useFormItemLabel(form, label);
   var itemHover = useFormItemHover(form, hover);
   if (hideItem) {
@@ -99,6 +104,9 @@ var Index = function Index(props) {
   }
   return jsx(Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
     className: "".concat(colClassName, " ").concat(itemClassName),
+    style: {
+      display: disHide ? "none" : "block"
+    },
     children: jsx(Form.Item, _objectSpread(_objectSpread({
       className: className,
       label: !hideLabel && jsx(Index$1, {

package/es/Form/FormItem/UpFormItem.d.ts

@@ -1,3 +1,3 @@
 import type { HFormItemProps } from "../modal";
-declare const _default: ({ shouldUpdate, dependencies, hide, itemSpan, ...props }: HFormItemProps) => JSX.Element;
+declare const _default: ({ shouldUpdate, dependencies, hide, itemSpan, hidden, ...props }: HFormItemProps) => JSX.Element;
 export default _default;

package/es/Form/FormItem/UpFormItem.js

@@ -13,7 +13,7 @@ import { Form } from 'antd';
 import Index from './BasicItem.js';
 import { useShouldUpdate } from './hooks.js';
 
-var _excluded = ["shouldUpdate", "dependencies", "hide", "itemSpan"];
+var _excluded = ["shouldUpdate", "dependencies", "hide", "itemSpan", "hidden"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Item = Form.Item;
@@ -22,10 +22,12 @@ var UpFormItem = (function (_ref) {
     dependencies = _ref.dependencies,
     hide = _ref.hide,
     itemSpan = _ref.itemSpan,
+    hidden = _ref.hidden,
     props = _objectWithoutProperties(_ref, _excluded);
   var resultShouldUpdate = useShouldUpdate({
     shouldUpdate: shouldUpdate,
-    hide: hide
+    hide: hide,
+    hidden: hidden
   });
   return jsx(Item, {
     shouldUpdate: resultShouldUpdate,
@@ -34,7 +36,8 @@ var UpFormItem = (function (_ref) {
     children: function children() {
       return jsx(Index, _objectSpread({
         hide: hide,
-        itemSpan: itemSpan
+        itemSpan: itemSpan,
+        hidden: hidden
       }, props));
     }
   });

package/es/Form/FormItem/hooks.d.ts

@@ -2,11 +2,11 @@ import type React from "react";
 import type { HFormInstance, HItemProps, HoverFn, HoverModal } from "../modal";
 import type { LabelAlignModal } from "../modal";
 import type { HelperModal } from "../modal";
-export declare const useFormItemDomControl: ({ shouldUpdate, hide, dependencies, }: HItemProps) => ({ shouldUpdate, dependencies, hide, itemSpan, ...props }: import("../modal").HFormItemProps) => JSX.Element;
+export declare const useFormItemDomControl: ({ shouldUpdate, hide, dependencies, hidden, }: HItemProps) => ({ shouldUpdate, dependencies, hide, itemSpan, hidden, ...props }: import("../modal").HFormItemProps) => JSX.Element;
 interface UseHideUpItemModal extends Omit<HItemProps, "name"> {
     form: HFormInstance;
 }
-export declare const useShouldUpdate: ({ hide, shouldUpdate, }: Omit<HItemProps, "name">) => import("rc-field-form/lib/Field").ShouldUpdate<any> | undefined;
+export declare const useShouldUpdate: ({ hide, shouldUpdate, hidden }: Omit<HItemProps, "name">) => import("rc-field-form/lib/Field").ShouldUpdate<any> | undefined;
 export declare const useHide: ({ hide, form }: UseHideUpItemModal) => boolean;
 export declare const usePositionClassName: (position: LabelAlignModal) => string;
 export declare const useFormItemLabel: (form: HFormInstance, label?: React.ReactNode | HelperModal) => any;

package/es/Form/FormItem/hooks.js

@@ -7,9 +7,10 @@ import { useClassName } from '../../hooks/index.js';
 var useFormItemDomControl = function useFormItemDomControl(_ref) {
   var shouldUpdate = _ref.shouldUpdate,
     hide = _ref.hide,
-    dependencies = _ref.dependencies;
+    dependencies = _ref.dependencies,
+    hidden = _ref.hidden;
   return useMemo(function () {
-    if (shouldUpdate || typeof hide === "function" || dependencies) {
+    if (shouldUpdate || typeof hide === "function" || dependencies || typeof hidden === "function") {
       return UpFormItem;
     }
     return RegularFormItem;
@@ -17,10 +18,14 @@ var useFormItemDomControl = function useFormItemDomControl(_ref) {
 };
 var useShouldUpdate = function useShouldUpdate(_ref2) {
   var hide = _ref2.hide,
-    shouldUpdate = _ref2.shouldUpdate;
+    shouldUpdate = _ref2.shouldUpdate,
+    hidden = _ref2.hidden;
   if (typeof hide === "function" && !shouldUpdate) {
     return true;
   }
+  if (typeof hidden === "function" && !shouldUpdate) {
+    return true;
+  }
   return shouldUpdate;
 };
 var useHide = function useHide(_ref3) {

package/es/Form/hooks/useHForm.js

@@ -6,11 +6,11 @@ import 'core-js/modules/es.object.get-own-property-descriptors.js';
 import _toConsumableArray from '@babel/runtime-corejs3/helpers/toConsumableArray';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
-import 'core-js/modules/es.object.to-string.js';
-import 'core-js/modules/es.promise.js';
 import 'core-js/modules/es.object.keys.js';
+import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/es.reflect.delete-property.js';
+import 'core-js/modules/es.promise.js';
 import 'core-js/modules/es.array.slice.js';
 import 'core-js/modules/es.function.name.js';
 import 'core-js/modules/es.array.concat.js';
@@ -46,6 +46,27 @@ var useHForm = (function () {
         defaultFn: []
       };
     };
+    var formatValuesFn = function formatValuesFn() {
+      var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
+      var valKeys = Object.keys(value).length;
+      if (!valKeys) {
+        return {};
+      }
+      var newValue = _objectSpread({}, value);
+      var keys = Object.keys(formatSourceData);
+      keys.forEach(function (key) {
+        var _formatSourceData$key;
+        var format = (_formatSourceData$key = formatSourceData[key]) === null || _formatSourceData$key === void 0 ? void 0 : _formatSourceData$key[formatKey];
+        if (!format) {
+          return;
+        }
+        var resultValue = format(value);
+        Reflect.deleteProperty(newValue, key);
+        newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
+      });
+      return newValue;
+    };
     return _objectSpread(_objectSpread({
       reload: function reload(params) {
         return Promise.resolve(params);
@@ -53,7 +74,7 @@ var useHForm = (function () {
       initValues: function initValues() {
         var newValue = {};
         if (cacheValues) {
-          newValue = this.formatValues(cacheValues);
+          newValue = formatValuesFn(cacheValues);
           initSaveValue = newValue;
           form.setFieldsValue(newValue);
         }
@@ -83,23 +104,7 @@ var useHForm = (function () {
       formatValues: function formatValues() {
         var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
-        var valKeys = Object.keys(value).length;
-        if (!valKeys) {
-          return {};
-        }
-        var newValue = _objectSpread({}, value);
-        var keys = Object.keys(formatSourceData);
-        keys.forEach(function (key) {
-          var _formatSourceData$key;
-          var format = (_formatSourceData$key = formatSourceData[key]) === null || _formatSourceData$key === void 0 ? void 0 : _formatSourceData$key[formatKey];
-          if (!format) {
-            return;
-          }
-          var resultValue = format(value);
-          Reflect.deleteProperty(newValue, key);
-          newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
-        });
-        return newValue;
+        return formatValuesFn(value, formatKey);
       },
       dispatch: function dispatch() {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -174,7 +179,7 @@ var useHForm = (function () {
       },
       outputValues: function outputValues(value) {
         var val = value || form.getFieldsValue();
-        return this.formatValues(val, "outputValue");
+        return formatValuesFn(val, "outputValue");
       }
     }, form), {}, {
       setFieldsValue: function setFieldsValue(values) {
@@ -182,14 +187,13 @@ var useHForm = (function () {
           cacheValues = values;
           return;
         }
-        var newValue = this.formatValues(values);
+        var newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
       validateFields: function validateFields(nameList) {
-        var _this = this;
         return new Promise(function (resolve, reject) {
           form.validateFields(nameList).then(function (value) {
-            var result = _this.formatValues(value, "outputValue");
+            var result = formatValuesFn(value, "outputValue");
             return resolve(result);
           }).catch(function (e) {
             reject(e);

package/es/Form/modal.d.ts

@@ -35,7 +35,7 @@ export interface DispatchModal<T = string | string[]> {
     reset?: boolean;
 }
 export type LabelAlignModal = "left" | "right" | "topLeft" | "topRight" | "top";
-export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" | "label"> {
+export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" | "label" | "hidden"> {
     type?: string;
     itemProps?: ItemPropsType;
     render?: RenderFun;
@@ -50,6 +50,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
     hideLabel?: boolean;
     labelAlign?: LabelAlignModal;
     label?: React.ReactNode | HelperModal;
+    hidden?: boolean | HideModal;
 }
 export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
     configData: HItemProps[];

package/lib/Form/FormItem/BasicItem.js

@@ -24,7 +24,7 @@ var useDefaultRender = require('../hooks/useDefaultRender.js');
 var index$1 = require('../hooks/index.js');
 var FormConfigProvider = require('../Context/FormConfigProvider.js');
 
-var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle"],
+var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle", "hidden"],
   _excluded2 = ["labelAlign", "itemProps"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -75,6 +75,7 @@ var Index = function Index(props) {
     colClassName = props.className,
     _props$noStyle = props.noStyle,
     noStyle = _props$noStyle === void 0 ? false : _props$noStyle,
+    hidden = props.hidden,
     oProps = _objectWithoutProperties(props, _excluded);
   var _props$labelAlign = props.labelAlign,
     align = _props$labelAlign === void 0 ? "right" : _props$labelAlign,
@@ -95,6 +96,10 @@ var Index = function Index(props) {
     hide: hide,
     form: form
   });
+  var disHide = hooks.useHide({
+    hide: hidden,
+    form: form
+  });
   var formItemLabel = hooks.useFormItemLabel(form, label);
   var itemHover = hooks.useFormItemHover(form, hover);
   if (hideItem) {
@@ -102,6 +107,9 @@ var Index = function Index(props) {
   }
   return jsxRuntime.jsx(antd.Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
     className: "".concat(colClassName, " ").concat(itemClassName),
+    style: {
+      display: disHide ? "none" : "block"
+    },
     children: jsxRuntime.jsx(antd.Form.Item, _objectSpread(_objectSpread({
       className: className,
       label: !hideLabel && jsxRuntime.jsx(Label.default, {

package/lib/Form/FormItem/UpFormItem.d.ts

@@ -1,3 +1,3 @@
 import type { HFormItemProps } from "../modal";
-declare const _default: ({ shouldUpdate, dependencies, hide, itemSpan, ...props }: HFormItemProps) => JSX.Element;
+declare const _default: ({ shouldUpdate, dependencies, hide, itemSpan, hidden, ...props }: HFormItemProps) => JSX.Element;
 export default _default;

package/lib/Form/FormItem/UpFormItem.js

@@ -16,7 +16,7 @@ var antd = require('antd');
 var BasicItem = require('./BasicItem.js');
 var hooks = require('./hooks.js');
 
-var _excluded = ["shouldUpdate", "dependencies", "hide", "itemSpan"];
+var _excluded = ["shouldUpdate", "dependencies", "hide", "itemSpan", "hidden"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Item = antd.Form.Item;
@@ -25,10 +25,12 @@ var UpFormItem = (function (_ref) {
     dependencies = _ref.dependencies,
     hide = _ref.hide,
     itemSpan = _ref.itemSpan,
+    hidden = _ref.hidden,
     props = _objectWithoutProperties(_ref, _excluded);
   var resultShouldUpdate = hooks.useShouldUpdate({
     shouldUpdate: shouldUpdate,
-    hide: hide
+    hide: hide,
+    hidden: hidden
   });
   return jsxRuntime.jsx(Item, {
     shouldUpdate: resultShouldUpdate,
@@ -37,7 +39,8 @@ var UpFormItem = (function (_ref) {
     children: function children() {
       return jsxRuntime.jsx(BasicItem.default, _objectSpread({
         hide: hide,
-        itemSpan: itemSpan
+        itemSpan: itemSpan,
+        hidden: hidden
       }, props));
     }
   });

package/lib/Form/FormItem/hooks.d.ts

@@ -2,11 +2,11 @@ import type React from "react";
 import type { HFormInstance, HItemProps, HoverFn, HoverModal } from "../modal";
 import type { LabelAlignModal } from "../modal";
 import type { HelperModal } from "../modal";
-export declare const useFormItemDomControl: ({ shouldUpdate, hide, dependencies, }: HItemProps) => ({ shouldUpdate, dependencies, hide, itemSpan, ...props }: import("../modal").HFormItemProps) => JSX.Element;
+export declare const useFormItemDomControl: ({ shouldUpdate, hide, dependencies, hidden, }: HItemProps) => ({ shouldUpdate, dependencies, hide, itemSpan, hidden, ...props }: import("../modal").HFormItemProps) => JSX.Element;
 interface UseHideUpItemModal extends Omit<HItemProps, "name"> {
     form: HFormInstance;
 }
-export declare const useShouldUpdate: ({ hide, shouldUpdate, }: Omit<HItemProps, "name">) => import("rc-field-form/lib/Field").ShouldUpdate<any> | undefined;
+export declare const useShouldUpdate: ({ hide, shouldUpdate, hidden }: Omit<HItemProps, "name">) => import("rc-field-form/lib/Field").ShouldUpdate<any> | undefined;
 export declare const useHide: ({ hide, form }: UseHideUpItemModal) => boolean;
 export declare const usePositionClassName: (position: LabelAlignModal) => string;
 export declare const useFormItemLabel: (form: HFormInstance, label?: React.ReactNode | HelperModal) => any;

package/lib/Form/FormItem/hooks.js

@@ -8,9 +8,10 @@ var index = require('../../hooks/index.js');
 var useFormItemDomControl = function useFormItemDomControl(_ref) {
   var shouldUpdate = _ref.shouldUpdate,
     hide = _ref.hide,
-    dependencies = _ref.dependencies;
+    dependencies = _ref.dependencies,
+    hidden = _ref.hidden;
   return React.useMemo(function () {
-    if (shouldUpdate || typeof hide === "function" || dependencies) {
+    if (shouldUpdate || typeof hide === "function" || dependencies || typeof hidden === "function") {
       return UpFormItem.default;
     }
     return RegularFormItem.default;
@@ -18,10 +19,14 @@ var useFormItemDomControl = function useFormItemDomControl(_ref) {
 };
 var useShouldUpdate = function useShouldUpdate(_ref2) {
   var hide = _ref2.hide,
-    shouldUpdate = _ref2.shouldUpdate;
+    shouldUpdate = _ref2.shouldUpdate,
+    hidden = _ref2.hidden;
   if (typeof hide === "function" && !shouldUpdate) {
     return true;
   }
+  if (typeof hidden === "function" && !shouldUpdate) {
+    return true;
+  }
   return shouldUpdate;
 };
 var useHide = function useHide(_ref3) {

package/lib/Form/hooks/useHForm.js

@@ -9,11 +9,11 @@ require('core-js/modules/es.object.get-own-property-descriptors.js');
 var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
-require('core-js/modules/es.object.to-string.js');
-require('core-js/modules/es.promise.js');
 require('core-js/modules/es.object.keys.js');
+require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/web.dom-collections.for-each.js');
 require('core-js/modules/es.reflect.delete-property.js');
+require('core-js/modules/es.promise.js');
 require('core-js/modules/es.array.slice.js');
 require('core-js/modules/es.function.name.js');
 require('core-js/modules/es.array.concat.js');
@@ -49,6 +49,27 @@ var useHForm = (function () {
         defaultFn: []
       };
     };
+    var formatValuesFn = function formatValuesFn() {
+      var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
+      var valKeys = Object.keys(value).length;
+      if (!valKeys) {
+        return {};
+      }
+      var newValue = _objectSpread({}, value);
+      var keys = Object.keys(formatSourceData);
+      keys.forEach(function (key) {
+        var _formatSourceData$key;
+        var format = (_formatSourceData$key = formatSourceData[key]) === null || _formatSourceData$key === void 0 ? void 0 : _formatSourceData$key[formatKey];
+        if (!format) {
+          return;
+        }
+        var resultValue = format(value);
+        Reflect.deleteProperty(newValue, key);
+        newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
+      });
+      return newValue;
+    };
     return _objectSpread(_objectSpread({
       reload: function reload(params) {
         return Promise.resolve(params);
@@ -56,7 +77,7 @@ var useHForm = (function () {
       initValues: function initValues() {
         var newValue = {};
         if (cacheValues) {
-          newValue = this.formatValues(cacheValues);
+          newValue = formatValuesFn(cacheValues);
           initSaveValue = newValue;
           form.setFieldsValue(newValue);
         }
@@ -86,23 +107,7 @@ var useHForm = (function () {
       formatValues: function formatValues() {
         var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
-        var valKeys = Object.keys(value).length;
-        if (!valKeys) {
-          return {};
-        }
-        var newValue = _objectSpread({}, value);
-        var keys = Object.keys(formatSourceData);
-        keys.forEach(function (key) {
-          var _formatSourceData$key;
-          var format = (_formatSourceData$key = formatSourceData[key]) === null || _formatSourceData$key === void 0 ? void 0 : _formatSourceData$key[formatKey];
-          if (!format) {
-            return;
-          }
-          var resultValue = format(value);
-          Reflect.deleteProperty(newValue, key);
-          newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
-        });
-        return newValue;
+        return formatValuesFn(value, formatKey);
       },
       dispatch: function dispatch() {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -177,7 +182,7 @@ var useHForm = (function () {
       },
       outputValues: function outputValues(value) {
         var val = value || form.getFieldsValue();
-        return this.formatValues(val, "outputValue");
+        return formatValuesFn(val, "outputValue");
       }
     }, form), {}, {
       setFieldsValue: function setFieldsValue(values) {
@@ -185,14 +190,13 @@ var useHForm = (function () {
           cacheValues = values;
           return;
         }
-        var newValue = this.formatValues(values);
+        var newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
       validateFields: function validateFields(nameList) {
-        var _this = this;
         return new Promise(function (resolve, reject) {
           form.validateFields(nameList).then(function (value) {
-            var result = _this.formatValues(value, "outputValue");
+            var result = formatValuesFn(value, "outputValue");
             return resolve(result);
           }).catch(function (e) {
             reject(e);

package/lib/Form/modal.d.ts

@@ -35,7 +35,7 @@ export interface DispatchModal<T = string | string[]> {
     reset?: boolean;
 }
 export type LabelAlignModal = "left" | "right" | "topLeft" | "topRight" | "top";
-export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" | "label"> {
+export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" | "label" | "hidden"> {
     type?: string;
     itemProps?: ItemPropsType;
     render?: RenderFun;
@@ -50,6 +50,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
     hideLabel?: boolean;
     labelAlign?: LabelAlignModal;
     label?: React.ReactNode | HelperModal;
+    hidden?: boolean | HideModal;
 }
 export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
     configData: HItemProps[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.9.3",
+  "version": "1.9.5",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/Form/FormItem/BasicItem.tsx

@@ -54,6 +54,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
     style,
     className: colClassName,
     noStyle = false,
+    hidden,
     ...oProps
   } = props;
   const { labelAlign: align = "right", itemProps, ...inProps } = props;
@@ -72,13 +73,19 @@ const Index: React.FC<HFormItemProps> = (props) => {
   );
   const className = usePositionClassName(align);
   const hideItem = useHide({ hide, form });
+  const disHide=useHide({hide:hidden,form});
   const formItemLabel = useFormItemLabel(form, label);
   const itemHover = useFormItemHover(form, hover);
   if (hideItem) {
     return null;
   }
   return (
-    <Col {...itemSpan} className={`${colClassName} ${itemClassName}`}>
+    <Col {...itemSpan}
+         className={`${colClassName} ${itemClassName}`}
+         style={{
+            display:disHide?"none":"block"
+         }}
+    >
       <Form.Item
         className={className}
         label={

package/src/components/Form/FormItem/UpFormItem.tsx

@@ -8,13 +8,14 @@ export default ({
   dependencies,
   hide,
   itemSpan,
+  hidden,
   ...props
 }: HFormItemProps) => {
-  const resultShouldUpdate = useShouldUpdate({ shouldUpdate, hide });
+  const resultShouldUpdate = useShouldUpdate({ shouldUpdate, hide,hidden });
   return (
     <Item shouldUpdate={resultShouldUpdate} dependencies={dependencies} noStyle>
       {() => {
-        return <BasicItem hide={hide} itemSpan={itemSpan} {...props} />;
+        return <BasicItem hide={hide} itemSpan={itemSpan} hidden={hidden} {...props} />;
       }}
     </Item>
   );

package/src/components/Form/FormItem/hooks.tsx

@@ -11,9 +11,10 @@ export const useFormItemDomControl = ({
   shouldUpdate,
   hide,
   dependencies,
+  hidden,
 }: HItemProps) => {
   return useMemo(() => {
-    if (shouldUpdate || typeof hide === "function" || dependencies) {
+    if (shouldUpdate || typeof hide === "function" || dependencies||typeof hidden === "function" ) {
       return UpFormItem;
     }
     return RegularFormItem;
@@ -26,10 +27,14 @@ interface UseHideUpItemModal extends Omit<HItemProps, "name"> {
 export const useShouldUpdate = ({
   hide,
   shouldUpdate,
+  hidden
 }: Omit<HItemProps, "name">) => {
   if (typeof hide === "function" && !shouldUpdate) {
     return true;
   }
+  if (typeof hidden==="function"&&!shouldUpdate){
+    return true
+  }
   return shouldUpdate;
 };
 

package/src/components/Form/hooks/useHForm.ts

@@ -34,6 +34,27 @@ export default () => {
         defaultFn: [],
       };
     };
+    const formatValuesFn=(value = {}, formatKey = "inputValue")=>{
+      const valKeys = Object.keys(value).length;
+      if (!valKeys) {
+        return {};
+      }
+      let newValue = { ...value };
+      const keys = Object.keys(formatSourceData);
+      keys.forEach((key) => {
+        const format = formatSourceData[key]?.[formatKey];
+        if (!format) {
+          return;
+        }
+        const resultValue = format(value);
+        Reflect.deleteProperty(newValue, key);
+        newValue = {
+          ...newValue,
+          ...resultValue,
+        };
+      });
+      return newValue;
+    }
     return {
       reload: (params) => {
         return Promise.resolve(params);
@@ -41,7 +62,7 @@ export default () => {
       initValues() {
         let newValue = {};
         if (cacheValues) {
-          newValue = this.formatValues(cacheValues);
+          newValue = formatValuesFn(cacheValues);
           initSaveValue = newValue;
           form.setFieldsValue(newValue);
         }
@@ -65,25 +86,7 @@ export default () => {
         Reflect.deleteProperty(formatSourceData, name);
       },
       formatValues(value = {}, formatKey = "inputValue") {
-        const valKeys = Object.keys(value).length;
-        if (!valKeys) {
-          return {};
-        }
-        let newValue = { ...value };
-        const keys = Object.keys(formatSourceData);
-        keys.forEach((key) => {
-          const format = formatSourceData[key]?.[formatKey];
-          if (!format) {
-            return;
-          }
-          const resultValue = format(value);
-          Reflect.deleteProperty(newValue, key);
-          newValue = {
-            ...newValue,
-            ...resultValue,
-          };
-        });
-        return newValue;
+       return formatValuesFn(value,formatKey);
       }, //转化方法
       dispatch(...args) {
         const [action, ...dispatchArgs] = args;
@@ -146,7 +149,7 @@ export default () => {
       },
       outputValues(value) {
         const val = value || form.getFieldsValue();
-        return this.formatValues(val, "outputValue");
+        return formatValuesFn(val, "outputValue");
       },
       ...form,
       setFieldsValue(values) {
@@ -154,7 +157,7 @@ export default () => {
           cacheValues = values;
           return;
         }
-        const newValue = this.formatValues(values);
+        const newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
       validateFields(nameList) {
@@ -162,7 +165,7 @@ export default () => {
           form
             .validateFields(nameList)
             .then((value) => {
-              const result = this.formatValues(value, "outputValue");
+              const result = formatValuesFn(value, "outputValue");
               return resolve(result);
             })
             .catch((e) => {

package/src/components/Form/index.tsx

@@ -3,8 +3,7 @@ import type { HFormProps } from "./modal";
 import { useCurrentForm, useInfoReq, useValuesChange } from "./hooks";
 import { FormContext } from "./Context";
 import PageHandler from "../PageHandler";
-import useInitConfigData from "./hooks/useInitConfigData";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import InitSet from "./InitSet";
 import Basic from "./Basic";
 

package/src/components/Form/modal.ts

@@ -81,7 +81,7 @@ export interface DispatchModal<T = string | string[]> {
 export type LabelAlignModal = "left" | "right" | "topLeft" | "topRight" | "top";
 
 export interface HItemProps
-  extends Omit<FormItemProps, "name" | "labelAlign" | "label"> {
+  extends Omit<FormItemProps, "name" | "labelAlign" | "label"|"hidden"> {
   type?: string;
   itemProps?: ItemPropsType;
   render?: RenderFun;
@@ -98,6 +98,7 @@ export interface HItemProps
   hideLabel?: boolean;
   labelAlign?: LabelAlignModal;
   label?: React.ReactNode | HelperModal;
+  hidden?:boolean|HideModal
 }
 export interface HFormProps<T = any, R = any>
   extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {

package/src/pages/Form/index.tsx

@@ -68,13 +68,29 @@ const formData = (options) => {
   return [
       {
           name:"name",
-          label:"输入框"
+          label:"输入框",
+          hidden:(form)=>{
+              const {check}=form.getFieldsValue();
+              console.log(check,"name")
+              return !check?.vv
+          }
       },
       {
           name:"url",
           type:"urlUpload",
           label:"文本"
       },
+      {
+          label:"输入框",
+          type:"checkboxGroup",
+          name:"check",
+          itemProps:{
+              options:[{
+                  key:"vv",
+                  value:"测试"
+              }]
+          }
+      }
   ];
 };
 function Ttta({ form }) {
@@ -119,6 +135,10 @@ export default () => {
           labelWidth={300}
           dismissOnPressEnter={false}
           form={form}
+          layout={"vertical"}
+          itemSpan={{
+              span:12
+          }}
           labelAlign={"left"}
           onFinish={(value) => {
             console.log(value, "onFinish");
@@ -148,7 +168,7 @@ export default () => {
       </div>
       <div
         onClick={() => {
-          form.submit();
+          console.log(form.formatValues())
         }}
       >
         提交