ztxkui 4.2.23-317 → 4.2.23-319-beta

package/dist/DemoCom/FormDemo.js

@@ -191,7 +191,7 @@ var FormDemo = function () {
                     // configInfo={configInfoMemo}
                     isDynamic: true, dynamicStorageKey: "symbol-key-00001", isToggle: true, toggleNum: 16, handleRef: handleRef },
                     React.createElement(SearchItem, { name: "applyPersonName1", label: "\u8D77\u8349\u4EBA" },
-                        React.createElement(Input, { allowClear: true, onClick: function () { return setVisible(true); } })),
+                        React.createElement(Input, { allowClear: true })),
                     React.createElement(SearchItem, { name: "applyPersonName2", label: "\u8D77\u8349\u4EBA", suffix: React.createElement(React.Fragment, null) },
                         React.createElement(Input, { allowClear: true })),
                     React.createElement(SearchItem, { name: "applyPersonName3", label: "\u8D77\u8349\u4EBA", suffix: React.createElement(React.Fragment, null, drafterMode === 0 ? (React.createElement(Tooltip, { title: "\u5207\u6362\u6210\u9009\u62E9\u6846" },

package/dist/components/Form/form.d.ts

@@ -1,13 +1,20 @@
 import React from 'react';
-import { FormProps } from 'antd/lib/form';
-export interface IProps extends FormProps {
+import { FormProps, FormInstance as AntFormInstance } from 'antd/lib/form';
+export interface IProps extends Omit<FormProps, 'form'> {
+    form?: FormInstance;
 }
+interface FormInstance extends AntFormInstance {
+    setDynamicList: (list: any[]) => void;
+}
+export declare const FormContext: React.Context<{
+    form?: FormInstance;
+}>;
 declare function Form(props: IProps): JSX.Element;
 declare namespace Form {
     var Item: typeof import("antd/lib/form/FormItem").default;
     var List: React.FC<import("antd/lib/form").FormListProps>;
     var ErrorList: typeof import("antd/lib/form/ErrorList").default;
-    var useForm: typeof import("antd/lib/form/Form").useForm;
+    var useForm: (_form?: FormInstance) => [FormInstance];
     var Provider: React.FC<import("antd/lib/form/context").FormProviderProps>;
 }
 export default Form;

package/dist/components/Form/form.js

@@ -20,11 +20,12 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React from 'react';
+import React, { createContext } from 'react';
 import { Form as AntForm } from 'antd';
 import { FormProvider } from 'antd/lib/form/context';
 import SearchContainer from '../business/SearchContainer/index';
 var SearchRight = SearchContainer.SearchRight;
+export var FormContext = createContext({});
 function Form(props) {
     var children = props.children, form = props.form, resetProps = __rest(props, ["children", "form"]);
     var newChildren = React.Children.map(children, function (child) {
@@ -60,11 +61,31 @@ function Form(props) {
             form === null || form === void 0 ? void 0 : form.setFieldsValue(formValues);
         }
     }
-    return (React.createElement(AntForm, __assign({ form: form }, resetProps), newChildren));
+    return (React.createElement(FormContext.Provider, { value: { form: form } },
+        React.createElement(AntForm, __assign({ form: form }, resetProps), newChildren)));
+}
+function useForm(_form) {
+    var antForm = AntForm.useForm(_form)[0];
+    var dynamicList = React.useRef();
+    var form = __assign(__assign({}, antForm), { setDynamicList: setDynamicList, getFieldsValue: function (nameList, filterFunc) {
+            var values = __assign({}, antForm.getFieldsValue(nameList, filterFunc));
+            if (dynamicList.current) {
+                dynamicList.current.forEach(function (item) {
+                    if (!item.show) {
+                        values[item.name] = undefined;
+                    }
+                });
+            }
+            return values;
+        } });
+    return [form];
+    function setDynamicList(list) {
+        dynamicList.current = list;
+    }
 }
 Form.Item = AntForm.Item;
 Form.List = AntForm.List;
 Form.ErrorList = AntForm.ErrorList;
-Form.useForm = AntForm.useForm;
+Form.useForm = useForm;
 Form.Provider = FormProvider;
 export default Form;

package/dist/components/business/SearchContainer/search-left.js

@@ -1,9 +1,10 @@
-import React, { useCallback, useEffect, useState, useRef, useImperativeHandle, } from 'react';
+import React, { useCallback, useEffect, useState, useRef, useImperativeHandle, useContext, } from 'react';
 import classNames from 'classnames';
 import SearchDrawer from './search-drawer';
 import { SettingOutlined, DownOutlined } from '@ant-design/icons';
 import useDynamic, { setDynamicKey, getNewChildren } from './hooks/useDynamic';
 import useToggle from './hooks/useToggle';
+import { FormContext } from '../../Form/form';
 function useConfigChildren(children, isDynamic) {
     var _a = useState(null), configChildren = _a[0], setConfigChildren = _a[1];
     useEffect(function () {
@@ -40,6 +41,12 @@ var SearchLeft = function (_a) {
     useEffect(function () {
         setDynamicList(dynamicArr);
     }, [dynamicArr]);
+    // 获取form
+    var form = useContext(FormContext).form;
+    // 绑定自定义配置类型
+    useEffect(function () {
+        form === null || form === void 0 ? void 0 : form.setDynamicList(dynamicList);
+    }, [form, dynamicList]);
     /** 表单容器Ref */
     var containerRef = useRef(null);
     var _g = useToggle(containerRef, dynamicList, isToggle, toggleNum), toggle = _g.toggle, onToggleChange = _g.onToggleChange, setToggleHandle = _g.setToggleHandle;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.23-317",
+  "version": "4.2.23-319-beta",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",