px-jspreadsheet-ce 0.0.15 → 0.0.16

package/dist/index.d.ts

@@ -1069,6 +1069,10 @@ declare namespace jspreadsheet {
          */
         freezeRows?: number;
 
+        hiddenColumnLabel?: boolean;
+
+        hiddenIndex?: boolean;
+
         /** Activate the table lazyloading. */
         lazyLoading?: boolean;
 

package/dist/index.js

@@ -1787,18 +1787,12 @@ const createCell = function (i, j, value) {
 
     if (obj.options.freezeRows > j) {
         td.classList.add('jss_frozen_row');
-        if (j + 1 === obj.options.freezeRows) {
-            td.classList.add('jss_frozen_row_edge');
-        }
-        td.style.top = (0,_internalHelpers_js__WEBPACK_IMPORTED_MODULE_7__/* .getFreezeRowTop */ .bI)(j, obj.options.rows, obj.options.defaultRowHeight);
+        td.style.top = (0,_internalHelpers_js__WEBPACK_IMPORTED_MODULE_7__/* .getFreezeRowTop */ .bI)(j, obj.options);
     }
 
     if (obj.options.freezeColumns > i) {
         td.classList.add('jss_frozen');
-        if (i + 1 === obj.options.freezeColumns) {
-            td.classList.add('jss_frozen_edge');
-        }
-        td.style.left = (0,_internalHelpers_js__WEBPACK_IMPORTED_MODULE_7__/* .getFreezeColumnLeft */ .FD)(i, obj.options.columns, obj.options.defaultColWidth);
+        td.style.left = (0,_internalHelpers_js__WEBPACK_IMPORTED_MODULE_7__/* .getFreezeColumnLeft */ .FD)(i, obj.options);
     }
 
     // Text align
@@ -1807,7 +1801,8 @@ const createCell = function (i, j, value) {
 
     // Wrap option
     if ((!config || config.wordWrap != false) && (obj.options.wordWrap == true || (config && config.wordWrap == true) || td.innerHTML.length > 200)) {
-        td.style.whiteSpace = 'pre-wrap';
+        td.style.overflowWrap = 'break-word';
+        td.style.whiteSpace = 'normal';
     }
 
     // Overflow
@@ -1990,7 +1985,10 @@ const updateCell = function (x, y, value, force) {
         }
 
         // On change
-        _dispatch_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.call(obj, 'onchange', obj, obj.records[y] && obj.records[y][x] ? obj.records[y][x].element : null, x, y, value, record.oldValue);
+        if (!obj.createTableProcess) {
+            obj.records[y][x].element.classList.add('jss_updated');
+            _dispatch_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.call(obj, 'onchange', obj, obj.records[y] && obj.records[y][x] ? obj.records[y][x].element : null, x, y, value, record.oldValue);
+        }
     }
 
     return record;
@@ -2538,6 +2536,9 @@ const createNestedHeader = function (nestedInformation) {
         if (!nestedInformation[i].colspan) {
             nestedInformation[i].colspan = 1;
         }
+        if (!nestedInformation[i].rowspan) {
+            nestedInformation[i].rowspan = 1;
+        }
         if (!nestedInformation[i].title) {
             nestedInformation[i].title = '';
         }
@@ -2563,6 +2564,7 @@ const createNestedHeader = function (nestedInformation) {
         const td = document.createElement('td');
         td.setAttribute('data-column', column.join(','));
         td.setAttribute('colspan', nestedInformation[i].colspan);
+        td.setAttribute('rowspan', nestedInformation[i].rowspan);
         td.setAttribute('align', nestedInformation[i].align || 'center');
         td.setAttribute('id', nestedInformation[i].id);
         td.textContent = nestedInformation[i].title;
@@ -3548,8 +3550,9 @@ const getColumnNameFromId = function (cellId) {
  * 获取静态的左侧距离
  *
  */
-const getFreezeColumnLeft = function (colNumber, columns, defaultWidth) {
-    let left = 50; // 距离左侧的位置
+const getFreezeColumnLeft = function (colNumber, options) {
+    const { columns, defaultColWidth: defaultWidth, hiddenIndex } = options;
+    let left = hiddenIndex ? 0 : 50; // 距离左侧的位置
     while (colNumber > 0) {
         const obj = columns[colNumber - 1]; // 左侧单元格
         if (obj.type !== 'hidden') {
@@ -3560,8 +3563,9 @@ const getFreezeColumnLeft = function (colNumber, columns, defaultWidth) {
     return left + 'px';
 };
 
-const getFreezeRowTop = function (rowNumber, rows, defaultHeight) {
-    let top = 30; // 距离顶部的位置
+const getFreezeRowTop = function (rowNumber, options) {
+    const { rows, defaultRowHeight: defaultHeight, hiddenColumnLabel } = options;
+    let top = hiddenColumnLabel ? 0 : 30; // 距离顶部的位置
     while (rowNumber > 0) {
         const obj = rows[rowNumber - 1]; // 左侧单元格
         top += parseInt(obj.height || defaultHeight);
@@ -5034,6 +5038,7 @@ const openEditor = function (cell, empty, e) {
         editor.style.minHeight = info.height - 2 + 'px';
 
         // Edit cell
+        cell.classList.remove('jss_updated');
         cell.classList.add('editor');
         cell.innerHTML = '';
         cell.appendChild(editor);
@@ -5059,6 +5064,7 @@ const openEditor = function (cell, empty, e) {
         if (config && typeof config.type === 'object') {
             // Custom editors
             config.type.openEditor(cell, obj.options.data[y][x], parseInt(x), parseInt(y), obj, config, e);
+            cell.classList.remove('jss_updated');
 
             // On edition start
             utils_dispatch/* default */.A.call(obj, 'oncreateeditor', obj, cell, parseInt(x), parseInt(y), null, config);
@@ -6346,10 +6352,7 @@ const createCellHeader = function (colNumber) {
     // 表头冻结
     if (obj.options.freezeColumns > colNumber) {
         obj.headers[colNumber].classList.add('jss_frozen');
-        if (colNumber + 1 === obj.options.freezeColumns) {
-            obj.headers[colNumber].classList.add('jss_frozen_edge');
-        }
-        obj.headers[colNumber].style.left = (0,internalHelpers/* getFreezeColumnLeft */.FD)(colNumber, obj.options.columns, obj.options.defaultColWidth);
+        obj.headers[colNumber].style.left = (0,internalHelpers/* getFreezeColumnLeft */.FD)(colNumber, obj.options);
     }
 
     // Width control
@@ -7094,10 +7097,7 @@ const createRow = function (j, data) {
     // freeze rows
     if (obj.options.freezeRows > j) {
         td.classList.add('jss_frozen_row');
-        if (j + 1 === obj.options.freezeRows) {
-            td.classList.add('jss_frozen_row_edge');
-        }
-        td.style.top = (0,internalHelpers/* getFreezeRowTop */.bI)(j, obj.options.rows, obj.options.defaultRowHeight);
+        td.style.top = (0,internalHelpers/* getFreezeRowTop */.bI)(j, obj.options);
     }
     row.element.appendChild(td);
 
@@ -10307,6 +10307,8 @@ const setWorksheetFunctions = function (worksheet) {
     }
 };
 
+const rowIndexWidth = 50;
+
 const createTable = function () {
     let obj = this;
 
@@ -10382,17 +10384,18 @@ const createTable = function () {
     // Colsgroup
     obj.colgroupContainer = document.createElement('colgroup');
     let tempCol = document.createElement('col');
-    tempCol.setAttribute('width', '50');
+    tempCol.setAttribute('width', rowIndexWidth);
     obj.colgroupContainer.appendChild(tempCol);
 
     // Nested
     if (obj.options.nestedHeaders && obj.options.nestedHeaders.length > 0 && obj.options.nestedHeaders[0] && obj.options.nestedHeaders[0][0]) {
         for (let j = 0; j < obj.options.nestedHeaders.length; j++) {
-            obj.thead.appendChild(internal/* createNestedHeader */.ju.call(obj, obj.options.nestedHeaders[j]));
+            const nestedHeader = internal/* createNestedHeader */.ju.call(obj, obj.options.nestedHeaders[j]);
+            obj.thead.appendChild(nestedHeader);
         }
     }
 
-    // Row
+    // Header Row
     obj.headerContainer = document.createElement('tr');
     tempCol = document.createElement('td');
     tempCol.classList.add('jss_selectall');
@@ -10408,6 +10411,10 @@ const createTable = function () {
         obj.colgroupContainer.appendChild(obj.cols[i].colElement);
     }
 
+    if (obj.options.hiddenColumnLabel) {
+        obj.headerContainer.style.visibility = 'collapse';
+    }
+
     obj.thead.appendChild(obj.headerContainer);
 
     // Filters
@@ -10433,6 +10440,7 @@ const createTable = function () {
     // Content table
     // obj.table = document.createElement('table');
     obj.table.classList.add('jss_worksheet');
+    if (obj.options.hiddenIndex) obj.table.classList.add('jss_hidden_index');
     obj.table.setAttribute('cellpadding', '0');
     obj.table.setAttribute('cellspacing', '0');
     obj.table.setAttribute('unselectable', 'yes');
@@ -10516,18 +10524,18 @@ const createTable = function () {
     }
 
     // Actions
-    if (obj.options.columnDrag != false) {
-        obj.thead.classList.add('draggable');
-    }
-    if (obj.options.columnResize != false) {
-        obj.thead.classList.add('resizable');
-    }
-    if (obj.options.rowDrag != false) {
-        obj.tbody.classList.add('draggable');
-    }
-    if (obj.options.rowResize != false) {
-        obj.tbody.classList.add('resizable');
-    }
+    // if (obj.options.columnDrag != false) {
+    //     obj.thead.classList.add('draggable');
+    // }
+    // if (obj.options.columnResize != false) {
+    //     obj.thead.classList.add('resizable');
+    // }
+    // if (obj.options.rowDrag != false) {
+    //     obj.tbody.classList.add('draggable');
+    // }
+    // if (obj.options.rowResize != false) {
+    //     obj.tbody.classList.add('resizable');
+    // }
 
     // Load data
     obj.setData.call(obj);
@@ -10740,6 +10748,7 @@ const worksheets_buildWorksheet = async function () {
     }
 
     utils_libraryBase.jspreadsheet.current = obj;
+    obj.createTableProcess = true;
     // prepareTable
     const promises = [];
 
@@ -10807,9 +10816,11 @@ const worksheets_buildWorksheet = async function () {
     } else {
         // Prepare table
         prepareTable.call(obj);
+        obj.createTableProcess = false;
     }
 
     await Promise.all(promises);
+    obj.createTableProcess = false;
 
     if (typeof spreadsheet.plugins === 'object') {
         Object.entries(spreadsheet.plugins).forEach(function ([, plugin]) {
@@ -10923,13 +10934,15 @@ const updateWorksheet = function (options) {
 
     obj.element.removeChild(obj.content);
     obj.element.removeChild(obj.pagination);
-    obj.element.removeChild(obj.ads);
 
     obj.options = options;
     obj.history = [];
     obj.historyIndex = -1;
+
     // Prepare table
+    obj.createTableProcess = true;
     prepareTable.call(obj);
+    obj.createTableProcess = false;
 };
 
 const worksheetPublicMethods = [