aloha-vue 1.0.294 → 1.0.295

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aloha-vue",
   "description": "Project aloha",
-  "version": "1.0.294",
+  "version": "1.0.295",
   "author": "Ilia Brykin",
   "scripts": {
     "build-icons": "node scriptsNode/iconsSvgToJs.js bootstrap3 && node scriptsNode/iconsSvgToJs.js bootstrap-1-9-1"

package/src/ATable/ATableHeaderThAction/ATableHeaderThAction.js

@@ -12,7 +12,6 @@ import ColumnSearchAPI from "../compositionAPI/ColumnSearchAPI";
 import DragAndDropParentAPI from "../compositionAPI/DragAndDropParentAPI";
 
 import {
-  getModelColumnsOrderingDefault,
   getModelColumnsVisibleDefault,
 } from "../utils/utils";
 import {
@@ -92,7 +91,7 @@ export default {
 
     resetColumns() {
       this.changeModelColumnsVisible(getModelColumnsVisibleDefault(this.columnsOrdered));
-      this.changeColumnsOrdering({ modelColumnsOrderingLocal: getModelColumnsOrderingDefault(this.columns) });
+      this.changeColumnsOrdering({ reset: true });
     },
   },
   render() {

package/src/ATable/compositionAPI/ColumnsOrderingAPI.js

@@ -17,24 +17,31 @@ export default function ColumnsOrderingAPI(props, { emit }, {
     false: [],
     trueObject: {},
     falseObject: {},
+    trueColumns: [],
+    falseColumns: [],
   })),
 }) {
   const columns = toRef(props, "columns");
   const modelColumnsOrdering = toRef(props, "modelColumnsOrdering");
 
-  const changeColumnsOrdering = ({ columnIndexDraggable, columnIndexOver }) => {
-    if (columnIndexDraggable === columnIndexOver) {
+  const changeColumnsOrdering = ({ columnIndexDraggable, columnIndexOver, reset }) => {
+    if (columnIndexDraggable === columnIndexOver && !reset) {
       return;
     }
-    const MODEL_COLUMNS_ORDERING = cloneDeep(modelColumnsOrdering.value);
-    const ID_DRAGGABLE = MODEL_COLUMNS_ORDERING[columnIndexDraggable];
-    MODEL_COLUMNS_ORDERING.splice(columnIndexDraggable, 1);
-    MODEL_COLUMNS_ORDERING.splice(columnIndexOver, 0, ID_DRAGGABLE);
+    let modelColumnsOrderingLocal = [];
+    if (reset) {
+      modelColumnsOrderingLocal = [...columnIdsGroupByLocked.value.true, ...columnIdsGroupByLocked.value.false];
+    } else {
+      modelColumnsOrderingLocal = cloneDeep(modelColumnsOrdering.value);
+      const ID_DRAGGABLE = modelColumnsOrderingLocal[columnIndexDraggable];
+      modelColumnsOrderingLocal.splice(columnIndexDraggable, 1);
+      modelColumnsOrderingLocal.splice(columnIndexOver, 0, ID_DRAGGABLE);
+    }
 
     emit("changeColumnsOrdering", {
       columnIndexDraggable,
       columnIndexOver,
-      modelColumnsOrdering: MODEL_COLUMNS_ORDERING,
+      modelColumnsOrdering: modelColumnsOrderingLocal,
     });
     checkVisibleColumns();
   };