diff --git a/Web/src/assets/style/lib/margin.less b/Web/src/assets/style/lib/margin.less index 567a16c..8f5e8bb 100644 --- a/Web/src/assets/style/lib/margin.less +++ b/Web/src/assets/style/lib/margin.less @@ -6,6 +6,10 @@ @position: extract(@margin-padding-position, @i); @name: extract(@margin-padding-position-name, @i); + .m@{name}-xl { + margin@{position}: @padding-xl !important; + } + .m@{name}-lg { margin@{position}: @padding-lg !important; } @@ -22,6 +26,14 @@ margin@{position}: @padding-xs !important; } + .m@{name}-xxs { + margin@{position}: @padding-xxs !important; + } + + .p@{name}-xl { + padding@{position}: @padding-xl !important; + } + .p@{name}-lg { padding@{position}: @padding-lg !important; } @@ -38,6 +50,10 @@ padding@{position}: @padding-xs !important; } + .p@{name}-xxs { + padding@{position}: @padding-xxs !important; + } + .m@{name}-none { margin@{position}: 0 !important; } diff --git a/Web/src/components/yoTable/index.js b/Web/src/components/yoTable/index.js index 4f05893..e0ce949 100644 --- a/Web/src/components/yoTable/index.js +++ b/Web/src/components/yoTable/index.js @@ -128,7 +128,10 @@ export default { onTableChange(pagination, filters, sorter) { this.pagination = pagination - this.sorter = sorter + this.sorter = { + sortField: sorter.field, + sortOrder: sorter.order, + } this.onLoadData() },