aloha-vue 1.2.123 → 1.2.125

package/package.json

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

package/src/AButton/AButton.js

@@ -52,6 +52,11 @@ export default {
       required: false,
       default: undefined,
     },
+    excludeRenderAttributes: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
     extra: {
       type: Object,
       required: false,

package/src/AElement/AElement.js

@@ -17,6 +17,7 @@ import SwitchAPI from "./comositionAPI/SwitchAPI";
 import TagAPI from "./comositionAPI/TagAPI";
 import TextAPI from "./comositionAPI/TextAPI";
 import TitleAPI from "./comositionAPI/TitleAPI";
+import UIExcludeRenderAttributesAPI from "../ui/compositionApi/UIExcludeRenderAttributesAPI";
 
 import placements from "../const/placements";
 import {
@@ -64,6 +65,11 @@ export default {
       required: false,
       default: undefined,
     },
+    excludeRenderAttributes: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
     extra: {
       type: Object,
       required: false,
@@ -175,12 +181,12 @@ export default {
       required: false,
       default: undefined,
     },
-    target: {
+    tag: {
       type: String,
       required: false,
       default: undefined,
     },
-    tag: {
+    target: {
       type: String,
       required: false,
       default: undefined,
@@ -263,6 +269,10 @@ export default {
     "click",
   ],
   setup(props, context) {
+    const {
+      attributesToExcludeFromRender,
+    } = UIExcludeRenderAttributesAPI(props);
+
     const {
       isRouterLink,
     } = RouterLinkAPI(props);
@@ -323,6 +333,7 @@ export default {
 
     return {
       ariaLabelAttributes,
+      attributesToExcludeFromRender,
       componentLocal,
       elementRef,
       htmlTitleAttributes,
@@ -363,6 +374,7 @@ export default {
       isAllRowsSelected: undefined, // TODO: ATable
       onClick: this.onClick,
       ...this.attributes,
+      ...this.attributesToExcludeFromRender,
     }, {
       default: () => [
         (!this.isTitleHtml && this.isTitleVisible) ? h(ATranslation, {

package/src/AFilters/AFilersRight/AFilersRight.js

@@ -13,6 +13,11 @@ export default {
       type: Boolean,
       required: false,
     },
+    excludeRenderAttributes: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
     filters: {
       type: Array,
       required: false,
@@ -59,13 +64,14 @@ export default {
       h("form", {}, [
         this.filters.map(filter => {
           return h(AFiltersHorizontalFilterUi, {
+            id: this.id,
             class: "a_filters_right__filter_ui",
+            excludeRenderAttributes: this.excludeRenderAttributes,
             filter,
             isLabelVisible: true,
+            onUpdateModelFilters: this.onUpdateModelFilters,
             unappliedModel: this.appliedModel,
             updateDataKeyByIdFromFilter: this.updateDataKeyByIdFromFilter,
-            onUpdateModelFilters: this.onUpdateModelFilters,
-            id: this.id,
           }, this.$slots);
         })
       ]),

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

@@ -3,7 +3,9 @@ import {
   toRef,
 } from "vue";
 
-import AUiTypesWithData from "../../../../ui/const/AUiTypesWithData";
+import {
+  typesWithData,
+} from "../../../../ui/const/AUiTypes";
 import {
   isEmpty,
 } from "lodash-es";
@@ -18,7 +20,7 @@ export default function IsDataLoadingAPI(props, { emit }, {
     if (!hasCurrentFilter.value) {
       return false;
     }
-    if (AUiTypesWithData[filter.value.type]) {
+    if (typesWithData.value[filter.value.type]) {
       return isEmpty(dataKeyByKeyIdPerFilter.value[filter.value.id]);
     }
     return false;

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

@@ -6,7 +6,9 @@ import {
 import AFiltersAPI from "../../../../compositionAPI/AFiltersAPI";
 
 import AKeyLabel from "../../../../const/AKeyLabel";
-import AUiTypesModelArray from "../../../../ui/const/AUiTypesModelArray";
+import {
+  typesModelArray,
+} from "../../../../ui/const/AUiTypes";
 import TypesNumberRange from "../../../../ui/AInputNumberRange/utils/Types";
 import {
   filter as _filter,
@@ -69,7 +71,7 @@ export default function ModelValuesAPI(props, {
       }
       return [];
     }
-    if (AUiTypesModelArray[filter.value.type] ||
+    if (typesModelArray.value[filter.value.type] ||
       (filter.value.type === "radio" && filter.value.isModelArray)) {
       if (modelArrayReal.value.length) {
         if (modelArrayReal.value.length === 1) {

package/src/AFilters/AFilters/AFilters.js

@@ -37,19 +37,24 @@ export default {
       type: Boolean,
       required: false,
     },
-    filters: {
+    excludeRenderAttributes: {
       type: Array,
       required: false,
       default: () => [],
     },
-    filtersSaved: {
+    filterMain: {
+      type: Object,
+      required: false,
+    },
+    filters: {
       type: Array,
       required: false,
       default: () => [],
     },
-    filterMain: {
-      type: Object,
+    filtersSaved: {
+      type: Array,
       required: false,
+      default: () => [],
     },
     id: {
       type: String,
@@ -181,6 +186,7 @@ export default {
         this.view === "top" && h(AFiltersMain, {
           id: this.id,
           disabled: this.disabled,
+          excludeRenderAttributes: this.excludeRenderAttributes,
           filterMain: this.filterMain,
           mainModel: this.mainModel,
           updateDataKeyByIdFromFilter: this.updateDataKeyByIdFromFilter,
@@ -194,6 +200,7 @@ export default {
           h(AFilersRight, {
             id: this.id,
             disabled: this.disabled,
+            excludeRenderAttributes: this.excludeRenderAttributes,
             filters: this.filters,
             filtersKeyById: this.filtersKeyById,
             appliedModel: this.appliedModel,
@@ -220,6 +227,7 @@ export default {
               id: this.id,
               canSave: this.canSave,
               disabled: this.disabled,
+              excludeRenderAttributes: this.excludeRenderAttributes,
               filtersGroup: this.filtersGroup,
               filtersKeyById: this.filtersKeyById,
               filtersSaved: this.filtersSavedLocal,

package/src/AFilters/AFilters/compositionAPI/CloseFilterAPI.js

@@ -4,8 +4,10 @@ import {
   toRef,
 } from "vue";
 
-import AUiTypesModelArray from "../../../ui/const/AUiTypesModelArray";
-import AUiTypesModelObject from "../../../ui/const/AUiTypesModelObject";
+import {
+  typesModelArray,
+  typesModelObject,
+} from "../../../ui/const/AUiTypes";
 import {
   cloneDeep,
   filter as _filter,
@@ -28,7 +30,7 @@ export default function CloseFilterAPI(props, { emit }, {
   const closeCurrentFilter = ({ filter, keyId, modelArray, appliedModelLocal, unappliedModelLocal }) => {
     const MODEL_ID = filter.modelId || filter.id;
 
-    if (AUiTypesModelArray[filter.type]) {
+    if (typesModelArray.value[filter.type]) {
       if (appliedModelLocal[MODEL_ID] &&
         appliedModelLocal[MODEL_ID].length) {
         if (modelArray) {
@@ -49,7 +51,7 @@ export default function CloseFilterAPI(props, { emit }, {
           unappliedModelLocal[MODEL_ID] = [];
         }
       }
-    } else if (AUiTypesModelObject[filter.type] && keyId) {
+    } else if (typesModelObject.value[filter.type] && keyId) {
       if (isPlainObject(unappliedModelLocal?.[MODEL_ID])) {
         unappliedModelLocal[MODEL_ID][keyId] = undefined;
       }

package/src/AFilters/AFilters/compositionAPI/FiltersAPI.js

@@ -4,7 +4,12 @@ import {
   toRef,
 } from "vue";
 
-import AUiTypesContainer from "../../../ui/const/AUiTypesContainer";
+import {
+  typesContainer,
+} from "../../../ui/const/AUiTypes";
+import {
+  isModelForFilterNotEmpty,
+} from "../../../utils/utilsUi";
 import {
   cloneDeep,
   forEach,
@@ -26,7 +31,7 @@ export default function FiltersAPI(props, { emit }) {
     const FILTERS = {};
     forEach(cloneDeep(filters.value), filter => {
       FILTERS[filter.id] = filter;
-      if (AUiTypesContainer[filter.type] &&
+      if (typesContainer.value[filter.type] &&
         filter.children &&
         filter.children.length) {
         forEach(filter.children, filterChild => {
@@ -69,7 +74,7 @@ export default function FiltersAPI(props, { emit }) {
     const FILERS_NEW = [];
     forEach(FILTERS, filter => {
       FILERS_NEW.push(filter);
-      if (AUiTypesContainer[filter.type] &&
+      if (typesContainer.value[filter.type] &&
         filter.children &&
         filter.children.length) {
         forEach(filter.children, filterChild => {
@@ -83,7 +88,9 @@ export default function FiltersAPI(props, { emit }) {
   const setFiltersVisibleIds = () => {
     const FILTERS_VISIBLE_IDS = [];
     forEach(filtersGroup.value.filters, filter => {
-      if (filter.id in unappliedModel.value) {
+      if (isModelForFilterNotEmpty({
+        filter, modelObj: unappliedModel.value,
+      })) {
         FILTERS_VISIBLE_IDS.push(filter.id);
       }
     });
@@ -94,7 +101,9 @@ export default function FiltersAPI(props, { emit }) {
     emit("update:unappliedModel", model);
 
     if (isUpdateFiltersVisible) {
-      setFiltersVisibleIds();
+      setTimeout(() => {
+        setFiltersVisibleIds();
+      });
     }
   };
 

package/src/AFilters/AFiltersHorizontal/AFiltersHorizontal.js

@@ -32,6 +32,11 @@ export default {
       type: Boolean,
       required: false,
     },
+    excludeRenderAttributes: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
     filtersGroup: {
       type: Object,
       required: true,
@@ -52,27 +57,27 @@ export default {
       type: Array,
       required: true,
     },
+    id: {
+      type: String,
+      required: true,
+    },
     mainModel: {
       type: Object,
       required: false,
     },
-    unappliedModel: {
-      type: Object,
-      required: true,
-    },
     onUpdateModelFilters: {
       type: Function,
       required: true,
     },
-    id: {
-      type: String,
+    unappliedModel: {
+      type: Object,
       required: true,
     },
-    updateFiltersSaved: {
+    updateDataKeyByIdFromFilter: {
       type: Function,
       required: true,
     },
-    updateDataKeyByIdFromFilter: {
+    updateFiltersSaved: {
       type: Function,
       required: true,
     },
@@ -253,11 +258,12 @@ export default {
                 h(AForm, {
                   idPrefix: this.idFilterTop,
                   class: "a_filter_horizontal__body__form",
-                  classColumns: "",
                   classColumnDefault: "",
+                  classColumns: "",
                   data: this.dataForForm,
-                  showErrors: false,
+                  excludeRenderAttributes: this.excludeRenderAttributes,
                   modelValue: this.unappliedModel,
+                  showErrors: false,
                   onChange: this.onUpdateModelFilters,
                 }, {
                   ...this.$slots,

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

@@ -12,6 +12,11 @@ import UpdateDataAPI from "./compositionAPI/UpdateDataAPI";
 export default {
   name: "AFiltersHorizontalFilterUi",
   props: {
+    excludeRenderAttributes: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
     filter: {
       type: Object,
       required: false,
@@ -79,6 +84,7 @@ export default {
       idPrefix: this.idPrefix,
       modelValue: this.isContainer ? this.unappliedModel : this.unappliedModel[this.filter.modelId || this.filter.id],
       "onUpdate:modelValue": this.onUpdateModelFiltersLocal,
+      excludeRenderAttributes: this.excludeRenderAttributes,
       ...this.filter,
       ...this.filterSpecificAttributes,
       label: this.isLabelVisible ? this.filter.label : undefined,

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

@@ -3,13 +3,15 @@ import {
   toRef,
 } from "vue";
 
-import AUiTypesContainer from "../../../../ui/const/AUiTypesContainer";
+import {
+  typesContainer,
+} from "../../../../ui/const/AUiTypes";
 
 export default function ContainerAPI(props) {
   const filter = toRef(props, "filter");
 
   const isContainer = computed(() => {
-    return !!AUiTypesContainer[filter.value.type];
+    return !!typesContainer.value[filter.value.type];
   });
 
   return {

package/src/AFilters/AFiltersMain/AFiltersMain.js

@@ -17,6 +17,11 @@ export default {
       type: Boolean,
       required: false,
     },
+    excludeRenderAttributes: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
     filterMain: {
       type: Object,
       required: false,
@@ -78,6 +83,7 @@ export default {
         classColumns: "a_filters_top__main_wrapper",
         classColumnDefault: "a_filters_top__main",
         data: this.dataMainFilter,
+        excludeRenderAttributes: this.excludeRenderAttributes,
         modelValue: this.mainModel,
         showErrors: false,
         onChange: this.updateMainModel,

package/src/ALink/ALink.js

@@ -47,6 +47,11 @@ export default {
       required: false,
       default: undefined,
     },
+    excludeRenderAttributes: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
     extra: {
       type: Object,
       required: false,

package/src/ATable/compositionAPI/ColumnsOrderingAPI.js

@@ -49,7 +49,9 @@ export default function ColumnsOrderingAPI(props, { emit }, {
       columnIndexOver,
       modelColumnsOrdering: modelColumnsOrderingLocal,
     });
-    checkVisibleColumns();
+    setTimeout(() => {
+      checkVisibleColumns();
+    });
   };
 
   const checkColumnsOrdering = () => {

package/src/ui/ACheckbox/ACheckbox.js

@@ -21,6 +21,7 @@ import UIDataGroupAPI from "../compositionApi/UIDataGroupAPI";
 import UiDataSortAPI from "../compositionApi/UiDataSortAPI";
 import UiDataWatchEmitAPI from "../compositionApi/UiDataWatchEmitAPI";
 import UiDataWithKeyIdAndLabelAPI from "../compositionApi/UiDataWithKeyIdAndLabelAPI";
+import UIExcludeRenderAttributesAPI from "../compositionApi/UIExcludeRenderAttributesAPI";
 import UiLoadingAPI from "../compositionApi/UiLoadingAPI";
 import UiSearchAPI from "../compositionApi/UiSearchAPI";
 import UiStyleHideAPI from "../compositionApi/UiStyleHideAPI";
@@ -91,6 +92,11 @@ export default {
       required: false,
       default: undefined,
     },
+    excludeRenderAttributes: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
     extra: {
       type: Object,
       required: false,
@@ -196,11 +202,6 @@ export default {
       required: false,
       default: undefined,
     },
-    modelId: {
-      type: String,
-      required: false,
-      default: undefined,
-    },
     label: {
       type: [String, Number],
       required: false,
@@ -220,6 +221,11 @@ export default {
       required: false,
       default: () => ({}),
     },
+    modelId: {
+      type: String,
+      required: false,
+      default: undefined,
+    },
     modelUndefined: {
       required: false,
       default: null,
@@ -304,6 +310,10 @@ export default {
     "update:modelValue",
   ],
   setup(props, context) {
+    const {
+      attributesToExcludeFromRender,
+    } = UIExcludeRenderAttributesAPI(props);
+
     const {
       componentStyleHide,
     } = UiStyleHideAPI(props);
@@ -422,6 +432,7 @@ export default {
 
     return {
       ariaDescribedbyLocal,
+      attributesToExcludeFromRender,
       componentStyleHide,
       dataExtraLocal,
       dataGrouped,
@@ -461,9 +472,14 @@ export default {
     };
   },
   render() {
-    return this.isRender && h("div", {
+    if (!this.isRender) {
+      return "";
+    }
+
+    return h("div", {
       style: this.componentStyleHide,
       errorsAll: undefined,
+      ...this.attributesToExcludeFromRender,
     }, [
       h("div", {
         class: ["a_form_element__parent"],