shineout 3.9.3-beta.1 → 3.9.3-beta.3

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.9.3-beta.1'
+  version: '3.9.3-beta.3'
 };

package/dist/shineout.js

@@ -12402,7 +12402,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.9.3-beta.1');
+/* harmony default export */ var version = ('3.9.3-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -24114,7 +24114,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
       fontSize: src.selectSmallFontSize
     },
     '& $optionGroupTitle': {
-      padding: "".concat(src.selectGroupTitleSmallTop, " ").concat(src.selectGroupTitlePaddingX, " 0 ").concat(src.selectGroupTitlePaddingX)
+      padding: "calc(".concat(src.selectFontSize, " - 10px) ").concat(src.selectGroupTitlePaddingX, " 0 ").concat(src.selectGroupTitlePaddingX)
     }
   },
   pickerLarge: {
@@ -24126,7 +24126,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
       fontSize: src.selectLargeFontSize
     },
     '& $optionGroupTitle': {
-      padding: "".concat(src.selectGroupTitleLargeTop, " ").concat(src.selectGroupTitlePaddingX, " ").concat(src.selectGroupTitleLargeBottom, " ").concat(src.selectGroupTitlePaddingX)
+      padding: "calc(".concat(src.selectFontSize, " + 2px) ").concat(src.selectGroupTitlePaddingX, " ").concat(src.selectGroupTitleLargeBottom, " ").concat(src.selectGroupTitlePaddingX)
     }
   },
   iconWrapper: {
@@ -24343,7 +24343,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
   optionGroupTitle: {
     fontSize: src.selectGroupTitleFontSize,
     lineHeight: src.lineHeightDynamic,
-    padding: "calc(".concat(src.selectGroupTitleFontSize, " - 4px) ").concat(src.selectGroupTitlePaddingX, " ").concat(src.selectGroupTitlePaddingBottom, " ").concat(src.selectGroupTitlePaddingX),
+    padding: "calc(".concat(src.selectFontSize, " - 4px) ").concat(src.selectGroupTitlePaddingX, " ").concat(src.selectGroupTitlePaddingBottom, " ").concat(src.selectGroupTitlePaddingX),
     color: src.selectGroupTitleFontColor,
     fontWeight: src.selectGroupTitleFontWeight
   },
@@ -64429,6 +64429,10 @@ var scroll_table_Scroll = function Scroll(props) {
   });
 };
 /* harmony default export */ var scroll_table = (scroll_table_Scroll);
+;// CONCATENATED MODULE: ../hooks/src/components/use-table/table-nested-context.tsx
+
+var TableContext = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createContext)({});
+/* harmony default export */ var table_nested_context = (TableContext);
 ;// CONCATENATED MODULE: ../hooks/src/common/use-scrollbar-width/index.ts
 
 
@@ -67101,6 +67105,7 @@ var Tr = function Tr(props) {
     if (expandCol && typeof expandCol.render === 'function') {
       var renderFunc = expandCol.render(props.rawData, props.rowIndex);
       if (typeof renderFunc === 'function') {
+        var _props$scrollRef;
         return /*#__PURE__*/(0,jsx_runtime.jsx)("tr", {
           className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowExpand,
           ref: expandRef,
@@ -67111,7 +67116,12 @@ var Tr = function Tr(props) {
             style: {
               padding: 0
             },
-            children: renderFunc()
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)(table_nested_context.Provider, {
+              value: {
+                parentTableWidth: (_props$scrollRef = props.scrollRef) === null || _props$scrollRef === void 0 || (_props$scrollRef = _props$scrollRef.current) === null || _props$scrollRef === void 0 ? void 0 : _props$scrollRef.clientWidth
+              },
+              children: renderFunc()
+            })
           })
         });
       }
@@ -67266,6 +67276,7 @@ var Tr = function Tr(props) {
       rowEvents: props.rowEvents,
       disabled: props.datum.disabledCheck(item),
       bodyScrollWidth: props.bodyScrollWidth,
+      scrollRef: props.scrollRef,
       resizeFlag: props.resizeFlag,
       treeCheckAll: props.treeCheckAll,
       onCellClick: props.onCellClick,
@@ -67442,6 +67453,7 @@ function Table(props) {
     _props$pagination = props.pagination,
     pagination = _props$pagination === void 0 ? {} : _props$pagination;
   var config = useConfig();
+  var nestedContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(table_nested_context);
   var isRtl = config.direction === 'rtl';
   var tableClasses = props === null || props === void 0 || (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$table = _props$jssStyle.table) === null || _props$jssStyle$table === void 0 ? void 0 : _props$jssStyle$table.call(_props$jssStyle);
   var tbodyRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
@@ -67802,7 +67814,8 @@ function Table(props) {
       resizeFlag: resizeFlag,
       treeCheckAll: props.treeCheckAll,
       onCellClick: props.onCellClick,
-      strictRowHeight: props.strictRowHeight
+      strictRowHeight: props.strictRowHeight,
+      scrollRef: scrollRef
     };
     var headCommonProps = {
       disabled: props.disabled,
@@ -68084,6 +68097,19 @@ function Table(props) {
       scrollElRef: scrollRef
     };
   }, [scrollRef]);
+  var tableWrapperStyle = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    if (nestedContext.parentTableWidth && props.width) {
+      return objectSpread2_default()({
+        width: nestedContext.parentTableWidth,
+        position: 'sticky',
+        left: 0,
+        height: defaultHeight
+      }, props.style);
+    }
+    return objectSpread2_default()({
+      height: defaultHeight
+    }, props.style);
+  }, [nestedContext.parentTableWidth, defaultHeight, props.style, props.width]);
   var tableWrapperClass = classnames_default()(props.className, tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rootClass, tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.wrapper, props.bordered && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.bordered), verticalAlign === 'top' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.verticalAlignTop), verticalAlign === 'middle' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.verticalAlignMiddle), size === 'small' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.small), size === 'large' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.large), size === 'default' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.default));
   if (!props.columns || columns.length === 0) return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
     className: classnames_default()(tableWrapperClass, tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.simple, props.striped && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.striped)),
@@ -68099,9 +68125,7 @@ function Table(props) {
   return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({
       className: classnames_default()(tableWrapperClass, defineProperty_default()(defineProperty_default()(defineProperty_default()({}, tableClasses.sticky, props.sticky), tableClasses.floatLeft, floatLeft), tableClasses.floatRight, floatRight)),
-      style: objectSpread2_default()({
-        height: defaultHeight
-      }, props.style)
+      style: tableWrapperStyle
     }, selection.getTableProps()), {}, {
       ref: tableRef,
       dir: config.direction,
@@ -74634,7 +74658,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.3-beta.1'
+  version: '3.9.3-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;