px-jspreadsheet-ce 0.0.3 → 0.0.4

package/package.json

@@ -6,7 +6,7 @@
     "main": "dist/index.js",
     "module": "src/index.js",
     "types": "dist/index.d.ts",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "exports": {
         ".": {
             "import": "./src/index.js",

package/src/index.js

@@ -58,6 +58,8 @@ libraryBase.jspreadsheet.destroy = function (element, destroyEventHandlers) {
     if (element.spreadsheet) {
         const spreadsheetIndex = libraryBase.jspreadsheet.spreadsheet.indexOf(element.spreadsheet);
         libraryBase.jspreadsheet.spreadsheet.splice(spreadsheetIndex, 1);
+        element.spreadsheet.worksheets.forEach((sheet, idx) => sheet.deleteWorksheet(idx));
+        element.spreadsheet.worksheets = null;
 
         const root = element.spreadsheet.config.root || document;
 

package/src/utils/factory.js

@@ -63,6 +63,7 @@ const createWorksheets = async function (spreadsheet, options, el) {
 
         let sheetNumber = 1;
 
+        // worksheetName
         for (let i = 0; i < o.length; i++) {
             if (!o[i].worksheetName) {
                 o[i].worksheetName = 'Sheet' + sheetNumber++;
@@ -79,10 +80,12 @@ const createWorksheets = async function (spreadsheet, options, el) {
 
         const tabs = jSuites.tabs(el, tabsOptions);
 
+        // global style
         const spreadsheetStyles = options.style;
         delete options.style;
 
         for (let i = 0; i < o.length; i++) {
+            // handle global style
             if (o[i].style) {
                 Object.entries(o[i].style).forEach(function ([cellName, value]) {
                     if (typeof value === 'number') {
@@ -110,6 +113,7 @@ const createWorksheets = async function (spreadsheet, options, el) {
 };
 
 factory.spreadsheet = async function (el, options, worksheets) {
+    // html table
     if (el.tagName == 'TABLE') {
         if (!options) {
             options = {};

package/src/utils/worksheets.js

@@ -50,6 +50,7 @@ import { copy, paste } from './copyPaste.js';
 import { isReadOnly, setReadOnly } from './cells.js';
 import { openFilter, resetFilters } from './filter.js';
 import { redo, undo } from './history.js';
+import { getCoordsFromRange, getCoordsFromCellName, getCellNameFromCoords } from './helpers.js';
 
 const setWorksheetFunctions = function (worksheet) {
     for (let i = 0; i < worksheetPublicMethodsLength; i++) {
@@ -62,7 +63,7 @@ const setWorksheetFunctions = function (worksheet) {
 const createTable = function () {
     let obj = this;
 
-    setWorksheetFunctions(obj);
+    setWorksheetFunctions(obj); // ??
 
     // Elements
     obj.table = document.createElement('table');
@@ -324,6 +325,57 @@ const createTable = function () {
     }
 };
 
+// check scope
+const isCellRange = (str) => /\w+:[\w-]/.test(str);
+const getCellRange = (str, size = 1) => {
+    // 'A3:-'
+    if (str.endsWith(':-')) {
+        const [start] = str.split(':');
+        const startCoord = getCoordsFromCellName(start);
+        return [...startCoord, size - 1, startCoord[1]];
+    }
+
+    return getCoordsFromRange(str);
+};
+
+/**
+ * 将对象中的范围键（如 "A1:C1"）展开为独立单元格键
+ * @param {Object} targetMap - 需要处理的目标对象 (如 obj.options.cells 或 obj.options.style)
+ * @param {Object} size - 表格尺寸数据 (getCellRange 需要用到)
+ */
+const expandRangeProperties = (targetMap, size) => {
+    // 1. 边界检查：如果对象为空，直接返回
+    if (!targetMap) return;
+
+    // 2. 获取所有键并筛选出是范围格式的键
+    const rangeKeys = Object.keys(targetMap).filter(isCellRange);
+
+    rangeKeys.forEach((key) => {
+        const val = targetMap[key]; // 获取该范围对应的值 (样式或数据)
+        const range = getCellRange(key, size); // 解析范围 [sx, sy, ex, ey]
+
+        const [sx, sy, ex, ey] = range;
+
+        // 3. 优化逻辑：使用双重循环。
+        // 原代码分别处理行和列，双重循环可以同时涵盖：
+        // - 单行 (sy === ey)
+        // - 单列 (sx === ex)
+        // - 矩形区域 (既跨行也跨列，如 A1:B2)
+        for (let x = sx; x <= ex; x++) {
+            for (let y = sy; y <= ey; y++) {
+                const cellName = getCellNameFromCoords(x, y);
+                // 只有当目标单元格不存在或是为了覆盖时赋值
+                // 这里直接赋值，保留原值引用的逻辑
+                targetMap[cellName] = val;
+            }
+        }
+
+        // 可选：展开后是否需要删除原始的范围 key？
+        // 如果不需要保留 "A1:B1" 这种键，可以解开下面这行的注释
+        delete targetMap[key];
+    });
+};
+
 /**
  * Prepare the jspreadsheet table
  *
@@ -408,6 +460,10 @@ const prepareTable = function () {
         }
     }
 
+    // cells
+    expandRangeProperties(obj.options.cells, size);
+    // style
+    expandRangeProperties(obj.options.style, size);
     // Create the table when is ready
     if (!multiple.length) {
         createTable.call(obj);
@@ -448,7 +504,7 @@ export const buildWorksheet = async function () {
     }
 
     libraryBase.jspreadsheet.current = obj;
-
+    // prepareTable
     const promises = [];
 
     // Load the table data based on an CSV file
@@ -577,8 +633,31 @@ export const deleteWorksheet = function (position) {
     obj.parent.element.tabs.remove(position);
 
     const removedWorksheet = obj.parent.worksheets.splice(position, 1)[0];
-
     dispatch.call(obj.parent, 'ondeleteworksheet', removedWorksheet, position);
+
+    removedWorksheet.content.onscroll = null;
+    removedWorksheet.content.onwheel = null;
+    removedWorksheet.searchInput.onfocus = null;
+    removedWorksheet.paginationDropdown && (removedWorksheet.paginationDropdown.onchange = null);
+
+    removedWorksheet.textarea.remove();
+    removedWorksheet.textarea = null;
+
+    if (removedWorksheet.element) {
+        delete removedWorksheet.element.jssWorksheet;
+        delete removedWorksheet.element.jspreadsheet;
+    }
+
+    removedWorksheet.headers = null;
+    removedWorksheet.cols = null;
+    removedWorksheet.records = null;
+    removedWorksheet.options = null;
+
+    Object.keys(removedWorksheet).forEach((key) => {
+        if (Object.hasOwn(removedWorksheet, key)) {
+            removedWorksheet[key] = null;
+        }
+    });
 };
 
 const worksheetPublicMethods = [