aloha-vue 1.2.112 → 1.2.113

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

@@ -43,7 +43,7 @@ export default {
       modelColumnsOrdering: ["sdf", "ddsadsa", "aloha"],
       columns: [
         {
-          label: "Aloha",
+          label: "_A_TABLE_COLUMN_1_",
           id: "aloha",
           keyLabel: "aloha",
           sortId: "aloha",
@@ -56,7 +56,7 @@ export default {
           title: "Aloha",
         },
         {
-          label: "Slot",
+          label: "_A_TABLE_COLUMN_2_",
           id: "slot",
           slot: "slot1",
           title: "bbbbbbbbbb",

package/package.json

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

package/src/ATable/ATable.js

@@ -399,7 +399,6 @@ export default {
       columnsDefaultValue: computed(() => this.columnsDefaultValue),
       columnActionsWidthLocal: computed(() => this.columnActionsWidth),
       columnWidthDefault: computed(() => this.columnWidthDefault),
-      isActionColumnVisible: computed(() => this.isActionColumnVisible),
       isLoadingOptions: computed(() => this.isLoadingOptions),
       isLoadingTable: computed(() => this.isLoadingTable),
       rowActions: computed(() => this.rowActions),
@@ -409,6 +408,7 @@ export default {
   },
   setup(props, context) {
     const {
+      isActionColumnVisibleLocal,
       isActionIconVisibleLocal,
       isColumnsDndLocal,
       isMobile,
@@ -630,6 +630,7 @@ export default {
     provide("currentMultipleActions", currentMultipleActions);
     provide("hasPreview", hasPreview);
     provide("indexFirstScrollInvisibleColumn", indexFirstScrollInvisibleColumn);
+    provide("isActionColumnVisible", isActionColumnVisibleLocal);
     provide("isActionIconVisible", isActionIconVisibleLocal);
     provide("isColumnsDnd", isColumnsDndLocal);
     provide("isMobile", isMobile);

package/src/ATable/ATableHeaderThAction/ATableHeaderThActionItem/ATableHeaderThActionItem.js

@@ -66,6 +66,11 @@ export default {
       inDropdown: true,
     });
 
+    const {
+      labelLocal,
+      labelTranslated,
+    } = LabelAPI(props);
+
     const {
       buttonVisibleProps,
       isColumnVisible,
@@ -88,12 +93,9 @@ export default {
       attributesForRoot,
       isColumnVisible,
       isLocked,
+      labelTranslated,
     });
 
-    const {
-      labelLocal,
-    } = LabelAPI(props);
-
     return {
       attributesComponent,
       attributesForRoot,

package/src/ATable/ATableHeaderThAction/ATableHeaderThActionItem/compositionAPI/AttributesComponentAPI.js

@@ -7,8 +7,8 @@ export default function AttributesComponentAPI(props, {
   attributesForRoot = computed(() => ({})),
   isColumnVisible = computed(() => false),
   isLocked = computed(() => false),
+  labelTranslated = computed(() => ""),
 }) {
-  const column = toRef(props, "column");
   const searchColumnModel = toRef(props, "searchColumnModel");
 
   const isComponentVisible = computed(() => {
@@ -16,7 +16,7 @@ export default function AttributesComponentAPI(props, {
       return true;
     }
     const RE = new RegExp(searchColumnModel.value, "gi");
-    return `${ column.value.label }`.search(RE) !== -1;
+    return `${ labelTranslated.value }`.search(RE) !== -1;
   });
 
   const attributesComponent = computed(() => {

package/src/ATable/ATableHeaderThAction/ATableHeaderThActionItem/compositionAPI/LabelAPI.js

@@ -5,6 +5,11 @@ import {
 
 import AFiltersAPI from "../../../../compositionAPI/AFiltersAPI";
 
+import {
+  isPlaceholderTranslate,
+  getTranslatedText,
+} from "../../../../ATranslation/compositionAPI/UtilsAPI";
+
 export default function LabelAPI(props) {
   const column = toRef(props, "column");
   const searchColumnModel = toRef(props, "searchColumnModel");
@@ -13,11 +18,22 @@ export default function LabelAPI(props) {
     filterSearchHighlight,
   } = AFiltersAPI();
 
+  const labelTranslated = computed(() => {
+    if (isPlaceholderTranslate(column.value.label)) {
+      return getTranslatedText({
+        placeholder: column.value.label,
+      });
+    }
+
+    return column.value.label;
+  });
+
   const labelLocal = computed(() => {
-    return filterSearchHighlight(column.value.label, { searchModel: searchColumnModel.value });
+    return filterSearchHighlight(labelTranslated.value, { searchModel: searchColumnModel.value });
   });
 
   return {
     labelLocal,
+    labelTranslated,
   };
 }

package/src/ATable/compositionAPI/SimpleTableAPI.js

@@ -6,15 +6,24 @@ import {
 import AMobileAPI from "../../compositionAPI/AMobileAPI";
 
 export default function SimpleTableAPI(props) {
+  const isActionColumnVisible = toRef(props, "isActionColumnVisible");
   const isActionIconVisible = toRef(props, "isActionColumnVisible");
   const isColumnsDnd = toRef(props, "isColumnsDnd");
   const isSimpleTable = toRef(props, "isSimpleTable");
   const modelIsTableWithoutScrollStart = toRef(props, "modelIsTableWithoutScrollStart");
+  const rowActions = toRef(props, "rowActions");
 
   const {
     isMobileWidth,
   } = AMobileAPI();
 
+  const isActionColumnVisibleLocal = computed(() => {
+    if (isSimpleTable.value) {
+      return rowActions.value && !!rowActions.value.length && isActionColumnVisible.value;
+    }
+
+    return isActionIconVisible.value;
+  });
   const isActionIconVisibleLocal = computed(() => {
     return !!(isActionIconVisible.value && !isSimpleTable.value);
   });
@@ -29,6 +38,7 @@ export default function SimpleTableAPI(props) {
   });
 
   return {
+    isActionColumnVisibleLocal,
     isActionIconVisibleLocal,
     isColumnsDndLocal,
     isMobile,