flameresttable 1.0.103 → 1.0.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flameresttable",
-  "version": "1.0.103",
+  "version": "1.0.105",
   "main": "./src/plugin.ts",
   "repository": {
     "type": "git",
@@ -12,37 +12,37 @@
     "dev": "vite"
   },
   "dependencies": {
-    "@vuepic/vue-datepicker": "^7.2.1",
-    "flamerest": "^1.0.94",
+    "@vuepic/vue-datepicker": "^7.4.1",
+    "flamerest": "^1.0.109",
     "lodash-es": "^4.17.21",
-    "pinia": "^2.1.7",
+    "pinia": "^2.2.6",
     "pug": "github:FlameArt/pug-tailwind-only",
     "pug-lexer": "github:FlameArt/pug-lexer-only",
-    "sass": "^1.69.5",
+    "sass": "^1.81.0",
     "vue": "^3.3.7",
-    "vue-router": "^4.2.5",
+    "vue-router": "^4.4.5",
     "vue-select": "^4.0.0-beta.6"
   },
   "devDependencies": {
-    "@heroicons/vue": "^2.0.18",
-    "@types/lodash-es": "^4.17.10",
-    "@types/lodash.merge": "^4.6.8",
+    "@heroicons/vue": "^2.1.5",
+    "@types/lodash-es": "^4.17.12",
+    "@types/lodash.merge": "^4.6.9",
     "@types/node": "20.8.9",
-    "@types/vue-select": "^3.16.6",
-    "@typescript-eslint/eslint-plugin": "^6.9.1",
-    "@typescript-eslint/parser": "^6.9.1",
-    "@vitejs/plugin-vue": "^4.4.0",
+    "@types/vue-select": "^3.16.8",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "@vitejs/plugin-vue": "^4.6.2",
     "@volar/vue-language-plugin-pug": "^1.6.5",
     "@vue/compiler-sfc": "^3.3.7",
-    "autoprefixer": "^10.4.16",
-    "eslint": "^8.53.0",
+    "autoprefixer": "^10.4.20",
+    "eslint": "^8.57.1",
     "eslint-plugin-vue": "^8.7.1",
-    "postcss": "^8.4.31",
+    "postcss": "^8.4.49",
     "postcss-import": "^14.1.0",
-    "tailwindcss": "^3.3.5",
-    "typescript": "^5.2.2",
-    "vite": "^4.5.0",
-    "vue-tsc": "^1.8.22",
+    "tailwindcss": "^3.4.15",
+    "typescript": "^5.6.3",
+    "vite": "^4.5.5",
+    "vue-tsc": "^1.8.27",
     "vue-universal-modal": "^1.1.4"
   },
   "rules": {}

package/src/App.vue

@@ -27,7 +27,7 @@ opts.set('name', { title: 'Название' });
 opts.set('dt1', { title: 'Дата 1' });
 opts.set('dt2', { title: 'Дата 2' });
 opts.set('id', { title: 'ID', Selector: { model: Relatedtable }, Filter: { isShow: true, type: 'selector', selector: { multiselect: true, mode: 'vertical' } } });
-opts.set('file', { title: 'файл', Filter: { isShow: false } });
+opts.set('file', { title: 'файл', Popup: {popupType: 'image'}, Filter: { isShow: false } });
 opts.set("name", {
   title: 'Название', Table:
   {

package/src/Table/FlameTable.ts

@@ -5,6 +5,7 @@ import { reactive, UnwrapRef } from 'vue';
 import merge from 'lodash-es/merge'
 import ITableLoadParams from './TableLoadParams';
 import TableRowParams from './TableRowParams';
+import cloneDeep from 'lodash-es/cloneDeep';
 
 // Подгрузчик типа класса
 type Class<T> = new (...args: any[]) => T
@@ -162,6 +163,7 @@ export default class FlameTable<T> {
         if (typeof this.RowsParams[row[pk]] === 'undefined') {
           const newParam = new TableRowParams;
           newParam.item = row;
+          newParam.previousAttributes = cloneDeep(row);
           this.RowsParams[row[pk]] = newParam;
         }
       })
@@ -423,8 +425,15 @@ export default class FlameTable<T> {
     // Сперва предобработка
     if (await this.opts.Popup.beforeEdit(columns, this) === false) { return null; }
 
+    // Убираем поля, которые не требуют изменения
+    const cleanedCols = this.RemoveUnchagedFields(columns);
+
+    // Если изменений нет, то не посылаем
+    if (Object.keys(cleanedCols).length === 0) return null;
+
     // Подготовка к загрузке
-    const preparedCols = await (window as any).REST.prepare(columns, true);
+    const preparedCols = await (window as any).REST.prepare(cleanedCols, true);
+
 
     // Сохраняем
     const res: SavedObject<T> = await tClass.edit(columns[indexKey], preparedCols);
@@ -435,14 +444,51 @@ export default class FlameTable<T> {
 
     if (res.data) {
       const findedIdx = this.Rows.rows.findIndex((row: any) => row[indexKey] === (res.data as any)[indexKey])
-      if (findedIdx !== -1)
+      if (findedIdx !== -1) {
         this.Rows.rows[findedIdx] = reactive(res.data as any);
+        this.RowsParams[columns[indexKey]].previousAttributes = res.data;
+      }
     }
 
     return res;
 
   }
 
+  private RemoveUnchagedFields(row: { [key: string]: any }) {
+
+    // primarykey
+    const pk = (this.model as any).constructor.primaryKeys[0];
+    const isPlainObject = (obj: any) => typeof obj === 'object' && obj !== null && Object.getPrototypeOf(obj) === Object.prototype;
+
+    // Теперь не отправляем на обнову значения, что не обновились
+    const cleanRow: { [key: string]: any } = {};
+    for (const key in this.columns) {
+
+      const cParam = this.RowsParams[row[pk]];
+      switch (this.columns[key].Popup.popupType) {
+
+        case 'file':
+        case 'image':
+          // Неизменный объект будет как простой объект, а не событие, File итд
+          if (row[key] === null || typeof row[key]?.[0]?.['id'] === 'string' && typeof row[key]?.[0]?.['file'] === 'string' || isPlainObject(row[key])) continue;
+          break;
+        case 'text':
+        case 'string':
+        case 'date':
+        case 'selector':
+          if (cParam.previousAttributes[key] === row[key]) continue;
+          break;
+        default:
+      }
+
+      cleanRow[key] = row[key];
+    }
+
+    return cleanRow;
+
+  }
+
+  
 
   public async remove(row: T): Promise<SavedObject<T>> {
 
@@ -462,15 +508,18 @@ export default class FlameTable<T> {
   private getColumnsForUpdate(mode: "add" | "edit") {
     const res: { [key: string]: string } = {};
     for (const key in this.columns) {
+
       if (mode === 'add' && !this.columns[key].Popup.isSendFromAdd) continue;
       if (mode === 'edit' && !this.columns[key].Popup.isSendFromEdit) continue;
-      // TODO: здесь может быть полезно сохранять пустую строку
-      if (this.columns[key].Popup.model !== '') { 
-        if (this.columns[key].Popup.fileModel !== null)
-          res[key] = this.columns[key].Popup.fileModel
-        else
-          res[key] = this.columns[key].Popup.model 
-      }
+
+      // пропускаем виртуальные поля
+      if (this.columns[key].isVirtual) continue;
+
+      if (this.columns[key].Popup.fileModel !== null)
+        res[key] = this.columns[key].Popup.fileModel
+      else
+        res[key] = this.columns[key].Popup.model
+
     }
     return res;
   }

package/src/Table/TableRowParams.ts

@@ -4,4 +4,7 @@ export default class TableRowParams {
    public selected: boolean = false;
    public item: any = null;
 
+   // Аттрибуты до сохранения новых
+   public previousAttributes: {[key:string]:any} = {};
+
 }