diff --git a/dist/style.css b/dist/style.css index af5faed..1e3fccb 100644 --- a/dist/style.css +++ b/dist/style.css @@ -33,6 +33,15 @@ line-height: 22px; vertical-align: bottom; } +.vxe-table-iview .col--valid-error > .vxe-cell > .ivu-input-wrapper .ivu-input, +.vxe-table-iview .col--valid-error > .vxe-cell > .ivu-auto-complete .ivu-input, +.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 { + 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, diff --git a/dist/style.min.css b/dist/style.min.css index b2246ea..6d252c4 100644 --- a/dist/style.min.css +++ b/dist/style.min.css @@ -1 +1 @@ -.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-input-number,.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-cell>.ivu-input-number .ivu-input-number-handler-wrap,.vxe-table-iview .vxe-table.c--highlight .vxe-cell>.ivu-input-wrapper .ivu-input,.vxe-table-iview .vxe-table.c--highlight .vxe-cell>.ivu-select .ivu-select-selection,.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-cell>.ivu-input-number,.vxe-table-iview.c--highlight .vxe-cell>.ivu-input-number .ivu-input-number-handler-down,.vxe-table-iview.c--highlight .vxe-cell>.ivu-input-number .ivu-input-number-handler-wrap,.vxe-table-iview.c--highlight .vxe-cell>.ivu-input-wrapper .ivu-input,.vxe-table-iview.c--highlight .vxe-cell>.ivu-select .ivu-select-selection{border:0;box-shadow:none}.vxe-table-iview .vxe-table--filter-body>.ivu-date-picker,.vxe-table-iview .vxe-table--filter-body>.ivu-input-number,.vxe-table-iview .vxe-table--filter-body>.ivu-input-wrapper,.vxe-table-iview .vxe-table--filter-body>.ivu-rate,.vxe-table-iview .vxe-table--filter-body>.ivu-select{width:180px}.vxe-table-iview .vxe-cell>.ivu-cascader,.vxe-table-iview .vxe-cell>.ivu-date-picker-editor,.vxe-table-iview .vxe-cell>.ivu-input-number,.vxe-table-iview .vxe-cell>.ivu-input-wrapper,.vxe-table-iview .vxe-cell>.ivu-select{width:100%}.vxe-table-iview .vxe-cell>.ivu-rate{height:22px;line-height:22px;vertical-align:bottom}.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-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-cell>.ivu-input-wrapper .ivu-input{padding:0} \ No newline at end of file +.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-input-number,.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-cell>.ivu-input-number .ivu-input-number-handler-wrap,.vxe-table-iview .vxe-table.c--highlight .vxe-cell>.ivu-input-wrapper .ivu-input,.vxe-table-iview .vxe-table.c--highlight .vxe-cell>.ivu-select .ivu-select-selection,.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-cell>.ivu-input-number,.vxe-table-iview.c--highlight .vxe-cell>.ivu-input-number .ivu-input-number-handler-down,.vxe-table-iview.c--highlight .vxe-cell>.ivu-input-number .ivu-input-number-handler-wrap,.vxe-table-iview.c--highlight .vxe-cell>.ivu-input-wrapper .ivu-input,.vxe-table-iview.c--highlight .vxe-cell>.ivu-select .ivu-select-selection{border:0;box-shadow:none}.vxe-table-iview .vxe-table--filter-body>.ivu-date-picker,.vxe-table-iview .vxe-table--filter-body>.ivu-input-number,.vxe-table-iview .vxe-table--filter-body>.ivu-input-wrapper,.vxe-table-iview .vxe-table--filter-body>.ivu-rate,.vxe-table-iview .vxe-table--filter-body>.ivu-select{width:180px}.vxe-table-iview .vxe-cell>.ivu-cascader,.vxe-table-iview .vxe-cell>.ivu-date-picker-editor,.vxe-table-iview .vxe-cell>.ivu-input-number,.vxe-table-iview .vxe-cell>.ivu-input-wrapper,.vxe-table-iview .vxe-cell>.ivu-select{width:100%}.vxe-table-iview .vxe-cell>.ivu-rate{height:22px;line-height:22px;vertical-align:bottom}.vxe-table-iview .col--valid-error>.vxe-cell>.ivu-auto-complete .ivu-input,.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-input-number,.vxe-table-iview .col--valid-error>.vxe-cell>.ivu-input-wrapper .ivu-input,.vxe-table-iview .col--valid-error>.vxe-cell>.ivu-select .ivu-select-selection{border-color:#f56c6c;box-shadow:none}.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-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-cell>.ivu-input-wrapper .ivu-input{padding:0} \ No newline at end of file diff --git a/package.json b/package.json index 7071120..dca004c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table-plugin-iview", - "version": "1.5.1", + "version": "1.5.2", "description": "基于 vxe-table 表格的适配插件,用于兼容 iview 组件库", "scripts": { "lib": "gulp build" diff --git a/style.scss b/style.scss index 24dd4aa..5935ff0 100644 --- a/style.scss +++ b/style.scss @@ -1,7 +1,10 @@ +$vxe-table-validate-error-color: #f56c6c; + %ResetBorder { border: 0; box-shadow: none; } + .vxe-table-iview { .vxe-table--filter-body { & > .ivu-input-wrapper, @@ -26,6 +29,19 @@ vertical-align: bottom; } } + .col--valid-error { + & > .vxe-cell { + & > .ivu-input-wrapper .ivu-input, + & > .ivu-auto-complete .ivu-input, + & > .ivu-input-number, + & > .ivu-select .ivu-select-selection, + & > .ivu-cascader .ivu-input, + & > .ivu-date-picker .ivu-input { + border-color: $vxe-table-validate-error-color; + box-shadow: none; + } + } + } &.c--highlight, .vxe-table.c--highlight { .vxe-cell {