flameresttable 1.0.82 → 1.0.84
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.
package/package.json
CHANGED
package/src/Table/FlameTable.ts
CHANGED
|
@@ -219,11 +219,15 @@ export default class FlameTable<T> {
|
|
|
219
219
|
|
|
220
220
|
const rows: Rows<T> = await (this.model as any).constructor.all(merge({}, this.opts.LoadParams, filters, { page: this.Pager.page, perPage: this.Pager.perPage }));
|
|
221
221
|
|
|
222
|
-
if (exportFilename === null)
|
|
222
|
+
if (exportFilename === null) {
|
|
223
223
|
|
|
224
224
|
// Строки: загружаем
|
|
225
225
|
this.load(rows);
|
|
226
226
|
|
|
227
|
+
|
|
228
|
+
|
|
229
|
+
}
|
|
230
|
+
|
|
227
231
|
else {
|
|
228
232
|
|
|
229
233
|
this.exportStatus = 'completed';
|
package/src/Table/Table.vue
CHANGED
|
@@ -33,7 +33,8 @@
|
|
|
33
33
|
|
|
34
34
|
<div v-for="column in Table.columns" v-show="column.Table.isShow" :key="'cheader_' + column.name"
|
|
35
35
|
:class="' defaultHeader ' + column.Table.classesHeader"
|
|
36
|
-
class=" table-cell align-middle border-r border-r-slate-100 px-2"
|
|
36
|
+
class=" table-cell align-middle border-r border-r-slate-100 px-2"
|
|
37
|
+
:style="(column.Table.width === null ? '' : 'width:' + column.Table.width + 'px')">
|
|
37
38
|
<span>{{ column.Table.titleCustom !== null ? (column as any).Table.titleCustom(column) : column.Table.title !==
|
|
38
39
|
'' ?
|
|
39
40
|
column.Table.title : column.title !== '' ? column.title :
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
</div>
|
|
16
16
|
|
|
17
17
|
<!-- ЦИФРЫ -->
|
|
18
|
-
<div class="fc mobile:w-full px-2" v-if="col.Filter.type === 'number'
|
|
18
|
+
<div class="fc mobile:w-full px-2" v-if="col.Filter.type === 'number'">
|
|
19
19
|
<input class="max-w-[100px] flex-1 outline-none border border-slate-500 px-2 py-1"
|
|
20
20
|
:placeholder="'From ' + col.title ?? col.name" type="text" @keyup="update()"
|
|
21
21
|
v-model="col.Filter.valueRangeNumbers.from" />
|