forgetest5
/
bee-table7
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

嵌套子表格的图标改为css，向下兼容

This commit is contained in:
yangchch6 2019-05-13 19:02:23 +08:00
parent 81f3a77733
commit de28af8e5c
14 changed files with 19676 additions and 4930 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/ExpandIcon.js
View File

@ -16,10 +16,6 @@ var _shallowequal = require('shallowequal');
var _shallowequal2 = _interopRequireDefault(_shallowequal);
var _beeIcon = require('bee-icon');
var _beeIcon2 = _interopRequireDefault(_beeIcon);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
function _defaults(obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }
@ -66,10 +62,8 @@ var ExpandIcon = function (_Component) {
if (expandable && !isHiddenExpandIcon) {
var expandClassName = expanded ? 'expanded' : 'collapsed';
var currentIcon = _react2["default"].createElement(_beeIcon2["default"], {
className: clsPrefix + '-expand-icon ' + clsPrefix + '-' + expandClassName,
type: expanded ? 'uf-triangle-down' : 'uf-triangle-right'
var currentIcon = _react2["default"].createElement('span', {
className: clsPrefix + '-expand-icon ' + clsPrefix + '-' + expandClassName
});
if (expanded && expandedIcon) {
currentIcon = expandedIcon;

6
build/Table.css
View File

@ -328,6 +328,12 @@
visibility: hidden; }
.u-table-row-spaced:after, .u-table-expanded-row-spaced:after {
content: "."; }
.u-table-row-expanded:after:after, .u-table-expanded-row-expanded:after:after {
content: "\e639";
font-family: "uf" !important; }
.u-table-row-collapsed:after, .u-table-expanded-row-collapsed:after {
content: "\e61c";
font-family: "uf" !important; }
.u-table-row.selected {
background: #FFF7E7; }
.u-table tr.u-table-expanded-row {

13
build/Table.js
View File

@ -452,13 +452,14 @@ var Table = function (_Component) {
this.bodyTable.style.overflowY = overflowy;
this.refs.headTable.style.overflowY = overflowy;
// 没有纵向滚动条时，表头横向滚动条根据内容动态显示
if (overflowy == 'auto') {
this.refs.fixedHeadTable && (this.refs.fixedHeadTable.style.overflowX = 'auto');
rightBodyTable && (rightBodyTable.style.overflowX = 'auto');
leftBodyTable && (leftBodyTable.style.overflowX = 'auto');
}
rightBodyTable && (rightBodyTable.style.overflowY = overflowy);
// 没有纵向滚动条时，表头横向滚动条根据内容动态显示 待验证
// if(overflowy == 'auto'){
// this.refs.fixedHeadTable && (this.refs.fixedHeadTable.style.overflowX = 'auto');
// rightBodyTable && (rightBodyTable.style.overflowX = 'auto');
// leftBodyTable && (leftBodyTable.style.overflowX = 'auto');
// }
}
};

6
dist/demo.css vendored
View File

@ -317,6 +317,12 @@
visibility: hidden; }
.u-table-row-spaced:after, .u-table-expanded-row-spaced:after {
content: "."; }
.u-table-row-expanded:after, .u-table-expanded-row-expanded:after {
content: "\e639";
font-family: "uf" !important; }
.u-table-row-collapsed:after, .u-table-expanded-row-collapsed:after {
content: "\e61c";
font-family: "uf" !important; }
.u-table-row.selected {
background: #FFF7E7; }
.u-table tr.u-table-expanded-row {

2
dist/demo.css.map vendored
View File

File diff suppressed because one or more lines are too long

23960
dist/demo.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

5
src/ExpandIcon.js
View File

@ -1,7 +1,6 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import shallowequal from 'shallowequal';
import Icon from 'bee-icon';
const propTypes = {
record: PropTypes.object,
@ -23,10 +22,8 @@ class ExpandIcon extends Component{
const { expandable, clsPrefix, onExpand, needIndentSpaced, expanded, record, isHiddenExpandIcon,expandedIcon,collapsedIcon } = this.props;
if (expandable && !isHiddenExpandIcon) {
const expandClassName = expanded ? 'expanded' : 'collapsed';
let currentIcon = <Icon
let currentIcon = <span
className={`${clsPrefix}-expand-icon ${clsPrefix}-${expandClassName}`}
type={expanded ? 'uf-triangle-down' : 'uf-triangle-right'}
/>;
if(expanded && expandedIcon){
currentIcon = expandedIcon;

12
src/Table.scss
View File

@ -295,6 +295,18 @@ $icon-color:#505F79;
&-spaced:after {
content: ".";
}
&-expanded:after {
&:after {
content: "\e639";
font-family: "uf" !important;
}
}
&-collapsed {
&:after {
content: "\e61c";
font-family: "uf" !important;
}
}
}
&-row{
&.selected{