flameresttable 1.0.40 → 1.0.42

package/package.json

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

package/src/Table/FlameTable.ts

@@ -119,6 +119,8 @@ export default class FlameTable<T> {
    */
   public load(rows: Rows<T>) {
 
+    rows.pages = rows.pages ?? { count: 0, page: 1, perPage: 1, total: 0 };
+
     if (rows.data) {
       this.Rows.rows = (rows.data ?? []) as any;
       Object.keys(this.Pager).forEach((key) => (this.Pager as any)[key] = (rows.pages as any)[key])
@@ -132,10 +134,13 @@ export default class FlameTable<T> {
           delete this.RowsParams[key];
 
       // Заполняем параметры каждой строки
-      this.Rows.rows.forEach(row => {
-        const newParam = new TableRowParams;
-        newParam.item = row;
-        this.RowsParams[(row as any)[(this.model as any).constructor.primaryKeys[0]]] = newParam;
+      const pk = (this.model as any).constructor.primaryKeys[0];
+      this.Rows.rows.forEach((row: any) => {
+        if (typeof this.RowsParams[row[pk]] === 'undefined') {
+          const newParam = new TableRowParams;
+          newParam.item = row;
+          this.RowsParams[row[pk]] = newParam;
+        }
       })
     }
 
@@ -201,14 +206,29 @@ export default class FlameTable<T> {
    * Обновить результаты от RESTа
    * @param CustomLoadParams Применить кастомные параметры загрузки
    */
-  public async update(CustomLoadParams: ITableLoadParams = {}) {
+  public async update(CustomLoadParams: ITableLoadParams = {}, isFile = false) {
 
     // Дополняем загрузочные параметры фильтрами
     const filters = merge(this.applyFiltersParams(), CustomLoadParams);
 
     const rows: Rows<T> = await (this.model as any).constructor.all(merge({}, this.opts.LoadParams, filters, { page: this.Pager.page, perPage: this.Pager.perPage }));
 
-    this.load(rows);
+    if (!isFile)
+
+      // Строки: загружаем
+      this.load(rows);
+
+    else {
+      // Файл: скачиваем
+      const url = window.URL.createObjectURL((rows as any).data);
+      const a = document.createElement('a');
+      a.href = url;
+      a.download = 'file.xlsx';
+      document.body.appendChild(a);
+      a.click();
+      window.URL.revokeObjectURL(url);
+      document.body.removeChild(a);
+    }
 
   }
 
@@ -470,7 +490,7 @@ export default class FlameTable<T> {
     }
 
     // Делаем запрос на отдачу
-    this.update(customFilter);
+    this.update(customFilter, true);
 
   }
 

package/src/Table/TableTasksPanel.vue

@@ -112,15 +112,17 @@ const selectAction = () => {
 
   switch (state.selectModel) {
     case 0:
-      return;
+      break;
     case 1:
 
-      return;
+      break;
     case 2:
       state.Table.exportToXLS();
-      return;
+      break;
   }
 
+  state.selectModel = 0;
+
 }
 
 </script>