flameresttable 1.0.72 → 1.0.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flameresttable",
-  "version": "1.0.72",
+  "version": "1.0.73",
   "main": "./src/plugin.ts",
   "repository": {
     "type": "git",

package/src/Table/FlameTable.ts

@@ -65,6 +65,11 @@ export default class FlameTable<T> {
    */
   public RowsSelected: Array<T> = [];
 
+  /**
+   * Состояние экспорта
+   */
+  public exportStatus: 'completed' | 'exportprocess' | string = 'completed';
+
   /**
    * Проинициализировать модели
    */
@@ -221,6 +226,8 @@ export default class FlameTable<T> {
 
     else {
 
+      this.exportStatus = 'completed';
+
       // Файл: скачиваем
       if (typeof this.opts.customDownloadHandler === 'function') {
         // Кастомный загрузчик
@@ -504,6 +511,8 @@ export default class FlameTable<T> {
 
     }
 
+    this.exportStatus = 'exportprocess';
+
     // Делаем запрос на отдачу
     this.update(customFilter, customFilter.export.filename ?? null);
 

package/src/Table/TableTasksPanel.vue

@@ -50,7 +50,7 @@
       <div class="fc">
         <div>
           <div class="inline-block">
-            <span v-if="state.exportStatus === 'exportprocess'" class="text-green-600 bg-green-50 px-2 py-1 mx-2">
+            <span v-if="state.Table.exportStatus === 'exportprocess'" class="text-green-600 bg-green-50 px-2 py-1 mx-2">
               {{ props.table.opts.lang === 'ru' ? 'Загрузка...' : 'Loading...' }}
             </span>
           </div>
@@ -112,7 +112,6 @@ const state = reactive({
   opts: props.table.opts,
   Table: props.table,
   selectModel: 0,
-  exportStatus: 'completed' as 'completed' | 'exportprocess' | 'error'
 })
 
 const selectAction = () => {
@@ -121,10 +120,10 @@ const selectAction = () => {
     case 0:
       break;
     case 1:
-      state.Table.exportToXLS(true);
+      state.Table.exportToXLS(true, null, null, null, state);
       break;
     case 2:
-      state.Table.exportToXLS();
+      state.Table.exportToXLS(false, null, null, null, state);
       break;
   }