aloha-vue 1.0.28 → 1.0.29

package/docs/src/views/PageTable/PageTable.pug

@@ -9,6 +9,9 @@ div
     :table-actions="tableActions"
     preview="right"
     :is-quick-search="true"
+    :is-action-column-visible="true"
+    :is-columns-dnd="true"
+    :is-pagination="true"
     v-model:modelQuickSearch="modelQuickSearch"
     @change-columns-ordering="changeColumnsOrdering"
   )

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aloha-vue",
   "description": "Project aloha",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "author": "Ilia Brykin",
   "dependencies": {
     "@popperjs/core": "2.11.5",

package/src/ATable/ATable.js

@@ -141,6 +141,11 @@ export default {
       required: false,
       default: () => [],
     },
+    isPagination: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
     isPaginationOutside: {
       type: Boolean,
       required: false,
@@ -174,6 +179,16 @@ export default {
       required: false,
       default: "",
     },
+    isActionColumnVisible: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+    isColumnsDnd: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
   },
   emits: [
     "update:modelColumnsOrder",
@@ -195,6 +210,8 @@ export default {
       columns: computed(() => this.columns),
       columnActionsWidthLocal: computed(() => this.columnActionsWidth),
       columnWidthDefault: computed(() => this.columnWidthDefault),
+      isActionColumnVisible: computed(() => this.isActionColumnVisible),
+      isColumnsDnd: computed(() => this.isColumnsDnd),
       isLoadingOptions: computed(() => this.isLoadingOptions),
       isLoadingTable: computed(() => this.isLoadingTable),
       rowActions: computed(() => this.rowActions),
@@ -305,7 +322,7 @@ export default {
     },
 
     dataPaginated() {
-      if (this.limit && !this.isPaginationOutside) {
+      if (this.limit && !this.isPaginationOutside && this.isPagination) {
         const DATA_SORTED = cloneDeep(this.dataSorted);
         const INDEX_START = this.offset;
         const INDEX_END = INDEX_START + this.limit;
@@ -498,7 +515,7 @@ export default {
       !this.hasRows && h("div", {
         class: "a_table__empty_text",
       }, "Keine Einträge vorhanden."),
-      h("div", {
+      this.isPagination && h("div", {
         class: "a_pagination__parent"
       }, [
         h(ATableCountProPage, {

package/src/ATable/ATableHeader/ATableHeader.js

@@ -20,6 +20,7 @@ export default {
     },
   },
   inject: [
+    "isActionColumnVisible",
     "changeColumnsOrdering",
     "columnsOrdered",
   ],
@@ -72,7 +73,7 @@ export default {
             onDragendParent: this.dragend,
           });
         }),
-        h(ATableHeaderThAction),
+        this.isActionColumnVisible && h(ATableHeaderThAction),
       ]),
     ]);
   },

package/src/ATable/ATableHeaderTh/ATableHeaderTh.js

@@ -36,6 +36,7 @@ export default {
   ],
   inject: [
     "changeModelSort",
+    "isColumnsDnd",
     "isLoadingOptions",
     "isLoadingTable",
     "modelColumnsVisibleMapping",
@@ -77,8 +78,9 @@ export default {
     classForTh() {
       return [
         "a_table__th a_table__cell",
+        this.column.class,
         {
-          a_table__th_draggable: !this.isLocked && !this.isLoadingOptions,
+          a_table__th_draggable: !this.isLocked && !this.isLoadingOptions && this.isColumnsDnd,
           a_table__th_sorting: this.isSorting,
         }
       ];

package/src/ATable/ATableHeaderThAction/ATableHeaderThActionItem.js

@@ -45,6 +45,7 @@ export default {
     "changeColumnsOrdering",
     "changeModelColumnsVisible",
     "columnsOrdered",
+    "isColumnsDnd",
     "isLoadingOptions",
     "isLoadingTable",
     "modelColumnsVisibleLocal",
@@ -118,7 +119,7 @@ export default {
     },
 
     arrowButtons() {
-      if (!this.isLocked) {
+      if (!this.isLocked && this.isColumnsDnd) {
         return [
           this.isButtonArrowUpVisible && h("button", {
             id: this.idButtonArrowUp,
@@ -246,7 +247,7 @@ export default {
           }),
           ...this.arrowButtons,
         ]),
-        !this.isLocked && h(AIcon, {
+        (!this.isLocked && this.isColumnsDnd) && h(AIcon, {
           icon: "Dnd",
           class: "a_table__th__dropdown_item__icon_dnd"
         }),

package/src/ATable/ATableTd/ATableTd.js

@@ -64,9 +64,13 @@ export default {
     attributesForTd() {
       const ATTRIBUTES = {
         role: "cell",
-        class: ["a_table__td a_table__cell", {
-          a_table__cell_click: this.hasPreview,
-        }],
+        class: [
+          "a_table__td a_table__cell",
+          this.column.class,
+          {
+            a_table__cell_click: this.hasPreview,
+          },
+        ],
         style: this.columnsStyles,
       };
       if (this.hasPreview) {

package/src/ATable/ATableTr/ATableTr.js

@@ -24,6 +24,7 @@ export default {
   inject: [
     "columnsOrdered",
     "hasPreview",
+    "isActionColumnVisible",
     "previewRightRowIndex",
     "previewRightRowIndexLast",
     "tableId",
@@ -71,7 +72,7 @@ export default {
           rowIndex: this.rowIndex,
         }, this.$slots);
       }),
-      h(ATableTdAction, {
+      this.isActionColumnVisible && h(ATableTdAction, {
         row: this.row,
         rowIndex: this.rowIndex,
       }, this.$slots),

package/src/ATable/compositionAPI/DragAndDropChildAPI.js

@@ -10,6 +10,7 @@ export default function DragAndDropChildAPI(props, { emit }, { classOver = "" })
   const columnIndex = toRef(props, "columnIndex");
 
   const isLoadingOptions = inject("isLoadingOptions");
+  const isColumnsDnd = inject("isColumnsDnd");
 
   const root = ref(null);
 
@@ -60,7 +61,7 @@ export default function DragAndDropChildAPI(props, { emit }, { classOver = "" })
     const ATTRIBUTES = {
       ref: "root",
     };
-    if (!isLocked.value) {
+    if (!isLocked.value && isColumnsDnd.value) {
       ATTRIBUTES.draggable = !isLoadingOptions.value;
       ATTRIBUTES.onDragstart = dragstart;
       ATTRIBUTES.onDragend = dragend;

package/src/styles/components/ATable.scss

@@ -171,6 +171,7 @@
 .a_table__top_panel__label {
   font-weight: bolder;
   display: inline-block;
+  font-size: 2rem;
 }
 .a_table__top_panel__label__count {
   padding-left: var(--a_table_between_actions_margin);