|
36 | 36 | <span style="width:100%"> |
37 | 37 | <svg v-if="selectedCount>0" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="times-circle" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="svg-inline--fa fa-times-circle fa-w-16 fa-sm"><path fill="currentColor" d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm121.6 313.1c4.7 4.7 4.7 12.3 0 17L338 377.6c-4.7 4.7-12.3 4.7-17 0L256 312l-65.1 65.6c-4.7 4.7-12.3 4.7-17 0L134.4 338c-4.7-4.7-4.7-12.3 0-17l65.6-65-65.6-65.1c-4.7-4.7-4.7-12.3 0-17l39.6-39.6c4.7-4.7 12.3-4.7 17 0l65 65.7 65.1-65.6c4.7-4.7 12.3-4.7 17 0l39.6 39.6c4.7 4.7 4.7 12.3 0 17L312 256l65.6 65.1z"></path></svg> |
38 | 38 | <svg v-else aria-hidden="true" focusable="false" data-prefix="fas" data-icon="bars" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" class="svg-inline--fa fa-bars fa-w-14 fa-sm"><path fill="currentColor" d="M16 132h416c8.837 0 16-7.163 16-16V76c0-8.837-7.163-16-16-16H16C7.163 60 0 67.163 0 76v40c0 8.837 7.163 16 16 16zm0 160h416c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H16c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16zm0 160h416c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H16c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16z"></path></svg> |
39 | | - <!-- |
40 | | - <svg v-if="processing" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="spinner" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="svg-inline--fa fa-spinner fa-w-16 fa-spin fa-sm"><path fill="currentColor" d="M304 48c0 26.51-21.49 48-48 48s-48-21.49-48-48 21.49-48 48-48 48 21.49 48 48zm-48 368c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zm208-208c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zM96 256c0-26.51-21.49-48-48-48S0 229.49 0 256s21.49 48 48 48 48-21.49 48-48zm12.922 99.078c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48c0-26.509-21.491-48-48-48zm294.156 0c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48c0-26.509-21.49-48-48-48zM108.922 60.922c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.491-48-48-48z"></path></svg> |
41 | | - <svg v-else aria-hidden="true" focusable="false" data-prefix="fas" data-icon="bars" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" class="svg-inline--fa fa-bars fa-w-14 fa-sm"><path fill="currentColor" d="M16 132h416c8.837 0 16-7.163 16-16V76c0-8.837-7.163-16-16-16H16C7.163 60 0 67.163 0 76v40c0 8.837 7.163 16 16 16zm0 160h416c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H16c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16zm0 160h416c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H16c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16z"></path></svg> |
42 | | - --> |
43 | 39 | </span> |
44 | 40 | </th> |
45 | 41 | <th v-for="(item, p) in fields" |
|
48 | 44 | :colspan="p === fields.length - 1 && vScroller.buttonHeight < vScroller.height ? 2: 1" |
49 | 45 | :class="{'sort-asc-sign': sortPos==p && sortDir==1, |
50 | 46 | 'sort-des-sign': sortPos==p && sortDir==-1, |
51 | | - 'sticky-column': item.sticky}" |
| 47 | + 'sticky-column': item.sticky, |
| 48 | + 'no-sorting': item.noSorting}" |
52 | 49 | :style="{left: item.left}" |
53 | 50 | @mousedown="headerClick($event, p)" |
54 | 51 | @contextmenu.prevent="panelFilterClick(item)"> |
@@ -331,6 +328,7 @@ export default defineComponent({ |
331 | 328 | }, |
332 | 329 | noFinding: {type: Boolean, default: false}, |
333 | 330 | noFindingNext: {type: Boolean, default: false}, |
| 331 | + noSorting: {type: Boolean, default: false}, |
334 | 332 | filterRow: {type: Boolean, default: false}, |
335 | 333 | freeSelect: {type: Boolean, default: false}, |
336 | 334 | noFooter: {type: Boolean, default: false}, |
@@ -1718,9 +1716,12 @@ export default defineComponent({ |
1718 | 1716 | this.fields[index - 1].label = e.target.textContent |
1719 | 1717 | }, |
1720 | 1718 | sort (n, pos) { |
1721 | | - this.processing = true |
1722 | 1719 | const colPos = typeof pos === 'undefined' ? this.columnFilterRef.colPos : pos |
1723 | 1720 | const field = this.fields[colPos] |
| 1721 | + if (field.noSorting) return |
| 1722 | +
|
| 1723 | + this.processing = true |
| 1724 | +
|
1724 | 1725 | const name = field.name |
1725 | 1726 | setTimeout(() => { |
1726 | 1727 | let sorting = field.sorting |
@@ -3074,6 +3075,9 @@ input:focus, input:active:focus, input.active:focus { |
3074 | 3075 | cursor: s-resize; |
3075 | 3076 | z-index: 6; |
3076 | 3077 | } |
| 3078 | +.systable thead th.no-sorting { |
| 3079 | + cursor: auto; |
| 3080 | +} |
3077 | 3081 | .systable thead td.column-filter { |
3078 | 3082 | text-align: left; |
3079 | 3083 | background-color: #fffff2; |
|
0 commit comments