shineout 3.9.0-beta.30 → 3.9.0-beta.31

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.0-beta.30'
+  version: '3.9.0-beta.31'
 };

package/dist/shineout.js

@@ -12400,7 +12400,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.0-beta.30');
+/* harmony default export */ var version = ('3.9.0-beta.31');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -66098,7 +66098,7 @@ var thead_toNum = toNum;
       dir: config.direction
     });
   };
-  var getFixedStyle = function getFixedStyle(fixed, index, level) {
+  var getFixedStyle = function getFixedStyle(fixed, index, colSpan, level) {
     // 累加level 至 0 的所有高度
     var top = context.trHeights.slice(0, level).reduce(function (a, b) {
       return thead_toNum(a) + thead_toNum(b);
@@ -66114,7 +66114,7 @@ var thead_toNum = toNum;
       };
     }
     if (fixed === 'right') {
-      var right = colgroup.slice(index + 1).reduce(function (a, b) {
+      var right = colgroup.slice(index + (typeof colSpan === 'function' ? 1 : colSpan)).reduce(function (a, b) {
         return thead_toNum(a) + thead_toNum(b);
       }, 0);
       return {
@@ -66132,7 +66132,7 @@ var thead_toNum = toNum;
     var _colTemp2$groupProps, _colTemp2$groupProps2;
     var colTemp = col;
     var colTemp2 = col;
-    var fixedStyle = getFixedStyle(col.fixed, col.index, level);
+    var fixedStyle = getFixedStyle(col.fixed, col.index, colTemp2.colSpan || 1, level);
     var cellClassName = classnames_default()(colTemp.className, colTemp.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), colTemp.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), colTemp.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), colTemp.align !== 'right' && colTemp.align !== 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignLeft), (col.lastFixed || col.firstFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), isLast && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), colTemp.sorter && props.cellSortable && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellSortable));
     var isExpand = colTemp.type === 'expand' || colTemp.type === 'row-expand';
     if (colTemp.title !== undefined || isExpand) {
@@ -74294,7 +74294,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.0-beta.30'
+  version: '3.9.0-beta.31'
 });
 }();
 /******/ 	return __webpack_exports__;