aloha-vue 1.0.124 → 1.0.126

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aloha-vue",
   "description": "Project aloha",
-  "version": "1.0.124",
+  "version": "1.0.126",
   "author": "Ilia Brykin",
   "scripts": {
     "build-icons": "node scriptsNode/iconsSvgToJs.js bootstrap3 && node scriptsNode/iconsSvgToJs.js bootstrap-1-9-1"

package/src/ATable/ATable.js

@@ -482,7 +482,10 @@ export default {
       if (this.modelColumnsOrdering.length) {
         this.modelColumnsOrderingLocal = cloneDeep(this.modelColumnsOrdering);
       } else {
-        this.changeColumnsOrdering({ modelColumnsOrderingLocal: getModelColumnsOrderingDefault(this.columns) });
+        this.changeColumnsOrdering({
+          modelColumnsOrderingLocal: getModelColumnsOrderingDefault(this.columns),
+          isFirst: true,
+        });
       }
     },
 
@@ -501,7 +504,7 @@ export default {
       this.closePreviewAll();
     },
 
-    changeColumnsOrdering({ modelColumnsOrderingLocal, columnIndexDraggable, columnIndexOver }) {
+    changeColumnsOrdering({ modelColumnsOrderingLocal, columnIndexDraggable, columnIndexOver, isFirst }) {
       if (columnIndexDraggable === columnIndexOver && !modelColumnsOrderingLocal) {
         return;
       }
@@ -516,6 +519,7 @@ export default {
         columnIndexDraggable,
         columnIndexOver,
         modelColumnsOrdering: cloneDeep(this.modelColumnsOrderingLocal),
+        isFirst,
       });
       this.checkVisibleColumns();
     },

package/src/ATable/ATableTd/ATableTd.js

@@ -142,9 +142,18 @@ export default {
         const TO = cloneDeep(this.column.to);
         const PARAMS = TO.params || {};
         if (this.column.to.paramsDynamic) {
+          let hasParamsDynamicError = false;
           forEach(this.column.to.paramsDynamic, (value, key) => {
-            PARAMS[key] = get(this.row, value);
+            const PARAMS_VALUE = get(this.row, value);
+            if (isUndefined(PARAMS_VALUE)) {
+              hasParamsDynamicError = true;
+              return false;
+            }
+            PARAMS[key] = PARAMS_VALUE;
           });
+          if (hasParamsDynamicError) {
+            return undefined;
+          }
         }
         TO.params = PARAMS;
         return TO;
@@ -177,7 +186,7 @@ export default {
           row: this.row,
           rowIndex: this.rowIndex,
           rows: this.rowsLocal,
-        }) : this.isLink ? [
+        }) : (this.isLink && this.toLocal) ? [
           h(resolveComponent("RouterLink"), {
             class: [this.column.class, this.classForLink],
             to: this.toLocal,

package/src/ATable/ATableTdActionItem/ATableTdActionItem.js

@@ -7,7 +7,7 @@ import AIcon from "../../AIcon/AIcon";
 import {
   cloneDeep,
   forEach, get,
-  isFunction, isPlainObject, isString,
+  isFunction, isPlainObject, isString, isUndefined,
 } from "lodash-es";
 
 export default {
@@ -99,9 +99,18 @@ export default {
         const TO = cloneDeep(this.rowAction.to);
         const PARAMS = TO.params || {};
         if (this.rowAction.to.paramsDynamic) {
+          let hasParamsDynamicError = false;
           forEach(this.rowAction.to.paramsDynamic, (value, key) => {
-            PARAMS[key] = get(this.row, value);
+            const PARAMS_VALUE = get(this.row, value);
+            if (isUndefined(PARAMS_VALUE)) {
+              hasParamsDynamicError = true;
+              return false;
+            }
+            PARAMS[key] = PARAMS_VALUE;
           });
+          if (hasParamsDynamicError) {
+            return undefined;
+          }
         }
         TO.params = PARAMS;
         return TO;
@@ -181,12 +190,14 @@ export default {
     if (this.rowAction.type === "link") {
       return h("li", null, [
         this.rowAction.to ?
-          h(resolveComponent("RouterLink"), {
-            id: this.idLocal,
-            class: ["a_dropdown__item a_table__row_action", this.classLocal],
-            to: this.toLocal,
-            ...this.targetObject,
-          }, () => CONTENT) :
+          this.toLocal ?
+            h(resolveComponent("RouterLink"), {
+              id: this.idLocal,
+              class: ["a_dropdown__item a_table__row_action", this.classLocal],
+              to: this.toLocal,
+              ...this.targetObject,
+            }, () => CONTENT) :
+            "" :
           h("a", {
             id: this.idLocal,
             class: ["a_dropdown__item a_table__row_action", this.classLocal],