@hw-component/form 0.0.9-beta-v4 → 0.0.9-beta-v6

package/es/CheckboxGroup/modal.d.ts

@@ -11,5 +11,5 @@ export interface HCheckboxProps extends Omit<CheckboxProps, "value" | "onChange"
     onChange?: (value: Record<string, any> | any[]) => void;
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
     subParams?: (formatValue: Record<string, any>, sourceValue: any[]) => any;
-    direction?: 'horizontal' | 'vertical';
+    direction?: "horizontal" | "vertical";
 }

package/es/Form/FormItem/BasicItem.js

@@ -19,7 +19,7 @@ import { useFormContext } from '../Context/index.js';
 import { useDefaultRender } from '../hooks/useDefaultRender.js';
 import { useDefaultComponents } from '../hooks/index.js';
 
-var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan"];
+var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel"];
 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 Content = function Content(_ref) {
@@ -62,6 +62,8 @@ var Index = function Index(props) {
     itemSpan = _props$itemSpan === void 0 ? {
       span: 24
     } : _props$itemSpan,
+    _props$hideLabel = props.hideLabel,
+    hideLabel = _props$hideLabel === void 0 ? false : _props$hideLabel,
     oProps = _objectWithoutProperties(props, _excluded);
   var _useFormContext = useFormContext(),
     form = _useFormContext.form;
@@ -76,7 +78,7 @@ var Index = function Index(props) {
   }
   return jsx(Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
     children: jsx(Form.Item, _objectSpread(_objectSpread({
-      label: jsx(Index$1, {
+      label: !hideLabel && jsx(Index$1, {
         hover: hover,
         labelWidth: labelWidth,
         required: required,

package/es/Form/index.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "./modal";
-declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, ...props }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, ...props }: HFormProps) => JSX.Element;
 export default _default;

package/es/Form/index.js

@@ -19,7 +19,7 @@ import Index from '../PageHandler/index.js';
 import useInitConfigData from './hooks/useInitConfigData.js';
 import InitSet from './InitSet.js';
 
-var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan"];
+var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter"];
 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 HForm = (function (_ref) {
@@ -36,6 +36,9 @@ var HForm = (function (_ref) {
     params = _ref$params === void 0 ? {} : _ref$params,
     onValuesChange = _ref.onValuesChange,
     itemSpan = _ref.itemSpan,
+    _ref$hideLabel = _ref.hideLabel,
+    formHideLabel = _ref$hideLabel === void 0 ? false : _ref$hideLabel,
+    gutter = _ref.gutter,
     props = _objectWithoutProperties(_ref, _excluded);
   var hForm = useCurrentForm(form);
   var _useInitConfigData = useInitConfigData({
@@ -88,10 +91,14 @@ var HForm = (function (_ref) {
         onValuesChange: valuesChange
       }, props), {}, {
         children: [jsx(Row, {
+          gutter: gutter,
           children: newConfigData.map(function (itemData, index) {
-            var itemLabelWidth = itemData.labelWidth;
+            var itemLabelWidth = itemData.labelWidth,
+              _itemData$hideLabel = itemData.hideLabel,
+              hideLabel = _itemData$hideLabel === void 0 ? formHideLabel : _itemData$hideLabel;
             return /*#__PURE__*/createElement(Item, _objectSpread(_objectSpread({}, itemData), {}, {
               key: index,
+              hideLabel: hideLabel,
               itemSpan: itemSpan,
               labelWidth: itemLabelWidth || labelWidth
             }));

package/es/Form/modal.d.ts

@@ -15,6 +15,7 @@ import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRang
 import type { ForwardedRef } from "react";
 import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
+import { Gutter } from "antd/lib/grid/row";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
 type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any>;
 export interface HoverModal {
@@ -43,6 +44,7 @@ export interface HItemProps extends Omit<FormItemProps, "name"> {
     name?: string;
     dispatch?: DispatchModal;
     itemSpan?: ColProps;
+    hideLabel?: boolean;
 }
 export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish"> {
     configData: HItemProps[];
@@ -54,6 +56,8 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "
     params?: any;
     onFinish?: (values: T, params?: any) => void;
     itemSpan?: ColProps;
+    hideLabel?: boolean;
+    gutter?: Gutter | [Gutter, Gutter];
 }
 export interface HFormItemProps extends HItemProps {
     required?: boolean;

package/lib/CheckboxGroup/modal.d.ts

@@ -11,5 +11,5 @@ export interface HCheckboxProps extends Omit<CheckboxProps, "value" | "onChange"
     onChange?: (value: Record<string, any> | any[]) => void;
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
     subParams?: (formatValue: Record<string, any>, sourceValue: any[]) => any;
-    direction?: 'horizontal' | 'vertical';
+    direction?: "horizontal" | "vertical";
 }

package/lib/Form/FormItem/BasicItem.js

@@ -22,7 +22,7 @@ var index = require('../Context/index.js');
 var useDefaultRender = require('../hooks/useDefaultRender.js');
 var index$1 = require('../hooks/index.js');
 
-var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan"];
+var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel"];
 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 Content = function Content(_ref) {
@@ -65,6 +65,8 @@ var Index = function Index(props) {
     itemSpan = _props$itemSpan === void 0 ? {
       span: 24
     } : _props$itemSpan,
+    _props$hideLabel = props.hideLabel,
+    hideLabel = _props$hideLabel === void 0 ? false : _props$hideLabel,
     oProps = _objectWithoutProperties(props, _excluded);
   var _useFormContext = index.useFormContext(),
     form = _useFormContext.form;
@@ -79,7 +81,7 @@ var Index = function Index(props) {
   }
   return jsxRuntime.jsx(antd.Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
     children: jsxRuntime.jsx(antd.Form.Item, _objectSpread(_objectSpread({
-      label: jsxRuntime.jsx(Label.default, {
+      label: !hideLabel && jsxRuntime.jsx(Label.default, {
         hover: hover,
         labelWidth: labelWidth,
         required: required,

package/lib/Form/index.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "./modal";
-declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, ...props }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, ...props }: HFormProps) => JSX.Element;
 export default _default;

package/lib/Form/index.js

@@ -22,7 +22,7 @@ var index$1 = require('../PageHandler/index.js');
 var useInitConfigData = require('./hooks/useInitConfigData.js');
 var InitSet = require('./InitSet.js');
 
-var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan"];
+var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter"];
 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 HForm = (function (_ref) {
@@ -39,6 +39,9 @@ var HForm = (function (_ref) {
     params = _ref$params === void 0 ? {} : _ref$params,
     onValuesChange = _ref.onValuesChange,
     itemSpan = _ref.itemSpan,
+    _ref$hideLabel = _ref.hideLabel,
+    formHideLabel = _ref$hideLabel === void 0 ? false : _ref$hideLabel,
+    gutter = _ref.gutter,
     props = _objectWithoutProperties(_ref, _excluded);
   var hForm = index.useCurrentForm(form);
   var _useInitConfigData = useInitConfigData.default({
@@ -91,10 +94,14 @@ var HForm = (function (_ref) {
         onValuesChange: valuesChange
       }, props), {}, {
         children: [jsxRuntime.jsx(antd.Row, {
+          gutter: gutter,
           children: newConfigData.map(function (itemData, index) {
-            var itemLabelWidth = itemData.labelWidth;
+            var itemLabelWidth = itemData.labelWidth,
+              _itemData$hideLabel = itemData.hideLabel,
+              hideLabel = _itemData$hideLabel === void 0 ? formHideLabel : _itemData$hideLabel;
             return /*#__PURE__*/React.createElement(index$3.default, _objectSpread(_objectSpread({}, itemData), {}, {
               key: index,
+              hideLabel: hideLabel,
               itemSpan: itemSpan,
               labelWidth: itemLabelWidth || labelWidth
             }));

package/lib/Form/modal.d.ts

@@ -15,6 +15,7 @@ import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRang
 import type { ForwardedRef } from "react";
 import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
+import { Gutter } from "antd/lib/grid/row";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
 type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any>;
 export interface HoverModal {
@@ -43,6 +44,7 @@ export interface HItemProps extends Omit<FormItemProps, "name"> {
     name?: string;
     dispatch?: DispatchModal;
     itemSpan?: ColProps;
+    hideLabel?: boolean;
 }
 export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish"> {
     configData: HItemProps[];
@@ -54,6 +56,8 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "
     params?: any;
     onFinish?: (values: T, params?: any) => void;
     itemSpan?: ColProps;
+    hideLabel?: boolean;
+    gutter?: Gutter | [Gutter, Gutter];
 }
 export interface HFormItemProps extends HItemProps {
     required?: boolean;

package/package.json

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

package/src/components/CheckboxGroup/index.tsx

@@ -15,7 +15,7 @@ const Index = ({
   disabled,
   keyInValue = true,
   addFormat,
-                 direction
+  direction,
 }: HCheckboxProps) => {
   const { valueCheckMap: resultValueCheckMap, fieldNames: resultFieldNames } =
     useMatchConfigProps({ fieldNames, valueCheckMap: valueMap }); //匹配全局

package/src/components/CheckboxGroup/modal.ts

@@ -13,5 +13,5 @@ export interface HCheckboxProps
   onChange?: (value: Record<string, any> | any[]) => void;
   addFormat?: (config: Record<string, addFormatItemModal>) => void;
   subParams?: (formatValue: Record<string, any>, sourceValue: any[]) => any;
-  direction?:'horizontal' | 'vertical'
+  direction?: "horizontal" | "vertical";
 }

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

@@ -44,6 +44,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
     hide,
     render,
     itemSpan = { span: 24 },
+    hideLabel = false,
     ...oProps
   } = props;
   const { form } = useFormContext();
@@ -57,14 +58,16 @@ const Index: React.FC<HFormItemProps> = (props) => {
     <Col {...itemSpan}>
       <Form.Item
         label={
-          <Label
-            hover={hover}
-            labelWidth={labelWidth}
-            required={required}
-            colon={colon}
-          >
-            {label}
-          </Label>
+          !hideLabel && (
+            <Label
+              hover={hover}
+              labelWidth={labelWidth}
+              required={required}
+              colon={colon}
+            >
+              {label}
+            </Label>
+          )
         }
         {...oProps}
         colon={false}

package/src/components/Form/index.tsx

@@ -20,6 +20,8 @@ export default ({
   params = {},
   onValuesChange,
   itemSpan,
+  hideLabel: formHideLabel = false,
+  gutter,
   ...props
 }: HFormProps) => {
   const hForm = useCurrentForm(form);
@@ -68,13 +70,15 @@ export default ({
           onValuesChange={valuesChange}
           {...props}
         >
-          <Row>
+          <Row gutter={gutter}>
             {newConfigData.map((itemData: HItemProps, index) => {
-              const { labelWidth: itemLabelWidth } = itemData;
+              const { labelWidth: itemLabelWidth, hideLabel = formHideLabel } =
+                itemData;
               return (
                 <Item
                   {...itemData}
                   key={index}
+                  hideLabel={hideLabel}
                   itemSpan={itemSpan}
                   labelWidth={itemLabelWidth || labelWidth}
                 />

package/src/components/Form/modal.ts

@@ -33,6 +33,7 @@ import type {
 import type { ForwardedRef } from "react";
 import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
+import {Gutter} from "antd/lib/grid/row";
 
 type RenderFun = (
   props: HItemProps,
@@ -88,6 +89,7 @@ export interface HItemProps extends Omit<FormItemProps, "name"> {
   name?: string;
   dispatch?: DispatchModal;
   itemSpan?: ColProps;
+  hideLabel?: boolean;
 }
 
 export interface HFormProps<T = any, R = any>
@@ -101,6 +103,8 @@ export interface HFormProps<T = any, R = any>
   params?: any;
   onFinish?: (values: T, params?: any) => void;
   itemSpan?: ColProps;
+  hideLabel?: boolean;
+  gutter?: Gutter | [Gutter, Gutter];
 }
 export interface HFormItemProps extends HItemProps {
   required?: boolean;

package/src/components/TDPicker/index.tsx

@@ -11,7 +11,7 @@ const Index: React.FC<HDatePickerProps> = ({
   format = "X",
   disabledDate,
   addFormat,
-    style={width:"100%"},
+  style = { width: "100%" },
   ...props
 }) => {
   addFormat?.({});

package/src/pages/Form/index.tsx

@@ -77,7 +77,7 @@ const formData = (options) => {
         { value: "选择1", key: "check1" },
         { value: "选择2", key: "check2" },
       ],
-      direction:"vertical"
+      direction: "vertical",
     },
     {
       label: "开关",
@@ -265,12 +265,13 @@ export default () => {
           configData={formData(options)}
           labelWidth={200}
           form={form}
+          hideLabel={true}
           initialValues={{
             name: "fff",
             trimInput: "trimInput",
             trimTextArea: "trimTextArea",
           }}
-          itemSpan={{ span: 12 }}
+          itemSpan={{ span: 12, xs: 24, md: 12 }}
           onFinish={(value) => {
             console.log(value);
           }}