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

feat(sheets-data-validation): data validation optimize #3422

Merged
merged 4 commits into from
Sep 18, 2024
Merged

feat(sheets-data-validation): data validation optimize #3422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0c5572
feat: update
weird94 Sep 12, 2024
7bb2fac
feat: update
weird94 Sep 12, 2024
6eb9f0c
feat: update
weird94 Sep 12, 2024
957301e
Merge remote-tracking branch 'origin/dev' into feat/data-validation-o…
weird94 Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/data-validation/src/validators/base-data-validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { DataValidationOperator, Inject, Injector, LocaleService, Tools } from '@univerjs/core';
import type { CellValue, IDataValidationRule, IDataValidationRuleBase, Nullable, Workbook, Worksheet } from '@univerjs/core';
import type { CellValue, IDataValidationRule, IDataValidationRuleBase, IStyleData, Nullable, Workbook, Worksheet } from '@univerjs/core';
import type { CellValueType } from '@univerjs/protocol';
import { OperatorErrorTitleMap, OperatorTitleMap } from '../types/const/operator-text-map';
import type { IBaseDataValidationWidget } from './base-widget';
Expand Down Expand Up @@ -111,6 +111,8 @@ export abstract class BaseDataValidator<DataType = CellValue> {
return `${errorMsg}`;
}

getExtraStyle(rule: IDataValidationRuleBase, value: Nullable<CellValue>, ctx: { style: IStyleData }): Nullable<IStyleData> {}

getRuleFinalError(rule: IDataValidationRule) {
if (rule.showErrorMessage && rule.error) {
return rule.error;
Expand Down
65 changes: 11 additions & 54 deletions packages/sheets-data-validation/src/controllers/dv-render.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,73 +164,27 @@ export class SheetsDataValidationRenderController extends RxDisposable {
{
// must be after numfmt
priority: InterceptCellContentPriority.DATA_VALIDATION,
// eslint-disable-next-line max-lines-per-function, complexity
// eslint-disable-next-line complexity
handler: (cell, pos, next) => {
const { row, col, unitId, subUnitId, workbook, worksheet } = pos;

const skeleton = this._renderManagerService.getRenderById(unitId)
?.with(SheetSkeletonManagerService)
.getWorksheetSkeleton(subUnitId)
?.skeleton;
if (!skeleton) {
return next(cell);
}

const styleMap = pos.workbook.getStyles();
const styleMap = workbook.getStyles();
const defaultStyle = (typeof cell?.s === 'string' ? styleMap.get(cell?.s) : cell?.s) || {};
const ruleId = this._sheetDataValidationModel.getRuleIdByLocation(unitId, subUnitId, row, col);
if (!ruleId) {
return next(cell);
}
const rule = this._sheetDataValidationModel.getRuleById(unitId, subUnitId, ruleId);

if (!rule) {
return next(cell);
}
const validStatus = this._sheetDataValidationModel.validator(cell, rule, pos);
const validator = this._dataValidatorRegistryService.getValidatorItem(rule.type);
const cellOrigin = worksheet.getCellRaw(row, col);
const cellValue = getCellValueOrigin(cellOrigin);

let extra: ICellDataForSheetInterceptor = {};
if (rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE) {
extra = {
interceptorStyle: {
...cell?.interceptorStyle,
tb: (defaultStyle.tb !== WrapStrategy.OVERFLOW ? defaultStyle.tb : WrapStrategy.CLIP) ?? WrapStrategy.WRAP,
},
};
}

if (rule.type === DataValidationType.CHECKBOX) {
extra = {
interceptorStyle: {
...cell?.interceptorStyle,
tb: WrapStrategy.CLIP,
},
};
}

if (rule.type === DataValidationType.LIST && (rule.renderMode === DataValidationRenderMode.ARROW || rule.renderMode === DataValidationRenderMode.TEXT)) {
const colorMap = (validator as ListValidator).getListWithColorMap(rule);
const valueStr = `${getCellValueOrigin(cellOrigin) ?? ''}`;
const color = colorMap[valueStr];
if (color) {
extra = {
...extra,
interceptorStyle: {
...extra.interceptorStyle,
bg: {
rgb: color,
},
},
};
}
}
const valueStr = `${getCellValueOrigin(cellOrigin) ?? ''}`;

return next({
...cell,
...extra,
dataValidation: {
ruleId,
validStatus,
Expand All @@ -251,13 +205,16 @@ export class SheetsDataValidationRenderController extends RxDisposable {
},
interceptorStyle: {
...cell?.interceptorStyle,
...extra.interceptorStyle,
...validator?.getExtraStyle(rule, valueStr, { style: defaultStyle }),
},
interceptorAutoHeight: () => {
// const mergeCell = skeleton.mergeData.find((range) => {
// const { startColumn, startRow, endColumn, endRow } = range;
// return row >= startRow && col >= startColumn && row <= endRow && col <= endColumn;
// });
const skeleton = this._renderManagerService.getRenderById(unitId)
?.with(SheetSkeletonManagerService)
.getWorksheetSkeleton(subUnitId)
?.skeleton;
if (!skeleton) {
return undefined;
}
const mergeCell = skeleton.worksheet.getMergedCell(row, col);

const info: ICellRenderContext = {
Expand Down
8 changes: 7 additions & 1 deletion packages/sheets-data-validation/src/validators/checkbox-validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { DataValidationType, isFormulaString, Tools } from '@univerjs/core';
import { DataValidationType, isFormulaString, Tools, WrapStrategy } from '@univerjs/core';
import { BaseDataValidator } from '@univerjs/data-validation';
import type { CellValue, DataValidationOperator, IDataValidationRule, IDataValidationRuleBase, ISheetDataValidationRule, LocaleService, Nullable } from '@univerjs/core';
import type { IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
Expand Down Expand Up @@ -111,6 +111,12 @@ export class CheckboxValidator extends BaseDataValidator {
};
}

override getExtraStyle(rule: IDataValidationRule, value: Nullable<CellValue>) {
return {
tb: WrapStrategy.CLIP,
};
}

parseFormulaSync(rule: IDataValidationRule, unitId: string, subUnitId: string) {
const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule;
const results = this._formulaService.getRuleFormulaResultSync(unitId, subUnitId, rule.uid);
Expand Down
35 changes: 28 additions & 7 deletions packages/sheets-data-validation/src/validators/list-validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
* limitations under the License.
*/

import { DataValidationRenderMode, DataValidationType, isFormulaString, IUniverInstanceService, numfmt, Rectangle, Tools, UniverInstanceType } from '@univerjs/core';
import type { CellValue, DataValidationOperator, ICellData, IDataValidationRule, IRange, ISheetDataValidationRule, Nullable, Workbook } from '@univerjs/core';
import type { IBaseDataValidationWidget, IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
import { DataValidationRenderMode, DataValidationType, isFormulaString, IUniverInstanceService, numfmt, Rectangle, Tools, UniverInstanceType, WrapStrategy } from '@univerjs/core';
import { BaseDataValidator } from '@univerjs/data-validation';
import { deserializeRangeWithSheet, isReferenceString, LexerTreeBuilder, sequenceNodeType } from '@univerjs/engine-formula';
import { LIST_FORMULA_INPUT_NAME } from '../views/formula-input';
import { LIST_DROPDOWN_KEY } from '../views';
import { DropdownWidget } from '../widgets/dropdown-widget';
import { ListRenderModeInput } from '../views/render-mode';
import type { CellValue, DataValidationOperator, ICellData, IDataValidationRule, IRange, ISheetDataValidationRule, IStyleData, Nullable, Workbook } from '@univerjs/core';
import type { IBaseDataValidationWidget, IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
import { DataValidationFormulaService } from '../services/dv-formula.service';
import { getCellValueOrigin } from '../utils/get-cell-data-origin';
import { LIST_DROPDOWN_KEY } from '../views';
import { LIST_FORMULA_INPUT_NAME } from '../views/formula-input';
import { ListRenderModeInput } from '../views/render-mode';
import { DropdownWidget } from '../widgets/dropdown-widget';
import { deserializeListOptions } from './util';

export function getRuleFormulaResultSet(result: Nullable<Nullable<ICellData>[][]>) {
Expand Down Expand Up @@ -127,6 +127,27 @@ export class ListValidator extends BaseDataValidator {
};
}

override getExtraStyle(rule: IDataValidationRule, value: Nullable<CellValue>, { style: defaultStyle }: { style: IStyleData }): Nullable<IStyleData> {
const tb = (defaultStyle.tb !== WrapStrategy.OVERFLOW ? defaultStyle.tb : WrapStrategy.CLIP) ?? WrapStrategy.WRAP;
if (rule.type === DataValidationType.LIST && (rule.renderMode === DataValidationRenderMode.ARROW || rule.renderMode === DataValidationRenderMode.TEXT)) {
const colorMap = this.getListWithColorMap(rule);
const valueStr = `${value ?? ''}`;
const color = colorMap[valueStr];
if (color) {
return {
bg: {
rgb: color,
},
tb,
};
}
}

return {
tb,
};
}

parseCellValue(cellValue: CellValue) {
const cellString = cellValue.toString();
return deserializeListOptions(cellString);
Expand Down
Loading