trending/univer
1
0
Fork 0
mirror of https://github.com/dream-num/univer.git synced 2026-10-02 04:24:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(numfmt): add or substract decimal inheritance (#3195)

Browse Source
This commit is contained in:
Gpound.liu
2024-08-27 15:30:42 +08:00
committed by GitHub
parent d8ca9f6043
commit 67f25c8278
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/sheets-numfmt/src/commands/commands/add-decimal.command.ts
+12 -2
View File
@@ -15,7 +15,7 @@
*/
import type { IAccessor, ICommand } from '@univerjs/core';
import { CommandType, ICommandService, IUniverInstanceService, Range } from '@univerjs/core';
import { CellValueType, CommandType, ICommandService, IUniverInstanceService, Range } from '@univerjs/core';
import { getSheetCommandTarget, INumfmtService, SheetsSelectionsService } from '@univerjs/sheets';
import { getDecimalFromPattern, setPatternDecimal } from '../../utils/decimal';
@@ -30,7 +30,6 @@ export const AddDecimalCommand: ICommand = {
const selectionManagerService = accessor.get(SheetsSelectionsService);
const numfmtService = accessor.get(INumfmtService);
const univerInstanceService = accessor.get(IUniverInstanceService);
const selections = selectionManagerService.getCurrentSelections();
if (!selections || !selections.length) {
return false;
@@ -46,6 +45,17 @@ export const AddDecimalCommand: ICommand = {
Range.foreach(selection.range, (row, col) => {
const numfmtValue = numfmtService.getValue(unitId, subUnitId, row, col);
if (!numfmtValue) {
const cell = target.worksheet.getCellRaw(row, col);
if (!maxDecimals && cell && cell.t === CellValueType.NUMBER && cell.v) {
const regResult = /\.(\d*)$/.exec(String(cell.v));
if (regResult) {
const length = regResult[1].length;
if (!length) {
return;
}
maxDecimals = Math.max(maxDecimals, length);
}
}
return;
}
const decimals = getDecimalFromPattern(numfmtValue.pattern);
packages/sheets-numfmt/src/commands/commands/subtract-decimal.command.ts
+12 -1
View File
@@ -15,7 +15,7 @@
*/
import type { IAccessor, ICommand } from '@univerjs/core';
import { CommandType, ICommandService, IUniverInstanceService, Range } from '@univerjs/core';
import { CellValueType, CommandType, ICommandService, IUniverInstanceService, Range } from '@univerjs/core';
import { getSheetCommandTarget, INumfmtService, SheetsSelectionsService } from '@univerjs/sheets';
import { getDecimalFromPattern, setPatternDecimal } from '../../utils/decimal';
@@ -46,6 +46,17 @@ export const SubtractDecimalCommand: ICommand = {
Range.foreach(selection.range, (row, col) => {
const numfmtValue = numfmtService.getValue(unitId, subUnitId, row, col);
if (!numfmtValue) {
const cell = target.worksheet.getCellRaw(row, col);
if (!maxDecimals && cell && cell.t === CellValueType.NUMBER && cell.v) {
const regResult = /\.(\d*)$/.exec(String(cell.v));
if (regResult) {
const length = regResult[1].length;
if (!length) {
return;
}
maxDecimals = Math.max(maxDecimals, length);
}
}
return;
}
const decimals = getDecimalFromPattern(numfmtValue.pattern);