aloha-vue 1.0.282 → 1.0.284

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/package.json +1 -1
  2. package/src/ATable/ATable.js +6 -0
  3. package/src/ATable/ATableHeader/ATableHeader.js +9 -4
  4. package/src/ATable/ATableHeaderTh/ATableHeaderTh.js +8 -4
  5. package/src/ATable/ATableHeaderTh/compositionAPI/SortAPI.js +7 -2
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "aloha-vue",
3
3
  "description": "Project aloha",
4
- "version": "1.0.282",
4
+ "version": "1.0.284",
5
5
  "author": "Ilia Brykin",
6
6
  "scripts": {
7
7
  "build-icons": "node scriptsNode/iconsSvgToJs.js bootstrap3 && node scriptsNode/iconsSvgToJs.js bootstrap-1-9-1"
package/src/ATable/ATable.js CHANGED
@@ -146,6 +146,11 @@ export default {
146
146
  required: false,
147
147
  default: "a_badge",
148
148
  },
149
+ showFirstSortingSequenceNumber: {
150
+ type: Boolean,
151
+ required: false,
152
+ default: true,
153
+ },
149
154
  sortingMultiColumnKey: {
150
155
  type: String,
151
156
  required: false,
@@ -726,6 +731,7 @@ export default {
726
731
  modelSort: this.modelSortLocal,
727
732
  isSortingMultiColumn: this.isSortingMultiColumn,
728
733
  sortingSequenceNumberClass: this.sortingSequenceNumberClass,
734
+ showFirstSortingSequenceNumber: this.showFirstSortingSequenceNumber,
729
735
  onSetSelectedRowsIndexes: this.setSelectedRowsIndexes,
730
736
  }),
731
737
  h("div", {
package/src/ATable/ATableHeader/ATableHeader.js CHANGED
@@ -32,6 +32,10 @@ export default {
32
32
  type: Boolean,
33
33
  required: true,
34
34
  },
35
+ isSortingMultiColumn: {
36
+ type: Boolean,
37
+ required: false,
38
+ },
35
39
  modelSort: {
36
40
  type: Array,
37
41
  required: true,
@@ -40,12 +44,12 @@ export default {
40
44
  type: Number,
41
45
  required: true,
42
46
  },
43
- sortingSequenceNumberClass: {
44
- type: [String, Object],
47
+ showFirstSortingSequenceNumber: {
48
+ type: Boolean,
45
49
  required: false,
46
50
  },
47
- isSortingMultiColumn: {
48
- type: Boolean,
51
+ sortingSequenceNumberClass: {
52
+ type: [String, Object],
49
53
  required: false,
50
54
  },
51
55
  },
@@ -141,6 +145,7 @@ export default {
141
145
  modelSort: this.modelSort,
142
146
  sortingSequenceNumberClass: this.sortingSequenceNumberClass,
143
147
  isSortingMultiColumn: this.isSortingMultiColumn,
148
+ showFirstSortingSequenceNumber: this.showFirstSortingSequenceNumber,
144
149
  onDragstartParent: this.dragstart,
145
150
  onDragenterParent: this.dragenter,
146
151
  onDragleaveParent: this.dragleave,
package/src/ATable/ATableHeaderTh/ATableHeaderTh.js CHANGED
@@ -30,16 +30,20 @@ export default {
30
30
  required: false,
31
31
  default: -1,
32
32
  },
33
+ isSortingMultiColumn: {
34
+ type: Boolean,
35
+ required: false,
36
+ },
33
37
  modelSort: {
34
38
  type: Array,
35
39
  required: false,
36
40
  },
37
- sortingSequenceNumberClass: {
38
- type: [String, Object],
41
+ showFirstSortingSequenceNumber: {
42
+ type: Boolean,
39
43
  required: false,
40
44
  },
41
- isSortingMultiColumn: {
42
- type: Boolean,
45
+ sortingSequenceNumberClass: {
46
+ type: [String, Object],
43
47
  required: false,
44
48
  },
45
49
  },
package/src/ATable/ATableHeaderTh/compositionAPI/SortAPI.js CHANGED
@@ -10,6 +10,7 @@ export default function SortAPI(props) {
10
10
  const column = toRef(props, "column");
11
11
  const isSortingMultiColumn = toRef(props, "isSortingMultiColumn");
12
12
  const modelSort = toRef(props, "modelSort");
13
+ const showFirstSortingSequenceNumber = toRef(props, "showFirstSortingSequenceNumber");
13
14
 
14
15
  const changeModelSort = inject("changeModelSort");
15
16
  const isLoadingTable = inject("isLoadingTable");
@@ -76,10 +77,10 @@ export default function SortAPI(props) {
76
77
  const iconsSortable = computed(() => {
77
78
  const ICONS = [];
78
79
  if (isSortable.value) {
79
- if (!isSortAscending.value) {
80
+ if (!isSortDescending.value) {
80
81
  ICONS.push(iconSortDescending.value);
81
82
  }
82
- if (!isSortDescending.value) {
83
+ if (!isSortAscending.value) {
83
84
  ICONS.push(iconSortAscending.value);
84
85
  }
85
86
  }
@@ -120,6 +121,10 @@ export default function SortAPI(props) {
120
121
  !isSorting.value) {
121
122
  return undefined;
122
123
  }
124
+ if (modelSort.value.length <= 1 &&
125
+ !showFirstSortingSequenceNumber.value) {
126
+ return undefined;
127
+ }
123
128
  if (modelSortIndexAscending.value !== -1) {
124
129
  return modelSortIndexAscending.value + 1;
125
130
  }