@hw-component/form 1.6.9 → 1.7.1

package/es/Form/index.js

@@ -8,17 +8,15 @@ import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/es.object.get-own-property-descriptors.js';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
-import 'core-js/modules/es.array.map.js';
-import 'core-js/modules/es.function.name.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useEffect, createElement } from 'react';
-import { Form, Row } from 'antd';
-import Item from './FormItem/index.js';
+import { Form } from 'antd';
 import { useCurrentForm, useInfoReq, useValuesChange } from './hooks/index.js';
 import { FormContext } from './Context/index.js';
 import Index from '../PageHandler/index.js';
 import useInitConfigData from './hooks/useInitConfigData.js';
+import { useEffect } from 'react';
 import InitSet from './InitSet.js';
+import Basic from './Basic.js';
 
 var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon"];
 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; }
@@ -82,9 +80,6 @@ var HForm = (function (_ref) {
       hForm.removeDispatchListener();
     };
   }, []);
-  var defaultOnPressEnter = function defaultOnPressEnter() {
-    hForm.submit();
-  };
   return jsx(Index, {
     loading: infoLoading,
     error: infoErr,
@@ -96,41 +91,21 @@ var HForm = (function (_ref) {
         form: hForm,
         valueType: valueType,
         labelAlign: formLabelAlign,
-        labelWidth: labelWidth
+        labelWidth: labelWidth,
+        formItemStyle: formItemStyle,
+        hideLabel: formHideLabel,
+        colon: colon,
+        itemProps: formItemProps,
+        itemSpan: itemSpan
       },
       children: jsxs(Form, _objectSpread(_objectSpread({
         form: hForm,
         onFinish: run,
         onValuesChange: valuesChange
       }, props), {}, {
-        children: [jsx(Row, {
-          gutter: gutter,
-          children: newConfigData.map(function (itemData, index) {
-            var itemLabelWidth = itemData.labelWidth,
-              _itemData$hideLabel = itemData.hideLabel,
-              hideLabel = _itemData$hideLabel === void 0 ? formHideLabel : _itemData$hideLabel,
-              _itemData$labelAlign = itemData.labelAlign,
-              labelAlign = _itemData$labelAlign === void 0 ? formLabelAlign : _itemData$labelAlign,
-              name = itemData.name,
-              _itemData$style = itemData.style,
-              style = _itemData$style === void 0 ? formItemStyle : _itemData$style,
-              _itemData$itemProps = itemData.itemProps,
-              itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps,
-              itemColon = itemData.colon;
-            var defaultItemProps = _objectSpread(_objectSpread({
-              onPressEnter: defaultOnPressEnter
-            }, formItemProps), itemProps);
-            return /*#__PURE__*/createElement(Item, _objectSpread(_objectSpread({}, itemData), {}, {
-              labelAlign: labelAlign,
-              key: name || index,
-              style: style,
-              itemProps: defaultItemProps,
-              hideLabel: hideLabel,
-              itemSpan: itemSpan,
-              labelWidth: itemLabelWidth || labelWidth,
-              colon: typeof itemColon === "undefined" ? colon : itemColon
-            }));
-          })
+        children: [jsx(Basic, {
+          configData: newConfigData,
+          gutter: gutter
         }), jsx(InitSet, {})]
       }))
     })

package/es/Form/modal.d.ts

@@ -83,6 +83,11 @@ export interface FormContextProps {
     valueType?: string;
     labelAlign?: LabelAlignModal;
     labelWidth?: number;
+    formItemStyle?: React.CSSProperties;
+    hideLabel?: boolean;
+    colon?: boolean;
+    itemProps?: ItemPropsType;
+    itemSpan?: ColProps;
 }
 interface ConfigUploadProps {
     exFiles?: string[];

package/es/index.d.ts

@@ -5,6 +5,7 @@ export { default as useHForm } from "./Form/hooks/useHForm";
 export { useHDialogForm } from "./DialogForm/hooks";
 export { default as HFormConnect } from "./Form/HFormConnect";
 export { default as HFormConfigProvider } from "./Form/Context/FormConfigProvider";
+export { default as HBasicForm } from './Form/Basic';
 export declare const HSelect: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export declare const HInput: ({ copy, value, addonAfter, ...props }: import("./Input/modal").HInputProps<any>) => JSX.Element;
 export declare const HSelectInput: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;

package/es/index.js

@@ -6,6 +6,7 @@ export { default as useHForm } from './Form/hooks/useHForm.js';
 export { useHDialogForm } from './DialogForm/hooks.js';
 export { default as HFormConnect } from './Form/HFormConnect.js';
 export { default as HFormConfigProvider } from './Form/Context/FormConfigProvider.js';
+export { default as HBasicForm } from './Form/Basic.js';
 import Index$1 from './DialogForm/ModalForm.js';
 import Index$2 from './DialogForm/DrawerForm/index.js';
 

package/lib/DialogForm/ChildComponent.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { HDialogFormInstance } from "@/components/DialogForm/modal";
+import type { HDialogFormInstance } from "@/components/DialogForm/modal";
 interface IProps<P = any> {
     contentRender?: (dom: React.ReactNode, form: HDialogFormInstance, params: P) => React.ReactNode;
     dialogForm: HDialogFormInstance;

package/lib/Form/Basic.d.ts

@@ -0,0 +1,3 @@
+import { HFormProps } from "@/components/Form/modal";
+declare const _default: ({ configData, gutter }: HFormProps) => JSX.Element;
+export default _default;

package/lib/Form/Basic.js

@@ -0,0 +1,66 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+require('core-js/modules/es.array.map.js');
+require('core-js/modules/es.function.name.js');
+require('core-js/modules/es.object.keys.js');
+require('core-js/modules/es.symbol.js');
+require('core-js/modules/es.array.filter.js');
+require('core-js/modules/es.object.to-string.js');
+require('core-js/modules/es.object.get-own-property-descriptor.js');
+require('core-js/modules/web.dom-collections.for-each.js');
+require('core-js/modules/es.object.get-own-property-descriptors.js');
+var jsxRuntime = require('react/jsx-runtime');
+var React = require('react');
+var index$1 = require('./FormItem/index.js');
+var antd = require('antd');
+var index = require('./Context/index.js');
+
+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 Basic = (function (_ref) {
+  var configData = _ref.configData,
+    gutter = _ref.gutter;
+  var _useFormContext = index.useFormContext(),
+    form = _useFormContext.form,
+    formItemProps = _useFormContext.itemProps,
+    itemSpan = _useFormContext.itemSpan,
+    formColon = _useFormContext.colon;
+  var defaultOnPressEnter = function defaultOnPressEnter() {
+    form.submit();
+  };
+  return jsxRuntime.jsx(antd.Row, {
+    gutter: gutter,
+    style: {
+      width: "100%"
+    },
+    children: configData.map(function (itemData, index) {
+      var itemLabelWidth = itemData.labelWidth,
+        hideLabel = itemData.hideLabel,
+        labelAlign = itemData.labelAlign,
+        name = itemData.name,
+        style = itemData.style,
+        _itemData$itemProps = itemData.itemProps,
+        itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps,
+        itemColon = itemData.colon;
+      var defaultItemProps = _objectSpread(_objectSpread({
+        onPressEnter: defaultOnPressEnter
+      }, formItemProps), itemProps);
+      return /*#__PURE__*/React.createElement(index$1.default, _objectSpread(_objectSpread({}, itemData), {}, {
+        labelAlign: labelAlign,
+        key: name || index,
+        style: style,
+        itemProps: defaultItemProps,
+        hideLabel: hideLabel,
+        itemSpan: itemSpan,
+        labelWidth: itemLabelWidth,
+        colon: typeof itemColon === "undefined" ? formColon : itemColon
+      }));
+    })
+  });
+});
+
+exports.default = Basic;
+// powered by h

package/lib/Form/FormItem/index.js

@@ -19,16 +19,26 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var Item = (function (props) {
   var _useFormContext = index.useFormContext(),
     formLabelWidth = _useFormContext.labelWidth,
-    formLabelAlign = _useFormContext.labelAlign;
+    formLabelAlign = _useFormContext.labelAlign,
+    formLabelHide = _useFormContext.hideLabel,
+    formItemStyle = _useFormContext.formItemStyle,
+    formColon = _useFormContext.colon;
   var _props$labelWidth = props.labelWidth,
     labelWidth = _props$labelWidth === void 0 ? formLabelWidth : _props$labelWidth,
     _props$labelAlign = props.labelAlign,
-    labelAlign = _props$labelAlign === void 0 ? formLabelAlign : _props$labelAlign;
+    labelAlign = _props$labelAlign === void 0 ? formLabelAlign : _props$labelAlign,
+    _props$hideLabel = props.hideLabel,
+    hideLabel = _props$hideLabel === void 0 ? formLabelHide : _props$hideLabel,
+    _props$style = props.style,
+    style = _props$style === void 0 ? formItemStyle : _props$style,
+    colon = props.colon;
   var Component = hooks.useFormItemDomControl(props);
-  console.log(formLabelWidth, "formLabelWidth");
   return jsxRuntime.jsx(Component, _objectSpread(_objectSpread({}, props), {}, {
     labelAlign: labelAlign,
-    labelWidth: labelWidth
+    labelWidth: labelWidth,
+    hideLabel: hideLabel,
+    style: style,
+    colon: typeof colon === "undefined" ? colon : formColon
   }));
 });
 

package/lib/Form/index.js

@@ -11,17 +11,15 @@ require('core-js/modules/web.dom-collections.for-each.js');
 require('core-js/modules/es.object.get-own-property-descriptors.js');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
-require('core-js/modules/es.array.map.js');
-require('core-js/modules/es.function.name.js');
 var jsxRuntime = require('react/jsx-runtime');
-var React = require('react');
 var antd = require('antd');
-var index$3 = require('./FormItem/index.js');
 var index = require('./hooks/index.js');
 var index$2 = require('./Context/index.js');
 var index$1 = require('../PageHandler/index.js');
 var useInitConfigData = require('./hooks/useInitConfigData.js');
+var React = require('react');
 var InitSet = require('./InitSet.js');
+var Basic = require('./Basic.js');
 
 var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon"];
 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; }
@@ -85,9 +83,6 @@ var HForm = (function (_ref) {
       hForm.removeDispatchListener();
     };
   }, []);
-  var defaultOnPressEnter = function defaultOnPressEnter() {
-    hForm.submit();
-  };
   return jsxRuntime.jsx(index$1.default, {
     loading: infoLoading,
     error: infoErr,
@@ -99,41 +94,21 @@ var HForm = (function (_ref) {
         form: hForm,
         valueType: valueType,
         labelAlign: formLabelAlign,
-        labelWidth: labelWidth
+        labelWidth: labelWidth,
+        formItemStyle: formItemStyle,
+        hideLabel: formHideLabel,
+        colon: colon,
+        itemProps: formItemProps,
+        itemSpan: itemSpan
       },
       children: jsxRuntime.jsxs(antd.Form, _objectSpread(_objectSpread({
         form: hForm,
         onFinish: run,
         onValuesChange: valuesChange
       }, props), {}, {
-        children: [jsxRuntime.jsx(antd.Row, {
-          gutter: gutter,
-          children: newConfigData.map(function (itemData, index) {
-            var itemLabelWidth = itemData.labelWidth,
-              _itemData$hideLabel = itemData.hideLabel,
-              hideLabel = _itemData$hideLabel === void 0 ? formHideLabel : _itemData$hideLabel,
-              _itemData$labelAlign = itemData.labelAlign,
-              labelAlign = _itemData$labelAlign === void 0 ? formLabelAlign : _itemData$labelAlign,
-              name = itemData.name,
-              _itemData$style = itemData.style,
-              style = _itemData$style === void 0 ? formItemStyle : _itemData$style,
-              _itemData$itemProps = itemData.itemProps,
-              itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps,
-              itemColon = itemData.colon;
-            var defaultItemProps = _objectSpread(_objectSpread({
-              onPressEnter: defaultOnPressEnter
-            }, formItemProps), itemProps);
-            return /*#__PURE__*/React.createElement(index$3.default, _objectSpread(_objectSpread({}, itemData), {}, {
-              labelAlign: labelAlign,
-              key: name || index,
-              style: style,
-              itemProps: defaultItemProps,
-              hideLabel: hideLabel,
-              itemSpan: itemSpan,
-              labelWidth: itemLabelWidth || labelWidth,
-              colon: typeof itemColon === "undefined" ? colon : itemColon
-            }));
-          })
+        children: [jsxRuntime.jsx(Basic.default, {
+          configData: newConfigData,
+          gutter: gutter
         }), jsxRuntime.jsx(InitSet.default, {})]
       }))
     })

package/lib/Form/modal.d.ts

@@ -83,6 +83,11 @@ export interface FormContextProps {
     valueType?: string;
     labelAlign?: LabelAlignModal;
     labelWidth?: number;
+    formItemStyle?: React.CSSProperties;
+    hideLabel?: boolean;
+    colon?: boolean;
+    itemProps?: ItemPropsType;
+    itemSpan?: ColProps;
 }
 interface ConfigUploadProps {
     exFiles?: string[];

package/lib/index.d.ts

@@ -5,6 +5,7 @@ export { default as useHForm } from "./Form/hooks/useHForm";
 export { useHDialogForm } from "./DialogForm/hooks";
 export { default as HFormConnect } from "./Form/HFormConnect";
 export { default as HFormConfigProvider } from "./Form/Context/FormConfigProvider";
+export { default as HBasicForm } from './Form/Basic';
 export declare const HSelect: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export declare const HInput: ({ copy, value, addonAfter, ...props }: import("./Input/modal").HInputProps<any>) => JSX.Element;
 export declare const HSelectInput: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;

package/lib/index.js

@@ -7,6 +7,7 @@ var useHForm = require('./Form/hooks/useHForm.js');
 var hooks = require('./DialogForm/hooks.js');
 var HFormConnect = require('./Form/HFormConnect.js');
 var FormConfigProvider = require('./Form/Context/FormConfigProvider.js');
+var Basic = require('./Form/Basic.js');
 var ModalForm = require('./DialogForm/ModalForm.js');
 var index$2 = require('./DialogForm/DrawerForm/index.js');
 
@@ -40,6 +41,7 @@ exports.useHForm = useHForm.default;
 exports.useHDialogForm = hooks.useHDialogForm;
 exports.HFormConnect = HFormConnect.default;
 exports.HFormConfigProvider = FormConfigProvider.default;
+exports.HBasicForm = Basic.default;
 exports.HButtonInput = HButtonInput;
 exports.HCascader = HCascader;
 exports.HCheckBox = HCheckBox;

package/package.json

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

package/src/components/DialogForm/ChildComponent.tsx

@@ -1,20 +1,29 @@
 import React from "react";
-import {HDialogFormInstance} from "@/components/DialogForm/modal";
+import type { HDialogFormInstance } from "@/components/DialogForm/modal";
 
-interface IProps<P=any> {
-    contentRender?: (
-        dom: React.ReactNode,
-        form: HDialogFormInstance,
-        params: P
-    ) => React.ReactNode;
-    dialogForm:HDialogFormInstance;
-    params:P;
-    formNode:React.ReactNode
+interface IProps<P = any> {
+  contentRender?: (
+    dom: React.ReactNode,
+    form: HDialogFormInstance,
+    params: P
+  ) => React.ReactNode;
+  dialogForm: HDialogFormInstance;
+  params: P;
+  formNode: React.ReactNode;
 }
-const Index:React.FC<IProps>=({contentRender,formNode,params,dialogForm,children})=>{
-    const cuNode=children?React.cloneElement((children as any),{dialogForm,params,formNode}):formNode;
-    return  <>{contentRender?contentRender(cuNode,dialogForm,params):cuNode}</>;
-}
-
+const Index: React.FC<IProps> = ({
+  contentRender,
+  formNode,
+  params,
+  dialogForm,
+  children,
+}) => {
+  const cuNode = children
+    ? React.cloneElement(children as any, { dialogForm, params, formNode })
+    : formNode;
+  return (
+    <>{contentRender ? contentRender(cuNode, dialogForm, params) : cuNode}</>
+  );
+};
 
-export default Index;
+export default Index;

package/src/components/DialogForm/DrawerForm/index.tsx

@@ -8,31 +8,31 @@ import FormConfigProvider, {
   useFormConfigContext,
 } from "../../Form/Context/FormConfigProvider";
 import React from "react";
-import ChildComponent from '../ChildComponent'
-const Index:React.FC<DialogFormProps>=({
-               visible,
-               title,
-               onCancel,
-               configData,
-               infoRequest,
-               request,
-               afterClose,
-               dialogForm,
-               closable = true,
-               initialValues,
-               labelWidth,
-               onOk,
-               onFinish,
-               size,
-               form,
-               footer,
-               params,
-               onValuesChange,
-               autoClear = true,
-               contentRender,
-    children,
-               ...props
-             }: DialogFormProps) => {
+import ChildComponent from "../ChildComponent";
+const Index: React.FC<DialogFormProps> = ({
+  visible,
+  title,
+  onCancel,
+  configData,
+  infoRequest,
+  request,
+  afterClose,
+  dialogForm,
+  closable = true,
+  initialValues,
+  labelWidth,
+  onOk,
+  onFinish,
+  size,
+  form,
+  footer,
+  params,
+  onValuesChange,
+  autoClear = true,
+  contentRender,
+  children,
+  ...props
+}: DialogFormProps) => {
   const currentForm = useCurrentForm(dialogForm);
   const providerConfig = useFormConfigContext();
   const {
@@ -66,60 +66,61 @@ const Index:React.FC<DialogFormProps>=({
     if (footer === null) {
       return null;
     }
-    if (typeof footer==="function"){
-        return  footer(dialogForm,loading,formParams)
+    if (typeof footer === "function") {
+      return footer(dialogForm, loading, formParams);
     }
     return (
-        footer || (
-            <Footer
-                onCancel={cancel}
-                onOk={currentForm.submit}
-                confirmLoading={loading}
-            />
-        )
+      footer || (
+        <Footer
+          onCancel={cancel}
+          onOk={currentForm.submit}
+          confirmLoading={loading}
+        />
+      )
     );
   };
   const node = (
-      <HForm
-          configData={modalFormData}
-          initialValues={initValue}
-          onValuesChange={onValuesChange}
-          {...props}
-          form={currentForm}
-          params={formParams}
-          onFinish={async (values, subParams) => {
-            const result = await run(values, subParams);
-            const close = onOk?.(result, subParams);
-            if (close === false) {
-              return;
-            }
-            cancel();
-          }}
-          infoRequest={infoRequest}
-          labelWidth={labelWidth}
-      />
+    <HForm
+      configData={modalFormData}
+      initialValues={initValue}
+      onValuesChange={onValuesChange}
+      {...props}
+      form={currentForm}
+      params={formParams}
+      onFinish={async (values, subParams) => {
+        const result = await run(values, subParams);
+        const close = onOk?.(result, subParams);
+        if (close === false) {
+          return;
+        }
+        cancel();
+      }}
+      infoRequest={infoRequest}
+      labelWidth={labelWidth}
+    />
   );
   return (
-      <Drawer
-          visible={modalVisible}
-          title={<Title title={modalTitle} closable={closable} onCancel={cancel} />}
-          {...props}
-          onClose={cancel}
-          closable={false}
-          destroyOnClose={true}
-          footer={footerComponent()}
-      >
-        <FormConfigProvider {...providerConfig}>
-          <ChildComponent dialogForm={currentForm}
-                          contentRender={contentRender}
-                          params={params}
-                          formNode={node}
-          >
-            {children}
-          </ChildComponent>
-        </FormConfigProvider>
-      </Drawer>
+    <Drawer
+      visible={modalVisible}
+      title={<Title title={modalTitle} closable={closable} onCancel={cancel} />}
+      {...props}
+      onClose={cancel}
+      closable={false}
+      destroyOnClose={true}
+      footer={footerComponent()}
+    >
+      <FormConfigProvider {...providerConfig}>
+        <ChildComponent
+          dialogForm={currentForm}
+          contentRender={contentRender}
+          params={params}
+          formNode={node}
+        >
+          {children}
+        </ChildComponent>
+      </FormConfigProvider>
+    </Drawer>
   );
 };
 
-export default Index;
+export default Index;