Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(formula): subtotal count #2452

Open
wants to merge 9 commits into
base: dev
Choose a base branch
from
+117 −39
Open

fix(formula): subtotal count #2452

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
603643c
fix(formula): subtotal count
Dushusir Jun 7, 2024
93ccab2
fix(formula): paste formula in other sheet
Dushusir Jun 7, 2024
24b4784
fix(formula): copy paste formula
Dushusir Jun 11, 2024
10a2d07
fix(formula): node cache
Dushusir Jun 12, 2024
9772703
fix(formula): paste formula only with no style
Dushusir Jun 12, 2024
dc45c2a
fix(formula): clipboard test params
Dushusir Jun 12, 2024
83be606
fix(formula): calculation cache
Dushusir Jun 14, 2024
0d03ee7
fix(formula): paste formula only without format
Dushusir Jun 17, 2024
0282dbe
fix(sheet): copy rich text remove style
Dushusir Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(formula): paste formula in other sheet
  • Loading branch information
@Dushusir
Dushusir committed Jun 17, 2024
commit 93ccab232d0607e3a533a14b158d99f5bc8d0611
34 changes: 24 additions & 10 deletions packages/sheets-formula/src/controllers/formula-clipboard.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
Tools,
UniverInstanceType,
} from '@univerjs/core';
import { LexerTreeBuilder } from '@univerjs/engine-formula';
import { FormulaDataModel, LexerTreeBuilder } from '@univerjs/engine-formula';
import type { ISetRangeValuesMutationParams } from '@univerjs/sheets';
import { SetRangeValuesMutation, SetRangeValuesUndoMutationFactory } from '@univerjs/sheets';
import { COPY_TYPE, ISheetClipboardService, PREDEFINED_HOOK_NAME } from '@univerjs/sheets-ui';
Expand All @@ -44,7 +44,8 @@ export class FormulaClipboardController extends Disposable {
@IUniverInstanceService private readonly _currentUniverSheet: IUniverInstanceService,
@Inject(LexerTreeBuilder) private readonly _lexerTreeBuilder: LexerTreeBuilder,
@ISheetClipboardService private readonly _sheetClipboardService: ISheetClipboardService,
@Inject(Injector) private readonly _injector: Injector
@Inject(Injector) private readonly _injector: Injector,
@Inject(FormulaDataModel) private readonly _formulaDataModel: FormulaDataModel
) {
super();

Expand Down Expand Up @@ -100,8 +101,8 @@ export class FormulaClipboardController extends Disposable {
const pastedRange = pasteTo.range;
const matrix = data;
const workbook = this._currentUniverSheet.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
const unitId = workbook.getUnitId();
const subUnitId = workbook.getActiveSheet()?.getSheetId();
const unitId = pasteTo.unitId || workbook.getUnitId();
const subUnitId = pasteTo.subUnitId || workbook.getActiveSheet()?.getSheetId();
if (!unitId || !subUnitId) {
return {
undos: [],
Expand All @@ -117,11 +118,14 @@ export class FormulaClipboardController extends Disposable {
accessor,
copyInfo,
this._lexerTreeBuilder,
isSpecialPaste
this._formulaDataModel,
isSpecialPaste,
pasteFrom
));
}
}

// eslint-disable-next-line max-lines-per-function
export function getSetCellFormulaMutations(
unitId: string,
subUnitId: string,
Expand All @@ -134,7 +138,9 @@ export function getSetCellFormulaMutations(
pasteType: string;
},
lexerTreeBuilder: LexerTreeBuilder,
isSpecialPaste = false
formulaDataModel: FormulaDataModel,
isSpecialPaste = false,
pasteFrom: ISheetDiscreteRangeLocation | null
) {
const redoMutationsInfo: IMutationInfo[] = [];
const undoMutationsInfo: IMutationInfo[] = [];
Expand Down Expand Up @@ -169,10 +175,18 @@ export function getSetCellFormulaMutations(

// Directly reuse when there is a formula id
if (isFormulaId(originalFormulaId)) {
valueObject.si = originalFormulaId;
valueObject.f = null;
valueObject.v = null;
valueObject.p = null;
const { unitId: pasteFromUnitId = '', subUnitId: pasteFromSubUnitId = '', range } = pasteFrom || {};

if (((pasteFromUnitId && unitId !== pasteFromUnitId) || (pasteFromSubUnitId && subUnitId !== pasteFromSubUnitId)) && range?.rows && range?.cols) {
const formulaString = formulaDataModel.getFormulaStringByCell(range.rows[row], range.cols[col], pasteFromSubUnitId, pasteFromUnitId);

// TODO handle as normal formula string
} else {
valueObject.si = originalFormulaId;
valueObject.f = null;
valueObject.v = null;
valueObject.p = null;
}
} else if (isFormulaString(originalFormula) && copyInfo.pasteType === PREDEFINED_HOOK_NAME.DEFAULT_PASTE) {
const rowIndex = row % copyRowLength;
const colIndex = col % copyColumnLength;
Expand Down