diff --git a/build/Table.css b/build/Table.css
index 1f299d9..7470f9a 100644
--- a/build/Table.css
+++ b/build/Table.css
@@ -218,6 +218,15 @@
color: #1565c0; }
.u-table tr tr a:active {
color: #1565c0; }
+ .u-table tr td.u-table-multiSelect-column.u-table-row-has-expandIcon:not(.u-table-row-fixed-columns-in-body) {
+ display: flex;
+ flex-direction: row-reverse; }
+ .u-table tr td.u-table-multiSelect-column.u-table-row-has-expandIcon:not(.u-table-row-fixed-columns-in-body) .expand-icon-con {
+ height: 15px; }
+ .u-table tr td.u-table-multiSelect-column.u-table-row-has-expandIcon:not(.u-table-row-fixed-columns-in-body) .expand-icon-con .uf {
+ padding-left: 0; }
+ .u-table tr td.u-table-multiSelect-column.u-table-row-has-expandIcon:not(.u-table-row-fixed-columns-in-body) .expand-icon-con .u-table-row-expand-icon {
+ width: 0; }
.u-table tr.tr-row-hover {
background: rgb(235, 236, 240); }
.u-table th,
diff --git a/build/TableCell.js b/build/TableCell.js
index eb3c3bb..e517d1f 100644
--- a/build/TableCell.js
+++ b/build/TableCell.js
@@ -119,6 +119,9 @@ var TableCell = function (_Component) {
if (typeof text == 'string' && bodyDisplayInRow) {
title = text;
}
+ if (expandIcon && expandIcon.props.expandable) {
+ className = className + (' ' + clsPrefix + '-has-expandIcon');
+ }
return _react2["default"].createElement(
'td',
{
diff --git a/build/TableHeader.js b/build/TableHeader.js
index 9404273..b5c01a3 100644
--- a/build/TableHeader.js
+++ b/build/TableHeader.js
@@ -307,7 +307,7 @@ var TableHeader = function (_Component) {
if (!currentIndex || parseInt(currentIndex) === _this.drag.currIndex) return;
if (target.nodeName.toUpperCase() === "TH") {
// target.style.border = "2px dashed rgba(5,0,0,0.25)";
- target.setAttribute("style", "border-right:2px dashed rgba(5,0,0,0.25)");
+ target.setAttribute("style", "border-right:2px dashed rgb(30, 136, 229)");
// target.style.backgroundColor = 'rgb(235, 236, 240)';
}
};
@@ -515,7 +515,7 @@ var TableHeader = function (_Component) {
table.cols = tableDome.getElementsByTagName("col");
table.ths = tableDome.getElementsByTagName("th");
table.tr = tableDome.getElementsByTagName("tr");
- table.tableBodyCols = contentTable.querySelector('.u-table-scroll .u-table-body').getElementsByTagName("col");
+ table.tableBodyCols = contentTable.querySelector('.u-table-scroll .u-table-body') && contentTable.querySelector('.u-table-scroll .u-table-body').getElementsByTagName("col");
}
table.fixedLeftHeaderTable = contentTable.querySelector('.u-table-fixed-left .u-table-header');
diff --git a/build/TableRow.js b/build/TableRow.js
index fd74f6c..707e8c8 100644
--- a/build/TableRow.js
+++ b/build/TableRow.js
@@ -252,7 +252,7 @@ var TableRow = function (_Component) {
}
}
if (type) {
- currentObj && currentObj.setAttribute("style", "border-bottom:2px dashed rgba(5,0,0,0.25)");
+ currentObj && currentObj.setAttribute("style", "border-bottom:2px dashed rgb(30, 136, 229)");
} else {
currentObj && currentObj.setAttribute("style", "");
}
diff --git a/build/lib/multiSelect.js b/build/lib/multiSelect.js
index 586b43c..b39eeaa 100644
--- a/build/lib/multiSelect.js
+++ b/build/lib/multiSelect.js
@@ -214,6 +214,7 @@ function multiSelect(Table, Checkbox) {
});
var _defaultColumns = [{
+ className: 'u-table-multiSelect-column',
title: _react2["default"].createElement(Checkbox, _extends({
className: "table-checkbox"
}, checkAttr, {
diff --git a/demo/demolist/Demo1101.js b/demo/demolist/Demo1101.js
index 97c8bea..ee747f6 100644
--- a/demo/demolist/Demo1101.js
+++ b/demo/demolist/Demo1101.js
@@ -9,8 +9,7 @@
import React, { Component } from "react";
import { Popconfirm,Icon } from 'tinper-bee';
import Table from "../../src";
-import dragColumn from '../../src/lib/dragColumn';
-const DragColumnTable = dragColumn(Table);
+
const columns16 = [
{
title: "操作",
@@ -60,7 +59,6 @@ const data16 = [
{ a: "NU0391003", b: "2019-05-03", c: "zz供应商", d: "操作", key: "3" }
];
-
class Demo16 extends Component {
constructor(props){
super(props);
@@ -111,14 +109,13 @@ class Demo16 extends Component {
}
render() {
return (
-
{ title }
\n{ desc }
\n 查看源码 \n\n { code }
\n
\n {!!scss_code ?\n { scss_code }
\n
: null }\n