aloha-vue 1.2.17 → 1.2.18

package/docs/src/views/PageTable/PageTableComplex/PageTableComplexExample/PageTableComplexExample.js

@@ -180,6 +180,9 @@ export default {
           callback: this.clickMe,
           class: "aloha a_dropdown__item",
           disabled: false,
+          extraCallback: ({ row }) => ({
+            aloha: row.aloha,
+          }),
         },
         {
           type: "divider",

package/package.json

@@ -14,7 +14,7 @@
     "Vue.js"
   ],
   "homepage": "https://github.com/ilia-brykin/aloha/#README.md",
-  "version": "1.2.17",
+  "version": "1.2.18",
   "author": {
     "name": "Ilia Brykin",
     "email": "brykin.ilia@gmail.com"

package/src/AFilters/AFilterCenter/AFilterCenterItem/compositionAPI/ModelValuesAPI.js

@@ -96,21 +96,23 @@ export default function ModelValuesAPI(props, {
     }
 
     if (TypesNumberRange.indexOf(filter.value.type) !== -1) {
+      const KEY_MAX = filter.value.keyMax || "max";
+      const KEY_MIN = filter.value.keyMin || "min";
       const MODEL_VALUES = [];
-      if (!isNil(model.value?.min) && model.value?.min !== "") {
+      if (!isNil(model.value?.[KEY_MIN]) && model.value?.[KEY_MIN] !== "") {
         MODEL_VALUES.push({
-          label: model.value.min,
+          label: model.value[KEY_MIN],
           filterLabelSuffix: filter.value.labelMin || "_A_INPUT_NUMBER_RANGE_LABEL_MIN_",
           idSuffix: "_min",
-          keyId: "min",
+          keyId: KEY_MIN,
         });
       }
-      if (!isNil(model.value?.max) && model.value?.max !== "") {
+      if (!isNil(model.value?.[KEY_MAX]) && model.value?.[KEY_MAX] !== "") {
         MODEL_VALUES.push({
-          label: model.value.max,
+          label: model.value[KEY_MAX],
           filterLabelSuffix: filter.value.labelMax || "_A_INPUT_NUMBER_RANGE_LABEL_MAX_",
           idSuffix: "_max",
-          keyId: "max",
+          keyId: KEY_MAX,
         });
       }
       return MODEL_VALUES;

package/src/ATable/compositionAPI/RowActionsAPI.js

@@ -165,6 +165,20 @@ export default function RowActionsAPI(props) {
     return false;
   };
 
+  const getRowActionExtra = ({ rowAction }) => {
+    if (rowAction.extra) {
+      return rowAction.extra;
+    }
+    if (isFunction(rowAction.extraCallback)) {
+      return rowAction.extraCallback({
+        row: row.value,
+        rowIndex: rowIndex.value,
+        rowAction,
+      });
+    }
+    return undefined;
+  };
+
   const replacePropertiesByRowAction = rowAction => {
     forEach(rowAction, (_, key) => {
       if (endsWith(key, "Callback")) {
@@ -202,6 +216,10 @@ export default function RowActionsAPI(props) {
           if (ICON_RIGHT) {
             rowAction.iconRight = ICON_RIGHT;
           }
+          const EXTRA = getRowActionExtra({ rowAction });
+          if (EXTRA) {
+            rowAction.extra = EXTRA;
+          }
           if (rowAction.type === "link") {
             const TO = getRowActionTo({ rowAction });
             if (TO) {

package/src/ui/AInputNumberRange/AInputNumberRange.js

@@ -140,6 +140,16 @@ export default {
       required: false,
       default: 200,
     },
+    keyMax: {
+      tpe: String,
+      required: false,
+      default: "max",
+    },
+    keyMin: {
+      tpe: String,
+      required: false,
+      default: "min",
+    },
     max: {
       type: Number,
       required: false,

package/src/ui/AInputNumberRange/compositionAPI/ModelAPI.js

@@ -7,25 +7,27 @@ import { cloneDeep } from "lodash-es";
 export default function ModelAPI(props, {
   changeModel = () => ({}),
 }) {
+  const keyMax = toRef(props, "keyMax");
+  const keyMin = toRef(props, "keyMin");
   const modelValue = toRef(props, "modelValue");
 
   const modelValueMin = computed(() => {
-    return modelValue.value?.min;
+    return modelValue.value?.[keyMin.value];
   });
 
   const modelValueMax = computed(() => {
-    return modelValue.value?.max;
+    return modelValue.value?.[keyMax.value];
   });
 
   const changeModelMin = ({ model }) => {
     const MODEL = cloneDeep(modelValue.value);
-    MODEL.min = model;
+    MODEL[keyMin.value] = model;
     changeModel({ model: MODEL });
   };
 
   const changeModelMax = ({ model }) => {
     const MODEL = cloneDeep(modelValue.value);
-    MODEL.max = model;
+    MODEL[keyMax.value] = model;
     changeModel({ model: MODEL });
   };