@websy/websy-designs 1.4.27 → 1.4.29

package/dist/websy-designs-es6.debug.js

@@ -2613,7 +2613,6 @@ class WebsyNavigationMenu {
         })        
       })
     }
-    console.log('visibleItems', visibleItems)
   }
   normaliseString (text) {
     return text.replace(/-/g, '').replace(/\s/g, '_')
@@ -4732,6 +4731,9 @@ const WebsyUtils = {
   },
   toQlikDateNum: d => {
     return Math.floor(d.getTime() / 86400000 + 25570)
+  },
+  toQlikDate: d => {
+    return Math.floor(d.getTime() / 86400000 + 25570)
   }
 }
 
@@ -5729,10 +5731,11 @@ class WebsyTable3 {
       allowPivoting: false,
       searchIcon: `<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 512 512"><title>ionicons-v5-f</title><path d="M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z" style="fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px"/><line x1="338.29" y1="338.29" x2="448" y2="448" style="fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px"/></svg>`,
       plusIcon: WebsyDesigns.Icons.PlusFilled,
-      minusIcon: WebsyDesigns.Icons.MinusFilled
+      minusIcon: WebsyDesigns.Icons.MinusFilled      
     }
     this.options = Object.assign({}, DEFAULTS, options)
     this.sizes = {}
+    this.currentData = []
     this.scrollDragging = false
     this.cellDragging = false
     this.vScrollRequired = false
@@ -5809,14 +5812,16 @@ class WebsyTable3 {
     this.renderTotals()
   }
   appendRows (data) {
-    this.hideError()
+    this.hideError()    
     let bodyEl = document.getElementById(`${this.elementId}_tableBody`)    
     if (bodyEl) {
       if (this.options.virtualScroll === true) {
         bodyEl.innerHTML = this.buildBodyHtml(data, true)
+        this.currentData = data
       }      
       else {
         bodyEl.innerHTML += this.buildBodyHtml(data, true)
+        this.currentData = this.currentData.concat(data)
       }
     }
     // this.data = this.data.concat(data)
@@ -5877,7 +5882,8 @@ class WebsyTable3 {
           colspan='${cell.colspan || 1}'
           rowspan='${cell.rowspan || 1}'
           data-row-index='${rowIndex}'
-          data-col-index='${cellIndex}'
+          data-cell-index='${cellIndex}'
+          data-col-index='${sizeIndex}'
         `
         // if (useWidths === true) {
         //   bodyHtml += `
@@ -5886,7 +5892,13 @@ class WebsyTable3 {
         //   `
         // }
         bodyHtml += `
-        ><div style='${divStyle}'>`
+        ><div 
+          style='${divStyle}' 
+          class='websy-table-cell-content'
+          data-row-index='${rowIndex}'
+          data-cell-index='${cellIndex}'
+          data-col-index='${sizeIndex}'
+        >`
         if (cell.expandable === true) {
           bodyHtml += `<i 
             data-row-index='${rowIndex}'
@@ -5972,7 +5984,15 @@ class WebsyTable3 {
         //     width='${col.width || col.actualWidth}'
         //   `
         // }
-        headerHtml += `><div style='${divStyle}'>${col.name}${col.searchable === true ? this.buildSearchIcon(col, colIndex) : ''}</div></td>`
+        headerHtml += `>
+          <div 
+            style='${divStyle}'
+            data-col-index="${colIndex}"
+            class='${['asc', 'desc'].indexOf(col.sort) !== -1 ? 'sortable-column' : ''}'
+          >
+            ${col.name}${col.activeSort ? this.buildSortIcon(col.sort, colIndex) : ''}${col.searchable === true ? this.buildSearchIcon(col, colIndex) : ''}
+          </div>
+        </td>`
       })
       headerHtml += `</tr>`
     })
@@ -5992,8 +6012,14 @@ class WebsyTable3 {
   }
   buildSearchIcon (col, index) {
     // return `<div class="websy-table-search-icon" data-col-id="${col.dimId}" data-col-index="${index}">
-    return `<div class="websy-table-search-icon" data-col-index="${index}">
-        <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 512 512"><title>ionicons-v5-f</title><path d="M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z" style="fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px"/><line x1="338.29" y1="338.29" x2="448" y2="448" style="fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px"/></svg>
+    return `<div class="websy-table-search-icon">
+        <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 512 512"><path d="M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z" style="fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px"/><line x1="338.29" y1="338.29" x2="448" y2="448" style="fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px"/></svg>
+      </div>`
+  }
+  buildSortIcon (direction, index) {
+    // return `<div class="websy-table-search-icon" data-col-id="${col.dimId}" data-col-index="${index}">
+    return `<div class="websy-table-sort-icon ${direction}" data-col-index="${index}">
+        <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 512 512"><path d="M98,190.06,237.78,353.18a24,24,0,0,0,36.44,0L414,190.06c13.34-15.57,2.28-39.62-18.22-39.62H116.18C95.68,150.44,84.62,174.49,98,190.06Z"/></svg>
       </div>`
   } 
   buildTotalHtml (useWidths = false) {
@@ -6167,9 +6193,9 @@ class WebsyTable3 {
   }
   handleClick (event) {
     const colIndex = +event.target.getAttribute('data-col-index')
+    const cellIndex = +event.target.getAttribute('data-cell-index')
     const rowIndex = +event.target.getAttribute('data-row-index')
     if (event.target.classList.contains('websy-table-search-icon')) {     
-      // console.log('clicked on search icon')            
       if (this.options.columns[this.options.columns.length - 1][colIndex].onSearch) {
         this.options.columns[this.options.columns.length - 1][colIndex].onSearch(event, this.options.columns[this.options.columns.length - 1][colIndex])
       } 
@@ -6190,6 +6216,27 @@ class WebsyTable3 {
         // out of box function
       }
     }
+    if (event.target.classList.contains('sortable-column')) {
+      // const sortIndex = +event.target.getAttribute('data-sort-index')
+      const column = this.options.columns[this.options.columns.length - 1][colIndex]
+      if (this.options.onSort) {
+        this.options.onSort(event, column, colIndex)
+      }
+      else {
+        this.internalSort(column, colIndex)
+      }
+    } 
+    if (event.target.classList.contains('websy-table-cell-content')) {
+      if (this.options.onCellSelect) {
+        this.options.onCellSelect(event, {
+          cellIndex,
+          colIndex, 
+          rowIndex,
+          cell: (this.currentData[rowIndex] || [])[cellIndex],
+          column: (this.options.columns[this.options.columns.length - 1] || [])[colIndex]
+        })
+      }
+    }
   }
   handleMouseDown (event) {
     if (event.target.classList.contains('websy-scroll-handle-y')) {

package/dist/websy-designs-es6.js

@@ -2781,8 +2781,6 @@ var WebsyNavigationMenu = /*#__PURE__*/function () {
           });
         });
       }
-
-      console.log('visibleItems', visibleItems);
     }
   }, {
     key: "normaliseString",
@@ -5266,6 +5264,9 @@ var WebsyUtils = {
   },
   toQlikDateNum: function toQlikDateNum(d) {
     return Math.floor(d.getTime() / 86400000 + 25570);
+  },
+  toQlikDate: function toQlikDate(d) {
+    return Math.floor(d.getTime() / 86400000 + 25570);
   }
 };
 /* global WebsyDesigns */
@@ -6276,6 +6277,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
     };
     this.options = _extends({}, DEFAULTS, options);
     this.sizes = {};
+    this.currentData = [];
     this.scrollDragging = false;
     this.cellDragging = false;
     this.vScrollRequired = false;
@@ -6329,8 +6331,10 @@ var WebsyTable3 = /*#__PURE__*/function () {
       if (bodyEl) {
         if (this.options.virtualScroll === true) {
           bodyEl.innerHTML = this.buildBodyHtml(data, true);
+          this.currentData = data;
         } else {
           bodyEl.innerHTML += this.buildBodyHtml(data, true);
+          this.currentData = this.currentData.concat(data);
         }
       } // this.data = this.data.concat(data)
       // this.rowCount = this.data.length   
@@ -6402,14 +6406,14 @@ var WebsyTable3 = /*#__PURE__*/function () {
           } // console.log('rowspan', cell.rowspan)
 
 
-          bodyHtml += "<td \n          class='websy-table-cell ".concat(sizeIndex < _this37.pinnedColumns ? 'pinned' : 'unpinned', " ").concat((cell.classes || []).join(' '), "'\n          style='").concat(style, "'\n          data-info='").concat(cell.value, "'\n          colspan='").concat(cell.colspan || 1, "'\n          rowspan='").concat(cell.rowspan || 1, "'\n          data-row-index='").concat(rowIndex, "'\n          data-col-index='").concat(cellIndex, "'\n        "); // if (useWidths === true) {
+          bodyHtml += "<td \n          class='websy-table-cell ".concat(sizeIndex < _this37.pinnedColumns ? 'pinned' : 'unpinned', " ").concat((cell.classes || []).join(' '), "'\n          style='").concat(style, "'\n          data-info='").concat(cell.value, "'\n          colspan='").concat(cell.colspan || 1, "'\n          rowspan='").concat(cell.rowspan || 1, "'\n          data-row-index='").concat(rowIndex, "'\n          data-cell-index='").concat(cellIndex, "'\n          data-col-index='").concat(sizeIndex, "'\n        "); // if (useWidths === true) {
           //   bodyHtml += `
           //     style='width: ${sizingColumns[cellIndex].width || sizingColumns[cellIndex].actualWidth}px!important'
           //     width='${sizingColumns[cellIndex].width || sizingColumns[cellIndex].actualWidth}'
           //   `
           // }
 
-          bodyHtml += "\n        ><div style='".concat(divStyle, "'>");
+          bodyHtml += "\n        ><div \n          style='".concat(divStyle, "' \n          class='websy-table-cell-content'\n          data-row-index='").concat(rowIndex, "'\n          data-cell-index='").concat(cellIndex, "'\n          data-col-index='").concat(sizeIndex, "'\n        >");
 
           if (cell.expandable === true) {
             bodyHtml += "<i \n            data-row-index='".concat(rowIndex, "'\n            data-col-index='").concat(cell.level || cellIndex, "'\n            class='websy-table-cell-expand'\n          >").concat(_this37.options.plusIcon, "</i>");
@@ -6487,7 +6491,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
           //   `
           // }
 
-          headerHtml += "><div style='".concat(divStyle, "'>").concat(col.name).concat(col.searchable === true ? _this38.buildSearchIcon(col, colIndex) : '', "</div></td>");
+          headerHtml += ">\n          <div \n            style='".concat(divStyle, "'\n            data-col-index=\"").concat(colIndex, "\"\n            class='").concat(['asc', 'desc'].indexOf(col.sort) !== -1 ? 'sortable-column' : '', "'\n          >\n            ").concat(col.name).concat(col.activeSort ? _this38.buildSortIcon(col.sort, colIndex) : '').concat(col.searchable === true ? _this38.buildSearchIcon(col, colIndex) : '', "\n          </div>\n        </td>");
         });
         headerHtml += "</tr>";
       });
@@ -6510,7 +6514,13 @@ var WebsyTable3 = /*#__PURE__*/function () {
     key: "buildSearchIcon",
     value: function buildSearchIcon(col, index) {
       // return `<div class="websy-table-search-icon" data-col-id="${col.dimId}" data-col-index="${index}">
-      return "<div class=\"websy-table-search-icon\" data-col-index=\"".concat(index, "\">\n        <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\" viewBox=\"0 0 512 512\"><title>ionicons-v5-f</title><path d=\"M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z\" style=\"fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px\"/><line x1=\"338.29\" y1=\"338.29\" x2=\"448\" y2=\"448\" style=\"fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px\"/></svg>\n      </div>");
+      return "<div class=\"websy-table-search-icon\">\n        <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\" viewBox=\"0 0 512 512\"><path d=\"M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z\" style=\"fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px\"/><line x1=\"338.29\" y1=\"338.29\" x2=\"448\" y2=\"448\" style=\"fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px\"/></svg>\n      </div>";
+    }
+  }, {
+    key: "buildSortIcon",
+    value: function buildSortIcon(direction, index) {
+      // return `<div class="websy-table-search-icon" data-col-id="${col.dimId}" data-col-index="${index}">
+      return "<div class=\"websy-table-sort-icon ".concat(direction, "\" data-col-index=\"").concat(index, "\">\n        <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"15\" height=\"15\" viewBox=\"0 0 512 512\"><path d=\"M98,190.06,237.78,353.18a24,24,0,0,0,36.44,0L414,190.06c13.34-15.57,2.28-39.62-18.22-39.62H116.18C95.68,150.44,84.62,174.49,98,190.06Z\"/></svg>\n      </div>");
     }
   }, {
     key: "buildTotalHtml",
@@ -6722,10 +6732,10 @@ var WebsyTable3 = /*#__PURE__*/function () {
     key: "handleClick",
     value: function handleClick(event) {
       var colIndex = +event.target.getAttribute('data-col-index');
+      var cellIndex = +event.target.getAttribute('data-cell-index');
       var rowIndex = +event.target.getAttribute('data-row-index');
 
       if (event.target.classList.contains('websy-table-search-icon')) {
-        // console.log('clicked on search icon')            
         if (this.options.columns[this.options.columns.length - 1][colIndex].onSearch) {
           this.options.columns[this.options.columns.length - 1][colIndex].onSearch(event, this.options.columns[this.options.columns.length - 1][colIndex]);
         }
@@ -6744,6 +6754,29 @@ var WebsyTable3 = /*#__PURE__*/function () {
         } else {// out of box function
         }
       }
+
+      if (event.target.classList.contains('sortable-column')) {
+        // const sortIndex = +event.target.getAttribute('data-sort-index')
+        var column = this.options.columns[this.options.columns.length - 1][colIndex];
+
+        if (this.options.onSort) {
+          this.options.onSort(event, column, colIndex);
+        } else {
+          this.internalSort(column, colIndex);
+        }
+      }
+
+      if (event.target.classList.contains('websy-table-cell-content')) {
+        if (this.options.onCellSelect) {
+          this.options.onCellSelect(event, {
+            cellIndex: cellIndex,
+            colIndex: colIndex,
+            rowIndex: rowIndex,
+            cell: (this.currentData[rowIndex] || [])[cellIndex],
+            column: (this.options.columns[this.options.columns.length - 1] || [])[colIndex]
+          });
+        }
+      }
     }
   }, {
     key: "handleMouseDown",