@cloudbase/weda-ui 3.23.0 → 3.24.0

package/dist/web/components/form/select/index.js

@@ -6,7 +6,7 @@ import './style';
 import { usePlatform } from '../../../utils/platform';
 import SelectH5, { decodeIsoDatetime } from './h5';
 import classNames from '../../../utils/classnames';
-import { Cascader, ConfigProvider, DatePicker, TimePicker, } from 'tea-component';
+import { Cascader, ConfigProvider, DatePicker, TimePicker } from 'tea-component';
 import isObjectEqual from '../../../utils/isObjectEqual';
 import { renderDecorator } from '../renderDecorator';
 import YearPicker from './year';
@@ -155,8 +155,8 @@ function SelectPc({ name, where, dataSourceName, viewId, format, primaryField, e
         const value = getRegionTree(regionData, regionType, mode);
         setRegionTree(value);
     }, [regionType, mode, regionData]);
-    const onDataChange = (value) => {
-        var _a;
+    const onDataChange = (value, context) => {
+        var _a, _b;
         let finalVal;
         if (value == null) {
             finalVal = value;
@@ -179,7 +179,12 @@ function SelectPc({ name, where, dataSourceName, viewId, format, primaryField, e
             finalVal = value;
         }
         onChange && onChange(finalVal);
-        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: finalVal });
+        if (mode === 'mutiRegion') {
+            (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: finalVal, result: context === null || context === void 0 ? void 0 : context.options.map((i) => ({ value: i.value, code: i.code })) });
+        }
+        else {
+            (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, { value: finalVal });
+        }
     };
     const sizeClassName = classNames({
         [`size-${size}`]: size,
@@ -212,38 +217,22 @@ function SelectPc({ name, where, dataSourceName, viewId, format, primaryField, e
                     clearable,
                 };
                 if (dateMode === 'year') {
-                    return readOnly ? (_jsx("div", { className: `${classPrefix}-select__disabled`, children: moment.isMoment(dateProps.value)
-                            ? dateProps.value.format('YYYY')
-                            : '' })) : (_jsx(YearPicker, { ...dateProps, range: [
-                            startDate && dateProps.range[0],
-                            endDate && dateProps.range[1],
-                        ] }));
+                    return readOnly ? (_jsx("div", { className: `${classPrefix}-select__disabled`, children: moment.isMoment(dateProps.value) ? dateProps.value.format('YYYY') : '' })) : (_jsx(YearPicker, { ...dateProps, range: [startDate && dateProps.range[0], endDate && dateProps.range[1]] }));
                 }
                 else if (dateMode === 'month') {
-                    return readOnly ? (_jsx("div", { className: `${classPrefix}-select__disabled`, children: moment.isMoment(dateProps.value)
-                            ? dateProps.value.format('YYYY-MM')
-                            : '' })) : (_jsx(DatePicker.MonthPicker, { className: sizeClassName, ...dateProps }));
+                    return readOnly ? (_jsx("div", { className: `${classPrefix}-select__disabled`, children: moment.isMoment(dateProps.value) ? dateProps.value.format('YYYY-MM') : '' })) : (_jsx(DatePicker.MonthPicker, { className: sizeClassName, ...dateProps }));
                 }
                 else if (dateMode === 'datetime') {
                     const startFormat = decodeIsoDatetime(startDate, 'date', 'datetime');
                     const endFormat = decodeIsoDatetime(endDate, 'date', 'datetime');
-                    return readOnly ? (_jsx("div", { className: `${classPrefix}-select__disabled`, children: moment.isMoment(dateProps.value)
-                            ? dateProps.value.format('YYYY-MM-DD HH:mm:ss')
-                            : '' })) : (_jsx(DatePicker, { showTime: true, className: sizeClassName, ...dateProps, range: [
-                            moment(startFormat, 'YYYY-MM-DD HH:mm:ss'),
-                            moment(endFormat, 'YYYY-MM-DD HH:mm:ss'),
-                        ] }));
+                    return readOnly ? (_jsx("div", { className: `${classPrefix}-select__disabled`, children: moment.isMoment(dateProps.value) ? dateProps.value.format('YYYY-MM-DD HH:mm:ss') : '' })) : (_jsx(DatePicker, { showTime: true, className: sizeClassName, ...dateProps, range: [moment(startFormat, 'YYYY-MM-DD HH:mm:ss'), moment(endFormat, 'YYYY-MM-DD HH:mm:ss')] }));
                 }
                 else {
-                    return readOnly ? (_jsx("div", { className: `${classPrefix}-select__disabled`, children: moment.isMoment(dateProps.value)
-                            ? dateProps.value.format('YYYY-MM-DD')
-                            : '' })) : (_jsx(DatePicker, { className: sizeClassName, ...dateProps }));
+                    return readOnly ? (_jsx("div", { className: `${classPrefix}-select__disabled`, children: moment.isMoment(dateProps.value) ? dateProps.value.format('YYYY-MM-DD') : '' })) : (_jsx(DatePicker, { className: sizeClassName, ...dateProps }));
                 }
             }
             case 'time': {
-                const start = startTime
-                    ? decodeIsoDatetime(startTime, 'time')
-                    : '00:00';
+                const start = startTime ? decodeIsoDatetime(startTime, 'time') : '00:00';
                 const end = endTime ? decodeIsoDatetime(endTime, 'time') : '23:59';
                 return readOnly ? (_jsx("div", { className: `${classPrefix}-select__disabled`, children: time })) : (_jsx(TimePicker, { className: sizeClassName, onChange: onDataChange, disabled: disabled, placeholder: placeholder, value: time ? moment(time, 'HH:mm') : undefined, range: [moment(start, 'HH:mm'), moment(end, 'HH:mm')], format: "HH:mm", clearable: clearable }));
             }

package/dist/web/components/wd-menu-layout/components/HorizontalMenu.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import { WdMenuLayoutProps } from '../wd-menu-layout';
-export declare const HorizontalMenu: React.ForwardRefExoticComponent<WdMenuLayoutProps & React.RefAttributes<unknown>>;
+export declare const HorizontalMenu: React.ForwardRefExoticComponent<WdMenuLayoutProps & React.RefAttributes<HTMLElement>>;

package/dist/web/components/wd-menu-layout/components/HorizontalMenu.js

@@ -5,5 +5,5 @@ import { slotDiv } from '../utils';
 import { WdMenuList } from '../../index';
 export const HorizontalMenu = forwardRef(function HorizontalMenu(props, ref) {
     const { classPrefix } = useConfig();
-    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: `${classPrefix}-menulayout-header`, children: [_jsx("div", { className: `${classPrefix}-menulayout-header__logo-wrap`, children: slotDiv(props.headSlot) }), _jsx("div", { className: `${classPrefix}-menulayout-header__slot`, children: _jsx(WdMenuList, { ...props, className: "", id: "", style: {}, ref: ref }) }), _jsx("div", { className: `${classPrefix}-menulayout-header__right-wrap`, children: slotDiv(props.headRightSlot, { justifyContent: 'flex-end' }) })] }), _jsx("div", { className: `${classPrefix}-menulayout-body`, children: _jsx("div", { className: `${classPrefix}-menulayout-body__content ${classPrefix}-menulayout__body`, children: props.contentSlot }) })] }));
+    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: `${classPrefix}-menulayout-header`, children: [props.headSlot && (_jsx("div", { className: `${classPrefix}-menulayout-header__logo-wrap`, children: slotDiv(props.headSlot) })), _jsx("div", { className: `${classPrefix}-menulayout-header__slot`, children: _jsx(WdMenuList, { ...props, className: "", id: "", style: {}, ref: ref }) }), props.headRightSlot && (_jsx("div", { className: `${classPrefix}-menulayout-header__right-wrap`, children: slotDiv(props.headRightSlot, { justifyContent: 'flex-end' }) }))] }), _jsx("div", { className: `${classPrefix}-menulayout-body`, children: _jsx("div", { className: `${classPrefix}-menulayout-body__content ${classPrefix}-menulayout__body`, children: props.contentSlot }) })] }));
 });

package/dist/web/components/wd-menu-layout/components/LeftMenu.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+import { WdMenuLayoutProps } from '../wd-menu-layout';
+export declare const LeftMenu: React.ForwardRefExoticComponent<WdMenuLayoutProps & React.RefAttributes<unknown>>;

package/dist/web/components/wd-menu-layout/components/LeftMenu.js

@@ -0,0 +1,41 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { forwardRef, useState } from 'react';
+import { useConfig } from '../../../utils/config-context';
+import { slotDiv } from '../utils';
+import { WdMenuList } from '../../index';
+import WdIcon from '../../wd-icon';
+import classNames from '../../../utils/classnames';
+export const LeftMenu = forwardRef(function LeftMenu(props, ref) {
+    const { classPrefix } = useConfig();
+    const { collapsed, onToggleCollapse, enableHeadSlot = false } = props;
+    const [isHovering, setIsHovering] = useState(false);
+    const [tempExpanded, setTempExpanded] = useState(false);
+    // 计算实际的展开状态
+    const effectiveCollapsed = collapsed && !tempExpanded;
+    const classes = classNames({
+        [`${classPrefix}-menulayout-body__left`]: true,
+        [`${classPrefix}-menulayout-body--hover`]: isHovering,
+        [`${classPrefix}-menulayout-body__left--collapsed`]: effectiveCollapsed,
+    });
+    // 处理鼠标进入事件
+    const handleMouseEnter = () => {
+        setIsHovering(true);
+        if (collapsed) {
+            setTempExpanded(true);
+        }
+    };
+    // 处理鼠标离开事件
+    const handleMouseLeave = () => {
+        setIsHovering(false);
+        if (collapsed) {
+            setTempExpanded(false);
+        }
+    };
+    // 点击展开收起按钮
+    const handleCollapse = () => {
+        onToggleCollapse();
+        setTempExpanded(false);
+        setIsHovering(false);
+    };
+    return (_jsxs("div", { className: classes, onMouseEnter: handleMouseEnter, onMouseLeave: handleMouseLeave, children: [enableHeadSlot && props.headSlot && (_jsx("div", { className: `${classPrefix}-menulayout-header__logo-wrap is-not-content`, children: slotDiv(props.headSlot) })), _jsx("div", { className: `${classPrefix}-menulayout-body__left-menu ${classPrefix}-menulayout__menu ${effectiveCollapsed ? `${classPrefix}-menulayout__menu--collapsed` : ''}`, children: _jsx(WdMenuList, { ...props, className: "", id: "", style: {}, ref: ref }) }), props.footerSlot && (_jsx("div", { className: `${classPrefix}-menulayout-body__left-slot is-not-content ${classPrefix}-menulayout-body__footer`, children: slotDiv(props.footerSlot) })), _jsx("div", { className: `${classPrefix}-menulayout-body__footer ${classPrefix}-menulayout-body__footer--collapse`, onClick: handleCollapse, children: _jsx("div", { className: `${classPrefix}-event-tap ${classPrefix}-menulayout-body__footer--collapse-icon`, children: _jsx(WdIcon, { type: "inner", size: "xs", name: collapsed ? 'td:menu-fold' : 'td:menu-unfold' }) }) })] }));
+});

package/dist/web/components/wd-menu-layout/components/PlantMenu.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import { WdMenuLayoutProps } from '../wd-menu-layout';
-export declare const PlantMenu: React.ForwardRefExoticComponent<WdMenuLayoutProps & React.RefAttributes<unknown>>;
+export declare const PlantMenu: React.ForwardRefExoticComponent<WdMenuLayoutProps & React.RefAttributes<HTMLElement>>;

package/dist/web/components/wd-menu-layout/components/PlantMenu.js

@@ -2,8 +2,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { forwardRef } from 'react';
 import { useConfig } from '../../../utils/config-context';
 import { slotDiv } from '../utils';
-import { WdMenuList } from '../../index';
+import { LeftMenu } from './LeftMenu';
 export const PlantMenu = forwardRef(function PlantMenu(props, ref) {
     const { classPrefix } = useConfig();
-    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: `${classPrefix}-menulayout-header ${classPrefix}-menulayout-header--plant`, children: [_jsx("div", { className: `${classPrefix}-menulayout-header__logo-wrap`, children: slotDiv(props.headSlot) }), _jsx("div", { className: `${classPrefix}-menulayout-header__right-wrap `, children: slotDiv(props.headRightSlot, { justifyContent: 'flex-end' }) })] }), _jsxs("div", { className: `${classPrefix}-menulayout-body ${classPrefix}-menulayout-body--plant`, children: [_jsxs("div", { className: `${classPrefix}-menulayout-body__left`, children: [_jsx("div", { className: `${classPrefix}-menulayout-body__left-menu ${classPrefix}-menulayout__menu`, children: _jsx(WdMenuList, { ...props, className: "", id: "", style: {}, ref: ref }) }), _jsx("div", { className: `${classPrefix}-menulayout-body__left-slot is-not-content ${classPrefix}-menulayout-body__footer`, children: slotDiv(props.footerSlot) })] }), _jsx("div", { className: `${classPrefix}-menulayout-body__content ${classPrefix}-menulayout__body`, children: props.contentSlot })] })] }));
+    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: `${classPrefix}-menulayout-header ${classPrefix}-menulayout-header--plant`, children: [props.headSlot && (_jsx("div", { className: `${classPrefix}-menulayout-header__logo-wrap`, children: slotDiv(props.headSlot) })), props.headRightSlot && (_jsx("div", { className: `${classPrefix}-menulayout-header__right-wrap `, children: slotDiv(props.headRightSlot, { justifyContent: 'flex-end' }) }))] }), _jsxs("div", { className: `${classPrefix}-menulayout-body ${classPrefix}-menulayout-body--plant`, children: [_jsx(LeftMenu, { ref: ref, ...props }), _jsx("div", { className: `${classPrefix}-menulayout-body__content ${classPrefix}-menulayout__body`, children: props.contentSlot })] })] }));
 });

package/dist/web/components/wd-menu-layout/components/VerticalMenu.js

@@ -1,9 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { forwardRef } from 'react';
 import { useConfig } from '../../../utils/config-context';
-import { slotDiv } from '../utils';
-import { WdMenuList } from '../../index';
+import classNames from '../../../utils/classnames';
+import { LeftMenu } from './LeftMenu';
 export const VerticalMenu = forwardRef(function VerticalMenu(props, ref) {
     const { classPrefix } = useConfig();
-    return (_jsx(_Fragment, { children: _jsxs("div", { className: `${classPrefix}-menulayout-body ${classPrefix}-menulayout-body--vertical`, children: [_jsxs("div", { className: `${classPrefix}-menulayout-body__left`, children: [_jsx("div", { className: `${classPrefix}-menulayout-header__logo-wrap is-not-content`, children: slotDiv(props.headSlot) }), _jsx("div", { className: `${classPrefix}-menulayout-body__left-menu ${classPrefix}-menulayout__menu`, children: _jsx(WdMenuList, { ...props, className: "", id: "", style: {}, ref: ref }) }), _jsx("div", { className: `${classPrefix}-menulayout-body__left-slot is-not-content ${classPrefix}-menulayout-body__footer`, children: slotDiv(props.footerSlot) })] }), _jsx("div", { className: `${classPrefix}-menulayout-body__content ${classPrefix}-menulayout__body`, children: props.contentSlot })] }) }));
+    // 计算实际的展开状态
+    const classes = classNames({
+        [`${classPrefix}-menulayout-body`]: true,
+        [`${classPrefix}-menulayout-body--vertical`]: true,
+    });
+    return (_jsx(_Fragment, { children: _jsxs("div", { className: classes, children: [_jsx(LeftMenu, { ref: ref, ...props, enableHeadSlot: true }), _jsx("div", { className: `${classPrefix}-menulayout-body__content ${classPrefix}-menulayout__body`, children: props.contentSlot })] }) }));
 });

package/dist/web/components/wd-menu-layout/wd-menu-layout.d.ts

@@ -2,7 +2,10 @@ import React from 'react';
 import type { CommonPropsType } from '../../types';
 import type { DataType } from '../../../configs/components/wd-menu-layout';
 import { WdMenuListProps } from '../wd-menu-list';
-export declare const WdMenuLayout: React.ForwardRefExoticComponent<WdMenuLayoutProps & React.RefAttributes<unknown>>;
+export declare const WdMenuLayout: React.ForwardRefExoticComponent<WdMenuLayoutProps & React.RefAttributes<HTMLElement>>;
 export interface WdMenuLayoutProps extends CommonPropsType, DataType {
     setSelectedInfo: (item: WdMenuListProps['menu']['menuData']['0'], isNavigate: boolean) => void;
+    collapsed?: boolean;
+    onToggleCollapse?: () => void;
+    enableHeadSlot?: boolean;
 }

package/dist/web/components/wd-menu-layout/wd-menu-layout.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { forwardRef } from 'react';
+import { forwardRef, useState } from 'react';
 import { HorizontalMenu } from './components/HorizontalMenu';
 import { PlantMenu } from './components/PlantMenu';
 import { VerticalMenu } from './components/VerticalMenu';
@@ -12,13 +12,12 @@ import classNames from '../../utils/classnames';
 import { usePlatform } from '../../utils/platform';
 // const type = 'horizontal'; // 顶导航: horizontal  侧导航: vertical  厂子形状：plant h5
 export const WdMenuLayout = forwardRef(function WdMenuLayout(props, ref) {
+    const [collapsed, setCollapsed] = useState(false);
     const { classPrefix } = useConfig();
     const platform = usePlatform();
     const _type = props.type || props.template;
-    const type = platform === 'h5' && !['tab', 'nav', 'navTab'].includes(_type)
-        ? 'h5'
-        : _type;
+    const type = platform === 'h5' && !['tab', 'nav', 'navTab'].includes(_type) ? 'h5' : _type;
     return (
     // 1024px 800px为方便测试  开发时去掉
-    _jsxs("div", { id: props.id, style: props.style, className: classNames(props.className, `${classPrefix}-menulayout`, `${classPrefix}-menulayout-root`, ['h5'].includes(type) ? `${classPrefix}-menulayout-h5-root` : '', `${classPrefix}-menulayout--${type}`), children: [['horizontal'].includes(type) && (_jsx(HorizontalMenu, { ...props, ref: ref })), ['vertical'].includes(type) && (_jsx(VerticalMenu, { ...props, ref: ref })), ['plant'].includes(type) && _jsx(PlantMenu, { ...props, ref: ref }), ['h5'].includes(type) && _jsx(H5Menu, { ...props, ref: ref }), ['tab'].includes(type) && _jsx(TabMenu, { ...props, ref: ref }), ['nav'].includes(type) && _jsx(NavMenu, { ...props, ref: ref }), ['navTab'].includes(type) && (_jsx(NavTabMenu, { ...props, ref: ref }))] }));
+    _jsxs("div", { id: props.id, style: props.style, className: classNames(props.className, `${classPrefix}-menulayout`, `${classPrefix}-menulayout-root`, ['h5'].includes(type) ? `${classPrefix}-menulayout-h5-root` : '', `${classPrefix}-menulayout--${type}`, collapsed ? `${classPrefix}-menulayout--collapsed` : ''), children: [['horizontal'].includes(type) && _jsx(HorizontalMenu, { ...props, ref: ref }), ['vertical'].includes(type) && (_jsx(VerticalMenu, { ...props, ref: ref, collapsed: collapsed, onToggleCollapse: () => setCollapsed(!collapsed) })), ['plant'].includes(type) && (_jsx(PlantMenu, { ...props, ref: ref, collapsed: collapsed, onToggleCollapse: () => setCollapsed(!collapsed) })), ['h5'].includes(type) && _jsx(H5Menu, { ...props, ref: ref }), ['tab'].includes(type) && _jsx(TabMenu, { ...props, ref: ref }), ['nav'].includes(type) && _jsx(NavMenu, { ...props, ref: ref }), ['navTab'].includes(type) && _jsx(NavTabMenu, { ...props, ref: ref })] }));
 });

package/dist/web/components/wd-menu-list/CommonMenuList.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { forwardRef, useEffect, useImperativeHandle, useState, useContext, useCallback, useMemo, } from 'react';
+import { forwardRef, useEffect, useImperativeHandle, useState, useContext, useCallback, useMemo } from 'react';
 import destr from 'destr';
 import classNames from '../../utils/classnames';
 import { useConfig } from '../../utils/config-context';
@@ -7,7 +7,7 @@ import { usePlatform } from '../../utils/platform';
 import { Menu, ConfigProvider } from 'tea-component';
 import WdIcon from '../wd-icon';
 import WdLink from '../wd-link';
-import { findSelectItem, navigateTo, getMenuList, hasChildSelected, } from './utils';
+import { findSelectItem, navigateTo, getMenuList, hasChildSelected } from './utils';
 import { MenuLayoutContext } from '../wd-menu-layout/utils';
 export const CommonMenuList = forwardRef(function CommonMenuList(props, ref) {
     const { className = '', style, id } = props;
@@ -85,9 +85,7 @@ export const CommonMenuList = forwardRef(function CommonMenuList(props, ref) {
     const renderMenuTitle = (item, useLink = false) => {
         var _a;
         const show = (_jsxs("div", { className: `${classPrefix}-menulayout-menu__item`, children: [getIconShow(item, selected), _jsx("div", { className: `${classPrefix}-menulayout-menu__item-text`, children: item.title })] }));
-        const url = (item === null || item === void 0 ? void 0 : item.type) === 'link' && item.linkUrl
-            ? item.linkUrl
-            : (_a = item === null || item === void 0 ? void 0 : item.path) === null || _a === void 0 ? void 0 : _a.replace('/', '');
+        const url = (item === null || item === void 0 ? void 0 : item.type) === 'link' && item.linkUrl ? item.linkUrl : (_a = item === null || item === void 0 ? void 0 : item.path) === null || _a === void 0 ? void 0 : _a.replace('/', '');
         return useLink && url ? (_jsx(WdLink, { style: { width: '100%', color: 'unset', fontSize: 'unset' }, packageName: item === null || item === void 0 ? void 0 : item.subPackageName, url: url, params: [], disabled: true, contentSlot: show, content: '' })) : (show);
     };
     // 渲染MenuItem
@@ -112,15 +110,12 @@ export const CommonMenuList = forwardRef(function CommonMenuList(props, ref) {
     // 渲染subMenu
     const renderSubMenu = (item, hasThereNode = false, level = '1') => {
         const { key, children, disabled } = item;
-        // 缓存key带上默认菜单展开状态，以区分不同的默认🚉开情况
+        // 缓存key带上默认菜单展开状态，以区分不同的默认展开情况
         const itemKey = `${key}_${props.defaultOpened}`;
         let isOpened = openStatus[itemKey];
         // 默认不展开菜单时进行判断
         if (!props.defaultOpened) {
-            isOpened =
-                openStatus[itemKey] === undefined
-                    ? hasChildSelected(item, selected)
-                    : openStatus[itemKey];
+            isOpened = openStatus[itemKey] === undefined ? hasChildSelected(item, selected) : openStatus[itemKey];
             if (openStatus[itemKey] === undefined && isOpened) {
                 setOpenStatus((prev) => ({ ...prev, [itemKey]: isOpened }));
             }
@@ -130,6 +125,7 @@ export const CommonMenuList = forwardRef(function CommonMenuList(props, ref) {
                 [`${classPrefix}-menulayout__submenu-stair`]: ['1'].includes(level),
                 [`${classPrefix}-menulayout__submenu-second`]: ['2'].includes(level),
                 'is-disabled': !!disabled,
+                'has-selected-child': hasChildSelected(item, selected),
             }), title: renderMenuTitle(item), defaultOpened: props.defaultOpened, opened: isOpened, onOpenedChange: (isOpened) => {
                 setOpenStatus((prev) => ({ ...prev, [itemKey]: isOpened }));
                 const result = { ...openStatus, [itemKey]: isOpened };
@@ -138,8 +134,6 @@ export const CommonMenuList = forwardRef(function CommonMenuList(props, ref) {
     };
     return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx("div", { id: id, className: classNames(classes, className), style: style, children: _jsx(Menu, { children: menuData === null || menuData === void 0 ? void 0 : menuData.map((item) => {
                     var _a;
-                    return ((_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.length) > 0
-                        ? renderSubMenu(item)
-                        : renderMenuItem(item, '1');
+                    return ((_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.length) > 0 ? renderSubMenu(item) : renderMenuItem(item, '1');
                 }) }) }) }));
 });

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

@@ -1,65 +1,43 @@
-import React from 'react';
-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, }: {
-    events: any;
-    recordKey: any;
-    className: any;
-    columns: any;
-    setColumns: any;
-    records: any;
-    sortColumns: any;
-    sort: any;
-    onSelectChange: any;
-    selectedKeys: any;
-    rowColor: any;
-    isError: any;
-    errorObj: any;
-    isLoading: any;
-    queryParams: any;
+import React, { ReactNode } from 'react';
+interface BaseTableComProps {
+    events?: any;
+    recordKey?: string;
+    className?: any;
+    columns?: any[];
+    setColumns?: (columns: any[]) => void;
+    records?: any[];
+    sortColumns?: any[];
+    sort?: any[];
+    onSelectChange?: (selectedKeys?: any, selectedRows?: any, clearAll?: boolean) => void;
+    selectedKeys?: string[];
+    rowColor?: string | ((params: {
+        event: {
+            detail: any;
+        };
+        data: any;
+    }) => string);
+    isError?: boolean;
+    errorObj?: any;
+    isLoading?: boolean;
+    queryParams?: any;
     total?: number;
-    onQueryChange: any;
-    enablePagination: any;
-    columnSelectType: any;
-    defaultPageSize: any;
-    defaultPageIndex: any;
-    rowClick: any;
-    cellClick: any;
-    currentSize: any;
-    isNoDataSourceBind: any;
-    isH5: any;
-    emptyText: any;
-    __innerSlot?: React.ReactNode;
-    bottomTip: any;
+    onQueryChange?: (query: any) => void;
+    enablePagination?: boolean;
+    columnSelectType?: 'select' | 'radio' | string;
+    defaultPageSize?: number;
+    defaultPageIndex?: number;
+    rowClick?: (e: React.MouseEvent, context: any) => void;
+    cellClick?: (e: React.MouseEvent, context: any) => void;
+    currentSize?: string;
+    isNoDataSourceBind?: boolean;
+    isH5?: boolean;
+    emptyText?: string;
+    __innerSlot?: ReactNode;
+    bottomTip?: ReactNode;
     enableBottomTipSlot?: boolean;
-}) => 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, }: {
-    events: any;
-    recordKey: any;
-    className: any;
-    columns: any;
-    setColumns: any;
-    records: any;
-    sortColumns: any;
-    sort: any;
-    onSelectChange: any;
-    selectedKeys: any;
-    rowColor: any;
-    isError: any;
-    errorObj: any;
-    isLoading: any;
-    queryParams: any;
-    total?: number;
-    onQueryChange: any;
-    enablePagination: any;
-    columnSelectType: any;
-    defaultPageSize: any;
-    defaultPageIndex: any;
-    rowClick: any;
-    cellClick: any;
-    currentSize: any;
-    isNoDataSourceBind: any;
-    isH5: any;
-    emptyText: any;
-    __innerSlot?: React.ReactNode;
-    bottomTip: any;
-    enableBottomTipSlot?: boolean;
-}) => JSX.Element>;
+    rowDisabled?: boolean | ((record: any) => boolean);
+    componentId?: string;
+}
+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,10 +1,10 @@
 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';
-import { Icon, Table, StatusTip, ConfigProvider } from 'tea-component';
+import { Table, StatusTip, ConfigProvider } from 'tea-component';
 import { useResizeObserver } from '@react-hookz/web';
+import { errorHandler } from '../../../../utils/error';
 import { useConfig } from '../../../../utils/config-context';
-import { isInIde } from '../../../../utils/platform';
 const { sortable, radioable, selectable, injectable, pageable, autotip, scrollable, columnsResizable } = Table.addons;
 import StatusContent from '../../../statusContent';
 import classNames from '../../../../utils/classnames';
@@ -34,9 +34,8 @@ const renderStatus = ({ isH5, status, isNoDataSourceBind, _emptyText, errorObj,
 // 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, }) => {
+onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageIndex, rowClick, cellClick, currentSize, isNoDataSourceBind, isH5, emptyText: _emptyText, __innerSlot = (_jsx(_Fragment, {})), bottomTip, enableBottomTipSlot = false, rowDisabled, componentId, }) => {
     var _a;
-    const inEditor = isInIde();
     const tableRef = useRef(null);
     const { classPrefix } = useConfig();
     // 是否展示全局loading
@@ -100,17 +99,14 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
                 },
             }),
         }),
-    ];
-    // 仅运行态可编辑
-    if (!inEditor) {
-        tableAddons.push(columnsResizable({
+        columnsResizable({
             onResizeEnd: (columns) => {
                 setColumns(columns);
             },
             minWidth: 92,
             maxWidth: 1000,
-        }));
-    }
+        }),
+    ];
     // 支撑分页的最大高度
     const tableDomHeight = (_a = tableRef.current) === null || _a === void 0 ? void 0 : _a.clientHeight;
     // 支持表格滚动，高度超过 500 开始显示滚动条
@@ -147,7 +143,6 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
         tableAddons.push(selectable({
             value: selectedKeys,
             onChange: onSelectChange,
-            render: (element, { disabled }) => (disabled ? _jsx(Icon, { type: "loading" }) : element),
             targetColumnKey: (columns === null || columns === void 0 ? void 0 : columns.length) && columnSelectType === 'select' ? 'weda_select' : undefined,
         }));
     }
@@ -155,7 +150,6 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
         tableAddons.push(radioable({
             value: selectedKeys === null || selectedKeys === void 0 ? void 0 : selectedKeys[0],
             onChange: onSelectChange,
-            render: (element, { disabled }) => (disabled ? _jsx(Icon, { type: "loading" }) : element),
             targetColumnKey: (columns === null || columns === void 0 ? void 0 : columns.length) && columnSelectType === 'radio' ? 'weda_radio' : undefined,
         }));
     }
@@ -207,14 +201,32 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
             tableDomHeight > minPageSizeHeight &&
             !isLoading &&
             isH5 &&
-            total > miniPageSize &&
-            !inEditor) {
+            total > miniPageSize) {
             onQueryChange({ pageIndex: queryParams.pageIndex + pageIndexSpan });
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [queryParams.pageIndex, currentSize, isLoading, isH5, total]);
     const status = isShowLoading ? 'loading' : isError ? 'error' : 'empty';
-    return (_jsxs("div", { className: classNames(className, classes), children: [_jsx(Table, { ref: tableRef, className: className, bordered: true, recordKey: recordKey, columns: columns, records: records, addons: tableAddons, bottomTip: bottomTipCompRender() }), showStatus &&
+    const handleRowDisable = (record) => {
+        if (typeof rowDisabled === 'function') {
+            try {
+                return rowDisabled(record);
+            }
+            catch (error) {
+                errorHandler({
+                    code: 'rowDisabledFailed',
+                    error: error,
+                    id: componentId,
+                });
+                return false;
+            }
+        }
+        else if (typeof rowDisabled === 'boolean') {
+            return rowDisabled;
+        }
+        return false;
+    };
+    return (_jsxs("div", { className: classNames(className, classes), children: [_jsx(Table, { rowDisabled: handleRowDisable, ref: tableRef, className: className, bordered: true, recordKey: recordKey, columns: columns, records: records, addons: tableAddons, bottomTip: bottomTipCompRender() }), showStatus &&
                 renderStatus({
                     isH5,
                     status,

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

@@ -80,7 +80,7 @@ forwardRef(function TableComp(tableProps, ref) {
     isSupportMultipleSort = false, // 是否支持多字段排序
     sorter, // 排序规则
     __innerSlot, enableRelationTag = true, // 关联关系字段是否开启关联标签
-    enableBottomTipSlot = false, row__bottom__slot, ...props } = tableProps;
+    enableBottomTipSlot = false, row__bottom__slot, rowDisabled, ...props } = tableProps;
     const formField = useFormField();
     const { formFieldsValue = [], setFieldValue, setFormFieldsValue } = formField || {};
     const formFieldObjsContext = useFormFieldObj();
@@ -747,7 +747,7 @@ forwardRef(function TableComp(tableProps, ref) {
                 pageIndex: 1,
             }));
         }
-        events === null || events === void 0 ? void 0 : events.onFilterChange({ searchValues });
+        events === null || events === void 0 ? void 0 : events.onFilterChange({ searchValues, filterConfig });
     };
     const errorStatus = isError || fieldsError;
     const errorMsg = isError ? errorObj : fieldsError;
@@ -756,7 +756,7 @@ forwardRef(function TableComp(tableProps, ref) {
                                                 setOpenMobileFilter(true);
                                             }, enableRefreshBtn: enableRefreshBtn, enableTableHeightSizeBtn: enableTableHeightSizeBtn, enablePagination: enablePagination }) }))] })), isH5 && (enablePagination || enableRefreshBtn || enableTableHeightSizeBtn || hasFilterButton) && (_jsx(ToolBar, { hasFilterButton: hasFilterButton, total: total, refreshTable: onRefreshBtnClick, setTableHightSize: setTableHightSize, currentSize: tableHightSize, setOpenMobileFilter: () => {
                                     setOpenMobileFilter(true);
-                                }, enableRefreshBtn: enableRefreshBtn, enableTableHeightSizeBtn: enableTableHeightSizeBtn, enablePagination: enablePagination })), _jsx(Table, { events: events, emptyText: emptyText, isH5: isH5, isNoDataSourceBind: isNoDataSourceBind, className: tableClassList, recordKey: recordKey, currentSize: tableHightSize, defaultPageIndex: defaultPageIndex, defaultPageSize: defaultPageSize, sortColumns: sortColumns, enablePagination: !isH5 && enablePagination, columnSelectType: columnSelectType, columns: visibleColumns, setColumns: setColumns, records: tableRecords, sort: queryParams.sort, selectedKeys: selectedKeys, onSelectChange: onSelectChange, isLoading: isTableLoading, rowColor: rowColor, queryParams: queryParams, total: total, onQueryChange: onQueryChange, rowClick: rowClick, cellClick: cellClick, isError: errorStatus, errorObj: errorMsg, __innerSlot: __innerSlot, bottomTip: row__bottom__slot, enableBottomTipSlot: enableBottomTipSlot }), isH5 && enableGlobalButton && !isNoDataSourceBind && (_jsx("div", { className: `${classPrefix}-h5-table-wrap-footer`, children: _jsx(GlobalButton, { classPrefix: classPrefix, slots: slots === null || slots === void 0 ? void 0 : slots.globalButton }) }))] }), _jsx(ImportFileModal, { columnSets: columnSets, dbName: dbName, datasourceTitle: datasourceTitle, fields: fields, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, isImportFileModalByApiVisible: isImportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible, refresh: refreshTable, supportManyRelated: supportManyRelated }), _jsx(ExportFileModal, { whereList: wList, fields: fields, columns: mapColumKey(columns), isExportFileModalByApiVisible: isExportFileModalByApiVisible, selectedKeys: selectedKeys, dbName: dbName, query: query, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible, supportManyRelated: supportManyRelated }), _jsx(InOrOutRecordModal, { dbName: dbName, isInOrOutRecordModalVisible: isInOrOutRecordModalVisible, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible }), isH5 && (_jsx(Modal, { overlayClassName: `${classPrefix}-h5-table-overlay`, className: `${classPrefix}-h5-table-option-modal-wrap`, disableCloseIcon: true, title: "\u64CD\u4F5C", visible: isMobileOptionVisible, outerRef: modalRef, events: {
+                                }, enableRefreshBtn: enableRefreshBtn, enableTableHeightSizeBtn: enableTableHeightSizeBtn, enablePagination: enablePagination })), _jsx(Table, { componentId: id, events: events, emptyText: emptyText, isH5: isH5, isNoDataSourceBind: isNoDataSourceBind, className: tableClassList, recordKey: recordKey, currentSize: tableHightSize, defaultPageIndex: defaultPageIndex, defaultPageSize: defaultPageSize, sortColumns: sortColumns, enablePagination: !isH5 && enablePagination, columnSelectType: columnSelectType, columns: visibleColumns, setColumns: setColumns, records: tableRecords, sort: queryParams.sort, selectedKeys: selectedKeys, onSelectChange: onSelectChange, isLoading: isTableLoading, rowColor: rowColor, queryParams: queryParams, total: total, onQueryChange: onQueryChange, rowClick: rowClick, cellClick: cellClick, isError: errorStatus, errorObj: errorMsg, __innerSlot: __innerSlot, bottomTip: row__bottom__slot, enableBottomTipSlot: enableBottomTipSlot, rowDisabled: rowDisabled }), isH5 && enableGlobalButton && !isNoDataSourceBind && (_jsx("div", { className: `${classPrefix}-h5-table-wrap-footer`, children: _jsx(GlobalButton, { classPrefix: classPrefix, slots: slots === null || slots === void 0 ? void 0 : slots.globalButton }) }))] }), _jsx(ImportFileModal, { columnSets: columnSets, dbName: dbName, datasourceTitle: datasourceTitle, fields: fields, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, isImportFileModalByApiVisible: isImportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible, refresh: refreshTable, supportManyRelated: supportManyRelated }), _jsx(ExportFileModal, { whereList: wList, fields: fields, columns: mapColumKey(columns), isExportFileModalByApiVisible: isExportFileModalByApiVisible, selectedKeys: selectedKeys, dbName: dbName, query: query, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible, supportManyRelated: supportManyRelated }), _jsx(InOrOutRecordModal, { dbName: dbName, isInOrOutRecordModalVisible: isInOrOutRecordModalVisible, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible }), isH5 && (_jsx(Modal, { overlayClassName: `${classPrefix}-h5-table-overlay`, className: `${classPrefix}-h5-table-option-modal-wrap`, disableCloseIcon: true, title: "\u64CD\u4F5C", visible: isMobileOptionVisible, outerRef: modalRef, events: {
                             close: () => {
                                 setIsMobileOptionVisible(false);
                             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.23.0",
+  "version": "3.24.0",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",