@univerjs/core 0.8.0-beta.0 → 0.8.0-beta.1

package/lib/types/facade/f-util.d.ts

@@ -1,4 +1,4 @@
-import { INumfmt, Rectangle, Tools } from '@univerjs/core';
+import { numfmt, Rectangle, Tools } from '@univerjs/core';
 /**
  * @ignore
  */
@@ -35,7 +35,7 @@ export declare class FUtil {
      * console.log(text);
      * ```
      */
-    get numfmt(): INumfmt;
+    get numfmt(): typeof numfmt;
     /**
      * common tools
      *

package/lib/types/index.d.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 export { getPlainText } from './docs/data-model/text-x/build-utils/parse';
-export type { INumfmt } from './shared/types/numfmt.type';
 export { debounce, get, merge, mergeWith, set } from 'lodash-es';
 export { textDiff } from './shared/text-diff';
 export { dedupe, dedupeBy, groupBy, makeArray, remove, rotate } from './common/array';

package/lib/types/services/log/log.service.d.ts

@@ -19,6 +19,7 @@ export declare const ILogService: import('@wendellhu/redi').IdentifierDecorator<
 export declare class DesktopLogService extends Disposable implements ILogService {
     private _logLevel;
     private _deduction;
+    dispose(): void;
     debug(...args: ArgsType): void;
     log(...args: ArgsType): void;
     warn(...args: ArgsType): void;

package/lib/types/services/user-manager/user-manager.service.d.ts

@@ -1,24 +1,10 @@
-/**
- * Copyright 2023-present DreamNum Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+import { Disposable } from '../../shared/lifecycle';
 export interface IUser {
     userID: string;
     name: string;
     avatar?: string;
 }
-export declare class UserManagerService {
+export declare class UserManagerService extends Disposable {
     private _model;
     private _userChange$;
     userChange$: import('rxjs').Observable<{
@@ -33,6 +19,7 @@ export declare class UserManagerService {
      * @memberof UserManagerService
      */
     currentUser$: import('rxjs').Observable<IUser>;
+    dispose(): void;
     getCurrentUser<T extends IUser>(): T;
     setCurrentUser<T extends IUser>(user: T): void;
     addUser<T extends IUser>(user: T): void;

package/lib/types/shared/index.d.ts

@@ -30,7 +30,7 @@ export * from './hash-algorithm';
 export * from './lifecycle';
 export * from './locale';
 export { LRUHelper, LRUMap } from './lru/lru-map';
-export { type INumfmtLocalTag, numfmt } from './numfmt';
+export { type INumfmtLocalTag, isPatternEqualWithoutDecimal, numfmt } from './numfmt';
 export * from './object-matrix';
 export { queryObjectMatrix } from './object-matrix-query';
 export { moveRangeByOffset, splitIntoGrid } from './range';

package/lib/types/shared/numfmt.d.ts

@@ -1,3 +1,23 @@
-import { INumfmt, LocaleTag } from './types/numfmt.type';
-declare const numfmt: INumfmt;
-export { LocaleTag as INumfmtLocalTag, numfmt };
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * as numfmt from 'numfmt';
+export type INumfmtLocalTag = 'zh-CN' | 'zh-TW' | 'cs' | 'da' | 'nl' | 'en' | 'fi' | 'fr' | 'de' | 'el' | 'hu' | 'is' | 'id' | 'it' | 'ja' | 'ko' | 'nb' | 'pl' | 'pt' | 'ru' | 'sk' | 'es' | 'sv' | 'th' | 'tr' | 'vi';
+/**
+ * Determines whether two patterns are equal, excluding differences in decimal places.
+ * This function ignores the decimal part of the patterns and the positive color will be ignored but negative color will be considered.
+ * more info can check the test case.
+ */
+export declare const isPatternEqualWithoutDecimal: (patternA: string, patternB: string) => boolean;

package/lib/types/shared/object-matrix.d.ts

@@ -9,6 +9,7 @@ export interface IObjectMatrixPrimitiveType<T> {
 export interface IObjectArrayPrimitiveType<T> {
     [key: number]: T;
 }
+export declare function mapObjectMatrix<T, R>(o: IObjectMatrixPrimitiveType<T>, callback: (row: number, col: number, value: T) => R): IObjectMatrixPrimitiveType<R>;
 export declare function getArrayLength<T>(o: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>): number;
 export declare function insertMatrixArray<T>(index: number, value: T, o: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>): void;
 export declare function spliceArray<T>(start: number, count: number, o: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>): void;
@@ -99,5 +100,6 @@ export declare class ObjectMatrix<T> {
     getStartEndScope(): IRange;
     getDataRange(): IRange;
     getDiscreteRanges(): IRange[];
+    merge(newObject: ObjectMatrix<Nullable<T>>): void;
     private _setOriginValue;
 }

package/lib/types/sheets/sheet-skeleton.d.ts

@@ -34,10 +34,6 @@ export declare class SheetSkeleton extends Skeleton {
     protected _renderRawFormula: boolean;
     protected _cellData: ObjectMatrix<Nullable<ICellData>>;
     protected _imageCacheMap: ImageCacheMap;
-    /**
-     * Whether the row style precedes the column style.
-     */
-    protected _isRowStylePrecedeColumnStyle: boolean;
     /**
      * Whether auto height for merged cells
      */

package/lib/types/sheets/worksheet.d.ts

@@ -42,19 +42,26 @@ export declare class Worksheet {
     private readonly _styles;
     protected _sheetId: string;
     protected _snapshot: IWorksheetData;
-    protected _cellData: ObjectMatrix<ICellData>;
+    protected _cellData: ObjectMatrix<Nullable<ICellData>>;
     protected _rowManager: RowManager;
     protected _columnManager: ColumnManager;
     protected readonly _viewModel: SheetViewModel;
     protected _spanModel: SpanModel;
+    /**
+     * Whether the row style precedes the column style.
+     */
+    protected _isRowStylePrecedeColumnStyle: boolean;
+    private _getCellHeight;
     constructor(unitId: string, snapshot: Partial<IWorksheetData>, _styles: Styles);
     getSnapshot(): IWorksheetData;
+    getCellHeight(row: number, col: number): number;
     /**
      * Set the merge data of the sheet, all the merged cells will be rebuilt.
      * @param mergeData
      */
     setMergeData(mergeData: IRange[]): void;
     getSpanModel(): SpanModel;
+    setIsRowStylePrecedeColumnStyle(isRowStylePrecedeColumnStyle: boolean): void;
     getStyleDataByHash(hash: string): Nullable<IStyleData>;
     setStyleData(style: IStyleData): Nullable<string>;
     /**
@@ -383,13 +390,13 @@ export declare class Worksheet {
      * @param cell
      * @param options
      */
-    private _getCellDocumentModel;
+    getCellDocumentModel(cell: Nullable<ICellDataForSheetInterceptor>, style: Nullable<IStyleData>, options?: ICellDocumentModelOption): Nullable<IDocumentLayoutObject>;
     private _updateConfigAndGetDocumentModel;
     /**
      * Only used for cell edit, and no need to rotate text when edit cell content!
      */
-    getBlankCellDocumentModel(cell: Nullable<ICellData>): IDocumentLayoutObject;
-    getCellDocumentModelWithFormula(cell: ICellData): Nullable<IDocumentLayoutObject>;
+    getBlankCellDocumentModel(cell: Nullable<ICellData>, row: number, column: number): IDocumentLayoutObject;
+    getCellDocumentModelWithFormula(cell: ICellData, row: number, column: number): Nullable<IDocumentLayoutObject>;
     /**
      * Get custom metadata of worksheet
      * @returns {CustomData | undefined} custom metadata

package/lib/types/types/interfaces/i-style-data.d.ts

@@ -1,6 +1,6 @@
 import { Nullable } from '../../shared/types';
 import { BorderStyleTypes } from '../enum/border-style-types';
-import { BaselineOffset, BooleanNumber, HorizontalAlign, TextDecoration, TextDirection, VerticalAlign, WrapStrategy } from '../enum/text-style';
+import { BaselineOffset, BooleanNumber, HorizontalAlign, TextDecoration, VerticalAlign, WrapStrategy } from '../enum/text-style';
 import { ThemeColorType } from '../enum/theme-color-type';
 /**
  * Properties of text decoration
@@ -166,10 +166,6 @@ export interface IStyleData extends IStyleBase {
      * textRotation
      */
     tr?: Nullable<ITextRotation>;
-    /**
-     * textDirection
-     */
-    td?: Nullable<TextDirection>;
     /**
      * horizontalAlignment
      */
@@ -182,8 +178,4 @@ export interface IStyleData extends IStyleBase {
      * wrapStrategy
      */
     tb?: Nullable<WrapStrategy>;
-    /**
-     * padding
-     */
-    pd?: Nullable<IPaddingData>;
 }