@cloudbase/weda-ui 3.6.3 → 3.7.1

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

@@ -0,0 +1,3 @@
+import { WdFormArr } from './wd-form-arr';
+export { WdFormArr } from './wd-form-arr';
+export default WdFormArr;

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

@@ -0,0 +1,8 @@
+import React from 'react';
+import type { CommonPropsType } from '../../types';
+import type { DataType } from '../../../configs/components/wd-form-arr';
+export declare const WdFormArr: React.ForwardRefExoticComponent<WdFormArrProps & React.RefAttributes<any>>;
+export interface WdFormArrProps extends CommonPropsType, DataType {
+    disabled: boolean;
+    readOnly: boolean;
+}

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

@@ -0,0 +1,6 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { forwardRef } from 'react';
+import { BaseFormObj } from '../wd-form-obj/base-form-obj';
+export const WdFormArr = forwardRef(function WdFormArr(props, ref) {
+    return _jsx(BaseFormObj, { objType: "arr", ...props, ref: ref });
+});

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

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import classNames from '../../utils/classnames';
 import { useConfig } from '../../utils/config-context';
 import { WdIcon } from '../wd-icon';
@@ -11,7 +11,7 @@ import { X_RUNTIME_DEFAULT } from '../../../configs/type-utils/x-runtime-default
  * 表单项包裹，包括标题、文本提示、校验
  */
 export function WdFormItem(props) {
-    const { id, className, style, label, labelVisible = X_RUNTIME_DEFAULT.labelVisible, labelTips = X_RUNTIME_DEFAULT.labelTips, labelWidth: _labelWidth = X_RUNTIME_DEFAULT.labelWidth, labelWrap = X_RUNTIME_DEFAULT.labelWrap, extra = X_RUNTIME_DEFAULT.extra, required = X_RUNTIME_DEFAULT.required, readOnly, children, testId, requiredFlag = X_RUNTIME_DEFAULT.requiredFlag, validateState, validateErrorMsg, readValue, borderedH5 = X_RUNTIME_DEFAULT.borderedH5, borderedPc = X_RUNTIME_DEFAULT.borderedPc, classRoot, controlAlign, inputId, isWdFormDetail, before, after, readBeforeAfter = true, visible = true, } = props;
+    const { id, className, style, label, labelVisible = X_RUNTIME_DEFAULT.labelVisible, labelTips = X_RUNTIME_DEFAULT.labelTips, labelWidth: _labelWidth = X_RUNTIME_DEFAULT.labelWidth, labelWrap = X_RUNTIME_DEFAULT.labelWrap, extra = X_RUNTIME_DEFAULT.extra, required = X_RUNTIME_DEFAULT.required, readOnly, children, testId, requiredFlag = X_RUNTIME_DEFAULT.requiredFlag, validateState, validateErrorMsg, readValue, borderedH5 = X_RUNTIME_DEFAULT.borderedH5, borderedPc = X_RUNTIME_DEFAULT.borderedPc, classRoot, controlAlign, inputId, isWdFormDetail, before, after, readBeforeAfter = true, visible = true, LabelContainer = null, } = props;
     const { classPrefix } = useConfig();
     const platform = usePlatform();
     const labelAlign = useLabelAlign(props);
@@ -62,5 +62,5 @@ export function WdFormItem(props) {
     const Message = validateErrorMsg && (_jsx("p", { className: `${item}__help`, children: _jsx("span", { className: `${classPrefix}-g-text-${validateState} ${root}__error`, children: textToString(validateErrorMsg) }) }));
     if (!visible)
         return null;
-    return (_jsxs("div", { className: cls, id: id, style: style, children: [_jsxs("div", { className: itemWrap, children: [Label, Item] }), Message, Help] }));
+    return (_jsxs("div", { className: cls, id: id, style: style, children: [_jsx("div", { className: itemWrap, children: LabelContainer ? (_jsx(LabelContainer, { Label: Label, Item: Item })) : (_jsxs(_Fragment, { children: [Label, Item] })) }), Message, Help] }));
 }

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

@@ -0,0 +1,13 @@
+import React from 'react';
+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>>;
+type DataType = ObjDataType & ArrDataType;
+export interface BaseFormObjProps extends CommonPropsType, DataType {
+    disabled: boolean;
+    readOnly: boolean;
+    objType: 'arr' | 'obj';
+}
+export {};

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

@@ -0,0 +1,351 @@
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+/* eslint-disable @typescript-eslint/no-magic-numbers */
+import React, { forwardRef, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, } from 'react';
+import { useConfig } from '../../utils/config-context';
+import { WdFormItem } from '../wd-form-item';
+import { usePlatform } from '../../utils/platform';
+import classNames from '../../utils/classnames';
+import { FormObjContext, FormObjWidgetContext, useFormObjWidget, } from '../../utils/widget-api';
+import { noop } from '../../utils/constant';
+import lodashSet from 'lodash.set';
+import lodashGet from 'lodash.get';
+import { useFormInputTrait, useParentForm } from '../form-input-hooks';
+import { deepClone } from '../../utils/tool';
+import isObjectEqual from '../../utils/isObjectEqual';
+import { WdIcon } from '../wd-icon';
+import { WdCard } from '../wd-card';
+import '../style';
+import useDebouncedCallback from '../../utils/hooks/use-debounced-callback';
+import { useMap } from '@react-hookz/web';
+import { isNil } from '../../utils/lodash';
+const classRoot = 'form-obj';
+/**
+ * 获取待操作的数据路径，嵌套表单中子组件的名称是按lodashSet形式拼接的，在更新嵌套表单值时，要去除掉当前嵌套表单的路径名称
+ * @param operateName 待操作的表单项名称
+ * @param currentName 当前表单项名称
+ * @returns
+ */
+const getValueName = (operateName, currentName) => operateName.replace(new RegExp(`^${currentName}(\\.)?`), '');
+const LabelContainer = (props) => {
+    const { Label, Item } = 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');
+                    },
+                } }), Label] }));
+    return (_jsx(WdCard, { ref: cardRef, className: iconName === 'chevrondown' ? 'wd-card-content__hidden' : '', showContent: true, headerSlot: headerSlot, contentSlot: Item, events: { tap: () => { } } }));
+};
+export const BaseFormObj = forwardRef(function BaseFormObj(props, ref) {
+    const { classPrefix } = useConfig();
+    const platform = usePlatform();
+    const cls = classNames({
+        [`${classPrefix}-form-obj`]: true,
+        [`${classPrefix}-${platform}-form-obj`]: true,
+        [props.className]: true,
+    });
+    const formItemProps = {
+        ...props,
+        classRoot,
+        LabelContainer,
+    };
+    const initValue = { arr: [], obj: {} }[props.objType];
+    // 嵌套表单状态
+    const [status, updateStatus] = useState('edit');
+    const [innerHandle, setInnerHandle] = useState({});
+    const inputRef = useRef({});
+    // 嵌套表单的最终值
+    const [objValue, setObjValue] = useState(initValue);
+    // 父级普通表单对象
+    const parentForm = useParentForm(props.$widget);
+    // 父级嵌套表单对象
+    const parentFormObj = useFormObjWidget();
+    // 嵌套表单内的子组件实例对象集合，在form-input-hooks中会调用addFormItem添加关联上
+    const formsItemMap = useMap([]);
+    const { name, value, readOnly, disabled, visible,
+    // onChange: _onChange,
+     } = useFormInputTrait({
+        label: props.label,
+        value: props.value,
+        name: props.name,
+        inputRef,
+        readOnly: props.readOnly,
+        disabled: props.disabled,
+        status: props.status,
+        required: false,
+        requiredMsg: '',
+        $widget: props.$widget,
+        setInnerHandle,
+        onChange: noop,
+        $node: props.$node,
+    });
+    useEffect(() => {
+        setObjValue(value || {});
+    }, [value]);
+    useEffect(() => {
+        if (readOnly) {
+            updateStatus('readOnly');
+        }
+        else if (disabled) {
+            updateStatus('disabled');
+        }
+        else {
+            updateStatus('edit');
+        }
+    }, [disabled, readOnly]);
+    /**
+     * 对外触发嵌套表单的onDataChange事件
+     */
+    const triggerOnDataChange = useDebouncedCallback(useCallback((value) => {
+        var _a, _b;
+        (_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);
+    /**
+     * 不在表单容器中使用时，更新子组件值
+     */
+    const updateChildValue = useDebouncedCallback(useCallback((value) => {
+        formsItemMap.forEach((items, childName) => {
+            var _a;
+            const newValue = lodashGet(value, getValueName(childName, name));
+            if (!Array.isArray(items)) {
+                items = [items];
+            }
+            (_a = items === null || items === void 0 ? void 0 : items.forEach) === null || _a === void 0 ? void 0 : _a.call(items, (item) => {
+                if (item.setValue && !isObjectEqual(item.value, newValue)) {
+                    item.setValue(newValue);
+                }
+            });
+        });
+    }, [formsItemMap, name]), 0);
+    const dealArrChange = (params, objValue) => {
+        let value;
+        // 顶层为数组类型
+        if (Array.isArray(objValue) && ['add', 'remove'].includes(params.type)) {
+            value = deepClone(objValue);
+            // 触发添加操作，则增加一个undefined值
+            if (params.type === 'add') {
+                value.push({});
+            }
+            // 触发删除操作，则删除对应索引的值
+            if (params.type === 'remove') {
+                value = [
+                    ...value.slice(0, params.value),
+                    ...value.slice(params.value + 1),
+                ];
+            }
+        }
+        return value;
+    };
+    const dealObjChange = (params, objValue) => {
+        var _a;
+        let value;
+        if ((_a = Object.keys(objValue || {})) === null || _a === void 0 ? void 0 : _a.length) {
+            value = deepClone({ ...objValue, ...params.value });
+        }
+        return value;
+    };
+    /**
+     * 更新值
+     * @param params
+     * @param param1.isUpdateParentForm 是否更新父级表单，因子组件值变化调用change时不去触发父表单的更新，因为子组件自己会触发；因为外部设置了值，则触发父表单更新
+     * @param param1.isUpdateChildValue 是否更新子组件值, 因子组件值变化调用change时不去触发updateChildValueWithoutForm；因为外部设置了值，则触发updateChildValueWithoutForm去更新子组件值
+     * @returns
+     */
+    const change = useCallback((params, { isUpdateParentForm = false, isUpdateChildValue = true } = {}) => {
+        var _a, _b, _c;
+        let value = deepClone(params.value);
+        if (props.objType === 'arr') {
+            value = dealArrChange(params, objValue) || value;
+        }
+        // 如果有更新标识，则按标识路径更新值
+        if (params.name) {
+            value = deepClone(objValue);
+            lodashSet(value, getValueName(params.name, name), params.value);
+        }
+        else if (props.objType === 'obj') {
+            value = dealObjChange(params, objValue) || value;
+        }
+        if (isObjectEqual(value, objValue)) {
+            return;
+        }
+        setObjValue(value || initValue);
+        if (isUpdateChildValue) {
+            // 外部设置数据，同时去更新子组件的值
+            updateChildValue(value);
+        }
+        if (isUpdateParentForm) {
+            // 触发父级普通表单值更新
+            (_a = parentForm === null || parentForm === void 0 ? void 0 : parentForm.__setValueImmediate__) === null || _a === void 0 ? void 0 : _a.call(parentForm, { [name]: value }, false, true);
+        }
+        if (params.name) {
+            // 触发父级嵌套表单值更新
+            (_b = parentFormObj === null || parentFormObj === void 0 ? void 0 : parentFormObj.__setValueImmediate__) === null || _b === void 0 ? void 0 : _b.call(parentFormObj, {
+                name: params.name,
+                value: params.value,
+            });
+        }
+        else if (parentFormObj === null || parentFormObj === void 0 ? void 0 : parentFormObj.formObjName) {
+            // 外部直接调用formObj.setValue的情况下，触发父级嵌套表单值更新
+            (_c = parentFormObj === null || parentFormObj === void 0 ? void 0 : parentFormObj.__setValueImmediate__) === null || _c === void 0 ? void 0 : _c.call(parentFormObj, { name, value });
+        }
+        triggerOnDataChange(value);
+    }, 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [
+        objValue,
+        updateChildValue,
+        name,
+        parentFormObj,
+        triggerOnDataChange,
+        parentForm,
+        props.objType,
+    ]);
+    /**
+     * 子组件默认值变更，触发嵌套表单值更新
+     */
+    const changeByChildFormObj = useCallback((params) => {
+        var _a, _b;
+        const value = deepClone(objValue);
+        lodashSet(value, getValueName(params.name, name), params.value);
+        if (isObjectEqual(value, objValue)) {
+            return;
+        }
+        if (params.name) {
+            // 将值同步给父级嵌套表单
+            (_a = parentFormObj === null || parentFormObj === void 0 ? void 0 : parentFormObj.__setValueImmediate__) === null || _a === void 0 ? void 0 : _a.call(parentFormObj, {
+                name: params.name,
+                value: params.value,
+            });
+        }
+        else if (parentFormObj === null || parentFormObj === void 0 ? void 0 : parentFormObj.formObjName) {
+            // 外部直接调用formObj.setValue的情况下，触发父级嵌套表单值更新
+            (_b = parentFormObj === null || parentFormObj === void 0 ? void 0 : parentFormObj.__setValueImmediate__) === null || _b === void 0 ? void 0 : _b.call(parentFormObj, { name, value });
+        }
+        setObjValue(value || initValue);
+    }, 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [objValue, name, parentFormObj]);
+    useLayoutEffect(() => {
+        if (!ref)
+            return;
+        ref.current = {
+            ...innerHandle,
+            /**
+             * 外部直接set嵌入表单的值
+             * @param value
+             */
+            setValue: (value) => {
+                change({ name: '', value }, { isUpdateParentForm: true });
+            },
+            getValue() {
+                return objValue;
+            },
+            getConfig() {
+                return {
+                    componentType: 'formObj',
+                };
+            },
+            methods: {
+                ...(props.objType === 'arr'
+                    ? {
+                        add: () => {
+                            change({ type: 'add' }, { isUpdateParentForm: false });
+                        },
+                        remove: ({ index = -1 } = {}) => {
+                            change({ type: 'remove', value: index }, { isUpdateParentForm: false });
+                        },
+                    }
+                    : {}),
+                change: (params) => {
+                    change(params, { isUpdateParentForm: true });
+                },
+            },
+            label: props.label,
+            name: name,
+            value: objValue,
+            visible,
+            disabled,
+            readOnly,
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [
+        innerHandle,
+        props.label,
+        name,
+        objValue,
+        visible,
+        disabled,
+        readOnly,
+        change,
+        props.objType,
+    ]);
+    const formObjWidgetContextProvider = useMemo(() => {
+        return {
+            formObjName: name,
+            /**
+             * 用于同步子组件的默认值
+             * @param params
+             */
+            __setValueImmediate__(params) {
+                changeByChildFormObj(params);
+            },
+        };
+    }, [changeByChildFormObj, name]);
+    const formObjContextProvider = useMemo(() => {
+        return {
+            formObjName: name,
+            status,
+            /**
+             * 嵌套表单内部子组件值改变时，触发嵌套表单组件的值更新
+             * @param params.name 子组件名称
+             * @param params.value 子组件值
+             */
+            valueChangeFromChild: (params = {}) => {
+                if (!params.name)
+                    return;
+                // 由于是子组件值变更触发，所以嵌套表单值更新后不再次触发子组件值变更
+                change(params, { isUpdateChildValue: false });
+            },
+            /**
+             * 收集嵌套表单内的子组件实例，以便嵌套表单值变化时，主动触发子组件值更新
+             * @param childName 子组件名称
+             * @param formItem 子组件$widget
+             * @returns
+             */
+            addFormItem(childName, formItem) {
+                if (isNil(childName) ||
+                    !formItem ||
+                    (typeof childName === 'string' && childName.length === 0)) {
+                    // childName 没设置或为空串的时候不受表单容器控制
+                    console.warn(`组件 #${formItem === null || formItem === void 0 ? void 0 : formItem.id} 表单key(表单输入类组件 childName 属性)没设置或为空串的时候不受表单容器控制`);
+                    return noop;
+                }
+                if (formsItemMap.has(childName)) {
+                    formsItemMap.get(childName).push(formItem);
+                }
+                else {
+                    formsItemMap.set(childName, [formItem]);
+                }
+                return () => {
+                    const items = formsItemMap.get(childName);
+                    const removedArr = items.filter((item) => item !== formItem);
+                    if (removedArr.length <= 0) {
+                        formsItemMap.delete(childName);
+                    }
+                    else {
+                        formsItemMap.set(childName, removedArr);
+                    }
+                };
+            },
+        };
+    }, [change, formsItemMap, name, status]);
+    useEffect(() => {
+        // 如果是最顶层的嵌套表单，则去更新子组件的值，否则自己的值更新不去触发子组件值更新，因为父级普通表单会去更新
+        if (!parentFormObj) {
+            updateChildValue(objValue);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [objValue, parentFormObj]);
+    return (_jsx(WdFormItem, { ...formItemProps, children: _jsx(FormObjWidgetContext.Provider, { value: formObjWidgetContextProvider, children: _jsx(FormObjContext.Provider, { value: formObjContextProvider, children: _jsx("fieldset", { className: cls, id: props.id, style: props.style, role: "container", "data-testid": "formObj", children: props.children }) }) }) }));
+});

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

@@ -0,0 +1,4 @@
+import { WdFormObj } from './wd-form-obj';
+export { WdFormObj } from './wd-form-obj';
+export type { WdFormObjProps } from './wd-form-obj';
+export default WdFormObj;

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

@@ -0,0 +1,3 @@
+import { WdFormObj } from './wd-form-obj';
+export { WdFormObj } from './wd-form-obj';
+export default WdFormObj;

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

@@ -0,0 +1,9 @@
+import React from 'react';
+import type { CommonPropsType } from '../../types';
+import type { DataType } from '../../../configs/components/wd-form-arr';
+import '../style';
+export declare const WdFormObj: React.ForwardRefExoticComponent<WdFormObjProps & React.RefAttributes<any>>;
+export interface WdFormObjProps extends CommonPropsType, DataType {
+    disabled: boolean;
+    readOnly: boolean;
+}

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

@@ -0,0 +1,7 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { forwardRef } from 'react';
+import '../style';
+import { BaseFormObj } from './base-form-obj';
+export const WdFormObj = forwardRef(function WdFormObj(props, ref) {
+    return _jsx(BaseFormObj, { objType: "obj", ...props, ref: ref });
+});

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

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

package/dist/web/components/wd-input-phone/wd-input-phone.js

@@ -9,6 +9,6 @@ const rules = [{ format: 'mobile', message: '手机校验失败' }];
 export const WdInputPhone = forwardRef(function WdInputPhone(props, ref) {
     const { classPrefix } = useConfig();
     const wrapCls = `${classPrefix}-form-input-number-wrap `;
-    const pattern = '^[0-9\\-]{0,11}$';
-    return (_jsx(WdInput, { ...props, inputPattern: pattern, maxLength: 11, wrapClassName: wrapCls, classRoot: "input-phone", rules: rules, ref: ref }));
+    const pattern = /^[()\d\s+-ext]{0,20}$/;
+    return (_jsx(WdInput, { ...props, inputPattern: pattern, maxLength: 20, wrapClassName: wrapCls, classRoot: "input-phone", rules: rules, ref: ref }));
 });

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

@@ -184,19 +184,22 @@ const getSearchValues = (searchValues) => {
         };
     });
 };
-const getPageParam = (_sort, params, _defaultPageSize, _defaultPageIndex, supportManyRelated, columns, isSupportMultipleSort) => {
+const getPageParam = ({ defaultSort, sort: _sort, params, _defaultPageSize, _defaultPageIndex, supportManyRelated, columns, isSupportMultipleSort, }) => {
+    let sort = defaultSort;
+    // 运行态有值，以运行态为准
+    if ((_sort === null || _sort === void 0 ? void 0 : _sort.length) && _sort[0].order) {
+        params.orderBy = _sort[0].by;
+        params.orderType = _sort[0].order;
+        sort = _sort;
+    }
     // 后端根据业务字段排序
-    const sort = _sort.map((n) => {
+    sort = sort.map((n) => {
         var _a;
         return ({
             ...n,
             by: ((_a = columns === null || columns === void 0 ? void 0 : columns.find((i) => n.by === i.slotKey)) === null || _a === void 0 ? void 0 : _a.fieldKey) || n.by,
         });
     });
-    if ((sort === null || sort === void 0 ? void 0 : sort.length) && sort[0].order) {
-        params.orderBy = sort[0].by;
-        params.orderType = sort[0].order;
-    }
     const _pageSize = parseInt(`${params.pageSize}`);
     params.pageSize = isNaN(_pageSize) ? _defaultPageSize : _pageSize;
     const _pageNo = parseInt(`${params.pageNo}`);
@@ -219,7 +222,7 @@ export const getQueryParams = ({ queryParams, wList, viewFieldsData, connectorPa
     var _a, _b;
     const _defaultPageSize = 10;
     const _defaultPageIndex = 1;
-    const { pageIndex: pageNo, pageSize, sort } = queryParams;
+    const { pageIndex: pageNo, pageSize, sort, defaultSort } = queryParams;
     let params = {
         pageNo,
         pageSize,
@@ -266,7 +269,16 @@ export const getQueryParams = ({ queryParams, wList, viewFieldsData, connectorPa
         params = Object.assign({}, connectorParams, params);
     }
     // 运行态主动排序进行覆盖
-    params = getPageParam(sort, params, _defaultPageSize, _defaultPageIndex, supportManyRelated, columns, isSupportMultipleSort);
+    params = getPageParam({
+        defaultSort,
+        sort,
+        params,
+        _defaultPageSize,
+        _defaultPageIndex,
+        supportManyRelated,
+        columns,
+        isSupportMultipleSort,
+    });
     return params;
 };
 // 获取视图

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

@@ -151,10 +151,11 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
     const [queryParams, setQueryParams] = useState({
         pageIndex: initPageIndex,
         pageSize: initPageSize,
-        sort: _sort,
+        sort: [],
         searchValues: [],
         orderBy,
         orderType,
+        defaultSort: _sort,
     });
     const columnSetsKey = columnSets === null || columnSets === void 0 ? void 0 : columnSets.map((i) => i.key);
     // 过滤权限字段
@@ -629,7 +630,8 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
                 pageSize: defaultPageSize,
                 orderBy: orderBy,
                 orderType: orderType,
-                sort: _sort,
+                defaultSort: _sort,
+                sort: [],
             }));
         }
         else {

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

@@ -9,5 +9,5 @@ export interface WdTabsProps extends CommonPropsType {
         selected?: boolean;
     }[];
     direction: string;
-    getIndex: (val: number) => void;
+    getIndex?: (val: number) => void;
 }

package/dist/web/components/wd-textarea/calcTextareaHeight.d.ts

@@ -0,0 +1 @@
+export declare function getHeight(id: any): number | "auto";

package/dist/web/components/wd-textarea/calcTextareaHeight.js

@@ -0,0 +1,45 @@
+const HIDDEN_TEXTAREA_STYLE = `
+  min-height:0 !important;
+  max-height:none !important;
+  height:0 !important;
+  visibility:hidden !important;
+  overflow-y:hidden !important;
+  position:absolute !important;
+  z-index:-1000 !important;
+  top:0 !important;
+  right:0 !important
+`;
+const SIZING_PROPS = [
+    'letter-spacing',
+    'line-height',
+    'padding-top',
+    'padding-bottom',
+    'font-family',
+    'font-weight',
+    'font-size',
+    'font-variant',
+    'text-rendering',
+    'text-transform',
+    'width',
+    'text-indent',
+    'padding-left',
+    'padding-right',
+    'border-width',
+    'box-sizing',
+];
+export function getHeight(id) {
+    const textarea = document.getElementById(id);
+    if (!textarea)
+        return 'auto';
+    const style = window.getComputedStyle(textarea);
+    const value = textarea.value || textarea.placeholder;
+    const sizingStyle = SIZING_PROPS.map((name) => `${name}:${style.getPropertyValue(name)}`).join(';');
+    let hiddenText = document.createElement('textarea');
+    hiddenText.setAttribute('style', `${sizingStyle};${HIDDEN_TEXTAREA_STYLE}`);
+    hiddenText.value = value;
+    document.body.appendChild(hiddenText);
+    const height = hiddenText.scrollHeight;
+    document.body.removeChild(hiddenText);
+    hiddenText = null;
+    return height;
+}

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

@@ -7,6 +7,7 @@ import { useFormInputTrait } from '../form-input-hooks';
 import { filterPropsWithOn, getUuid } from '../../utils/tool';
 import { useSize } from '../../utils/hooks/useFormLegacy';
 import { X_RUNTIME_DEFAULT } from '../../../configs/type-utils/x-runtime-default';
+import { getHeight } from './calcTextareaHeight';
 /**
  * 标准化：多行输入组件
  */
@@ -40,16 +41,13 @@ export const WdTextarea = forwardRef(function WdTextarea(props, ref) {
     const autoScroll = function () {
         if (!autoHeight || !textareaRef.current)
             return;
-        textareaRef.current.style.height = 'auto';
-        if (textareaRef.current.scrollHeight >= textareaRef.current.offsetHeight) {
-            textareaRef.current.style.height =
-                textareaRef.current.scrollHeight + 'px';
-        }
+        const height = getHeight(inputId);
+        textareaRef.current.style.height = height + 'px';
     };
     useEffect(() => {
         autoScroll();
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [autoHeight]);
+    }, [autoHeight, inputId]);
     /** 内部事件 */
     const onChange = function (e) {
         var _a;

package/dist/web/components/wd-unified-link/index.js

@@ -63,7 +63,7 @@ export const WdUnifiedLink = forwardRef(function WdUnifiedLink(props, ref) {
                         (_c = window === null || window === void 0 ? void 0 : window.app) === null || _c === void 0 ? void 0 : _c.navigateTo({
                             pageId,
                             packageName: packageName === 'main' ? '' : packageName,
-                            mode: options.target === '_blank' ? 'web' : 'weDa',
+                            mode: (options === null || options === void 0 ? void 0 : options.target) === '_blank' ? 'web' : 'weDa',
                             params,
                         });
                         break;
@@ -86,6 +86,6 @@ export const WdUnifiedLink = forwardRef(function WdUnifiedLink(props, ref) {
             }
         }
     };
-    return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx("a", { href: /https?:\/\//.test(url) ? url : 'javascript:void(0);', rel: "noopener noreferrer", className: classNames(classes, className), id: id, style: style, onClick: onClick, ...options, children: children }) }));
+    return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx("a", { href: /https?:\/\//.test(url) ? url : 'javascript:void(0);', rel: "noopener noreferrer", className: classNames(classes, className), id: id, style: style, onClick: onClick, "data-testid": "wd-unified-link", ...options, children: children }) }));
 });
 export default WdUnifiedLink;