Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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/"
Expand Down
24 changes: 20 additions & 4 deletions src/components/Pagination/SPagination.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,18 @@ export default class SPagination extends Mixins(BorderRadiusMixin) {
* `false` by default
*/
@Prop({ default: false, type: Boolean }) readonly hideOnSinglePage!: boolean
/**
* 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

Expand Down Expand Up @@ -134,13 +146,17 @@ 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')
itemsPerPageText.textContent = 'Rows per page'
itemsPerPageText.textContent = this.perPageText
itemsPerPageText.classList.add('per-page-text')
this.pagination.$el.insertBefore(itemsPerPageText, this.sizesItem)
}
Expand Down
7 changes: 7 additions & 0 deletions src/components/Table/SHierarchicalTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@select-all="handleSelectAll"
@selection-change="handleSelectionChange"
@row-click="row => $emit('row-click', row, level)"
:empty-text="emptyText"
>
<s-table-column
v-if="levelIndex === (data.length - 1)"
Expand Down Expand Up @@ -63,6 +64,12 @@ export default class SHierarchicalTable extends Mixins(SizeMixin) {
* By default it's set to an empty array
*/
@Prop({ default: () => [], type: Array }) readonly path!: Array<any>
/**
* 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<any>, row: any): void {
this.$emit('select', selection, row)
Expand Down