From 94ba4f30561983d66ba7d53759f727ac497d7f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?= <188633308@qq.com> Date: Wed, 28 Apr 2021 15:44:02 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=98=8E=E7=A1=AE=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/src/assets/style/lib/margin.less | 16 ++++++++++++++++ Web/src/components/yoTable/index.js | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) 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() },