@cloudbase/weda-ui 3.24.0 → 3.25.0

package/dist/web/components/form-input-hooks/index.js

@@ -20,11 +20,11 @@ import { useFormField } from '../wd-form/contexts/form-field-context';
 import { useFormFieldObj } from '../wd-form/contexts/form-field-obj-context';
 import { errorHandler } from '../../utils/error';
 const logger = debug('wd-form-item');
-const SET_VALUE_DEBOUNCE_TIMEOUT = 250;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function useParentForm(widgetIgnored) {
     return useFormWidget();
 }
+const regex = /^[a-zA-Z_$][\w$]*(?:\[\d+\])*(?:\.[a-zA-Z_$][\w$]*(?:\[\d+\])*)*$/;
 // 转换路径
 const convertPathToArray = (path) => {
     return path
@@ -46,7 +46,11 @@ export function useFormInputTrait(inputParams) {
     const formFieldObjsContext = useFormFieldObj();
     const [isChange, setIsChange] = useState(false);
     const name = useMemo(() => {
-        if (isNil(_name) || (typeof _name === 'string' && _name.length === 0)) {
+        if (isNil(_name)) {
+            console.warn(`组件 ${$widget.id} 表单key(表单输入类组件 name 属性)没设置或为空串的时候不受表单容器控制`);
+            return ''; // 或者 return null; 根据你的后续逻辑决定
+        }
+        if (typeof _name === 'string' && _name.length === 0) {
             // name 没设置或为空串的时候不受表单容器控制
             console.warn(`组件 ${$widget.id}  表单key(表单输入类组件 name 属性)没设置或为空串的时候不受表单容器控制`);
         }
@@ -55,10 +59,14 @@ export function useFormInputTrait(inputParams) {
     }, [$widget.id, _name]);
     // namePath 用于标识表单项的属性路径，用于容器通过lodash.set/get管理表单项的值
     const namePath = useMemo(() => {
+        var _a;
+        if (!name) {
+            return [];
+        }
         if (formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.isChildField) {
-            return formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.namePath.concat(name);
+            return ((_a = formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.namePath) !== null && _a !== void 0 ? _a : []).concat(name);
         }
-        else if (name.includes('].')) {
+        else if (regex.test(name)) {
             // 兼容 formDetail 中 的 name 写法
             return convertPathToArray(name);
         }

package/dist/web/components/formdetail/index.js

@@ -167,6 +167,7 @@ const FormDetailCom = forwardRef(function FormDetail(props, ref) {
         if (isWdFormDetail) {
             data = initialValues;
         }
+        data = data.map((i, index) => ({ ...i, _id: index }));
         setContextData(data);
         (_a = events === null || events === void 0 ? void 0 : events.onDataChange) === null || _a === void 0 ? void 0 : _a.call(events, {
             data,

package/dist/web/components/table/ExportFileModalByApi/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useMemo } from 'react';
 import { Modal, Radio, Form, Table, Checkbox, Icon, List, Status, Bubble, Tooltip } from 'tea-component';
 import { useImportingStatus } from '../hooks/useImportingStatus';
 import { callWedaApi } from '../../../utils/tcb';
@@ -15,20 +15,31 @@ export function ExportFileModalByApi({ onCancel, visible, fields, selectedKeysLi
     const [status, setStatus] = useState(null);
     const [fileId, setFileIds] = useState(null);
     const { fileImportStatus, fileImportErrorMessage } = useImportingStatus(fileId, dbName, 'export');
-    const exportFields = selectedKeys === null || selectedKeys === void 0 ? void 0 : selectedKeys.map((item) => {
-        const field = tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.find((columns) => {
-            if (columns === null || columns === void 0 ? void 0 : columns.isRelated) {
-                return (columns === null || columns === void 0 ? void 0 : columns.slotKey) === item;
-            }
-            else {
-                return (columns === null || columns === void 0 ? void 0 : columns.fieldKey) === item;
+    const exportFields = useMemo(() => {
+        const resultArray = [];
+        selectedKeys === null || selectedKeys === void 0 ? void 0 : selectedKeys.forEach((item) => {
+            const field = tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.find((columns) => {
+                if (columns === null || columns === void 0 ? void 0 : columns.isRelated) {
+                    return (columns === null || columns === void 0 ? void 0 : columns.slotKey) === item;
+                }
+                else {
+                    return (columns === null || columns === void 0 ? void 0 : columns.fieldKey) === item;
+                }
+            });
+            resultArray.push({
+                FieldId: (field === null || field === void 0 ? void 0 : field.isRelated) ? `@${field === null || field === void 0 ? void 0 : field.fieldKey}.${field === null || field === void 0 ? void 0 : field.relatedField}` : item,
+                ColumnName: item === '_id' ? '数据标识' : field === null || field === void 0 ? void 0 : field.header,
+            });
+            const hasRelationId = resultArray.some((item) => item.FieldId === `@${field === null || field === void 0 ? void 0 : field.fieldKey}._id`);
+            if (!!exportIdentity.length && (field === null || field === void 0 ? void 0 : field.isRelated) && !hasRelationId) {
+                resultArray.push({
+                    FieldId: `@${field === null || field === void 0 ? void 0 : field.fieldKey}._id`,
+                    ColumnName: `关联关系【${field === null || field === void 0 ? void 0 : field.fieldKey}】数据标识`,
+                });
             }
         });
-        return {
-            FieldId: (field === null || field === void 0 ? void 0 : field.isRelated) ? `@${field === null || field === void 0 ? void 0 : field.fieldKey}.${field === null || field === void 0 ? void 0 : field.relatedField}` : item,
-            ColumnName: item === '_id' ? '数据标识' : field === null || field === void 0 ? void 0 : field.header,
-        };
-    });
+        return resultArray;
+    }, [selectedKeys, tableColumns, exportIdentity]);
     const handleExport = async () => {
         try {
             setStep('isExporting');

package/dist/web/components/wd-button/wd-button.js

@@ -70,14 +70,14 @@ export const WdButton = forwardRef(function WdButton(props, ref) {
             case 'reset':
                 // 调用父级表单容器的重置
                 parentForm = getParentForm($widget);
-                if (parentForm.reset) {
-                    parentForm === null || parentForm === void 0 ? void 0 : parentForm.reset();
+                if ((parentForm === null || parentForm === void 0 ? void 0 : parentForm.reset) && typeof (parentForm === null || parentForm === void 0 ? void 0 : parentForm.reset) === 'function') {
+                    parentForm.reset();
                     return;
                 }
                 // 老逻辑兼容
                 parentForm = getParentForm($node);
-                if (parentForm.reset) {
-                    parentForm === null || parentForm === void 0 ? void 0 : parentForm.reset();
+                if ((parentForm === null || parentForm === void 0 ? void 0 : parentForm.reset) && typeof (parentForm === null || parentForm === void 0 ? void 0 : parentForm.reset) === 'function') {
+                    parentForm.reset();
                     return;
                 }
                 break;
@@ -111,5 +111,5 @@ export const WdButton = forwardRef(function WdButton(props, ref) {
             openType,
         };
     }, [text, theme, variant, size, block, disabled, formType, openType]);
-    return (_jsxs("button", { className: classNames(classes, className), disabled: disabled, type: formType, style: style, id: id, ...propsStartWithOn, onClick: onClick, children: [iconPosition === 'before' && iconType === 'text-with-icon' && _jsx(Icon, {}), iconType === 'icon-only' ? (_jsx(Icon, {})) : (_jsx("span", { className: `${classPrefix}-btn__text`, children: textToString(text) })), iconPosition === 'after' && iconType === 'text-with-icon' && _jsx(Icon, {})] }));
+    return (_jsxs("button", { className: classNames(classes, className), disabled: disabled, type: formType, style: style, id: id, ...propsStartWithOn, onClick: onClick, children: [iconPosition === 'before' && iconType === 'text-with-icon' && _jsx(Icon, {}), iconType === 'icon-only' ? _jsx(Icon, {}) : _jsx("span", { className: `${classPrefix}-btn__text`, children: textToString(text) }), iconPosition === 'after' && iconType === 'text-with-icon' && _jsx(Icon, {})] }));
 });

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

@@ -6,6 +6,7 @@ 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';
+import { useFormFieldObj } from '../contexts/form-field-obj-context';
 /**
  * 表单容器装饰器高阶组件
  * 用于包装组件，提供表单容器上下文
@@ -17,6 +18,7 @@ export function withFormContainer(Component) {
         var _a;
         const { ...componentProps } = props;
         const formField = useFormField();
+        const formFieldObjsContext = useFormFieldObj();
         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);
@@ -49,8 +51,11 @@ export function withFormContainer(Component) {
                 return _formData;
             });
         }, []);
-        // 在表单容器内直接渲染原始组件
-        if (formField) {
+        // 顶层没有表单容器，则组件自己管理值
+        // 非table组件，直接渲染原始组件，值交给顶层表单容器管理
+        // 在表单容器内，table组件，如果结合嵌套组件使用，则将组件值交给顶层表单容器管理，否则自己管理
+        const shouldUseProvider = formField ? !formFieldObjsContext && (props === null || props === void 0 ? void 0 : props.componentType) === 'table' : true;
+        if (!shouldUseProvider) {
             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 }) }));

package/dist/web/components/wd-form/hooks/use-remote-value.js

@@ -104,7 +104,6 @@ methodGetItem, paramGetItem, appCloud, isDataModel, allSelectFields = emptyObjec
                                 },
                             },
                         },
-                        version: 1,
                     },
                 }, true);
                 if (Object.keys(initValue).length === 0) {

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

@@ -17,24 +17,21 @@ const Label = React.memo(function Label({ labelCls, labelStyle, itemWrap, inputI
 const Item = React.memo(function Item({ itemWrap, testId, controlWrapCls, readOnly, before, after, readValue, readBeforeAfter, format, value, children, }) {
     return (_jsx("div", { className: `${itemWrap}__control`, "data-testid": testId, children: _jsx("div", { className: controlWrapCls, children: _jsx(WdFormItemReadOnly, { readOnly: readOnly, readValue: readValue, version: "wd", before: before, after: after, readBeforeAfter: readBeforeAfter, format: format, value: value, children: children }) }) }));
 });
-const LabelContainer = React.memo(function LabelContainer(props) {
-    const { mode, labelProps, itemProps, children } = props || {};
+const LabelContainerComp = React.memo(function LabelContainer(props) {
+    const { isH5, isRoot, labelVisible, mode, labelProps, itemProps, children } = props || {};
     const cardRef = React.createRef();
     const [iconName, setIconName] = useState('chevronup');
     const headerSlot = (_jsxs(_Fragment, { children: [_jsx(WdIcon, { name: iconName, events: {
                     tap: () => {
                         setIconName(iconName === 'chevrondown' ? 'chevronup' : 'chevrondown');
                     },
-                } }), _jsx(Label, { ...labelProps })] }));
-    if (mode === 'custom' || mode === 'table') {
-        return _jsx(Item, { ...itemProps, children: children });
+                } }), (labelVisible || (!isH5 && isRoot)) && _jsx(Label, { ...labelProps })] }));
+    const showLabel = isRoot && labelVisible;
+    if (mode === 'custom' || mode === 'table' || mode === 'web-table') {
+        return (_jsxs(_Fragment, { children: [showLabel && _jsx(Label, { ...labelProps }), _jsx(Item, { ...itemProps, children: children }), ' '] }));
     }
     const contentSlot = _jsx(Item, { ...itemProps, children: children });
-    return (_jsx(WdCard, { ref: cardRef, className: iconName === 'chevrondown' ? 'wd-card-content__hidden' : '', showContent: true, headerSlot: headerSlot, contentSlot: contentSlot, events: { tap: () => { } } }));
-});
-const LabelContainerComp = React.memo(function LabelContainerComp({ isRoot, isH5, mode, labelProps, itemProps, children, }) {
-    const showLabel = isRoot && !isH5;
-    return (_jsxs(_Fragment, { children: [showLabel && _jsx(Label, { ...labelProps }), _jsx(LabelContainer, { isRoot: isRoot, labelProps: labelProps, itemProps: itemProps, mode: mode, children: children })] }));
+    return (_jsxs(_Fragment, { children: [showLabel && !isH5 && _jsx(Label, { ...labelProps }), ' ', _jsx(WdCard, { ref: cardRef, className: iconName === 'chevrondown' ? 'wd-card-content__hidden' : '', showContent: true, headerSlot: headerSlot, contentSlot: contentSlot, events: { tap: () => { } } })] }));
 });
 /**
  * 表单项包裹，包括标题、文本提示、校验
@@ -152,5 +149,6 @@ export const WdFormItem = React.memo(function WdFormItem(props) {
     };
     if (!visible)
         return null;
-    return (_jsxs("div", { className: cls, id: isRoot ? id : null, style: style, children: [_jsx("div", { className: itemWrap, children: hasLabelContainer ? (_jsx(LabelContainerComp, { isRoot: isRoot, isH5: isH5, mode: props === null || props === void 0 ? void 0 : props.mode, labelProps: labelProps, itemProps: itemProps, children: children })) : (_jsxs(_Fragment, { children: [labelVisible && _jsx(Label, { ...labelProps }), _jsx(Item, { ...itemProps, children: children })] })) }), Message, Help] }));
+    const labelClass = classNames({ [`${itemWrap}`]: true, [`${itemWrap}__vertical`]: hasLabelContainer && isH5 });
+    return (_jsxs("div", { className: cls, id: isRoot ? id : null, style: style, children: [_jsx("div", { className: labelClass, children: hasLabelContainer ? (_jsx(LabelContainerComp, { isRoot: isRoot, isH5: isH5, mode: props === null || props === void 0 ? void 0 : props.mode, labelProps: labelProps, itemProps: itemProps, labelVisible: labelVisible, children: children })) : (_jsxs(_Fragment, { children: [labelVisible && _jsx(Label, { ...labelProps }), _jsx(Item, { ...itemProps, children: children })] })) }), Message, Help] }));
 });

package/dist/web/components/wd-table/components/FieldRender/index.js

@@ -989,6 +989,7 @@ export const getTableColumns = ({ fields, columnSets, slots, fixedFront, fixedEn
         key: (i === null || i === void 0 ? void 0 : i.slotKey) || (i === null || i === void 0 ? void 0 : i.key),
         // 此字段为colum 绑定字段的key值，业务场景使用次字段
         fieldKey: i === null || i === void 0 ? void 0 : i.key,
+        shouldCellUpdate: (prevRow, nextRow) => prevRow[i === null || i === void 0 ? void 0 : i.key] !== nextRow[i === null || i === void 0 ? void 0 : i.key],
     }));
 };
 export const mapColumKey = (columnSets) => {

package/dist/web/components/wd-table/components/FilterFieldsPanel/index.js

@@ -8,7 +8,7 @@ import { FilterFieldItem } from './FilterFieldItem';
 import { arrayInputType } from './Fields';
 import { filterFieldsGenerate } from './filterFieldsGenerate';
 import { WdButton } from '../../../wd-button';
-import { usePlatform } from '../../../../utils/platform';
+import { usePlatform, textToString } from '../../../../utils/platform';
 import { useSetWidgetApi } from '../../../../utils/widget-api/use-set-widget-api';
 // 正则元字符添加转义符
 const escapeRegExp = (string) => {
@@ -151,7 +151,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                             searchValues.push(searchItem);
                         }
                         else {
-                            searchItem.val = (_c = i.value) === null || _c === void 0 ? void 0 : _c.trim();
+                            searchItem.val = (_c = textToString(i.value)) === null || _c === void 0 ? void 0 : _c.trim();
                             searchValues.push(searchItem);
                         }
                     }

package/dist/web/components/wd-table/components/Table/index.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-interface BaseTableComProps {
+export interface BaseTableComProps {
     events?: any;
     recordKey?: string;
     className?: any;
@@ -40,4 +40,3 @@ interface BaseTableComProps {
 }
 export declare const BaseTableCom: ({ events, recordKey, className, columns, setColumns, records, sortColumns, sort, onSelectChange, selectedKeys, rowColor, isError, errorObj, isLoading, queryParams, total, onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageIndex, rowClick, cellClick, currentSize, isNoDataSourceBind, isH5, emptyText: _emptyText, __innerSlot, bottomTip, enableBottomTipSlot, rowDisabled, componentId, }: BaseTableComProps) => JSX.Element;
 export declare const BaseTable: React.MemoExoticComponent<({ events, recordKey, className, columns, setColumns, records, sortColumns, sort, onSelectChange, selectedKeys, rowColor, isError, errorObj, isLoading, queryParams, total, onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageIndex, rowClick, cellClick, currentSize, isNoDataSourceBind, isH5, emptyText: _emptyText, __innerSlot, bottomTip, enableBottomTipSlot, rowDisabled, componentId, }: BaseTableComProps) => JSX.Element>;
-export {};

package/dist/web/components/wd-table/components/Table/index.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-/* eslint max-lines: [error, 350] */
-import React, { useRef, useEffect } from 'react';
+/* eslint max-lines: [error, 380] */
+import React, { useRef, useEffect, useState } from 'react';
 import { Table, StatusTip, ConfigProvider } from 'tea-component';
-import { useResizeObserver } from '@react-hookz/web';
+import { useResizeObserver, useDebouncedCallback } from '@react-hookz/web';
 import { errorHandler } from '../../../../utils/error';
 import { useConfig } from '../../../../utils/config-context';
 const { sortable, radioable, selectable, injectable, pageable, autotip, scrollable, columnsResizable } = Table.addons;
@@ -17,6 +17,8 @@ const miniPageSize = 10;
 // h5 端表格高度
 const tableHeight = { sm: 500, md: 580, lg: 880 };
 const tableHeaderHeight = 51;
+// 默认防抖延迟时间（毫秒）
+const DEFAULT_DEBOUNCE_DELAY = 200;
 const renderStatus = ({ isH5, status, isNoDataSourceBind, _emptyText, errorObj, __innerSlot }) => {
     var _a, _b;
     const text = {
@@ -32,14 +34,13 @@ const renderStatus = ({ isH5, status, isNoDataSourceBind, _emptyText, errorObj,
     return (_jsx(StatusContent, { emptyText: text[`${status}`], component: "table", icon: status, errorObj: errorObj, isH5: isH5 }));
 };
 // eslint-disable-next-line complexity
-export const BaseTableCom = ({ events, recordKey, className, columns, setColumns, records, sortColumns, sort, onSelectChange, selectedKeys, rowColor, isError, errorObj, isLoading, queryParams, total = defaultTotal, 
-// refreshTable,
-onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageIndex, rowClick, cellClick, currentSize, isNoDataSourceBind, isH5, emptyText: _emptyText, __innerSlot = (_jsx(_Fragment, {})), bottomTip, enableBottomTipSlot = false, rowDisabled, componentId, }) => {
+export const BaseTableCom = ({ events, recordKey, className, columns, setColumns, records, sortColumns, sort, onSelectChange, selectedKeys, rowColor, isError, errorObj, isLoading, queryParams, total = defaultTotal, onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageIndex, rowClick, cellClick, currentSize, isNoDataSourceBind, isH5, emptyText: _emptyText, __innerSlot = (_jsx(_Fragment, {})), bottomTip, enableBottomTipSlot = false, rowDisabled, componentId, }) => {
     var _a;
     const tableRef = useRef(null);
     const { classPrefix } = useConfig();
     // 是否展示全局loading
     const isShowLoading = isH5 ? (queryParams === null || queryParams === void 0 ? void 0 : queryParams.pageIndex) === pageIndexSpan && isLoading : isLoading;
+    const [h5Loading, setH5Loading] = useState(false);
     // table状态样式
     const showStatus = isShowLoading || isError || !(records === null || records === void 0 ? void 0 : records.length);
     const classes = {
@@ -110,17 +111,29 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
     // 支撑分页的最大高度
     const tableDomHeight = (_a = tableRef.current) === null || _a === void 0 ? void 0 : _a.clientHeight;
     // 支持表格滚动，高度超过 500 开始显示滚动条
+    const fetchData = useDebouncedCallback(() => {
+        if (!isLoading && (records === null || records === void 0 ? void 0 : records.length) < total && isH5 && Number.isFinite(total)) {
+            const newPageIndex = queryParams.pageIndex + pageIndexSpan;
+            onQueryChange({ pageIndex: newPageIndex });
+            if (events === null || events === void 0 ? void 0 : events.onPagingChange) {
+                events.onPagingChange({
+                    pageIndex: newPageIndex,
+                    pageSize: queryParams.pageSize || defaultPageSize,
+                });
+            }
+        }
+    }, [isLoading, records === null || records === void 0 ? void 0 : records.length, total, isH5, queryParams.pageIndex], DEFAULT_DEBOUNCE_DELAY);
     if (isH5) {
         tableAddons.push(scrollable({
             maxHeight: tableDomHeight - tableHeaderHeight,
             onScrollBottom: () => {
-                if (!isLoading && (records === null || records === void 0 ? void 0 : records.length) < total && isH5) {
-                    onQueryChange({ pageIndex: queryParams.pageIndex + pageIndexSpan });
-                    events === null || events === void 0 ? void 0 : events.onPagingChange({
-                        pageIndex: queryParams.pageIndex + pageIndexSpan,
-                        pageSize: queryParams.pageSize || defaultPageSize,
-                    });
+                if ((records === null || records === void 0 ? void 0 : records.length) < total && isH5) {
+                    setH5Loading(true);
+                }
+                else {
+                    setH5Loading(false);
                 }
+                fetchData();
             },
         }));
     }
@@ -153,7 +166,7 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
             targetColumnKey: (columns === null || columns === void 0 ? void 0 : columns.length) && columnSelectType === 'radio' ? 'weda_radio' : undefined,
         }));
     }
-    const showLoadingBottomTip = isLoading && (queryParams === null || queryParams === void 0 ? void 0 : queryParams.pageIndex) !== pageIndexSpan;
+    const showLoadingBottomTip = (isLoading || h5Loading) && records.length > 0;
     const showAllDataBottomTip = (records === null || records === void 0 ? void 0 : records.length) === total && !isLoading && (records === null || records === void 0 ? void 0 : records.length) > miniPageSize;
     const bottomTipCompRender = () => {
         const shouldShowBottomTip = enableBottomTipSlot && !showStatus;

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

@@ -1,5 +1,5 @@
 import { Pagination } from './Pagination';
-import { BaseTable as Table } from './Table';
+import { BaseTable as Table, BaseTableComProps } from './Table';
 import { SearchBox } from './SearchBox';
 import { ExportFileModal, exportHandle, exportHandleByApi } from './ExportFileModalByApi';
 import { ImportFileModal, importHandleByApi } from './ImportFileModalByApi';
@@ -8,3 +8,4 @@ import { deleteRecord } from './deleteModal';
 import { FilterFieldsPanel } from './FilterFieldsPanel';
 import { ToolBar } from './ToolBar';
 export { Pagination, Table, SearchBox, ExportFileModal, ImportFileModal, InOrOutRecordModal, deleteRecord, importHandleByApi, exportHandle, exportHandleByApi, FilterFieldsPanel, ToolBar, };
+export type { BaseTableComProps };

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

@@ -1,7 +1,7 @@
 import { Pagination } from './Pagination';
 import { BaseTable as Table } from './Table';
 import { SearchBox } from './SearchBox';
-import { ExportFileModal, exportHandle, exportHandleByApi, } from './ExportFileModalByApi';
+import { ExportFileModal, exportHandle, exportHandleByApi } from './ExportFileModalByApi';
 import { ImportFileModal, importHandleByApi } from './ImportFileModalByApi';
 import { InOrOutRecordModal } from './InOrOutRecordModal';
 import { deleteRecord } from './deleteModal';

package/dist/web/components/wd-table/hooks/useTableData.js

@@ -28,22 +28,31 @@ export const useTableData = ({ dataSourceAPI, connectorMethod, query, events, is
                     canCallQuerySuccess = false;
                     if (Object.keys(select).length !== 0) {
                         canCallQuerySuccess = true;
-                        data = await dataSourceAPI.getRecordListV2(query, { swr });
-                        data.records = data.records || [];
+                        const result = await dataSourceAPI.getRecordListV2(query, { swr });
+                        data = {
+                            ...data,
+                            total: result.total,
+                            records: result.records || [],
+                        };
                     }
                 }
                 else {
                     // 不是新添加的表格，用旧方法查询
-                    data = await dataSourceAPI.getRecordList(query, { swr });
-                    data.records = data.records || [];
+                    const result = await dataSourceAPI.getRecordList(query, { swr });
+                    data = {
+                        ...data,
+                        total: result.total,
+                        records: result.records || [],
+                    };
                 }
                 setIsError(false);
             }
             else if (connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name) {
                 data = await dataSourceAPI.getConnect(connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name, query, swr);
             }
-            // 合并多次请求结果再赋值表格
-            if (fetchVersion !== fetchRef.current.version)
+            // 分页器查询时合并多次请求结果再赋值表格
+            // H5端是滚动加载更多，不合并请求
+            if (fetchVersion !== fetchRef.current.version && !isH5)
                 return;
             const records = (data === null || data === void 0 ? void 0 : data.records) || [];
             setTotal(data === null || data === void 0 ? void 0 : data.total);

package/dist/web/components/wd-table/table-with-form.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import { BaseTableComProps } from './components';
+export interface TableWithFormProps extends BaseTableComProps {
+    isInformContainer?: boolean;
+}
+export declare const TableWithForm: React.ForwardRefExoticComponent<Pick<{
+    [key: string]: any;
+    initialValues?: any;
+}, string | number> & React.RefAttributes<unknown>>;

package/dist/web/components/wd-table/table-with-form.js

@@ -0,0 +1,46 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import React, { forwardRef, useMemo, useState } from 'react';
+import { useDeepCompareEffect } from '@react-hookz/web';
+import { Table } from './components';
+// eslint-disable-next-line tree-shaking/no-side-effects-in-initialization
+import { withFormContainer } from '../wd-form/hoc/form-container-decorator';
+import { useFormField } from '../wd-form/contexts/form-field-context';
+import { useFormFieldObj } from '../wd-form/contexts/form-field-obj-context';
+import { useSetWidgetApi } from '../../utils/widget-api/use-set-widget-api';
+import isObjectEqual from '../../utils/isObjectEqual';
+export const TableWithForm = withFormContainer(React.memo(forwardRef(function TableComp(tableProps, ref) {
+    var _a, _b;
+    const { records = [] } = tableProps;
+    const formField = useFormField();
+    const { formFieldsValue = [], setFieldValue, setFormFieldsValue, getFieldValue } = formField || {};
+    const formFieldObjsContext = useFormFieldObj();
+    const [columns, setColumns] = useState(tableProps.columns);
+    const isEditorMode = (_b = (_a = window.$w) === null || _a === void 0 ? void 0 : _a.wedaContext) === null || _b === void 0 ? void 0 : _b.isEditorMode;
+    const parentNamePath = tableProps.isInformContainer && (formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.isChildField) ? formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.namePath : null;
+    const tableValue = useMemo(() => {
+        return parentNamePath && getFieldValue ? getFieldValue({ namePath: parentNamePath }) : formFieldsValue;
+    }, [formFieldsValue, getFieldValue, parentNamePath]);
+    useDeepCompareEffect(() => {
+        if (!isObjectEqual(tableProps.columns, columns, true)) {
+            setColumns(tableProps.columns);
+        }
+    }, [tableProps.columns]);
+    useDeepCompareEffect(() => {
+        // records变化时，同步更新value
+        const value = [...records];
+        const parentNamePath = tableProps.isInformContainer && (formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.isChildField) ? formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.namePath : null;
+        if (setFieldValue && parentNamePath && !isObjectEqual(tableValue, value)) {
+            // 情况1: 在表单容器内且是子字段，通过父路径设置值
+            setFieldValue({ namePath: parentNamePath, value });
+        }
+        else if (setFormFieldsValue && !isObjectEqual(tableValue, value)) {
+            // 情况2: 不在表单容器内，或者是表单容器但非子字段，直接设置表单值
+            setFormFieldsValue(value);
+        }
+    }, [formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.namePath, records, tableProps.isInformContainer, formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.isChildField]);
+    useSetWidgetApi(() => ({
+        value: tableValue,
+    }), [tableValue], ref);
+    // 非编辑模式缓存columns
+    return _jsx(Table, { ...tableProps, columns: isEditorMode ? tableProps.columns : columns });
+})));

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

@@ -10,10 +10,7 @@ export declare const GlobalButton: React.NamedExoticComponent<{
     classPrefix: string;
     slots: any;
 }>;
-export declare const WdTable: React.ForwardRefExoticComponent<Pick<{
-    [key: string]: any;
-    initialValues?: any;
-}, string | number> & React.RefAttributes<unknown>>;
+export declare const WdTable: React.ForwardRefExoticComponent<WdTableProps & React.RefAttributes<TCompRef>>;
 export interface WdTableProps extends CommonPropsType, DataType {
     isMock?: boolean;
     multipleSelect: boolean;
@@ -22,3 +19,21 @@ export interface WdTableProps extends CommonPropsType, DataType {
     __innerSlot?: React.ReactNode;
     initialValues?: [];
 }
+type TCompRef = {
+    import: () => void;
+    exportOptionalMode: () => void;
+    export: () => void;
+    deleteSelected: () => void;
+    refresh: () => void;
+    refreshKeepPage: () => void;
+    deleteOne: (params: {
+        id: string;
+    }) => void;
+    openOperationDialog: () => void;
+    records?: any[];
+    total: number;
+    pageNo: number;
+    pageSize: number;
+    selectedRecords: any[];
+};
+export {};