flameresttable 1.0.80 → 1.0.82
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
|
@@ -468,7 +468,7 @@ export default class FlameTable<T> {
|
|
|
468
468
|
* @param filename
|
|
469
469
|
* @param arr
|
|
470
470
|
*/
|
|
471
|
-
public exportToXLS(onlySelected: boolean = false, filename: string | null = null, arr: any = null, columnList: Array<string> | null = null) {
|
|
471
|
+
public exportToXLS(onlySelected: boolean = false, filename: string | null = null, arr: any = null, columnList: Array<string> | null = null): Promise<void> {
|
|
472
472
|
|
|
473
473
|
const tClass = Object.getPrototypeOf(this.model).constructor;
|
|
474
474
|
const indexKey = tClass.primaryKeys[0];
|
|
@@ -516,7 +516,7 @@ export default class FlameTable<T> {
|
|
|
516
516
|
this.exportStatus = 'exportprocess';
|
|
517
517
|
|
|
518
518
|
// Делаем запрос на отдачу
|
|
519
|
-
this.update(customFilter, customFilter.export.filename ?? null);
|
|
519
|
+
return this.update(customFilter, customFilter.export.filename ?? null);
|
|
520
520
|
|
|
521
521
|
}
|
|
522
522
|
|
package/src/Table/Table.vue
CHANGED
package/src/Table/TableOpts.ts
CHANGED
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
<div>
|
|
48
48
|
|
|
49
49
|
<!-- ДЕЙСТВИЯ С ОТМЕЧЕННЫМИ -->
|
|
50
|
-
<div class="fc">
|
|
50
|
+
<div class="fc" v-show="state.opts.Export.isShow">
|
|
51
51
|
<div>
|
|
52
52
|
<div class="inline-block">
|
|
53
53
|
<span v-if="state.Table.exportStatus === 'exportprocess'" class="text-green-600 bg-green-50 px-2 py-1 mx-2">
|