aloha-vue 1.2.117 → 1.2.119

package/package.json

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

package/src/AFilters/AFilters/AFilters.js

@@ -214,22 +214,24 @@ export default {
           filtersKeyById: this.filtersKeyById,
           filtersVisibleAll: this.filtersVisibleAll,
         }, {
-          filtersHorizontal: () => h(AFiltersHorizontal, {
-            ref: "filtersHorizontalRef",
-            id: this.id,
-            canSave: this.canSave,
-            disabled: this.disabled,
-            filtersGroup: this.filtersGroup,
-            filtersKeyById: this.filtersKeyById,
-            filtersSaved: this.filtersSavedLocal,
-            filtersVisible: this.filtersVisible,
-            onUpdateModelFilters: this.onUpdateModelFilters,
-            unappliedModel: this.unappliedModel,
-            updateDataKeyByIdFromFilter: this.updateDataKeyByIdFromFilter,
-            updateFiltersSaved: this.updateFiltersSavedLocal,
-            onStartSearch: this.startSearch,
-            onToggleFiltersVisible: this.toggleFiltersVisible,
-          }, this.$slots),
+          filtersHorizontal: () => this.view === "top" ?
+            h(AFiltersHorizontal, {
+              ref: "filtersHorizontalRef",
+              id: this.id,
+              canSave: this.canSave,
+              disabled: this.disabled,
+              filtersGroup: this.filtersGroup,
+              filtersKeyById: this.filtersKeyById,
+              filtersSaved: this.filtersSavedLocal,
+              filtersVisible: this.filtersVisible,
+              onUpdateModelFilters: this.onUpdateModelFilters,
+              unappliedModel: this.unappliedModel,
+              updateDataKeyByIdFromFilter: this.updateDataKeyByIdFromFilter,
+              updateFiltersSaved: this.updateFiltersSavedLocal,
+              onStartSearch: this.startSearch,
+              onToggleFiltersVisible: this.toggleFiltersVisible,
+            }, this.$slots) :
+            "",
           ...this.$slots,
         }),
       ],

package/src/AFilters/AFiltersHorizontal/AFiltersHorizontal.js

@@ -232,7 +232,6 @@ export default {
                   class: "a_filters_top__save_select",
                   data: this.filtersSavedLocal,
                   deselect: false,
-                  // disabled: !this.filtersSaved.length,
                   keyId: "label",
                   keyLabel: "label",
                   keyGroup: "group",
@@ -279,6 +278,7 @@ export default {
                       change: this.addFiltersVisible,
                       data: this.filtersHidden,
                       hasCaret: false,
+                      disabled: !this.filtersHidden.length,
                       isLabelFloat: false,
                       keyGroup: "group",
                       keyId: "id",

package/src/AFilters/AFiltersHorizontal/AFiltersHorizontalFilterUi/AFiltersHorizontalFilterUi.js

@@ -4,10 +4,10 @@ import {
 
 import ComponentTypesAPI from "./compositionAPI/ComponentTypesAPI";
 import ContainerAPI from "./compositionAPI/ContainerAPI";
-import DataAPI from "./compositionAPI/DataAPI";
 import FilterSpecificTypeAPI from "./compositionAPI/FilterSpecificTypeAPI";
 import IdAPI from "./compositionAPI/IdAPI";
 import ModelAPI from "./compositionAPI/ModelAPI";
+import UpdateDataAPI from "./compositionAPI/UpdateDataAPI";
 
 export default {
   name: "AFiltersHorizontalFilterUi",
@@ -51,7 +51,7 @@ export default {
 
     const {
       emitForComponentsWithData,
-    } = DataAPI(props);
+    } = UpdateDataAPI(props);
 
     const {
       idPrefix,

package/src/AFilters/AFiltersHorizontal/AFiltersHorizontalFilterUi/compositionAPI/{DataAPI.js → UpdateDataAPI.js}

@@ -3,11 +3,11 @@ import {
   toRef,
 } from "vue";
 
-export default function DataAPI(props) {
+export default function UpdateDataAPI(props) {
   const filter = toRef(props, "filter");
   const updateDataKeyByIdFromFilter = toRef(props, "updateDataKeyByIdFromFilter");
 
-  const typesWithData = ["select", "multiselect", "radio", "checkbox", "group", "fieldset"];
+  const TYPES_WITH_DATA = ["select", "multiselect", "radio", "checkbox", "group", "fieldset"];
 
   const updateDataLocal = ({ dataKeyByKeyId, item }) => {
     let filterId = filter.value.id;
@@ -22,7 +22,7 @@ export default function DataAPI(props) {
 
   const emitForComponentsWithData = computed(() => {
     const EMITS = {};
-    if (typesWithData.indexOf(filter.value.type) !== -1) {
+    if (TYPES_WITH_DATA.indexOf(filter.value.type) !== -1) {
       EMITS.onUpdateData = updateDataLocal;
     }
     return EMITS;

package/src/AFilters/AFiltersHorizontal/compositionAPI/FormAPI.js

@@ -11,18 +11,38 @@ import {
 export default function FormAPI(props) {
   const filtersGroup = toRef(props, "filtersGroup");
   const filtersVisible = toRef(props, "filtersVisible");
+  const updateDataKeyByIdFromFilter = toRef(props, "updateDataKeyByIdFromFilter");
+
+  const LABEL_CLASS = "a_column a_column_12_touch a_column_3_fullhd a_column_3_widescreen a_column_3_desktop";
+  const CLASS_COLUMNS = "a_columns a_columns_count_12 a_columns_gab_x_2 a_columns_gab_y_2 a_columns_gab_y_1_touch";
+  const CLASS_COLUMN_DEFAULT = "a_filters__form_element a_column a_column_12_touch a_column_9_fullhd a_column_9_widescreen a_column_9_desktop";
+  const TYPES_WITH_DATA = ["select", "multiselect", "radio", "checkbox", "group", "fieldset"];
+
+  const updateDataLocal = ({ dataKeyByKeyId, item, filter }) => {
+    let filterId = filter.id;
+    if (item) {
+      filterId = item.id;
+    }
+    updateDataKeyByIdFromFilter.value({
+      filterId: filterId,
+      dataKeyByKeyId,
+    });
+  };
 
   const dataForForm = computed(() => {
     const DATA = [];
     forEach(filtersGroup.value.alwaysVisible, filter => {
       const FILTER = cloneDeep(filter);
-      FILTER.labelClass = "a_column a_column_12_touch a_column_3_fullhd a_column_3_widescreen a_column_3_desktop";
-      FILTER.classColumn = "a_filters__form_element a_column a_column_12_touch a_column_9_fullhd a_column_9_widescreen a_column_9_desktop";
+      FILTER.labelClass = LABEL_CLASS;
+      FILTER.classColumn = CLASS_COLUMN_DEFAULT;
+      if (TYPES_WITH_DATA.indexOf(filter.type) !== -1) {
+        FILTER.onUpdateData = ({ dataKeyByKeyId, item }) => updateDataLocal({ dataKeyByKeyId, item, filter });
+      }
 
       DATA.push({
         type: "group",
         id: `group_${ filter.id }`,
-        classColumns: "a_columns a_columns_count_12 a_columns_gab_x_2 a_columns_gab_y_2 a_columns_gab_y_1_touch",
+        classColumns: CLASS_COLUMNS,
         children: [
           FILTER
         ],
@@ -31,15 +51,18 @@ export default function FormAPI(props) {
 
     forEach(filtersVisible.value, filter => {
       const FILTER = cloneDeep(filter);
-      FILTER.labelClass = "a_column a_column_12_touch a_column_3_fullhd a_column_3_widescreen a_column_3_desktop";
-      FILTER.classColumn = "a_filters__form_element a_column a_column_12_touch a_column_9_fullhd a_column_9_widescreen a_column_9_desktop a_d_flex a_align_items_center";
+      FILTER.labelClass = LABEL_CLASS;
+      FILTER.classColumn = `${ CLASS_COLUMN_DEFAULT }  a_d_flex a_align_items_center`;
       FILTER.slotAppend = "groupAppend";
       FILTER.class = "a_width_100";
+      if (TYPES_WITH_DATA.indexOf(filter.type) !== -1) {
+        FILTER.onUpdateData = ({ dataKeyByKeyId, item }) => updateDataLocal({ dataKeyByKeyId, item, filter });
+      }
 
       DATA.push({
         type: "group",
         id: `group_${ filter.id }`,
-        classColumns: "a_columns a_columns_count_12 a_columns_gab_x_2 a_columns_gab_y_2 a_columns_gab_y_1_touch",
+        classColumns: CLASS_COLUMNS,
         children: [
           FILTER
         ],

package/src/ui/ASelect/ASelect.js

@@ -533,7 +533,7 @@ export default {
       deep: true,
     });
 
-    addPopperContainerInBody({ className: "a_select_container " });
+    addPopperContainerInBody({ className: "a_select_container" });
     loadDataFromServer();
     loadDataFromServerForSearchAPI();