@cloudbase/weda-ui 3.22.2 → 3.23.0

package/dist/web/components/wd-form/hoc/form-container-decorator.js

@@ -0,0 +1,61 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import React, { useState, useCallback } from 'react';
+import lodashSet from 'lodash.set';
+import lodashGet from 'lodash.get';
+import { deepClone } from '../../../utils/tool';
+import isObjectEqual from '../../../utils/isObjectEqual';
+import { emptyObject, emptyArray, NOT_EXISTED_VALUE } from '../../../utils/constant';
+import { FormFieldProvider, useFormField } from '../contexts/form-field-context';
+/**
+ * 表单容器装饰器高阶组件
+ * 用于包装组件，提供表单容器上下文
+ * @param Component 需要包装的组件
+ * @returns 包装后的组件，支持透传ref
+ */
+export function withFormContainer(Component) {
+    const WithFormContainer = React.forwardRef((props, ref) => {
+        var _a;
+        const { ...componentProps } = props;
+        const formField = useFormField();
+        const _formFieldValues = (_a = props.initialValues) !== null && _a !== void 0 ? _a : props.value;
+        const [formFieldsValue, setFormFieldsValue] = useState(_formFieldValues !== null && _formFieldValues !== void 0 ? _formFieldValues : ((props === null || props === void 0 ? void 0 : props.objType) === 'arr' ? emptyArray : emptyObject));
+        const [isReadyToCalculate, setIsReadyToCalculate] = useState(true);
+        const getFieldValue = useCallback(({ namePath, initialValue }) => {
+            const value = lodashGet(formFieldsValue, namePath, NOT_EXISTED_VALUE);
+            if (value !== NOT_EXISTED_VALUE) {
+                return value;
+            }
+            else {
+                // 设置初始值,兼容表单项变量绑定场景
+                // form的初始值>formArr/formObj/formDetail>field
+                if (initialValue !== undefined) {
+                    return initialValue;
+                }
+                return null;
+            }
+        }, [formFieldsValue]);
+        const setFieldValue = useCallback(({ namePath, value }) => {
+            setFormFieldsValue((formData) => {
+                if (typeof formData !== 'object' || formData === null) {
+                    console.warn('setValue data need expect a object but got null', formData);
+                    return formData;
+                }
+                // 获取当前值并比较
+                const _value = lodashGet(formData, namePath, NOT_EXISTED_VALUE);
+                if (isObjectEqual(_value, value))
+                    return formData;
+                const _formData = deepClone(formData);
+                lodashSet(_formData, namePath, value);
+                return _formData;
+            });
+        }, []);
+        // 在表单容器内直接渲染原始组件
+        if (formField) {
+            return _jsx(Component, { ...props, ref: ref, isInformContainer: true });
+        }
+        return (_jsx(FormFieldProvider, { setFieldValue: setFieldValue, getFieldValue: getFieldValue, isInformContainer: true, formFieldsValue: formFieldsValue, setFormFieldsValue: setFormFieldsValue, isReadyToCalculate: isReadyToCalculate, setIsReadyToCalculate: setIsReadyToCalculate, children: _jsx(Component, { ...componentProps, formFieldsValue: formFieldsValue, ref: ref }) }));
+    });
+    // 设置显示名称，方便调试
+    WithFormContainer.displayName = `withFormContainer(${Component.displayName || Component.name || 'Component'})`;
+    return WithFormContainer;
+}

package/dist/web/components/wd-form/index.d.ts

@@ -6,53 +6,8 @@ import '../style';
 export type WdFromProps = CommonPropsType & DataType & EventsType & {
     appCloud: typeof tcbAppCloud;
 };
-declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<CommonPropsType & {
-    _id?: string;
-    value: Record<string, any>;
-    formType: "create" | "edit" | "read";
-    contentSlot: React.ReactNode;
-    layout: "vertical" | "horizontal";
-    dataSourceName: string;
-    labelAlign: "left" | "right";
-    datasourceType: "connector" | "custom-connector" | "model" | "expression";
-    methodGetItem: string;
-    paramGetItem: Record<string, unknown>;
-    methodCreate: string;
-    methodUpdate: string;
-    isDisabledSubmit: boolean;
-    formType_bind: boolean;
-    fields: {
-        name: string;
-        componentType: string;
-    }[];
-    colNum: never;
-    lgWidth: "lg" | "sm" | "md" | "hundred";
-    initialValues: Record<string, unknown>;
-} & {
-    events: {
-        submit: (eventDetail: unknown, ...args: unknown[]) => unknown;
-        validateSuccess: (eventDetail: {
-            errors: Record<string, string>;
-        }, ...args: unknown[]) => unknown;
-        validateFail: (eventDetail: {
-            errors: Record<string, string>;
-        }, ...args: unknown[]) => unknown;
-        queryEmpty: (eventDetail: {
-            data: Record<string, any>;
-        }, ...args: unknown[]) => unknown;
-        querySuccess: (eventDetail: {
-            data: Record<string, any>;
-        }, ...args: unknown[]) => unknown;
-        queryFail: (eventDetail: {
-            error: {
-                requestid?: string;
-                code: string;
-                message: string;
-                original: any;
-            };
-        }, ...args: unknown[]) => unknown;
-    };
-} & {
-    appCloud: typeof tcbAppCloud;
-} & React.RefAttributes<unknown>>>;
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<Pick<{
+    [key: string]: any;
+    initialValues?: any;
+}, string | number> & React.RefAttributes<unknown>>>;
 export default _default;

package/dist/web/components/wd-form/index.js

@@ -19,7 +19,6 @@ import { useDataSource } from '../../utils/hooks/useDataSource';
 import { WdForm as FormUi } from './wd-form';
 import StatusContent from '../statusContent';
 import { deepClone } from '../../utils/tool';
-import isObjectEqual from '../../utils/isObjectEqual';
 import { convertMethodParam } from '../../utils/hooks/useFormLegacy';
 import '../style';
 import { getErrorObjectFromValidateResult, convertFormData } from './form-utils';
@@ -27,13 +26,15 @@ import { isNil } from '../../utils/lodash';
 import { FormTypeProvider } from './contexts/form-type-context';
 import { FormLayoutProvider } from './contexts/form-layout-context';
 import { FormWidgetProvider } from './contexts/form-widget-context';
-import { FormFieldProvider } from './contexts/form-field-context';
+import { useFormField } from './contexts/form-field-context';
+// eslint-disable-next-line tree-shaking/no-side-effects-in-initialization
+import { withFormContainer } from './hoc/form-container-decorator';
 import { useSyncValue } from '../../utils/hooks/useSyncValue';
 import useDebouncedCallback from '../../utils/hooks/use-debounced-callback';
 const SET_VALUE_DEBOUNCE_TIMEOUT = 250;
 const logger = debug('wd-form');
-const WdForm = React.forwardRef(function WdForm(props, ref) {
-    var _a, _b, _c;
+const WdForm = withFormContainer(React.forwardRef(function WdForm(props, ref) {
+    var _a, _b;
     const { className, id, style, contentSlot: contentSlotEl, layout = 'horizontal', formType = 'create', _id, datasourceType = 'model', dataSourceName, methodGetItem, methodCreate, methodUpdate, paramGetItem, appCloud = tcbAppCloud, lgWidth, labelAlign = 'left', initialValues: _initialValues, 
     // 兼容流程setValue调用，其他地方别用
     $node, $widget, } = props;
@@ -74,16 +75,32 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
     const [initialValues, setInitialValues] = useState((_b = deepClone(_initialValues)) !== null && _b !== void 0 ? _b : emptyObject);
     const [propsValue] = useSyncValue(props.value);
     // 表单值
-    const [formData, setFormData] = useState((_c = deepClone(_initialValues)) !== null && _c !== void 0 ? _c : emptyObject);
+    // const [formData, setFormData] = useState<Record<string, unknown>>(deepClone(_initialValues) ?? emptyObject);
+    const formField = useFormField();
+    const { setFormFieldsValue, formFieldsValue, setIsReadyToCalculate } = formField || {};
     // 转换后表单值，仅保留已挂载表单项的值
-    const formFieldsValue = useMemo(() => {
-        return convertFormData(formData, formItemMapList, fieldInitValueCache);
-    }, [formData, formItemMapList, fieldInitValueCache]);
+    const formFieldConvertValues = useMemo(() => {
+        return convertFormData(formFieldsValue, formItemMapList, fieldInitValueCache);
+    }, [formFieldsValue, formItemMapList, fieldInitValueCache]);
     useDebouncedEffect(() => {
         var _a, _b;
         // 表单容器上挂载的表单项的值
-        (_b = (_a = eventsRef === null || eventsRef === void 0 ? void 0 : eventsRef.current) === null || _a === void 0 ? void 0 : _a.onDataChange) === null || _b === void 0 ? void 0 : _b.call(_a, { data: formFieldsValue });
-    }, [formFieldsValue], 
+        (_b = (_a = eventsRef === null || eventsRef === void 0 ? void 0 : eventsRef.current) === null || _a === void 0 ? void 0 : _a.onDataChange) === null || _b === void 0 ? void 0 : _b.call(_a, { data: formFieldConvertValues });
+    }, [formFieldConvertValues], 
+    // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+    SET_VALUE_DEBOUNCE_TIMEOUT);
+    useEffect(() => {
+        if (['edit', 'read'].includes(formType) && !hasSetInitValueRef.current) {
+            // 表单容器编辑和只读状态下，接口返回数据后具备相应数据计算条件
+            setIsReadyToCalculate(false);
+        }
+    }, [formType, setIsReadyToCalculate]);
+    useDebouncedEffect(() => {
+        // 在编辑/只读场景下，当所有依赖表单数据全部完成时，允许触发计算逻辑
+        if (['edit', 'read'].includes(formType) && hasSetInitValueRef.current) {
+            setIsReadyToCalculate(true);
+        }
+    }, [hasSetInitValueRef.current, formType], 
     // eslint-disable-next-line @typescript-eslint/no-magic-numbers
     SET_VALUE_DEBOUNCE_TIMEOUT);
     const eventsRef = useSyncedRef(props.events);
@@ -182,9 +199,9 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             if (Object.keys(errorObj !== null && errorObj !== void 0 ? errorObj : {}).length === 0) {
                 validateSuccess({ errors: {} });
                 const extra = ['read', 'edit'].includes(formType) && _id ? { _id } : {};
-                submit && submit(deepClone({ ...extra, ...formFieldsValue }));
+                submit && submit(deepClone({ ...extra, ...formFieldConvertValues }));
                 // 流程用了;
-                return formFieldsValue;
+                return formFieldConvertValues;
             }
             else {
                 setErrors(errorObj);
@@ -199,19 +216,30 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
         const r = await submitPromiseCache.current;
         submitPromiseCache.current = null;
         return r;
-    }, [_id, eventsRef, formFieldsValue, formType, isDisabledSubmit, validate]);
+    }, [_id, eventsRef, formFieldConvertValues, formType, isDisabledSubmit, validate]);
     const submit = useDebouncedCallback(submitHandler, SET_VALUE_DEBOUNCE_TIMEOUT, {
         // eslint-disable-next-line @typescript-eslint/no-magic-numbers
         maxWait: SET_VALUE_DEBOUNCE_TIMEOUT,
         trailing: true,
     });
-    const setValue = useCallback((data) => {
+    const setValue = useCallback((data, notMerge = false) => {
+        // notMerge 默认false，表示与之前的表单值合并
         if (typeof data !== 'object' || data === null) {
             console.warn('setValue data need expect a object but got null', data);
             return;
         }
-        setFormData(data);
-    }, []);
+        if (notMerge) {
+            setFormFieldsValue(data);
+        }
+        else {
+            setFormFieldsValue((formFieldsValue) => ({ ...formFieldsValue, ...data }));
+        }
+    }, [setFormFieldsValue]);
+    const setValueDebounce = useDebouncedCallback(setValue, SET_VALUE_DEBOUNCE_TIMEOUT, {
+        // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+        maxWait: SET_VALUE_DEBOUNCE_TIMEOUT * 2,
+        trailing: true,
+    });
     const clearValidate = useCallback(() => {
         formsItemMap.forEach((items) => {
             items.forEach((item) => {
@@ -223,10 +251,6 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             });
         });
     }, [formsItemMap]);
-    const [isInformContainer, setIsInformContainer] = React.useState(false);
-    React.useEffect(() => {
-        setIsInformContainer(true);
-    }, []);
     useMountEffect(() => {
         logger.debug('formItemMap', formsItemMap);
     });
@@ -291,19 +315,14 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [formsItemMap]);
     const { data: formInitValueToSet } = useInitValueFromRemote(datasourceType, dataSourceProfile, fetchedInitialValues);
-    const setValueDebounce = useDebouncedCallback(setValue, SET_VALUE_DEBOUNCE_TIMEOUT, {
-        // eslint-disable-next-line @typescript-eslint/no-magic-numbers
-        maxWait: SET_VALUE_DEBOUNCE_TIMEOUT * 2,
-        trailing: true,
-    });
     useEffect(() => {
         if (initValueLoadingStatus !== 'done' || !fetchedInitialValues)
             return;
         if (!initValueFetchError && formInitValueToSet) {
             /*
-            错误处理放在了 @link {onInitialValuesError}
-            下面是可以拿到data了
-            */
+          错误处理放在了 @link {onInitialValuesError}
+          下面是可以拿到data了
+          */
             // TODO: 有哪些key可以暴露
             setInitialValues((original) => {
                 if (hasSetInitValueRef.current) {
@@ -326,7 +345,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
     }, [authValue, isDataModel, initDataSourceFieldsWithAuth, formItemMapKey]);
     const submitParams = useRemoteParamsFromValue({
         dataSourceProfile,
-        formData: formFieldsValue,
+        formData: formFieldConvertValues,
         formType,
         _id,
     });
@@ -378,23 +397,22 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             setValue(val, opts = { notMerge: false }) {
                 const value = convertMethodParam(val);
                 // notMerge 默认false，表示与之前的表单值合并
-                if (opts.notMerge) {
-                    setValueDebounce(value);
-                }
-                else {
-                    const _formData = deepClone(formData);
-                    setValueDebounce({ ..._formData, ...value });
-                }
+                setValueDebounce(value, opts.notMerge);
             },
             reset() {
                 setValueDebounce(initialValues);
             },
             clearValue({ isImmediate = false } = {}) {
+                // 创建一个对象，将所有表单项的值设为 undefined
+                const emptyValues = formItemMapList.reduce((acc, key) => {
+                    acc[key] = null;
+                    return acc;
+                }, {});
                 if (isImmediate) {
-                    setValue({});
+                    setValue(emptyValues);
                 }
                 else {
-                    setValueDebounce({});
+                    setValueDebounce(emptyValues);
                 }
             },
             async validate() {
@@ -422,7 +440,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             authValue,
             layout,
             dataSourceName,
-            value: formFieldsValue,
+            value: formFieldConvertValues,
             remoteValue: fetchedInitialValues,
             dataSourceProfile,
             errors,
@@ -444,7 +462,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
         authValue,
         layout,
         dataSourceName,
-        formFieldsValue,
+        formFieldConvertValues,
         fetchedInitialValues,
         dataSourceProfile,
         errors,
@@ -459,7 +477,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
         fieldInitValueCache,
         formsItemMap,
         setValueDebounce,
-        formData,
+        formItemMapList,
         setValue,
         validate,
         eventsRef,
@@ -489,38 +507,9 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
     const labelPosition = useMemo(() => {
         return `${layout}-${labelAlign}`;
     }, [layout, labelAlign]);
-    const getFieldValue = useCallback(({ namePath, initialValue }) => {
-        const value = lodashGet(formData, namePath, NOT_EXISTED_VALUE);
-        if (value !== NOT_EXISTED_VALUE) {
-            return value;
-        }
-        else {
-            // 设置初始值,兼容表单项变量绑定场景
-            // form的初始值>formArr/formObj/formDetail>field
-            if (initialValue !== undefined) {
-                return initialValue;
-            }
-            return null;
-        }
-    }, [formData]);
-    const setFieldValue = useCallback(({ namePath, value }) => {
-        setFormData((formData) => {
-            const _formData = deepClone(formData);
-            const _value = lodashGet(_formData, namePath, NOT_EXISTED_VALUE);
-            if (isObjectEqual(_value, value)) {
-                return _formData;
-            }
-            lodashSet(_formData, namePath, value);
-            if (typeof _formData !== 'object' || _formData === null) {
-                console.warn('setValue data need expect a object but got null', _formData);
-                return formData;
-            }
-            return _formData;
-        });
-    }, []);
     if (initValueLoadingStatus === 'loading' && !fetchedInitialValues) {
         return _jsx(StatusContent, { emptyText: '数据加载中,请稍候...', component: "table", icon: "loading" });
     }
-    return (_jsx(FormWidgetProvider, { "$widget": $widget, children: _jsx(FormLayoutProvider, { layout: layout, children: _jsx(FormTypeProvider, { formType: formType, children: _jsx(FormFieldProvider, { setFieldValue: setFieldValue, isInformContainer: isInformContainer, getFieldValue: getFieldValue, children: _jsx(FormUi, { layout: layout, className: cls, style: style, id: id, lgWidth: lgWidth, labelPosition: labelPosition, children: initValueFetchError ? (_jsx(StatusContent, { emptyText: '数据加载失败', errorObj: initValueFetchError, icon: 'error', isH5: isH5 })) : (contentSlot) }) }) }) }) }));
-});
+    return (_jsx(FormWidgetProvider, { "$widget": $widget, children: _jsx(FormLayoutProvider, { layout: layout, children: _jsx(FormTypeProvider, { formType: formType, children: _jsx(FormUi, { layout: layout, className: cls, style: style, id: id, lgWidth: lgWidth, labelPosition: labelPosition, children: initValueFetchError ? (_jsx(StatusContent, { emptyText: '数据加载失败', errorObj: initValueFetchError, icon: 'error', isH5: isH5 })) : (contentSlot) }) }) }) }));
+}));
 export default React.memo(WdForm);

package/dist/web/components/wd-form-obj/base-form-obj.d.ts

@@ -3,12 +3,16 @@ import type { CommonPropsType } from '../../types';
 import type { DataType as ObjDataType } from '../../../configs/components/wd-form-obj';
 import type { DataType as ArrDataType } from '../../../configs/components/wd-form-arr';
 import '../style';
-export declare const BaseFormObj: React.ForwardRefExoticComponent<BaseFormObjProps & React.RefAttributes<any>>;
+export declare const BaseFormObj: React.ForwardRefExoticComponent<Pick<{
+    [key: string]: any;
+    initialValues?: any;
+}, string | number> & React.RefAttributes<unknown>>;
 type DataType = ObjDataType & ArrDataType;
 export interface BaseFormObjProps extends CommonPropsType, DataType {
     disabled: boolean;
     readOnly: boolean;
     objType: 'arr' | 'obj';
     isRoot?: boolean;
+    isInformContainer?: boolean;
 }
 export {};

package/dist/web/components/wd-form-obj/base-form-obj.js

@@ -1,23 +1,24 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable @typescript-eslint/no-magic-numbers */
-import { forwardRef, useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
+import { forwardRef, useCallback, useEffect, useLayoutEffect, useRef, useState, useMemo } from 'react';
 import { useDeepCompareEffect } from '@react-hookz/web';
 import { useConfig } from '../../utils/config-context';
 import { WdFormItem } from '../wd-form-item';
 import { usePlatform } from '../../utils/platform';
 import classNames from '../../utils/classnames';
 import { FormFieldObjProvider } from '../wd-form/contexts/form-field-obj-context';
-import { FormFieldProvider } from '../wd-form/contexts/form-field-context';
-import { noop, NOT_EXISTED_VALUE } from '../../utils/constant';
+import { useFormField } from '../wd-form/contexts/form-field-context';
+import { noop } from '../../utils/constant';
 import lodashSet from 'lodash.set';
-import lodashGet from 'lodash.get';
 import { useFormInputTrait } from '../form-input-hooks';
 import { deepClone } from '../../utils/tool';
 import isObjectEqual from '../../utils/isObjectEqual';
+// eslint-disable-next-line tree-shaking/no-side-effects-in-initialization
+import { withFormContainer } from '../wd-form/hoc/form-container-decorator';
 import '../style';
 import useDebouncedCallback from '../../utils/hooks/use-debounced-callback';
 const classRoot = 'form-obj';
-export const BaseFormObj = forwardRef(function BaseFormObj(props, ref) {
+export const BaseFormObj = withFormContainer(forwardRef(function BaseFormObj(props, ref) {
     const { classPrefix } = useConfig();
     const platform = usePlatform();
     const cls = classNames({
@@ -34,8 +35,9 @@ export const BaseFormObj = forwardRef(function BaseFormObj(props, ref) {
     const [status, updateStatus] = useState('edit');
     const [innerHandle, setInnerHandle] = useState({});
     const inputRef = useRef({});
-    const [isInformObjContainer, setIsInformObjContainer] = useState(false);
-    const { name, value: objValue, readOnly, disabled, visible, onChange: _onChange, namePath, isInformContainer: _isInformContainer, } = useFormInputTrait({
+    const formField = useFormField();
+    const { setFormFieldsValue, formFieldsValue } = formField || {};
+    const { name, value: _objValue, readOnly, disabled, visible, onChange: _onChange, namePath, } = useFormInputTrait({
         label: props.label,
         value: props.value,
         name: props.name,
@@ -47,9 +49,10 @@ export const BaseFormObj = forwardRef(function BaseFormObj(props, ref) {
         requiredMsg: '',
         $widget: props.$widget,
         setInnerHandle,
-        onChange: noop,
+        onChange: props.isInformContainer ? noop : setFormFieldsValue,
         $node: props.$node,
     });
+    const objValue = useMemo(() => (props.isInformContainer ? _objValue : formFieldsValue), [_objValue, formFieldsValue, props.isInformContainer]);
     const valueRef = useRef(props.value);
     useDeepCompareEffect(() => {
         if (isObjectEqual(valueRef.current, objValue)) {
@@ -57,9 +60,6 @@ export const BaseFormObj = forwardRef(function BaseFormObj(props, ref) {
         }
         triggerOnDataChange(objValue);
     }, [objValue]);
-    useEffect(() => {
-        setIsInformObjContainer(true);
-    }, []);
     useEffect(() => {
         if (readOnly) {
             updateStatus('readOnly');
@@ -78,7 +78,7 @@ export const BaseFormObj = forwardRef(function BaseFormObj(props, ref) {
         var _a, _b;
         valueRef.current = value;
         (_b = (_a = props.events) === null || _a === void 0 ? void 0 : _a.onDataChange) === null || _b === void 0 ? void 0 : _b.call(_a, { data: value });
-    }, [props.events]), 500);
+    }, [props.events]), 250);
     const dealArrChange = useCallback((params, objValue) => {
         let value;
         // 顶层为数组类型
@@ -138,12 +138,13 @@ export const BaseFormObj = forwardRef(function BaseFormObj(props, ref) {
         if (isObjectEqual(value, objValue) || (value === null && isObjectEqual(initValue, objValue))) {
             return;
         }
-        _onChange(value || initValue);
-        triggerOnDataChange(value);
-    }, [disabled, readOnly, props.objType, objValue, _onChange, triggerOnDataChange, dealArrChange]);
+        if (_onChange) {
+            _onChange(value || initValue);
+        }
+    }, [disabled, readOnly, props.objType, objValue, _onChange, dealArrChange]);
     const changeDebounce = useDebouncedCallback(useCallback((value) => {
         change(value);
-    }, [change]), 300);
+    }, [change]), 250);
     useLayoutEffect(() => {
         if (!ref)
             return;
@@ -187,25 +188,5 @@ export const BaseFormObj = forwardRef(function BaseFormObj(props, ref) {
             readOnly,
         };
     }, [innerHandle, props.label, name, objValue, visible, disabled, readOnly, props.objType, change, ref, changeDebounce]);
-    const setFieldValue = useCallback(({ namePath, value }) => {
-        change({ name: namePath, value });
-    }, [change]);
-    const getFieldValue = useCallback(({ namePath, initialValue }) => {
-        const value = lodashGet(objValue, namePath, NOT_EXISTED_VALUE);
-        if (value !== NOT_EXISTED_VALUE) {
-            return value;
-        }
-        else {
-            // 设置初始值,兼容表单项变量绑定场景
-            // form的初始值>formArr/formObj/formDetail>field
-            if (initialValue !== undefined) {
-                return initialValue;
-            }
-            return null;
-        }
-    }, [objValue]);
-    if (_isInformContainer) {
-        return (_jsx(FormFieldObjProvider, { namePath: namePath, status: status, objType: props.objType, children: _jsx(WdFormItem, { ...formItemProps, children: _jsx("fieldset", { className: cls, id: props.id, style: props.style, role: "container", "data-testid": "formObj", children: props.children }) }) }));
-    }
-    return (_jsx(FormFieldProvider, { setFieldValue: setFieldValue, isInformContainer: isInformObjContainer, getFieldValue: getFieldValue, children: _jsx(FormFieldObjProvider, { namePath: namePath, status: status, children: _jsx(WdFormItem, { ...formItemProps, children: _jsx("fieldset", { className: cls, id: props.id, style: props.style, role: "container", "data-testid": "formObj", children: props.children }) }) }) }));
-});
+    return (_jsx(FormFieldObjProvider, { namePath: namePath, status: status, isChildField: props.isInformContainer, children: _jsx(WdFormItem, { ...formItemProps, children: _jsx("fieldset", { className: cls, id: props.id, style: props.style, role: "container", "data-testid": "formObj", children: props.children }) }) }));
+}));

package/dist/web/components/wd-input/wd-input.d.ts

@@ -67,9 +67,11 @@ export declare const WdInput: React.ForwardRefExoticComponent<CommonPropsType &
     wrapClassName?: string;
     classRoot?: string;
     inputPattern?: RegExp;
+    isTagInput?: boolean;
 } & React.RefAttributes<any>>;
 export type WdInputProps = CommonPropsType & DataType & EventsType & {
     wrapClassName?: string;
     classRoot?: string;
     inputPattern?: RegExp;
+    isTagInput?: boolean;
 };