@hw-component/form 1.7.1 → 1.7.3

package/es/Form/Basic.js

@@ -10,10 +10,11 @@ import 'core-js/modules/es.object.get-own-property-descriptor.js';
 import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/es.object.get-own-property-descriptors.js';
 import { jsx } from 'react/jsx-runtime';
-import { createElement } from 'react';
+import { useEffect, createElement } from 'react';
 import Item from './FormItem/index.js';
 import { Row } from 'antd';
 import { useFormContext } from './Context/index.js';
+import useInitConfigData from './hooks/useInitConfigData.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; }
@@ -24,7 +25,17 @@ var Basic = (function (_ref) {
     form = _useFormContext.form,
     formItemProps = _useFormContext.itemProps,
     itemSpan = _useFormContext.itemSpan,
-    formColon = _useFormContext.colon;
+    formColon = _useFormContext.colon,
+    setData = _useFormContext.setData;
+  var _useInitConfigData = useInitConfigData({
+      configData: configData,
+      form: form
+    }),
+    newConfigData = _useInitConfigData.newConfigData,
+    dispatchSourceData = _useInitConfigData.dispatchSourceData;
+  useEffect(function () {
+    setData === null || setData === void 0 || setData(dispatchSourceData);
+  }, []);
   var defaultOnPressEnter = function defaultOnPressEnter() {
     form.submit();
   };
@@ -33,7 +44,7 @@ var Basic = (function (_ref) {
     style: {
       width: "100%"
     },
-    children: configData.map(function (itemData, index) {
+    children: newConfigData.map(function (itemData, index) {
       var itemLabelWidth = itemData.labelWidth,
         hideLabel = itemData.hideLabel,
         labelAlign = itemData.labelAlign,

package/es/Form/FormItem/BasicItem.js

@@ -96,6 +96,7 @@ var Index = function Index(props) {
   if (hideItem) {
     return null;
   }
+  console.log(colon, align, "lllll", className);
   return jsx(Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
     className: "".concat(colClassName, " ").concat(itemClassName),
     children: jsx(Form.Item, _objectSpread(_objectSpread({

package/es/Form/FormItem/RegularFormItem.js

@@ -16,6 +16,7 @@ var RegularFormItem = (function (props) {
   var type = props.type,
     colon = props.colon,
     itemSpan = props.itemSpan;
+  console.log(props, "....pppp");
   return jsx(Index, _objectSpread(_objectSpread({}, props), {}, {
     itemSpan: itemSpan,
     colon: type === "submit" ? false : colon

package/es/Form/FormItem/index.js

@@ -35,7 +35,7 @@ var Item = (function (props) {
     labelWidth: labelWidth,
     hideLabel: hideLabel,
     style: style,
-    colon: typeof colon === "undefined" ? colon : formColon
+    colon: typeof colon !== "undefined" ? colon : formColon
   }));
 });
 

package/es/Form/index.js

@@ -7,14 +7,14 @@ import 'core-js/modules/es.object.get-own-property-descriptor.js';
 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 _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import { jsx, jsxs } from 'react/jsx-runtime';
 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 { useState, useEffect } from 'react';
 import InitSet from './InitSet.js';
 import Basic from './Basic.js';
 
@@ -47,12 +47,10 @@ var HForm = (function (_ref) {
     colon = _ref$colon === void 0 ? true : _ref$colon,
     props = _objectWithoutProperties(_ref, _excluded);
   var hForm = useCurrentForm(form);
-  var _useInitConfigData = useInitConfigData({
-      configData: configData,
-      form: hForm
-    }),
-    newConfigData = _useInitConfigData.newConfigData,
-    dispatchSourceData = _useInitConfigData.dispatchSourceData;
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    dispatchSourceData = _useState2[0],
+    setDispatchSourceData = _useState2[1];
   var _useInfoReq = useInfoReq({
       initialValues: initialValues,
       request: request,
@@ -80,6 +78,11 @@ var HForm = (function (_ref) {
       hForm.removeDispatchListener();
     };
   }, []);
+  var setData = function setData(newData) {
+    setDispatchSourceData(function (oldData) {
+      return _objectSpread(_objectSpread({}, oldData), newData);
+    });
+  };
   return jsx(Index, {
     loading: infoLoading,
     error: infoErr,
@@ -96,7 +99,8 @@ var HForm = (function (_ref) {
         hideLabel: formHideLabel,
         colon: colon,
         itemProps: formItemProps,
-        itemSpan: itemSpan
+        itemSpan: itemSpan,
+        setData: setData
       },
       children: jsxs(Form, _objectSpread(_objectSpread({
         form: hForm,
@@ -104,7 +108,7 @@ var HForm = (function (_ref) {
         onValuesChange: valuesChange
       }, props), {}, {
         children: [jsx(Basic, {
-          configData: newConfigData,
+          configData: configData,
           gutter: gutter
         }), jsx(InitSet, {})]
       }))

package/es/Form/modal.d.ts

@@ -88,6 +88,7 @@ export interface FormContextProps {
     colon?: boolean;
     itemProps?: ItemPropsType;
     itemSpan?: ColProps;
+    setData?: (newData: any) => void;
 }
 interface ConfigUploadProps {
     exFiles?: string[];

package/lib/Form/Basic.js

@@ -17,6 +17,7 @@ var React = require('react');
 var index$1 = require('./FormItem/index.js');
 var antd = require('antd');
 var index = require('./Context/index.js');
+var useInitConfigData = require('./hooks/useInitConfigData.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; }
@@ -27,7 +28,17 @@ var Basic = (function (_ref) {
     form = _useFormContext.form,
     formItemProps = _useFormContext.itemProps,
     itemSpan = _useFormContext.itemSpan,
-    formColon = _useFormContext.colon;
+    formColon = _useFormContext.colon,
+    setData = _useFormContext.setData;
+  var _useInitConfigData = useInitConfigData.default({
+      configData: configData,
+      form: form
+    }),
+    newConfigData = _useInitConfigData.newConfigData,
+    dispatchSourceData = _useInitConfigData.dispatchSourceData;
+  React.useEffect(function () {
+    setData === null || setData === void 0 || setData(dispatchSourceData);
+  }, []);
   var defaultOnPressEnter = function defaultOnPressEnter() {
     form.submit();
   };
@@ -36,7 +47,7 @@ var Basic = (function (_ref) {
     style: {
       width: "100%"
     },
-    children: configData.map(function (itemData, index) {
+    children: newConfigData.map(function (itemData, index) {
       var itemLabelWidth = itemData.labelWidth,
         hideLabel = itemData.hideLabel,
         labelAlign = itemData.labelAlign,

package/lib/Form/FormItem/BasicItem.js

@@ -99,6 +99,7 @@ var Index = function Index(props) {
   if (hideItem) {
     return null;
   }
+  console.log(colon, align, "lllll", className);
   return jsxRuntime.jsx(antd.Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
     className: "".concat(colClassName, " ").concat(itemClassName),
     children: jsxRuntime.jsx(antd.Form.Item, _objectSpread(_objectSpread({

package/lib/Form/FormItem/RegularFormItem.js

@@ -19,6 +19,7 @@ var RegularFormItem = (function (props) {
   var type = props.type,
     colon = props.colon,
     itemSpan = props.itemSpan;
+  console.log(props, "....pppp");
   return jsxRuntime.jsx(BasicItem.default, _objectSpread(_objectSpread({}, props), {}, {
     itemSpan: itemSpan,
     colon: type === "submit" ? false : colon

package/lib/Form/FormItem/index.js

@@ -38,7 +38,7 @@ var Item = (function (props) {
     labelWidth: labelWidth,
     hideLabel: hideLabel,
     style: style,
-    colon: typeof colon === "undefined" ? colon : formColon
+    colon: typeof colon !== "undefined" ? colon : formColon
   }));
 });
 

package/lib/Form/index.js

@@ -10,13 +10,13 @@ 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 _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 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');
@@ -50,12 +50,10 @@ var HForm = (function (_ref) {
     colon = _ref$colon === void 0 ? true : _ref$colon,
     props = _objectWithoutProperties(_ref, _excluded);
   var hForm = index.useCurrentForm(form);
-  var _useInitConfigData = useInitConfigData.default({
-      configData: configData,
-      form: hForm
-    }),
-    newConfigData = _useInitConfigData.newConfigData,
-    dispatchSourceData = _useInitConfigData.dispatchSourceData;
+  var _useState = React.useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    dispatchSourceData = _useState2[0],
+    setDispatchSourceData = _useState2[1];
   var _useInfoReq = index.useInfoReq({
       initialValues: initialValues,
       request: request,
@@ -83,6 +81,11 @@ var HForm = (function (_ref) {
       hForm.removeDispatchListener();
     };
   }, []);
+  var setData = function setData(newData) {
+    setDispatchSourceData(function (oldData) {
+      return _objectSpread(_objectSpread({}, oldData), newData);
+    });
+  };
   return jsxRuntime.jsx(index$1.default, {
     loading: infoLoading,
     error: infoErr,
@@ -99,7 +102,8 @@ var HForm = (function (_ref) {
         hideLabel: formHideLabel,
         colon: colon,
         itemProps: formItemProps,
-        itemSpan: itemSpan
+        itemSpan: itemSpan,
+        setData: setData
       },
       children: jsxRuntime.jsxs(antd.Form, _objectSpread(_objectSpread({
         form: hForm,
@@ -107,7 +111,7 @@ var HForm = (function (_ref) {
         onValuesChange: valuesChange
       }, props), {}, {
         children: [jsxRuntime.jsx(Basic.default, {
-          configData: newConfigData,
+          configData: configData,
           gutter: gutter
         }), jsxRuntime.jsx(InitSet.default, {})]
       }))

package/lib/Form/modal.d.ts

@@ -88,6 +88,7 @@ export interface FormContextProps {
     colon?: boolean;
     itemProps?: ItemPropsType;
     itemSpan?: ColProps;
+    setData?: (newData: any) => void;
 }
 interface ConfigUploadProps {
     exFiles?: string[];

package/package.json

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

package/src/components/Form/Basic.tsx

@@ -2,14 +2,23 @@ import {HFormProps, HItemProps, ItemPropsType} from "@/components/Form/modal";
 import Item from "./FormItem";
 import {Row} from "antd";
 import {useFormContext} from "./Context";
+import useInitConfigData from "./hooks/useInitConfigData";
+import {useEffect} from "react";
 
 export default ({configData,gutter}:HFormProps)=>{
-  const {form,itemProps:formItemProps,itemSpan,colon:formColon}=useFormContext();
+  const {form,itemProps:formItemProps,itemSpan,colon:formColon,setData}=useFormContext();
+  const { newConfigData, dispatchSourceData } = useInitConfigData({
+    configData,
+    form,
+   });
+   useEffect(()=>{
+       setData?.(dispatchSourceData);
+   },[]);
     const defaultOnPressEnter = () => {
         form.submit();
     };
   return <Row gutter={gutter} style={{width:"100%"}}>
-      {configData.map((itemData: HItemProps, index) => {
+      {newConfigData.map((itemData: HItemProps, index) => {
           const {
               labelWidth: itemLabelWidth,
               hideLabel ,

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

@@ -71,6 +71,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
   if (hideItem) {
     return null;
   }
+  console.log(colon,align,"lllll",className)
   return (
     <Col {...itemSpan} className={`${colClassName} ${itemClassName}`}>
       <Form.Item

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

@@ -3,6 +3,7 @@ import type { HItemProps } from "../modal";
 
 export default (props: HItemProps) => {
   const { type, colon, itemSpan } = props;
+  console.log(props,"....pppp")
   return (
     <BasicItem
       {...props}

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

@@ -25,7 +25,7 @@ export default (props: HItemProps) => {
                labelWidth={labelWidth}
                hideLabel={hideLabel}
                style={style}
-               colon={typeof colon === "undefined" ? colon : formColon}
+               colon={typeof colon !== "undefined" ? colon : formColon}
     />
   );
 };

package/src/components/Form/index.tsx

@@ -4,7 +4,7 @@ import { useCurrentForm, useInfoReq, useValuesChange } from "./hooks";
 import { FormContext } from "./Context";
 import PageHandler from "../PageHandler";
 import useInitConfigData from "./hooks/useInitConfigData";
-import { useEffect } from "react";
+import {useEffect, useMemo, useState} from "react";
 import InitSet from "./InitSet";
 import Basic from "./Basic";
 
@@ -30,10 +30,8 @@ export default ({
   ...props
 }: HFormProps) => {
   const hForm = useCurrentForm(form);
-  const { newConfigData, dispatchSourceData } = useInitConfigData({
-    configData,
-    form: hForm,
-  });
+  const [dispatchSourceData,setDispatchSourceData]=useState({});
+
   const { subControl, infoControl } = useInfoReq({
     initialValues,
     request,
@@ -61,6 +59,14 @@ export default ({
       hForm.removeDispatchListener();
     };
   }, []);
+  const setData=(newData)=>{
+      setDispatchSourceData((oldData)=>{
+          return {
+            ...oldData,
+            ...newData
+          }
+      })
+  }
   return (
     <PageHandler
       loading={infoLoading}
@@ -79,7 +85,8 @@ export default ({
           hideLabel:formHideLabel,
           colon,
           itemProps:formItemProps,
-          itemSpan
+          itemSpan,
+          setData
         }}
       >
         <Form
@@ -88,7 +95,7 @@ export default ({
           onValuesChange={valuesChange}
           {...props}
         >
-          <Basic configData={newConfigData} gutter={gutter}/>
+          <Basic configData={configData} gutter={gutter}/>
           <InitSet />
         </Form>
       </FormContext.Provider>

package/src/components/Form/modal.ts

@@ -137,6 +137,7 @@ export interface FormContextProps {
   colon?:boolean;
   itemProps?: ItemPropsType;
   itemSpan?: ColProps;
+  setData?:(newData:any)=>void;
 }
 interface ConfigUploadProps {
   exFiles?: string[];

package/src/pages/Form/index.tsx

@@ -26,48 +26,18 @@ const Test3 = ({ value, onChange }) => {
 };
 const formData = (options) => {
   return [
-    {
-      label: "12321",
-      className: "3",
-      name: "inputNumberGroup",
-      type: "inputNumberGroup",
-      itemProps: {
-        addonAfter: <Test3 />,
-      },
-    },
-    {
-      label: "下拉",
-      className: "hdjd",
-      type: "select",
-      name: "test321",
-      itemProps: {
-        options: [
-          {
-            value: "选项1",
-            key: 1,
-          },
-          {
-            value: "选项2",
-            key: 2,
-          },
-        ],
-        showSearch: true,
-      },
-    },
-    {
-      label: "测试12312",
-      className: "hdjd",
-      name: "test123",
-    },
       {
         noStyle:true,
         render:()=>{
             return <HBasicForm configData={[
                 {
                     label: "下拉",
-                    className: "hdjd",
+                    className: "xiala",
                     type: "select",
                     name: "test321",
+                    colon:false,
+                    rules:[{required:true}],
+                    labelAlign:"left",
                     itemProps: {
                         options: [
                             {
@@ -132,7 +102,6 @@ export default () => {
           labelWidth={300}
           form={form}
           labelAlign={"right"}
-          colon={false}
           onFinish={(value) => {
             console.log(value, "onFinish");
           }}