@univerjs/core 0.3.0-alpha.0 → 0.3.0

package/lib/es/index.js

@@ -2513,6 +2513,8 @@ let CommandService = (_a = class extends Disposable {
       }
       throw new Error(`[CommandService]: command "${id}" is not registered.`);
     } catch (error) {
+      if (error instanceof CustomCommandExecutionError)
+        return !1;
       throw this._logService.error(error), error;
     }
   }
@@ -11117,7 +11119,7 @@ const FOCUSING_UNIT = "FOCUSING_UNIT", FOCUSING_SHEET = "FOCUSING_SHEET", FOCUSI
 };
 __name(_ErrorService, "ErrorService");
 let ErrorService = _ErrorService;
-const version = "0.3.0-alpha.0";
+const version = "0.3.0";
 function getEmptySnapshot(unitID = "", locale = LocaleType.ZH_CN, name = "") {
   return {
     id: unitID,
@@ -11471,15 +11473,23 @@ const _SpanModel = class _SpanModel extends Disposable {
     /**
      * @property Cache for RANGE_TYPE.NORMAL
      */
-    __publicField(this, "_cellCache", {});
+    __publicField(this, "_cellCache", /* @__PURE__ */ new Map());
     /**
      * @property Cache for RANGE_TYPE.ROW
      */
-    __publicField(this, "_rowCache", {});
+    __publicField(this, "_rowCache", /* @__PURE__ */ new Map());
     /**
      * @property Cache for RANGE_TYPE.COLUMN
      */
-    __publicField(this, "_columnCache", {});
+    __publicField(this, "_columnCache", /* @__PURE__ */ new Map());
+    /**
+     * @property Whether has RANGE_TYPE.ROW
+     */
+    __publicField(this, "_hasRow", !1);
+    /**
+     * @property Whether has RANGE_TYPE.COLUMN
+     */
+    __publicField(this, "_hasColumn", !1);
     /**
      * @property Whether has RANGE_TYPE.ALL
      */
@@ -11500,7 +11510,7 @@ const _SpanModel = class _SpanModel extends Disposable {
     this._mergeData = mergeData, this._createCache(mergeData);
   }
   _clearCache() {
-    this._cellCache = {}, this._rowCache = {}, this._columnCache = {}, this._hasAll = !1, this._allIndex = -1, this._rangeMap.clear(), this._skeletonCache.clear();
+    this._cellCache.clear(), this._rowCache.clear(), this._columnCache.clear(), this._hasAll = !1, this._allIndex = -1, this._rangeMap.clear(), this._skeletonCache.clear(), this._hasColumn = !1, this._hasRow = !1;
   }
   _createCache(mergeData) {
     let index2 = 0;
@@ -11518,25 +11528,24 @@ const _SpanModel = class _SpanModel extends Disposable {
   }
   _createRowCache(range, index2) {
     const { startRow, endRow } = range;
-    for (let i = startRow; i <= endRow; i++) {
-      const key = `${i}`;
-      this._rowCache[key] = index2;
-    }
+    for (let i = startRow; i <= endRow; i++)
+      this._rowCache.set(i, index2), this._hasRow = !0;
   }
   _createColumnCache(range, index2) {
     const { startColumn, endColumn } = range;
-    for (let i = startColumn; i <= endColumn; i++) {
-      const key = `${i}`;
-      this._columnCache[key] = index2;
-    }
+    for (let i = startColumn; i <= endColumn; i++)
+      this._columnCache.set(i, index2), this._hasColumn = !0;
   }
   _createCellAllCache(index2) {
     this._hasAll = !0, this._allIndex = index2;
   }
   _createCellCache(range, index2) {
-    for (let i = range.startRow; i <= range.endRow; i++)
+    for (let i = range.startRow; i <= range.endRow; i++) {
+      let columnCache = this._cellCache.get(i);
+      columnCache == null && (columnCache = /* @__PURE__ */ new Map(), this._cellCache.set(i, columnCache));
       for (let j = range.startColumn; j <= range.endColumn; j++)
-        this._cellCache[`${i}-${j}`] = index2;
+        columnCache.set(j, index2);
+    }
   }
   add(range) {
     this._mergeData.push(range), this._clearCache(), this._createCache(this._mergeData);
@@ -11626,15 +11635,21 @@ const _SpanModel = class _SpanModel extends Disposable {
     return ranges;
   }
   _getMergeDataIndex(row, column) {
+    var _a13;
     if (this._hasAll)
       return this._allIndex;
-    const rowKey = `${row}`, columnKey = `${column}`;
-    if (this._rowCache[rowKey] !== void 0)
-      return this._rowCache[rowKey];
-    if (this._columnCache[columnKey] !== void 0)
-      return this._columnCache[columnKey];
-    const key = `${row}-${column}`;
-    return this._cellCache[key] !== void 0 ? this._cellCache[key] : -1;
+    if (this._hasRow) {
+      const rowValue = this._rowCache.get(row);
+      if (rowValue !== void 0)
+        return rowValue;
+    }
+    if (this._hasColumn) {
+      const columnValue = this._columnCache.get(column);
+      if (columnValue !== void 0)
+        return columnValue;
+    }
+    const cellValue = (_a13 = this._cellCache.get(row)) == null ? void 0 : _a13.get(column);
+    return cellValue !== void 0 ? cellValue : -1;
   }
   getMergeDataSnapshot() {
     return this._mergeData;

package/lib/types/sheets/span-model.d.ts

@@ -13,6 +13,14 @@ export declare class SpanModel extends Disposable {
      * @property Cache for RANGE_TYPE.COLUMN
      */
     private _columnCache;
+    /**
+     * @property Whether has RANGE_TYPE.ROW
+     */
+    private _hasRow;
+    /**
+     * @property Whether has RANGE_TYPE.COLUMN
+     */
+    private _hasColumn;
     /**
      * @property Whether has RANGE_TYPE.ALL
      */