aloha-vue 1.2.112 → 1.2.114

package/docs/src/views/PageList/i18n/de.json

@@ -12,6 +12,8 @@
   "_A_LIST_GROUP_IS_HTML_HEADER_": "Anzeige von Listen im Text- oder HTML-Format",
   "_A_LIST_GROUP_SEPARATOR_DESCRIPTION_": "Dieses Beispiel zeigt die Verwendung der <strong>separator</strong>-Prop in der Komponente, um benutzerdefinierte Trennzeichen zwischen den Elementen festzulegen.",
   "_A_LIST_GROUP_SEPARATOR_HEADER_": "Benutzerdefinierte Trennzeichen zwischen den Elementen",
+  "_A_LIST_GROUP_SEPARATOR_HTML_DESCRIPTION_": "Der Inhalt, der als Trennzeichen von Elementen in einer Liste verwendet wird, kann auch im HTML-Format angegeben werden. Dieser Inhalt wird bereinigt.",
+  "_A_LIST_GROUP_SEPARATOR_HTML_HEADER_": "Benutzerdefinierte Trennzeichen zwischen Elementen einer Liste im HTML Format",
   "_A_LIST_GROUP_TAG_DESCRIPTION_": "Die Verwendung der Komponente zur dynamischen Anpassung zwischen geordneten (<strong>ol</strong>) und ungeordneten (<strong>ul</strong>) Listen durch die Prop <strong>tag</strong>.",
   "_A_LIST_GROUP_TAG_HEADER_": "Dynamische Anpassung des HTML-Tags",
   "_A_LIST_IS_DATA_SIMPLE_ARRAY_PROP_DESCRIPTION_": "Gibt an, ob nur ein einfaches Array ohne Objekte verwendet wird",
@@ -28,8 +30,8 @@
   "_A_LIST_KEY_LABEL_PROP_DESCRIPTION_": "Schlüssel für das anzuzeigende Label, wenn data ein Array von Objekten ist",
   "_A_LIST_LABEL_TAG_PROP_DESCRIPTION_": "HTML-Tag für die Labels",
   "_A_LIST_LIST_ITEM_TAG_PROP_DESCRIPTION_": "HTML-Tag für die Elemente in der Liste",
-  "_A_LIST_SEPARATOR_PROP_DESCRIPTION_": "Separator zwischen Elementen",
-  "_A_LIST_SEPARATOR_HTML_PROP_DESCRIPTION_": "Separator-HTML zwischen Elementen (nur aktiv, wenn <strong>is-html</strong> auf <strong>false</strong> gesetzt ist)",
+  "_A_LIST_SEPARATOR_PROP_DESCRIPTION_": "Separator zwischen Elementen einer Liste.",
+  "_A_LIST_SEPARATOR_HTML_PROP_DESCRIPTION_": "Trennzeichen zwischen Elementen einer liste im HTML Format. ",
   "_A_LIST_SLOT_DESCRIPTION_": "Benutzerdefinierter Inhalt für jedes Listenelement",
   "_A_LIST_TAG_PROP_DESCRIPTION_": "HTML-Tag für die gesamte Liste",
   "_A_LIST_WITH_SLOT_DESCRIPTION_": "Eine Liste mit benutzerdefiniertem Inhalt in den Elementen über den Slot.",

package/docs/src/views/PageList/i18n/en.json

@@ -12,6 +12,8 @@
   "_A_LIST_GROUP_IS_HTML_HEADER_": "Display of Lists in Text or HTML Format",
   "_A_LIST_GROUP_SEPARATOR_DESCRIPTION_": "This example shows the use of the <strong>separator</strong> property in the component to set custom separators between items.",
   "_A_LIST_GROUP_SEPARATOR_HEADER_": "Custom Separators Between Items",
+  "_A_LIST_GROUP_SEPARATOR_HTML_DESCRIPTION_": "The content used to separate items of a list can also be specified in HTML format. The content will be sanitized.",
+  "_A_LIST_GROUP_SEPARATOR_HTML_HEADER_": "Custom HTML Separators Between Items",
   "_A_LIST_GROUP_TAG_DESCRIPTION_": "Using the component to dynamically switch between ordered (<strong>ol</strong>) and unordered (<strong>ul</strong>) lists via the <strong>tag</strong> property.",
   "_A_LIST_GROUP_TAG_HEADER_": "Dynamic Adjustment of HTML Tag",
   "_A_LIST_IS_DATA_SIMPLE_ARRAY_PROP_DESCRIPTION_": "Indicates whether only a simple array without objects is used",
@@ -28,8 +30,8 @@
   "_A_LIST_KEY_LABEL_PROP_DESCRIPTION_": "Key for the label to be displayed, if data is an array of objects",
   "_A_LIST_LABEL_TAG_PROP_DESCRIPTION_": "HTML tag for the labels",
   "_A_LIST_LIST_ITEM_TAG_PROP_DESCRIPTION_": "HTML tag for the items in the list",
-  "_A_LIST_SEPARATOR_PROP_DESCRIPTION_": "Separator between items",
-  "_A_LIST_SEPARATOR_HTML_PROP_DESCRIPTION_": "_A_LIST_SEPARATOR_HTML_PROP_DESCRIPTION_",
+  "_A_LIST_SEPARATOR_PROP_DESCRIPTION_": "Separator between items in the list.",
+  "_A_LIST_SEPARATOR_HTML_PROP_DESCRIPTION_": "Separator between items in HTML format.",
   "_A_LIST_SLOT_DESCRIPTION_": "Custom content for each item in the list",
   "_A_LIST_TAG_PROP_DESCRIPTION_": "HTML tag for the entire list",
   "_A_LIST_WITH_SLOT_DESCRIPTION_": "A list with custom content in the items through the slot.",

package/docs/src/views/PageList/i18n/hr.json

@@ -12,6 +12,8 @@
   "_A_LIST_GROUP_IS_HTML_HEADER_": "Prikaz liste u tekstualnom ili HTML formatu",
   "_A_LIST_GROUP_SEPARATOR_DESCRIPTION_": "Ovaj primjer prikazuje uporabu propa <strong>separator</strong> za postavljanje prilagođenih separatora između elemenata.",
   "_A_LIST_GROUP_SEPARATOR_HEADER_": "Prilagođeni razdjelnici između elemenata",
+  "_A_LIST_GROUP_SEPARATOR_HTML_DESCRIPTION_": "Sadržaj koji se koristi za razdvajanje elemenata u listi može se odrediti i u HTML formatu. Na ovaj sadržaj se primjenjuje sanitizacija.",
+  "_A_LIST_GROUP_SEPARATOR_HTML_HEADER_": "Prilagođeni razdjelnici u HTML formatu za elemente liste",
   "_A_LIST_GROUP_TAG_DESCRIPTION_": "Primjer mogućnosti dinamičke prilagodbe između numeričke (<strong>ol</strong>) i simboličke (<strong>ul</strong>) liste koristeći prop <strong>tag</strong>.",
   "_A_LIST_GROUP_TAG_HEADER_": "Dinamička prilagodba HTML oznake",
   "_A_LIST_IS_DATA_SIMPLE_ARRAY_PROP_DESCRIPTION_": "Određuje koristi li se samo jednostavan niz bez objekata.",
@@ -28,8 +30,8 @@
   "_A_LIST_KEY_LABEL_PROP_DESCRIPTION_": "Ključ za prikazanu oznaku, ako su podaci niz objekata.",
   "_A_LIST_LABEL_TAG_PROP_DESCRIPTION_": "HTML tag za oznake.",
   "_A_LIST_LIST_ITEM_TAG_PROP_DESCRIPTION_": "HTML tag za elemente u listi.",
-  "_A_LIST_SEPARATOR_PROP_DESCRIPTION_": "Separator između elemenata.",
-  "_A_LIST_SEPARATOR_HTML_PROP_DESCRIPTION_": "_A_LIST_SEPARATOR_HTML_PROP_DESCRIPTION_",
+  "_A_LIST_SEPARATOR_PROP_DESCRIPTION_": "Razdjelnik između elemenata liste.",
+  "_A_LIST_SEPARATOR_HTML_PROP_DESCRIPTION_": "Razdjelnik između elemenata u HTML formatu.",
   "_A_LIST_SLOT_DESCRIPTION_": "Prilagođeni sadržaj svakog od elementa liste.",
   "_A_LIST_TAG_PROP_DESCRIPTION_": "HTML oznaka cijele liste.",
   "_A_LIST_WITH_SLOT_DESCRIPTION_": "Lista s prilagođenim sadržajem elemenata koristeći slot.",

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.114",
   "author": {
     "name": "Ilia Brykin",
     "email": "brykin.ilia@gmail.com"

package/src/ATable/ATable.js

@@ -323,6 +323,11 @@ export default {
       required: false,
       default: () => [],
     },
+    showCount: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
     showFirstSortingSequenceNumber: {
       type: Boolean,
       required: false,
@@ -399,7 +404,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 +413,7 @@ export default {
   },
   setup(props, context) {
     const {
+      isActionColumnVisibleLocal,
       isActionIconVisibleLocal,
       isColumnsDndLocal,
       isMobile,
@@ -630,6 +635,7 @@ export default {
     provide("currentMultipleActions", currentMultipleActions);
     provide("hasPreview", hasPreview);
     provide("indexFirstScrollInvisibleColumn", indexFirstScrollInvisibleColumn);
+    provide("isActionColumnVisible", isActionColumnVisibleLocal);
     provide("isActionIconVisible", isActionIconVisibleLocal);
     provide("isColumnsDnd", isColumnsDndLocal);
     provide("isMobile", isMobile);
@@ -790,6 +796,7 @@ export default {
           hasViews: this.hasViews,
           viewCurrent: this.viewCurrent,
           modelView: this.modelView,
+          showCount: this.showCount,
           tableActionsIndexFirstDropdownAction: this.tableActionsIndexFirstDropdownAction,
           tableActionsIndexFirstDropdownActionMobile: this.tableActionsIndexFirstDropdownActionMobile,
           useViewSlot: this.useViewSlot,

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/ATableTopPanel/ATableTopPanel.js

@@ -92,6 +92,11 @@ export default {
       type: Array,
       required: true,
     },
+    showCount: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
     tableActions: {
       type: Array,
       required: true,
@@ -202,7 +207,7 @@ export default {
                 class: "a_table__top_panel__label__text",
                 text: this.label,
               }),
-              h(AButton, {
+              this.showCount ? h(AButton, {
                 class: "a_table__top_panel__label__count",
                 tag: "span",
                 text: this.countAllRowsFormatted,
@@ -211,7 +216,7 @@ export default {
                 extra: {
                   count: this.countAllRows,
                 },
-              }),
+              }) : "",
             ]) :
           "",
         h("div", {

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,

package/src/compositionAPI/APageTabTitleAPI.js

@@ -67,7 +67,7 @@ export default function APageTabTitleAPI(props) {
 
   setPageTabTitle();
 
-  watch(title, () => {
+  watch(titleTranslated, () => {
     setPageTabTitle();
   });
 }