@sheinx/base 3.8.0-beta.22 → 3.8.0-beta.24

package/cjs/table/table.js

@@ -559,7 +559,9 @@ var _default = exports.default = function _default(props) {
               currentIndex: virtualInfo.startIndex,
               data: virtualInfo.data,
               setRowHeight: virtualInfo.setRowHeight,
-              scrolling: scrolling
+              scrolling: scrolling,
+              virtualRowSpanInfo: virtualInfo.rowSpanInfo,
+              fullData: treeData
             }))]
           }), showFoot ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             className: footWrapperClass,

package/cjs/table/tbody.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tbody.d.ts","sourceRoot":"","sources":["tbody.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;gCAEnB,UAAU;AAAjC,wBAsFE"}
+{"version":3,"file":"tbody.d.ts","sourceRoot":"","sources":["tbody.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;gCAEnB,UAAU;AAAjC,wBAmGE"}

package/cjs/table/tbody.js

@@ -41,6 +41,17 @@ var _default = exports.default = function _default(props) {
     var rowIndex = index + currentIndex;
     var originKey = _hooks.util.getKey(props.keygen, item, rowIndex);
     var trRenderKey = props.loader || (_props$rowEvents = props.rowEvents) !== null && _props$rowEvents !== void 0 && _props$rowEvents.draggable ? originKey : "".concat(originKey, "-").concat(rowIndex);
+
+    // 在虚拟列表模式下，使用 virtualRowSpanInfo 来获取正确的选择数据
+    var selectData = item;
+    if (props.virtualRowSpanInfo && props.fullData) {
+      // rowSpanIndexArray[rowIndex] 表示第 rowIndex 行所属合并组的起始行索引
+      var selectIndex = props.virtualRowSpanInfo.rowSpanIndexArray[rowIndex];
+      selectData = props.fullData[selectIndex];
+    } else {
+      // 非虚拟列表模式使用原有逻辑
+      selectData = rowSelectMergeStartData[index];
+    }
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tr.default, {
       originKey: originKey,
       row: rowData[index],
@@ -68,7 +79,8 @@ var _default = exports.default = function _default(props) {
       striped: props.striped,
       radio: props.radio,
       hover: hover,
-      isSelect: props.datum.check(rowSelectMergeStartData[index]),
+      isSelect: props.datum.check(selectData),
+      selectData: selectData,
       handleCellHover: handleCellHover
       // to update
       ,

package/cjs/table/tbody.type.d.ts

@@ -19,5 +19,10 @@ export interface TbodyProps extends Pick<OptionalToRequired<TableProps<any, any>
     bodyScrollWidth?: number;
     resizeFlag?: number;
     scrolling?: boolean;
+    virtualRowSpanInfo?: {
+        rowSpanIndexArray: number[];
+        maxRowSpan: number;
+    } | null;
+    fullData?: any[];
 }
 //# sourceMappingURL=tbody.type.d.ts.map

package/cjs/table/tbody.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tbody.type.d.ts","sourceRoot":"","sources":["tbody.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE3E,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;AAClE,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;AAE/D,MAAM,WAAW,UACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EACtC,MAAM,GACN,UAAU,GACV,cAAc,GACd,YAAY,GACZ,QAAQ,GACR,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,GAChB,QAAQ,GACR,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,UAAU,GACV,OAAO,GACP,cAAc,GACd,aAAa,GACb,SAAS,CACZ;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACjD,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAChC,eAAe,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAClD,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}
+{"version":3,"file":"tbody.type.d.ts","sourceRoot":"","sources":["tbody.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE3E,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;AAClE,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;AAE/D,MAAM,WAAW,UACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EACtC,MAAM,GACN,UAAU,GACV,cAAc,GACd,YAAY,GACZ,QAAQ,GACR,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,GAChB,QAAQ,GACR,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,UAAU,GACV,OAAO,GACP,cAAc,GACd,aAAa,GACb,SAAS,CACZ;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACjD,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAChC,eAAe,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAClD,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE;QACnB,iBAAiB,EAAE,MAAM,EAAE,CAAC;QAC5B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,IAAI,CAAC;IACT,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;CAClB"}

package/cjs/table/tr.d.ts

@@ -23,6 +23,7 @@ interface TrProps extends Pick<TbodyProps, 'jssStyle' | 'rowClassName' | 'datum'
     isSelect: boolean;
     disabled?: boolean;
     scrolling?: boolean;
+    selectData?: any;
 }
 declare const Tr: (props: TrProps) => import("react/jsx-runtime").JSX.Element;
 export default Tr;

package/cjs/table/tr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tr.d.ts","sourceRoot":"","sources":["tr.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAQvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI7D,UAAU,OACR,SAAQ,IAAI,CACV,UAAU,EACR,UAAU,GACV,cAAc,GACd,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,GAChB,QAAQ,GACR,aAAa,GACb,cAAc,GACd,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,cAAc,GACd,aAAa,GACb,SAAS,CACZ;IACD,GAAG,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACnD,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,4CAqazB,CAAC;AAEF,eAAe,EAAE,CAAC"}
+{"version":3,"file":"tr.d.ts","sourceRoot":"","sources":["tr.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAQvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI7D,UAAU,OACR,SAAQ,IAAI,CACV,UAAU,EACR,UAAU,GACV,cAAc,GACd,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,GAChB,QAAQ,GACR,aAAa,GACb,cAAc,GACd,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,cAAc,GACd,aAAa,GACb,SAAS,CACZ;IACD,GAAG,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACnD,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,4CAsazB,CAAC;AAEF,eAAe,EAAE,CAAC"}

package/cjs/table/tr.js

@@ -211,6 +211,7 @@ var Tr = function Tr(props) {
       return expandInstance;
     }
     if (col.type === 'checkbox') {
+      var selectData = props.selectData || data;
       var instance = /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper,
         children: props.radio ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_radio.default, {
@@ -222,9 +223,9 @@ var Tr = function Tr(props) {
           disabled: props.disabled,
           onChange: function onChange(value) {
             if (value) {
-              props.datum.add(data);
+              props.datum.add(selectData);
             } else {
-              props.datum.remove(data);
+              props.datum.remove(selectData);
             }
           }
         }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.default, {
@@ -236,11 +237,11 @@ var Tr = function Tr(props) {
           checked: props.isSelect,
           onChange: function onChange(_value, check) {
             if (check) {
-              props.datum.add(data, props.treeCheckAll ? {
+              props.datum.add(selectData, props.treeCheckAll ? {
                 childrenKey: props.treeColumnsName
               } : undefined);
             } else {
-              props.datum.remove(data, props.treeCheckAll ? {
+              props.datum.remove(selectData, props.treeCheckAll ? {
                 childrenKey: props.treeColumnsName
               } : undefined);
             }

package/esm/modal/modal-content.js

@@ -336,7 +336,8 @@ var Modal = function Modal(props) {
       onAnimationEnd: handleAnimationEnd,
       style: {
         background: props.maskBackground,
-        zIndex: props.zIndex
+        zIndex: props.zIndex,
+        display: !visible && !animation ? 'none' : undefined
       },
       children: /*#__PURE__*/_jsx("div", _objectSpread(_objectSpread({
         className: modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.mask

package/esm/popover/popover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"popover.d.ts","sourceRoot":"","sources":["popover.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAM9C,QAAA,MAAM,OAAO,UAAW,YAAY,wDA+LnC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"popover.d.ts","sourceRoot":"","sources":["popover.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAM9C,QAAA,MAAM,OAAO,UAAW,YAAY,wDAsMnC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/esm/popover/popover.js

@@ -39,7 +39,8 @@ var Popover = function Popover(props) {
     _props$zIndex = props.zIndex,
     zIndex = _props$zIndex === void 0 ? 1060 : _props$zIndex;
   var _React$useRef = React.useRef({
-      rendered: false
+      rendered: false,
+      hasOpened: false
     }),
     context = _React$useRef.current;
   var config = useConfig();
@@ -153,8 +154,16 @@ var Popover = function Popover(props) {
     });
   }
   context.rendered = true;
-  var childrened = util.isFunc(children) ? children(closePop) : children;
+
+  // Track if popover has ever been opened
+  if (open && !context.hasOpened) {
+    context.hasOpened = true;
+  }
+
+  // Only execute functional children after popover has been opened at least once
+  var childrened = util.isFunc(children) ? context.hasOpened ? children(closePop) : null : children;
   var containerStyle = {
+    display: open ? undefined : 'none',
     borderColor: props.border,
     backgroundColor: props.background
   };

package/esm/radio/group-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"group-context.d.ts","sourceRoot":"","sources":["group-context.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,QAAA,MAAM,YAAY,qCAAgC,CAAC;AAEnD,eAAe,YAAY,CAAC"}
+{"version":3,"file":"group-context.d.ts","sourceRoot":"","sources":["group-context.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,QAAA,MAAM,YAAY,qCAAgC,CAAC;AAInD,eAAe,YAAY,CAAC"}

package/esm/radio/group-context.js

@@ -2,4 +2,5 @@
 
 import { createContext } from 'react';
 var groupContext = /*#__PURE__*/createContext({});
+groupContext.displayName = 'RadioGroupContext';
 export default groupContext;

package/esm/radio/radio-group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"radio-group.d.ts","sourceRoot":"","sources":["radio-group.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAarD,QAAA,MAAM,KAAK,wGA+HV,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"radio-group.d.ts","sourceRoot":"","sources":["radio-group.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAarD,QAAA,MAAM,KAAK,wGAgIV,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/esm/radio/radio-group.js

@@ -14,7 +14,6 @@ import Button from "../button/button";
 import { FormFieldContext } from "../form/form-field-context";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 var defaultFormat = function defaultFormat(d) {
   return d;
 };
@@ -116,7 +115,11 @@ var Group = function Group(props0) {
   var Radios = props.data === undefined ? /*#__PURE__*/_jsx(GroupContext.Provider, {
     value: providerValue,
     children: children
-  }) : /*#__PURE__*/_jsxs(_Fragment, {
+  }) :
+  /*#__PURE__*/
+  // 传一个空的providerValue目的是为了避免父级Radio向下传递的GroupContext.Consumer影响
+  _jsxs(GroupContext.Provider, {
+    value: {},
     children: [props.data.map(function (d, i) {
       return /*#__PURE__*/_jsx(Radio, {
         jssStyle: jssStyle,

package/esm/radio/simple-radio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simple-radio.d.ts","sourceRoot":"","sources":["simple-radio.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhD,QAAA,MAAM,KAAK,UAAW,gBAAgB,4CAoDrC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"simple-radio.d.ts","sourceRoot":"","sources":["simple-radio.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhD,QAAA,MAAM,KAAK,UAAW,gBAAgB,4CAqDrC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/esm/radio/simple-radio.js

@@ -37,7 +37,8 @@ var Radio = function Radio(props) {
   var inputProps = getInputProps();
   var rootProps = getRootProps({
     className: rootClass,
-    style: style
+    style: style,
+    needStopPropagation: true
   });
   var indicatorProps = getIndicatorProps();
   var simpleRadio = /*#__PURE__*/_jsxs("div", _objectSpread(_objectSpread({