flamerest 1.0.44 → 1.0.47

package/REST.d.ts

@@ -29,7 +29,7 @@ export function get<T>(table: string, where?: object | string | null, expand?: o
  * @param {object} params 
  * @returns 
  */
-export function all<T>(table: string, params?: { where?: object, fields?: object | Array<string>, sort?: Array<string>, page?: number, perPage?: number }): Promise<Rows<T>>;
+export function all<T>(table: string, params?: { where?: object, fields?: object | Array<string>, sort?: Array<string>, page?: number, perPage?: number, tree?: number }): Promise<Rows<T>>;
 
 /**
  * Стандартный ответ от Request с несколькими строками

package/REST.js

@@ -295,9 +295,10 @@ class FLAMEREST {
    * @param RemoveDuplicates
    * @param format
    * @param titles Это чтобы мы могли контроллить какие названия полей мы будет загружать при экспорте, чтобы они были как в таблице
+   * @param tree дерево
    * @return Promise<>
    */
-  get(table, where, expand, fields, sortfields, page, perPage, RemoveDuplicates, format, titles) {
+  get(table, where, expand, fields, sortfields, page, perPage, RemoveDuplicates, format, titles, tree) {
 
     // Нормализуем имена таблиц
     table = table.replace(/_/g, "");
@@ -313,6 +314,10 @@ class FLAMEREST {
     if (where !== undefined && where !== null)
       json.where = where;
 
+    // Генерим условия
+    if (tree !== undefined && tree !== null)
+      json.tree = tree;
+
     if (fields !== undefined && fields !== null)
       json.fields = fields;
 
@@ -484,31 +489,36 @@ class FLAMEREST {
     for (let val in values) {
       
       // Преобразуем
-      if (typeof values[val] === 'object' 
-        && values[val].hasOwnProperty('value') 
+      let value = values[val];
+      let isRef = false;
+      if (value instanceof Object 
+        && value.hasOwnProperty('_value') 
         && (
-          values[val].value instanceof Event || 
-          values[val].value instanceof HTMLInputElement || 
-          values[val].value instanceof ClipboardEvent || 
-          values[val].value instanceof DataTransfer || 
-          values[val].value instanceof FileList
+          value._value instanceof Event || 
+          value._value instanceof HTMLInputElement || 
+          value._value instanceof ClipboardEvent || 
+          value._value instanceof DataTransfer || 
+          value._value instanceof FileList
           )
-      ) values[val] = values[val].value;
+      ) {value = value.value; isRef = true}
 
-      if (values[val] instanceof Event && values[val].target instanceof HTMLInputElement && values[val].target.type === 'file') values[val] = values[val].target.files;
-      if (values[val] instanceof HTMLInputElement && values[val].type === 'file') values[val] = values[val].files;
-      if (values[val] instanceof ClipboardEvent) values[val] = values[val].clipboardData.files;
-      if (values[val] instanceof DataTransfer) values[val] = values[val].files;
-      if (values[val] instanceof FileList) {
+      if (value instanceof Event && value.target instanceof HTMLInputElement && value.target.type === 'file') value = value.target.files;
+      if (value instanceof HTMLInputElement && value.type === 'file') value = value.files;
+      if (value instanceof ClipboardEvent) value = value.clipboardData.files;
+      if (value instanceof DataTransfer) value = value.files;
+      if (value instanceof FileList) {
         let newValues = [];
-        values[val] = Array.from(values[val]);
-        for (let file in values[val]) {
+        value = Array.from(value);
+        for (let file in value) {
           newValues.push({
-            'name': values[val][file].name,
-            'data': await this.readFileAsync(values[val][file])
+            'name': value[file].name,
+            'data': await this.readFileAsync(value[file])
           });
         }
-        values[val] = newValues;
+        if (isRef)
+          values[val].value = newValues;
+        else
+          values[val] = newValues;
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flamerest",
-  "version": "1.0.44",
+  "version": "1.0.47",
   "description": "",
   "main": "REST.js",
   "typings": "./REST.d.ts",