1、链接文字改为蓝色 2、输入框高度统一为26px,字号统一为12px
This commit is contained in:
parent
554c1ca568
commit
0f5eea9a37
|
@ -187,7 +187,7 @@
|
||||||
.u-table td {
|
.u-table td {
|
||||||
border-bottom: 1px solid rgb(233,233,233); }
|
border-bottom: 1px solid rgb(233,233,233); }
|
||||||
.u-table td a {
|
.u-table td a {
|
||||||
color: rgb(245, 60, 50); }
|
color: #2196F3; }
|
||||||
.u-table td a:hover {
|
.u-table td a:hover {
|
||||||
color: rgb(230, 0, 18); }
|
color: rgb(230, 0, 18); }
|
||||||
.u-table td a:active {
|
.u-table td a:active {
|
||||||
|
@ -569,7 +569,8 @@
|
||||||
display: none; }
|
display: none; }
|
||||||
|
|
||||||
.editable-cell-input-wrapper .u-input-group .u-form-control {
|
.editable-cell-input-wrapper .u-input-group .u-form-control {
|
||||||
height: 26px; }
|
height: 26px;
|
||||||
|
font-size: 12px; }
|
||||||
|
|
||||||
.editable-cell-text-wrapper {
|
.editable-cell-text-wrapper {
|
||||||
padding: 5px 24px 5px 5px;
|
padding: 5px 24px 5px 5px;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
'use strict';
|
"use strict";
|
||||||
|
|
||||||
Object.defineProperty(exports, "__esModule", {
|
Object.defineProperty(exports, "__esModule", {
|
||||||
value: true
|
value: true
|
||||||
|
@ -8,15 +8,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
||||||
|
|
||||||
exports["default"] = multiSelect;
|
exports["default"] = multiSelect;
|
||||||
|
|
||||||
var _react = require('react');
|
var _react = require("react");
|
||||||
|
|
||||||
var _react2 = _interopRequireDefault(_react);
|
var _react2 = _interopRequireDefault(_react);
|
||||||
|
|
||||||
var _beeCheckbox = require('bee-checkbox');
|
var _util = require("./util");
|
||||||
|
|
||||||
var _beeCheckbox2 = _interopRequireDefault(_beeCheckbox);
|
|
||||||
|
|
||||||
var _util = require('./util');
|
|
||||||
|
|
||||||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
||||||
|
|
||||||
|
@ -27,6 +23,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||||
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
|
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
|
||||||
|
|
||||||
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
|
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
|
||||||
|
// import Checkbox from 'bee-checkbox';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 参数: 过滤表头
|
* 参数: 过滤表头
|
||||||
|
@ -218,7 +216,7 @@ function multiSelect(Table, Checkbox) {
|
||||||
|
|
||||||
var _defaultColumns = [{
|
var _defaultColumns = [{
|
||||||
title: _react2["default"].createElement(Checkbox, _extends({
|
title: _react2["default"].createElement(Checkbox, _extends({
|
||||||
className: 'table-checkbox'
|
className: "table-checkbox"
|
||||||
}, checkAttr, {
|
}, checkAttr, {
|
||||||
disabled: disabledCount == dataLength ? true : false,
|
disabled: disabledCount == dataLength ? true : false,
|
||||||
onChange: _this2.onAllCheckChange
|
onChange: _this2.onAllCheckChange
|
||||||
|
@ -232,7 +230,7 @@ function multiSelect(Table, Checkbox) {
|
||||||
record._disabled ? attr.disabled = record._disabled : "";
|
record._disabled ? attr.disabled = record._disabled : "";
|
||||||
return _react2["default"].createElement(Checkbox, _extends({
|
return _react2["default"].createElement(Checkbox, _extends({
|
||||||
key: index,
|
key: index,
|
||||||
className: 'table-checkbox'
|
className: "table-checkbox"
|
||||||
}, attr, {
|
}, attr, {
|
||||||
checked: record._checked,
|
checked: record._checked,
|
||||||
onClick: _this2.handleClick,
|
onClick: _this2.handleClick,
|
||||||
|
@ -244,4 +242,4 @@ function multiSelect(Table, Checkbox) {
|
||||||
};
|
};
|
||||||
}, _temp;
|
}, _temp;
|
||||||
}
|
}
|
||||||
module.exports = exports['default'];
|
module.exports = exports["default"];
|
|
@ -1,4 +1,4 @@
|
||||||
'use strict';
|
"use strict";
|
||||||
|
|
||||||
Object.defineProperty(exports, "__esModule", {
|
Object.defineProperty(exports, "__esModule", {
|
||||||
value: true
|
value: true
|
||||||
|
@ -8,15 +8,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
||||||
|
|
||||||
exports["default"] = newMultiSelect;
|
exports["default"] = newMultiSelect;
|
||||||
|
|
||||||
var _react = require('react');
|
var _react = require("react");
|
||||||
|
|
||||||
var _react2 = _interopRequireDefault(_react);
|
var _react2 = _interopRequireDefault(_react);
|
||||||
|
|
||||||
var _beeCheckbox = require('bee-checkbox');
|
var _util = require("./util");
|
||||||
|
|
||||||
var _beeCheckbox2 = _interopRequireDefault(_beeCheckbox);
|
|
||||||
|
|
||||||
var _util = require('./util');
|
|
||||||
|
|
||||||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
||||||
|
|
||||||
|
@ -27,6 +23,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||||
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
|
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
|
||||||
|
|
||||||
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
|
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
|
||||||
|
// import Checkbox from 'bee-checkbox';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 参数: 过滤表头
|
* 参数: 过滤表头
|
||||||
|
@ -166,7 +164,7 @@ function newMultiSelect(Table, Checkbox) {
|
||||||
|
|
||||||
var _defaultColumns = [{
|
var _defaultColumns = [{
|
||||||
title: _react2["default"].createElement(Checkbox, {
|
title: _react2["default"].createElement(Checkbox, {
|
||||||
className: 'table-checkbox',
|
className: "table-checkbox",
|
||||||
checked: checkedAll
|
checked: checkedAll
|
||||||
// indeterminate={indeterminate_bool && !this.state.checkedAll}
|
// indeterminate={indeterminate_bool && !this.state.checkedAll}
|
||||||
, onChange: _this2.onAllCheckChange
|
, onChange: _this2.onAllCheckChange
|
||||||
|
@ -180,7 +178,7 @@ function newMultiSelect(Table, Checkbox) {
|
||||||
record._disabled ? attr.disabled = record._disabled : "";
|
record._disabled ? attr.disabled = record._disabled : "";
|
||||||
return _react2["default"].createElement(Checkbox, _extends({
|
return _react2["default"].createElement(Checkbox, _extends({
|
||||||
key: index,
|
key: index,
|
||||||
className: 'table-checkbox'
|
className: "table-checkbox"
|
||||||
}, attr, {
|
}, attr, {
|
||||||
checked: record._checked,
|
checked: record._checked,
|
||||||
onClick: _this2.handleClick,
|
onClick: _this2.handleClick,
|
||||||
|
@ -192,4 +190,4 @@ function newMultiSelect(Table, Checkbox) {
|
||||||
};
|
};
|
||||||
}, _temp;
|
}, _temp;
|
||||||
}
|
}
|
||||||
module.exports = exports['default'];
|
module.exports = exports["default"];
|
|
@ -161,6 +161,7 @@ class Demo14 extends React.Component {
|
||||||
isclickTrigger={true}
|
isclickTrigger={true}
|
||||||
value={text}
|
value={text}
|
||||||
onChange={this.onSelectChange(index, "address")}
|
onChange={this.onSelectChange(index, "address")}
|
||||||
|
size="sm"
|
||||||
>
|
>
|
||||||
<Option value="jack">boyuzhou</Option>
|
<Option value="jack">boyuzhou</Option>
|
||||||
<Option value="lucy">renhualiu</Option>
|
<Option value="lucy">renhualiu</Option>
|
||||||
|
|
|
@ -121,6 +121,7 @@ class Demo19 extends React.Component {
|
||||||
onChange={this.onSelectChange(index, "address")}
|
onChange={this.onSelectChange(index, "address")}
|
||||||
onFocus={this.handFocus}
|
onFocus={this.handFocus}
|
||||||
onBlur={this.onBlur}
|
onBlur={this.onBlur}
|
||||||
|
size="sm"
|
||||||
autofocus
|
autofocus
|
||||||
>
|
>
|
||||||
<Option value="jack">boyuzhou</Option>
|
<Option value="jack">boyuzhou</Option>
|
||||||
|
|
|
@ -81,7 +81,7 @@ class Demo35 extends Component {
|
||||||
this.currentRecord = record;
|
this.currentRecord = record;
|
||||||
}
|
}
|
||||||
getHoverContent=()=>{
|
getHoverContent=()=>{
|
||||||
return <div className="opt-btns"><Button colors="primary" size="sm" onClick={this.delFun}>删除</Button> </div>
|
return <div className="opt-btns"><Button size="sm" onClick={this.delFun}>删除</Button> </div>
|
||||||
}
|
}
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
.opt-btns{
|
||||||
|
.u-button{
|
||||||
|
background-color: #505F79;
|
||||||
|
border-color: #505F79;
|
||||||
|
color: #fff;
|
||||||
|
&:hover, &:active{
|
||||||
|
background-color: #344563;
|
||||||
|
border-color: #344563;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
File diff suppressed because one or more lines are too long
|
@ -8428,7 +8428,7 @@ ul {
|
||||||
.u-table td {
|
.u-table td {
|
||||||
border-bottom: 1px solid rgb(233,233,233); }
|
border-bottom: 1px solid rgb(233,233,233); }
|
||||||
.u-table td a {
|
.u-table td a {
|
||||||
color: rgb(245, 60, 50); }
|
color: #2196F3; }
|
||||||
.u-table td a:hover {
|
.u-table td a:hover {
|
||||||
color: rgb(230, 0, 18); }
|
color: rgb(230, 0, 18); }
|
||||||
.u-table td a:active {
|
.u-table td a:active {
|
||||||
|
@ -8812,7 +8812,8 @@ ul {
|
||||||
display: none; }
|
display: none; }
|
||||||
|
|
||||||
.editable-cell-input-wrapper .u-input-group .u-form-control {
|
.editable-cell-input-wrapper .u-input-group .u-form-control {
|
||||||
height: 26px; }
|
height: 26px;
|
||||||
|
font-size: 12px; }
|
||||||
|
|
||||||
.editable-cell-text-wrapper {
|
.editable-cell-text-wrapper {
|
||||||
padding: 5px 24px 5px 5px;
|
padding: 5px 24px 5px 5px;
|
||||||
|
@ -10488,6 +10489,13 @@ th:hover .uf {
|
||||||
padding-bottom: 0px; }
|
padding-bottom: 0px; }
|
||||||
|
|
||||||
|
|
||||||
|
.opt-btns .u-button {
|
||||||
|
background-color: #505F79;
|
||||||
|
border-color: #505F79;
|
||||||
|
color: #fff; }
|
||||||
|
.opt-btns .u-button:hover, .opt-btns .u-button:active {
|
||||||
|
background-color: #344563;
|
||||||
|
border-color: #344563; }
|
||||||
|
|
||||||
.demo8 .u-table {
|
.demo8 .u-table {
|
||||||
margin-bottom: 11px; }
|
margin-bottom: 11px; }
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -57,7 +57,7 @@ $checkbox-height:16px;
|
||||||
td {
|
td {
|
||||||
border-bottom: 1px solid $table-border-color;
|
border-bottom: 1px solid $table-border-color;
|
||||||
a{
|
a{
|
||||||
color: $brand-primary;
|
color: #2196F3;
|
||||||
&:hover{
|
&:hover{
|
||||||
color: $brand-primary-hover;
|
color: $brand-primary-hover;
|
||||||
}
|
}
|
||||||
|
@ -641,6 +641,7 @@ $checkbox-height:16px;
|
||||||
}
|
}
|
||||||
.u-input-group .u-form-control{
|
.u-input-group .u-form-control{
|
||||||
height: 26px;
|
height: 26px;
|
||||||
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue