fix: 合计和固定列错位[#540]

tinper-bee · Jul 22, 2020 · f3541df · f3541df
1 parent ecf0664
commit f3541df
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 39 deletions.
diff --git a/build/Table.js b/build/Table.js
@@ -1304,7 +1304,7 @@ var Table = function (_Component) {
     }
     // const leftFixedWidth = this.columnManager.getLeftColumnsWidth(this.contentWidth);
     // const rightFixedWidth = this.columnManager.getRightColumnsWidth(this.contentWidth);
-    var expandIconWidth = expandIconAsCell ? 33 : 0;
+    var expandIconWidth = expandIconAsCell ? 32 : 0;
     var parStyle = {};
     if (!fixed) {
       parStyle = { 'marginLeft': leftFixedWidth + expandIconWidth, 'marginRight': rightFixedWidth };

diff --git a/build/TableRow.js b/build/TableRow.js
@@ -603,8 +603,8 @@ var TableRow = function (_Component) {
       expandIndexInThisTable = expandIconColumnIndex;
     }
     for (var i = 0; i < columns.length; i++) {
-      if (expandIconAsCell && i === 0 && !showSum) {
-        cells.push(_react2["default"].createElement(
+      if (expandIconAsCell && i === 0) {
+        showSum ? cells.push(_react2["default"].createElement('td', { width: expandIconCellWidth })) : cells.push(_react2["default"].createElement(
           'td',
           {
             className: clsPrefix + '-expand-icon-cell ' + isExpandIconAsCell,

diff --git a/demo/index.js b/demo/index.js
diff --git a/dist/demo.js b/dist/demo.js
diff --git a/dist/demo.js.map b/dist/demo.js.map
diff --git a/src/Table.js b/src/Table.js
@@ -1127,7 +1127,7 @@ class Table extends Component {
     }
     // const leftFixedWidth = this.columnManager.getLeftColumnsWidth(this.contentWidth);
     // const rightFixedWidth = this.columnManager.getRightColumnsWidth(this.contentWidth);
-    let expandIconWidth = expandIconAsCell ? 33 : 0;
+    let expandIconWidth = expandIconAsCell ? 32 : 0;
     let parStyle = {}
     if(!fixed){
       parStyle = {'marginLeft':leftFixedWidth + expandIconWidth,'marginRight':rightFixedWidth}

diff --git a/src/TableRow.js b/src/TableRow.js
@@ -481,7 +481,8 @@ class TableRow extends Component{
       expandIndexInThisTable = expandIconColumnIndex
     }
     for (let i = 0; i < columns.length; i++) {
-      if (expandIconAsCell && i === 0 && !showSum ) {
+      if (expandIconAsCell && i === 0) {
+        showSum ? cells.push(<td width={expandIconCellWidth}></td>) :
         cells.push(
           <td
             className={`${clsPrefix}-expand-icon-cell ${isExpandIconAsCell}`}