Skip to content

Commit

Permalink
优化样式
Browse files Browse the repository at this point in the history
  • Loading branch information
@xuliangzhan
xuliangzhan committed Dec 26, 2019
1 parent 765656a commit 64e81af
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 13 deletions.
52 changes: 44 additions & 8 deletions dist/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,31 @@
.vxe-table-iview.c--highlight .vxe-cell > .ivu-auto-complete .ivu-input,
.vxe-table-iview.c--highlight .vxe-cell > .ivu-cascader .ivu-input,
.vxe-table-iview.c--highlight .vxe-cell > .ivu-date-picker .ivu-input,
.vxe-table-iview.c--highlight .vxe-tree-cell > .ivu-input-wrapper .ivu-input,
.vxe-table-iview.c--highlight .vxe-tree-cell > .ivu-auto-complete .ivu-input,
.vxe-table-iview.c--highlight .vxe-tree-cell > .ivu-cascader .ivu-input,
.vxe-table-iview.c--highlight .vxe-tree-cell > .ivu-date-picker .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-input-wrapper .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-auto-complete .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-cascader .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-date-picker .ivu-input, .vxe-table-iview.c--highlight .vxe-cell > .ivu-input-number,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-input-number, .vxe-table-iview.c--highlight .vxe-cell > .ivu-input-number .ivu-input-number-handler-wrap,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-date-picker .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-tree-cell > .ivu-input-wrapper .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-tree-cell > .ivu-auto-complete .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-tree-cell > .ivu-cascader .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-tree-cell > .ivu-date-picker .ivu-input, .vxe-table-iview.c--highlight .vxe-cell > .ivu-input-number,
.vxe-table-iview.c--highlight .vxe-tree-cell > .ivu-input-number,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-input-number,
.vxe-table-iview .vxe-table.c--highlight .vxe-tree-cell > .ivu-input-number, .vxe-table-iview.c--highlight .vxe-cell > .ivu-input-number .ivu-input-number-handler-wrap,
.vxe-table-iview.c--highlight .vxe-cell > .ivu-input-number .ivu-input-number-handler-down,
.vxe-table-iview.c--highlight .vxe-tree-cell > .ivu-input-number .ivu-input-number-handler-wrap,
.vxe-table-iview.c--highlight .vxe-tree-cell > .ivu-input-number .ivu-input-number-handler-down,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-input-number .ivu-input-number-handler-wrap,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-input-number .ivu-input-number-handler-down, .vxe-table-iview.c--highlight .vxe-cell > .ivu-select .ivu-select-selection,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-select .ivu-select-selection {
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-input-number .ivu-input-number-handler-down,
.vxe-table-iview .vxe-table.c--highlight .vxe-tree-cell > .ivu-input-number .ivu-input-number-handler-wrap,
.vxe-table-iview .vxe-table.c--highlight .vxe-tree-cell > .ivu-input-number .ivu-input-number-handler-down, .vxe-table-iview.c--highlight .vxe-cell > .ivu-select .ivu-select-selection,
.vxe-table-iview.c--highlight .vxe-tree-cell > .ivu-select .ivu-select-selection,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-select .ivu-select-selection,
.vxe-table-iview .vxe-table.c--highlight .vxe-tree-cell > .ivu-select .ivu-select-selection {
border: 0;
box-shadow: none; }

Expand All @@ -25,10 +41,16 @@
.vxe-table-iview .vxe-cell > .ivu-input-number,
.vxe-table-iview .vxe-cell > .ivu-select,
.vxe-table-iview .vxe-cell > .ivu-cascader,
.vxe-table-iview .vxe-cell > .ivu-date-picker-editor {
.vxe-table-iview .vxe-cell > .ivu-date-picker-editor,
.vxe-table-iview .vxe-tree-cell > .ivu-input-wrapper,
.vxe-table-iview .vxe-tree-cell > .ivu-input-number,
.vxe-table-iview .vxe-tree-cell > .ivu-select,
.vxe-table-iview .vxe-tree-cell > .ivu-cascader,
.vxe-table-iview .vxe-tree-cell > .ivu-date-picker-editor {
width: 100%; }

.vxe-table-iview .vxe-cell > .ivu-rate {
.vxe-table-iview .vxe-cell > .ivu-rate,
.vxe-table-iview .vxe-tree-cell > .ivu-rate {
height: 22px;
line-height: 22px;
vertical-align: bottom; }
Expand All @@ -38,16 +60,30 @@
.vxe-table-iview .col--valid-error > .vxe-cell > .ivu-input-number,
.vxe-table-iview .col--valid-error > .vxe-cell > .ivu-select .ivu-select-selection,
.vxe-table-iview .col--valid-error > .vxe-cell > .ivu-cascader .ivu-input,
.vxe-table-iview .col--valid-error > .vxe-cell > .ivu-date-picker .ivu-input {
.vxe-table-iview .col--valid-error > .vxe-cell > .ivu-date-picker .ivu-input,
.vxe-table-iview .col--valid-error > .vxe-tree-cell > .ivu-input-wrapper .ivu-input,
.vxe-table-iview .col--valid-error > .vxe-tree-cell > .ivu-auto-complete .ivu-input,
.vxe-table-iview .col--valid-error > .vxe-tree-cell > .ivu-input-number,
.vxe-table-iview .col--valid-error > .vxe-tree-cell > .ivu-select .ivu-select-selection,
.vxe-table-iview .col--valid-error > .vxe-tree-cell > .ivu-cascader .ivu-input,
.vxe-table-iview .col--valid-error > .vxe-tree-cell > .ivu-date-picker .ivu-input {
border-color: #f56c6c;
box-shadow: none; }

.vxe-table-iview.c--highlight .vxe-cell > .ivu-input-wrapper .ivu-input,
.vxe-table-iview.c--highlight .vxe-cell > .ivu-auto-complete .ivu-input,
.vxe-table-iview.c--highlight .vxe-cell > .ivu-cascader .ivu-input,
.vxe-table-iview.c--highlight .vxe-cell > .ivu-date-picker .ivu-input,
.vxe-table-iview.c--highlight .vxe-tree-cell > .ivu-input-wrapper .ivu-input,
.vxe-table-iview.c--highlight .vxe-tree-cell > .ivu-auto-complete .ivu-input,
.vxe-table-iview.c--highlight .vxe-tree-cell > .ivu-cascader .ivu-input,
.vxe-table-iview.c--highlight .vxe-tree-cell > .ivu-date-picker .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-input-wrapper .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-auto-complete .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-cascader .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-date-picker .ivu-input {
.vxe-table-iview .vxe-table.c--highlight .vxe-cell > .ivu-date-picker .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-tree-cell > .ivu-input-wrapper .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-tree-cell > .ivu-auto-complete .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-tree-cell > .ivu-cascader .ivu-input,
.vxe-table-iview .vxe-table.c--highlight .vxe-tree-cell > .ivu-date-picker .ivu-input {
padding: 0; }
2 changes: 1 addition & 1 deletion dist/style.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vxe-table-plugin-iview",
"version": "1.5.9",
"version": "1.5.10",
"description": "基于 vxe-table 表格的适配插件，用于兼容 iview 组件库",
"scripts": {
"lib": "gulp build"
Expand Down
9 changes: 6 additions & 3 deletions style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ $vxe-table-validate-error-color: #f56c6c;
width: 180px;
}
}
.vxe-cell {
.vxe-cell,
.vxe-tree-cell {
& > .ivu-input-wrapper,
& > .ivu-input-number,
& > .ivu-select,
Expand All @@ -30,7 +31,8 @@ $vxe-table-validate-error-color: #f56c6c;
}
}
.col--valid-error {
& > .vxe-cell {
& > .vxe-cell,
& > .vxe-tree-cell {
& > .ivu-input-wrapper .ivu-input,
& > .ivu-auto-complete .ivu-input,
& > .ivu-input-number,
Expand All @@ -44,7 +46,8 @@ $vxe-table-validate-error-color: #f56c6c;
}
&.c--highlight,
.vxe-table.c--highlight {
.vxe-cell {
.vxe-cell,
.vxe-tree-cell {
& > .ivu-input-wrapper,
& > .ivu-auto-complete,
& > .ivu-cascader,
Expand Down

0 comments on commit 64e81af

Please sign in to comment.