@bit-sun/business-component 2.1.13 → 2.1.15

package/dist/index.esm.js

@@ -14234,7 +14234,7 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
       var columnConfig = _this.getConfigFromlocalstorage();
 
       var initialDataSourceData = columnConfig.length ? datasource.map(function (item) {
-        var _showColumnItem$, _inner$;
+        var _inner$, _showColumnItem$, _inner$2;
 
         var inner = columnConfig.filter(function (innerItem) {
           return innerItem.dataIndex && innerItem.dataIndex === item.dataIndex || innerItem.key && innerItem.key === item.key;
@@ -14243,8 +14243,9 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
           return inneritem.dataIndex && inneritem.dataIndex === item.dataIndex || inneritem.key && inneritem.key === item.key;
         });
         return _objectSpread2(_objectSpread2({}, item), {}, {
+          fixed: inner.length ? (_inner$ = inner[0]) === null || _inner$ === void 0 ? void 0 : _inner$.fixed : item === null || item === void 0 ? void 0 : item.fixed,
           key: item.key || item.dataIndex,
-          width: ((_showColumnItem$ = showColumnItem[0]) === null || _showColumnItem$ === void 0 ? void 0 : _showColumnItem$.width) || ((_inner$ = inner[0]) === null || _inner$ === void 0 ? void 0 : _inner$.width) || item.width,
+          width: ((_showColumnItem$ = showColumnItem[0]) === null || _showColumnItem$ === void 0 ? void 0 : _showColumnItem$.width) || ((_inner$2 = inner[0]) === null || _inner$2 === void 0 ? void 0 : _inner$2.width) || item.width,
           hidden: columnConfig.length && !inner.length
         });
       }) : _toConsumableArray(datasource);
@@ -14979,7 +14980,7 @@ var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
         fixed: true
       }, /*#__PURE__*/React.createElement(Table.Summary.Row, null, _toConsumableArray(summaryRow).map(function (item, index) {
         return /*#__PURE__*/React.createElement(Table.Summary.Cell, {
-          index: rowSelection ? index : index - 1
+          index: index
         }, /*#__PURE__*/React.createElement(Text, {
           type: "danger"
         }, summaryInitial.filter(function (inner) {
@@ -15267,7 +15268,7 @@ var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
         fixed: true
       }, /*#__PURE__*/React.createElement(Table.Summary.Row, null, _toConsumableArray(summaryRow).map(function (item, index) {
         return /*#__PURE__*/React.createElement(Table.Summary.Cell, {
-          index: rowSelection ? index : index - 1
+          index: index
         }, /*#__PURE__*/React.createElement(Text$1, {
           type: "danger"
         }, summaryInitial.filter(function (inner) {
@@ -21267,25 +21268,13 @@ var index$7 = /*#__PURE__*/forwardRef(function (props, ref) {
         colSpan: innerItem && innerItem.rowSpan
       }, innerItem && innerItem.title);
     }));
-  }))), /*#__PURE__*/React.createElement("div", {
-    style: {
-      position: 'absolute',
-      left: "".concat(config.colHeaderWidth, "px"),
-      minWidth: rightAreaWidth,
-      zIndex: 0,
-      top: 0
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      position: 'relative'
-    }
-  }, /*#__PURE__*/React.createElement("table", {
+  }))), /*#__PURE__*/React.createElement("table", {
     className: " ".concat('editTable__block', " ", 'table_border_style'),
     style: {
       width: '100%',
       top: 0,
       left: "".concat(config.colHeaderWidth, "px"),
-      position: 'sticky',
+      position: 'absolute',
       display: config.tableType === 'col-header-table' ? 'none' : ''
     }
   }, /*#__PURE__*/React.createElement("colgroup", null, config.rowLastData.map(function (row) {
@@ -21307,7 +21296,15 @@ var index$7 = /*#__PURE__*/forwardRef(function (props, ref) {
         colSpan: innerItem && innerItem.colSpan
       }, innerItem && innerItem.title);
     }));
-  })))), /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      position: 'absolute',
+      left: "".concat(config.colHeaderWidth, "px"),
+      top: "".concat(config.colHeaderToTop, "px"),
+      minWidth: rightAreaWidth,
+      zIndex: 0
+    }
+  }, /*#__PURE__*/React.createElement("div", {
     style: {
       width: '100%',
       position: 'relative'

package/dist/index.js

@@ -14248,7 +14248,7 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
       var columnConfig = _this.getConfigFromlocalstorage();
 
       var initialDataSourceData = columnConfig.length ? datasource.map(function (item) {
-        var _showColumnItem$, _inner$;
+        var _inner$, _showColumnItem$, _inner$2;
 
         var inner = columnConfig.filter(function (innerItem) {
           return innerItem.dataIndex && innerItem.dataIndex === item.dataIndex || innerItem.key && innerItem.key === item.key;
@@ -14257,8 +14257,9 @@ var SortableTable = /*#__PURE__*/function (_React$Component) {
           return inneritem.dataIndex && inneritem.dataIndex === item.dataIndex || inneritem.key && inneritem.key === item.key;
         });
         return _objectSpread2(_objectSpread2({}, item), {}, {
+          fixed: inner.length ? (_inner$ = inner[0]) === null || _inner$ === void 0 ? void 0 : _inner$.fixed : item === null || item === void 0 ? void 0 : item.fixed,
           key: item.key || item.dataIndex,
-          width: ((_showColumnItem$ = showColumnItem[0]) === null || _showColumnItem$ === void 0 ? void 0 : _showColumnItem$.width) || ((_inner$ = inner[0]) === null || _inner$ === void 0 ? void 0 : _inner$.width) || item.width,
+          width: ((_showColumnItem$ = showColumnItem[0]) === null || _showColumnItem$ === void 0 ? void 0 : _showColumnItem$.width) || ((_inner$2 = inner[0]) === null || _inner$2 === void 0 ? void 0 : _inner$2.width) || item.width,
           hidden: columnConfig.length && !inner.length
         });
       }) : _toConsumableArray(datasource);
@@ -14993,7 +14994,7 @@ var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
         fixed: true
       }, /*#__PURE__*/React__default['default'].createElement(antd.Table.Summary.Row, null, _toConsumableArray(summaryRow).map(function (item, index) {
         return /*#__PURE__*/React__default['default'].createElement(antd.Table.Summary.Cell, {
-          index: rowSelection ? index : index - 1
+          index: index
         }, /*#__PURE__*/React__default['default'].createElement(Text, {
           type: "danger"
         }, summaryInitial.filter(function (inner) {
@@ -15281,7 +15282,7 @@ var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
         fixed: true
       }, /*#__PURE__*/React__default['default'].createElement(antd.Table.Summary.Row, null, _toConsumableArray(summaryRow).map(function (item, index) {
         return /*#__PURE__*/React__default['default'].createElement(antd.Table.Summary.Cell, {
-          index: rowSelection ? index : index - 1
+          index: index
         }, /*#__PURE__*/React__default['default'].createElement(Text$1, {
           type: "danger"
         }, summaryInitial.filter(function (inner) {
@@ -21281,25 +21282,13 @@ var index$7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
         colSpan: innerItem && innerItem.rowSpan
       }, innerItem && innerItem.title);
     }));
-  }))), /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
-      position: 'absolute',
-      left: "".concat(config.colHeaderWidth, "px"),
-      minWidth: rightAreaWidth,
-      zIndex: 0,
-      top: 0
-    }
-  }, /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
-      position: 'relative'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement("table", {
+  }))), /*#__PURE__*/React__default['default'].createElement("table", {
     className: " ".concat('editTable__block', " ", 'table_border_style'),
     style: {
       width: '100%',
       top: 0,
       left: "".concat(config.colHeaderWidth, "px"),
-      position: 'sticky',
+      position: 'absolute',
       display: config.tableType === 'col-header-table' ? 'none' : ''
     }
   }, /*#__PURE__*/React__default['default'].createElement("colgroup", null, config.rowLastData.map(function (row) {
@@ -21321,7 +21310,15 @@ var index$7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
         colSpan: innerItem && innerItem.colSpan
       }, innerItem && innerItem.title);
     }));
-  })))), /*#__PURE__*/React__default['default'].createElement("div", {
+  }))), /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      position: 'absolute',
+      left: "".concat(config.colHeaderWidth, "px"),
+      top: "".concat(config.colHeaderToTop, "px"),
+      minWidth: rightAreaWidth,
+      zIndex: 0
+    }
+  }, /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       width: '100%',
       position: 'relative'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.1.13",
+  "version": "2.1.15",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/columnSettingTable/columnSetting.tsx

@@ -119,6 +119,7 @@ class SortableTable extends React.Component<SortTableProps> {
       let showColumnItem = showColumns.filter((inneritem:any) => ((inneritem.dataIndex && inneritem.dataIndex === item.dataIndex) || (inneritem.key && inneritem.key === item.key)))
       return {
         ...item,
+        fixed: inner.length ? inner[0]?.fixed : item?.fixed,
         key: item.key || item.dataIndex,
         width: showColumnItem[0]?.width || inner[0]?.width || item.width,
         hidden: columnConfig.length && !inner.length,

package/src/components/Business/columnSettingTable/index.tsx

@@ -77,7 +77,7 @@ export default class ColumnSettingTable extends React.Component {
         {
           [...summaryRow].map((item: any, index: number) => {
             return (
-              <Table.Summary.Cell index={rowSelection ? index : index - 1}>
+              <Table.Summary.Cell index={index}>
                 <Text type="danger">
                   {
                     summaryInitial.filter((inner: any) => inner.key === item.dataIndex || inner.key === item.key).length ?

package/src/components/Business/columnSettingTable/sulaSettingTable.tsx

@@ -83,7 +83,7 @@ export default class ColumnSettingSulaTable extends React.Component {
         {
           [...summaryRow].map((item: any, index: number) => {
             return (
-              <Table.Summary.Cell index={rowSelection ? index : index - 1}>
+              <Table.Summary.Cell index={index}>
                 <Text type="danger">
                   {
                     summaryInitial.filter((inner: any) => inner.key === item.dataIndex || inner.key === item.key).length ?

package/src/components/Business/moreTreeTable/index.tsx

@@ -163,67 +163,67 @@ export default forwardRef((props, ref) => {
             })}
           </tbody>
         </table>
-       
+        <table 
+          className={` ${'editTable__block'} ${'table_border_style'}`}
+          style={{
+            width: '100%',
+            top: 0,
+            left: `${config.colHeaderWidth}px`,
+            position: 'absolute',
+            display: config.tableType === 'col-header-table' ? 'none' : ''
+          }}
+        >
+          <colgroup>
+            {
+              config.rowLastData.map(row => {
+                return (<col width={row.width ? `${row.width}px` : '100px'} />)
+              })
+            }
+          </colgroup>
+          <tbody>
+            {
+              config.rowHeader.map((item) => {
+                return (
+                  <tr>
+                    {
+                      item.map((innerItem) => {
+                        if (!innerItem) return null;
+                        return (
+                          <td
+                            style={{
+                              height: '40px',
+                              background: '#f7f8fb',
+                              color: '#000000',
+                              fontWeight: 500,
+                              width: innerItem.width ? `${innerItem.width}px` : '100px',
+                            }}
+                            rowSpan={innerItem && innerItem.rowSpan}
+                            colSpan={innerItem && innerItem.colSpan}
+                          >
+                            {innerItem && innerItem.title}
+                          </td>
+                        )
+                      })
+                    }
+                  </tr>
+                )
+              })
+            }
+          </tbody>
+      </table>
         <div
           style={{
             position: 'absolute',
             left: `${config.colHeaderWidth}px`,
+            top: `${config.colHeaderToTop}px`, 
             minWidth: rightAreaWidth,
             zIndex: 0,
-            top: 0
           }}
         >
           {/* --------------------------------------横向表头---------------------------------------- */}
-          <div style={{position: 'relative'}}>
-            <table 
-              className={` ${'editTable__block'} ${'table_border_style'}`}
-              style={{
-                width: '100%',
-                top: 0, 
-                left: `${config.colHeaderWidth}px`,
-                position: 'sticky',
-                display: config.tableType === 'col-header-table' ? 'none' : ''
-              }}
-            >
-              <colgroup>
-                {
-                  config.rowLastData.map(row => {
-                    return (<col width={row.width ? `${row.width}px` : '100px'} />)
-                  })
-                }
-              </colgroup>
-              <tbody>
-                {
-                  config.rowHeader.map((item) => {
-                    return (
-                      <tr>
-                        {
-                          item.map((innerItem) => {
-                            if (!innerItem) return null;
-                            return (
-                              <td
-                                style={{
-                                  height: '40px',
-                                  background: '#f7f8fb',
-                                  color: '#000000',
-                                  fontWeight: 500,
-                                  width: innerItem.width ? `${innerItem.width}px` : '100px',
-                                }}
-                                rowSpan={innerItem && innerItem.rowSpan}
-                                colSpan={innerItem && innerItem.colSpan}
-                              >
-                                {innerItem && innerItem.title}
-                              </td>
-                            )
-                          })
-                        }
-                      </tr>
-                    )
-                  })
-                }
-              </tbody>
-            </table>
-          </div>
+          {/* <div style={{position: 'relative'}}>
+            
+          </div> */}
           <div 
             style={{
               width: '100%',