From 98078f5a4338785d6d312bc67e967eccee9696d2 Mon Sep 17 00:00:00 2001 From: RDMStreet Date: Mon, 24 May 2021 09:41:51 +0300 Subject: [PATCH 1/3] UNK-752 Add per page text parameter to pagination --- src/components/Pagination/SPagination.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/Pagination/SPagination.vue b/src/components/Pagination/SPagination.vue index bb06f139..44aa87c7 100644 --- a/src/components/Pagination/SPagination.vue +++ b/src/components/Pagination/SPagination.vue @@ -107,6 +107,12 @@ export default class SPagination extends Mixins(BorderRadiusMixin) { * `false` by default */ @Prop({ default: false, type: Boolean }) readonly hideOnSinglePage!: boolean + /** + * Text for 'Rows per page' + * + * `Per page text` by default + */ + @Prop({ default: 'Rows per page', type: String }) readonly perPageText!: string @Ref('pagination') pagination!: any @@ -140,7 +146,7 @@ export default class SPagination extends Mixins(BorderRadiusMixin) { } if (this.sizesItem && !this.sizesLabelItem) { const itemsPerPageText = document.createElement('span') - itemsPerPageText.textContent = 'Rows per page' + itemsPerPageText.textContent = this.perPageText itemsPerPageText.classList.add('per-page-text') this.pagination.$el.insertBefore(itemsPerPageText, this.sizesItem) } From f95a52cc7c4a591920187bc0fd05979c94fba496 Mon Sep 17 00:00:00 2001 From: RDMStreet Date: Mon, 24 May 2021 09:58:15 +0300 Subject: [PATCH 2/3] Add total text parameter to pagination and empty text parameter to hierarchical table --- src/components/Pagination/SPagination.vue | 18 ++++++++++++++---- src/components/Table/SHierarchicalTable.vue | 7 +++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/components/Pagination/SPagination.vue b/src/components/Pagination/SPagination.vue index 44aa87c7..3ffd34a1 100644 --- a/src/components/Pagination/SPagination.vue +++ b/src/components/Pagination/SPagination.vue @@ -108,11 +108,17 @@ export default class SPagination extends Mixins(BorderRadiusMixin) { */ @Prop({ default: false, type: Boolean }) readonly hideOnSinglePage!: boolean /** - * Text for 'Rows per page' + * Text for 'Rows per page' text * * `Per page text` by default */ @Prop({ default: 'Rows per page', type: String }) readonly perPageText!: string + /** + * Text for 'Total' text + * + * `Total` by default + */ + @Prop({ default: 'Total', type: String }) readonly totalText!: string @Ref('pagination') pagination!: any @@ -140,9 +146,13 @@ export default class SPagination extends Mixins(BorderRadiusMixin) { } private renderPaginationItems (): void { - if (this.totalItem && this.total) { - const upperNumber = this.pageSizeModel * this.currentPageModel - this.totalItem.textContent = `${upperNumber - this.pageSizeModel + 1}—${upperNumber > this.total ? this.total : upperNumber} of ${this.total}` + if (this.totalItem) { + if (this.total) { + const upperNumber = this.pageSizeModel * this.currentPageModel + this.totalItem.textContent = `${upperNumber - this.pageSizeModel + 1}—${upperNumber > this.total ? this.total : upperNumber} of ${this.total}` + } else { + this.totalItem.textContent = `${this.totalText} ${this.total}` + } } if (this.sizesItem && !this.sizesLabelItem) { const itemsPerPageText = document.createElement('span') diff --git a/src/components/Table/SHierarchicalTable.vue b/src/components/Table/SHierarchicalTable.vue index e0af3c06..b9a6c6e1 100644 --- a/src/components/Table/SHierarchicalTable.vue +++ b/src/components/Table/SHierarchicalTable.vue @@ -15,6 +15,7 @@ @select-all="handleSelectAll" @selection-change="handleSelectionChange" @row-click="row => $emit('row-click', row, level)" + :empty-text="emptyText" > [], type: Array }) readonly path!: Array + /** + * A message for an empty data array. + * + * By default it's set to `"No data"` + */ + @Prop({ default: 'No data', type: String }) readonly emptyText!: string handleSelect (selection: Array, row: any): void { this.$emit('select', selection, row) From 00c4d594ba7a78bd017f9daf79f3ead6326e9424 Mon Sep 17 00:00:00 2001 From: RDMStreet Date: Mon, 24 May 2021 12:15:00 +0300 Subject: [PATCH 3/3] Change version to 0.8.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d0b74706..6e8bcc79 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "0.8.8", + "version": "0.8.9", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/"