aloha-vue 1.2.149 → 1.2.151

package/package.json

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

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

@@ -17,6 +17,7 @@ import {
 
 export default function FiltersAPI(props, { emit }) {
   const filters = toRef(props, "filters");
+  const filterMain = toRef(props, "filterMain");
   const unappliedModel = toRef(props, "unappliedModel");
 
   const filtersDataKeyById = ref({});
@@ -24,7 +25,7 @@ export default function FiltersAPI(props, { emit }) {
   const filtersVisibleIds = ref([]);
 
   const hasFilters = computed(() => {
-    return filters.value.length > 0;
+    return !!(filters.value.length || filterMain.value);
   });
 
   const filtersKeyById = computed(() => {

package/src/ATable/ATable.js

@@ -825,6 +825,7 @@ export default {
           isLabelVisible: this.isLabelVisible,
           isLoadingMultipleActions: this.isLoadingMultipleActions,
           isQuickSearch: this.isQuickSearch,
+          isSortingMultiColumn: this.isSortingMultiColumn,
           label: this.label,
           labelClass: this.labelClass,
           labelTag: this.labelTag,

package/src/ATable/ATableSortingAdditional/ATableSortingAdditional.js

@@ -27,6 +27,11 @@ export default {
       type: Boolean,
       required: false,
     },
+    isSortingMultiColumn: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     modelSort: {
       type: Array,
       required: false,

package/src/ATable/ATableSortingAdditional/__tests__/ATableSortingAdditional.ModelAPI.test.js

@@ -12,7 +12,9 @@ describe("ATableSortingAdditional ModelAPI", () => {
     const {
       initUnappliedModelSort,
     } = ModelAPI({
-      modelSort: ref([]) }, {
+      modelSort: ref([]),
+      isSortingMultiColumn: ref(true),
+    }, {
       countColumnsAll,
       unappliedModelSort,
     });
@@ -33,7 +35,10 @@ describe("ATableSortingAdditional ModelAPI", () => {
 
     const {
       updateUnappliedModelSort
-    } = ModelAPI({ modelSort: modelSortProvided }, {
+    } = ModelAPI({
+      isSortingMultiColumn: ref(true),
+      modelSort: modelSortProvided,
+    }, {
       countColumnsAll,
       unappliedModelSort,
     });
@@ -55,7 +60,9 @@ describe("ATableSortingAdditional ModelAPI", () => {
     const {
       removeUnappliedModelSort,
     } = ModelAPI({
-      modelSort: ref([]) }, {
+      isSortingMultiColumn: ref(true),
+      modelSort: ref([]),
+    }, {
       countColumnsAll,
       unappliedModelSort,
     });
@@ -93,7 +100,9 @@ describe("ATableSortingAdditional ModelAPI", () => {
     const {
       updateUnappliedModelSort,
     } = ModelAPI({
-      modelSort: ref([]) }, {
+      isSortingMultiColumn: ref(true),
+      modelSort: ref([]),
+    }, {
       countColumnsAll,
       unappliedModelSort,
     });
@@ -142,4 +151,45 @@ describe("ATableSortingAdditional ModelAPI", () => {
       { sortId: "3", sortMode: "asc" },
     ]);
   });
+
+  it("Initializes, updates, and removes unapplied model sort while maintaining a single-column sort constraint", () => {
+    const countColumnsAll = computed(() => 3);
+    const unappliedModelSort = ref([]);
+    const {
+      initUnappliedModelSort,
+      removeUnappliedModelSort,
+      updateUnappliedModelSort,
+    } = ModelAPI({
+      modelSort: ref([]),
+      isSortingMultiColumn: ref(false),
+    }, {
+      countColumnsAll,
+      unappliedModelSort,
+    });
+
+    initUnappliedModelSort();
+
+    expect(unappliedModelSort.value).toHaveLength(1);
+    expect(unappliedModelSort.value[0].sortId).toBeUndefined();
+    expect(unappliedModelSort.value[0].sortMode).toBe("asc");
+
+    let model = [
+      { sortId: "1", sortMode: "asc" },
+    ];
+    updateUnappliedModelSort({ model });
+
+    expect(unappliedModelSort.value).toHaveLength(1);
+    expect(unappliedModelSort.value).toStrictEqual([
+      { sortId: "1", sortMode: "asc" },
+    ]);
+
+    removeUnappliedModelSort({
+      item: { additionalProps: { index: 0 } },
+    });
+
+    expect(unappliedModelSort.value).toHaveLength(1);
+    expect(unappliedModelSort.value).toStrictEqual([
+      { sortId: undefined, sortMode: "asc" },
+    ]);
+  });
 });

package/src/ATable/ATableSortingAdditional/compositionAPI/ModelAPI.js

@@ -20,6 +20,7 @@ export default function ModelAPI(props, {
   unappliedModelSort = ref([]),
   wasOpenDropdown = ref(false),
 }) {
+  const isSortingMultiColumn = toRef(props, "isSortingMultiColumn");
   const modelSort = toRef(props, "modelSort");
 
   const changeModelSort = inject("changeModelSort");
@@ -36,6 +37,12 @@ export default function ModelAPI(props, {
       MODEL_SORT.push(undefined);
     }
 
+    if (!isSortingMultiColumn.value) {
+      if (MODEL_SORT.length > 1) {
+        MODEL_SORT.length = 1;
+      }
+    }
+
     const UNAPPLIED_MODEL = [];
     forEach(MODEL_SORT, model => {
       const sortId = model ? model.replace(/^-/, "") : model;
@@ -53,7 +60,7 @@ export default function ModelAPI(props, {
   };
 
   const needAddModelUndefined = ({ model }) => {
-    if (model.length >= countColumnsAll.value) {
+    if (!isSortingMultiColumn.value || model.length >= countColumnsAll.value) {
       return false;
     }
     const MODEL_LAST_ITEM = last(model);

package/src/ATable/ATableTopPanel/ATableTopPanel.js

@@ -76,6 +76,11 @@ export default {
       type: Boolean,
       required: false,
     },
+    isSortingMultiColumn: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     label: {
       type: [String, Number],
       required: false,
@@ -322,6 +327,7 @@ export default {
             h(ATableSortingAdditional, {
               additionalSortingColumns: this.additionalSortingColumns,
               disabledSort: this.disabledSort,
+              isSortingMultiColumn: this.isSortingMultiColumn,
               modelSort: this.modelSort,
             }) :
             "",

package/src/ATable/compositionAPI/ScrollControlAPI.js

@@ -48,11 +48,6 @@ export default function ScrollControlAPI(props, { emit }, {
   const aTableRef = ref(undefined);
   const columnsVisibleAdditionalSpaceForOneGrow = ref(0);
 
-  const changeModelIsTableWithoutScroll = model => {
-    modelIsTableWithoutScroll.value = model;
-    emit("updateModelIsTableWithoutScroll", model);
-  };
-
   const setAdditionalSpaceColumnsForOneGrow = ({
     sumGrows = 0,
     freeSpaceWidth = 0,
@@ -178,6 +173,14 @@ export default function ScrollControlAPI(props, { emit }, {
     }
   };
 
+  const changeModelIsTableWithoutScroll = model => {
+    modelIsTableWithoutScroll.value = model;
+    emit("updateModelIsTableWithoutScroll", model);
+    if (modelIsTableWithoutScroll.value) {
+      checkVisibleColumns();
+    }
+  };
+
   onMounted(() => {
     if (!isMobile.value) {
       resizeOb.observe(aTableRef.value);