Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
feat(sheets-data-validation): add data validation any-validator and allowBlank options (#3845)
zhangwb415476e9d30
diff --git a/packages/core/src/shared/rectangle.ts b/packages/core/src/shared/rectangle.tsindex 9f8b4d4862..f9894b807e 100644--- a/packages/core/src/shared/rectangle.ts+++ b/packages/core/src/shared/rectangle.ts@@ -398,4 +398,8 @@ export class Rectangle {height: bottom - top,} as Required<IRectLTRB>;}++ static sort(ranges: IRange[]) {+ return ranges.sort((a, b) => a.startRow - b.startRow || a.startColumn - b.startColumn);+ }}diff --git a/packages/core/src/types/enum/data-validation-type.ts b/packages/core/src/types/enum/data-validation-type.tsindex fe026a2924..9c9bcd8dce 100644--- a/packages/core/src/types/enum/data-validation-type.ts+++ b/packages/core/src/types/enum/data-validation-type.ts@@ -34,4 +34,5 @@ export enum DataValidationType {*/DECIMAL = 'decimal',CHECKBOX = 'checkbox',+ ANY = 'any',}diff --git a/packages/data-validation/src/types/const/operator-text-map.ts b/packages/data-validation/src/types/const/operator-text-map.tsindex 3b50c50a62..aa2429e766 100644--- a/packages/data-validation/src/types/const/operator-text-map.ts+++ b/packages/data-validation/src/types/const/operator-text-map.ts@@ -59,3 +59,4 @@ export const TextLengthErrorTitleMap: Record<DataValidationOperator, string> = {[DataValidationOperator.NOT_BETWEEN]: 'dataValidation.textLength.errorMsg.notBetween',[DataValidationOperator.NOT_EQUAL]: 'dataValidation.textLength.errorMsg.notEqual',};+diff --git a/packages/data-validation/src/validators/base-data-validator.ts b/packages/data-validation/src/validators/base-data-validator.tsindex 4087471685..196496eefc 100644--- a/packages/data-validation/src/validators/base-data-validator.ts+++ b/packages/data-validation/src/validators/base-data-validator.ts@@ -49,6 +49,7 @@ export interface IValidatorCellInfo<DataType = Nullable<CellValue>> {export interface IFormulaResult<T = any> {formula1: T;formula2: T;+ isFormulaValid: boolean;}export interface IFormulaValidResult {@@ -186,6 +187,10 @@ export abstract class BaseDataValidator<DataType = CellValue> {const formulaInfo = await this.parseFormula(rule, unitId, subUnitId);+ if (!formulaInfo.isFormulaValid) {+ return false;+ }+if (!(await this.isValidType(cellInfo, formulaInfo, rule))) {return false;}diff --git a/packages/design/src/components/form-layout/index.module.less b/packages/design/src/components/form-layout/index.module.lessindex 6dd58f112c..fb0f5f0c12 100644--- a/packages/design/src/components/form-layout/index.module.less+++ b/packages/design/src/components/form-layout/index.module.less@@ -6,6 +6,7 @@font-size: var(--font-size-sm);min-height: var(--font-size-sm);color: rgba(var(--color-black));+ margin-bottom: var(--margin-xs);}&-desc {@@ -15,7 +16,6 @@}&-content {- margin-top: var(--margin-xs);margin-bottom: var(--margin-sm);.input-affix-wrapper {@@ -43,7 +43,8 @@&-error {color: rgba(var(--red-400));- font-size: var(--font-size-sm);+ font-size: var(--font-size-xxs);+ margin-top: var(--margin-xxs);}}diff --git a/packages/sheets-data-validation-ui/src/locale/en-US.ts b/packages/sheets-data-validation-ui/src/locale/en-US.tsindex 94baac4ac7..6ec5243620 100644--- a/packages/sheets-data-validation-ui/src/locale/en-US.ts+++ b/packages/sheets-data-validation-ui/src/locale/en-US.ts@@ -53,6 +53,7 @@ const locale: typeof zhCN = {messageInfo: 'Helper message',showInfo: 'Show help text for a selected cell',rangeError: 'Ranges are not legal',+ allowBlank: 'Allow blank values',},operators: {between: 'between',@@ -84,6 +85,10 @@ const locale: typeof zhCN = {notEqual: 'Value must be not equal to {FORMULA1}',notBetween: 'Value must be not between {FORMULA1} and {FORMULA2}',},+ any: {+ title: 'Any value',+ error: 'The content of this cell violates the validation rule',+ },date: {title: 'Date',operators: {@@ -164,6 +169,7 @@ const locale: typeof zhCN = {title: 'Custom formula',error: 'This cell\'s contents violate its validation rule',validFail: 'Please input a valid formula',+ ruleName: 'Custom formula is {FORMULA1}',},alert: {title: 'Error',diff --git a/packages/sheets-data-validation-ui/src/locale/fa-IR.ts b/packages/sheets-data-validation-ui/src/locale/fa-IR.tsindex 438b07bef0..e514f9a23e 100644--- a/packages/sheets-data-validation-ui/src/locale/fa-IR.ts+++ b/packages/sheets-data-validation-ui/src/locale/fa-IR.ts@@ -53,6 +53,7 @@ const locale: typeof zhCN = {messageInfo: 'پیام راهنما',showInfo: 'نمایش متن راهنما برای یک سلول انتخاب شده',rangeError: 'محدودهها نامعتبر هستند',+ allowBlank: 'رد سلول خالی',},operators: {between: 'بین',@@ -84,6 +85,10 @@ const locale: typeof zhCN = {notEqual: 'مقدار باید برابر نیست با {FORMULA1}',notBetween: 'مقدار باید بین {FORMULA1} و {FORMULA2} نباشد',},+ any: {+ title: 'هر مقدار',+ error: 'محتوای این سلول نقض قانون اعتبارسنجی است',+ },date: {title: 'تاریخ',operators: {@@ -161,9 +166,10 @@ const locale: typeof zhCN = {unchecked: 'مقدار انتخاب نشده',},custom: {- title: 'فرمول سفارشی',+ title: 'فرمول سفارشی ',error: 'محتوای این سلول با قانون اعتبارسنجی آن نقض میشود',validFail: 'لطفا یک فرمول معتبر وارد کنید',+ ruleName: 'فرمول سفارشی {FORMULA1}',},alert: {title: 'خطا',diff --git a/packages/sheets-data-validation-ui/src/locale/ru-RU.ts b/packages/sheets-data-validation-ui/src/locale/ru-RU.tsindex 356cfa9f8c..d1c6d8375e 100644--- a/packages/sheets-data-validation-ui/src/locale/ru-RU.ts+++ b/packages/sheets-data-validation-ui/src/locale/ru-RU.ts@@ -32,6 +32,7 @@ const locale: typeof zhCN = {formulaError: 'Диапазон ссылок содержит невидимые данные, пожалуйста, пересмотрите диапазон',listIntersects: 'Выбранный диапазон не может пересекаться с диапазоном правила.',primitive: 'Formulas are not permitted for custom ticked and unticked values.',+},panel: {title: 'Управление проверкой данных',@@ -53,6 +54,7 @@ const locale: typeof zhCN = {rejectInput: 'Отклонить ввод',messageInfo: 'Сообщение помощи',showInfo: 'Показать текст помощи для выбранной ячейки',+ allowBlank: 'Игнорировать пустые значения',},operators: {between: 'между',@@ -84,6 +86,10 @@ const locale: typeof zhCN = {notEqual: 'Значение должно быть не равно {FORMULA1}',notBetween: 'Значение должно быть не между {FORMULA1} и {FORMULA2}',},+ any: {+ title: 'Любое значение',+ error: 'Содержимое этой ячейки нарушает правило проверки',+ },date: {title: 'Дата',operators: {@@ -164,6 +170,7 @@ const locale: typeof zhCN = {title: 'Пользовательская формула',error: 'Содержимое этой ячейки нарушает правило проверки',validFail: 'Пожалуйста, введите допустимую формулу',+ ruleName: 'Пользовательская формула {FORMULA1}',},alert: {title: 'Ошибка',diff --git a/packages/sheets-data-validation-ui/src/locale/vi-VN.ts b/packages/sheets-data-validation-ui/src/locale/vi-VN.tsindex 2a3cd384f7..94afabac72 100644--- a/packages/sheets-data-validation-ui/src/locale/vi-VN.ts+++ b/packages/sheets-data-validation-ui/src/locale/vi-VN.ts@@ -53,6 +53,7 @@ const locale: typeof zhCN = {rejectInput: 'Từ chối đầu vào',messageInfo: 'Thông báo',showInfo: 'Hiển thị thông báo cho ô đã chọn',+ allowBlank: 'Bỏ qua giá trị rỗng',},operators: {between: 'Giữa',@@ -84,6 +85,10 @@ const locale: typeof zhCN = {notEqual: 'Giá trị phải không bằng {FORMULA1}',notBetween: 'Giá trị phải không nằm giữa {FORMULA1} và {FORMULA2}',},+ any: {+ title: 'Bất kỳ giá trị',+ error: 'Nội dung của ô này vi phạm quy tắc xác thực',+ },date: {title: 'Ngày',operators: {@@ -164,6 +169,7 @@ const locale: typeof zhCN = {title: 'Công thức tùy chỉnh',error: 'Nội dung của ô này vi phạm quy tắc xác thực',validFail: 'Vui lòng nhập một công thức hợp lệ',+ ruleName: 'Công thức tùy chỉnh {FORMULA1}',},alert: {title: 'Thông báo',diff --git a/packages/sheets-data-validation-ui/src/locale/zh-CN.ts b/packages/sheets-data-validation-ui/src/locale/zh-CN.tsindex db623b0ab5..3696dd450c 100644--- a/packages/sheets-data-validation-ui/src/locale/zh-CN.ts+++ b/packages/sheets-data-validation-ui/src/locale/zh-CN.ts@@ -51,6 +51,7 @@ const locale = {rejectInput: '拒绝输入',messageInfo: '文字提示',showInfo: '显示所选单元格的提示文字',+ allowBlank: '忽略空值',},operators: {between: '介于',@@ -82,6 +83,10 @@ const locale = {notEqual: '值必须不等于 {FORMULA1}',notBetween: '值必须在 {FORMULA1} 和 {FORMULA2} 范围之外',},+ any: {+ title: '任意值',+ error: '此单元格的内容违反了验证规则',+ },date: {title: '日期',operators: {@@ -164,6 +169,7 @@ const locale = {title: '自定义公式',error: '此单元格的内容违反了验证规则',validFail: '请输入合法的公式',+ ruleName: '自定义公式 {FORMULA1}',},alert: {title: '提示',diff --git a/packages/sheets-data-validation-ui/src/locale/zh-TW.ts b/packages/sheets-data-validation-ui/src/locale/zh-TW.tsindex c6f3d72b5a..1841a6b7df 100644--- a/packages/sheets-data-validation-ui/src/locale/zh-TW.ts+++ b/packages/sheets-data-validation-ui/src/locale/zh-TW.ts@@ -53,6 +53,7 @@ const locale: typeof zhCN = {rejectInput: '拒絕輸入',messageInfo: '文字提示',showInfo: '顯示所選單元格的提示文字',+ allowBlank: '忽略空值',},operators: {between: '介於',@@ -84,6 +85,10 @@ const locale: typeof zhCN = {notEqual: '值必須不等於 {FORMULA1}',notBetween: '值必須在 {FORMULA1} 和 {FORMULA2} 範圍之外',},+ any: {+ title: '任意值',+ error: '此儲存格的內容違反了驗證規則',+ },date: {title: '日期',operators: {@@ -166,6 +171,7 @@ const locale: typeof zhCN = {title: '自訂公式',error: '此儲存格的內容違反了驗證規則',validFail: '請輸入合法的公式',+ ruleName: '自訂公式 {FORMULA1}',},alert: {title: '提示',diff --git a/packages/sheets-data-validation-ui/src/views/components/detail/index.tsx b/packages/sheets-data-validation-ui/src/views/components/detail/index.tsxindex a839ebe35a..34ac520811 100644--- a/packages/sheets-data-validation-ui/src/views/components/detail/index.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/detail/index.tsx@@ -18,7 +18,7 @@ import type { DataValidationOperator, DataValidationType, IDataValidationRuleBasimport type { IUpdateSheetDataValidationRangeCommandParams } from '@univerjs/sheets-data-validation';import { debounce, ICommandService, isUnitRangesEqual, IUniverInstanceService, LocaleService, RedoCommand, shallowEqual, UndoCommand, UniverInstanceType, useDependency } from '@univerjs/core';import { DataValidationModel, DataValidatorRegistryScope, DataValidatorRegistryService, getRuleOptions, getRuleSetting, TWO_FORMULA_OPERATOR_COUNT } from '@univerjs/data-validation';-import { Button, FormLayout, Select } from '@univerjs/design';+import { Button, Checkbox, FormLayout, Select } from '@univerjs/design';import { deserializeRangeWithSheet, serializeRange } from '@univerjs/engine-formula';import { SheetsSelectionsService } from '@univerjs/sheets';import { RemoveSheetDataValidationCommand, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand } from '@univerjs/sheets-data-validation';@@ -65,6 +65,7 @@ export function DataValidationDetail() {const validators = validatorService.getValidatorsByScope(DataValidatorRegistryScope.SHEET);const [localRanges, setLocalRanges] = useState<IUnitRange[]>(() => localRule.ranges.map((i) => ({ unitId: '', sheetId: '', range: i })));const debounceExecute = useMemo(() => debounceExecuteFactory(commandService), [commandService]);+ const [isRangeError, setIsRangeError] = useState(false);const rangeSelectorActionsRef = useRef<Parameters<typeof RangeSelector>[0]['actions']>({});const [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(false);@@ -104,7 +105,7 @@ export function DataValidationDetail() {const isTwoFormula = localRule.operator ? TWO_FORMULA_OPERATOR_COUNT.includes(localRule.operator) : false;const handleOk = () => {- if (!localRule.ranges.length) {+ if (!localRule.ranges.length || isRangeError) {return;}if (validator.validatorFormula(localRule, unitId, subUnitId).success) {@@ -254,7 +255,7 @@ export function DataValidationDetail() {<div className={styles.dataValidationDetail} onClick={handlePanelClick}><FormLayoutlabel={localeService.t('dataValidation.panel.range')}- error={!localRule.ranges.length ? localeService.t('dataValidation.panel.rangeError') : ''}+ error={(!localRule.ranges.length || isRangeError) ? localeService.t('dataValidation.panel.rangeError') : ''}><RangeSelectorunitId={unitId}@@ -263,23 +264,8 @@ export function DataValidationDetail() {onChange={handleUpdateRuleRanges}isFocus={isFocusRangeSelector}actions={rangeSelectorActionsRef.current}+ onVerify={(isValid) => setIsRangeError(!isValid)}/>- {/* <RangeSelector- key={key}- className={styles.dataValidationDetailFormItem}- value={rangeStr}- id={createInternalEditorID('data-validation-detail')}- openForSheetUnitId={unitId}- openForSheetSubUnitId={subUnitId}- onChange={(newRange) => {- if (newRange.some((i) => !isValidRange(i.range) || i.range.endColumn < i.range.startColumn || i.range.endRow < i.range.startRow)) {- return;- }-- handleUpdateRuleRanges(newRange);- }}-- /> */}</FormLayout><FormLayout label={localeService.t('dataValidation.panel.type')}><Select@@ -335,6 +321,17 @@ export function DataValidationDetail() {/>): null}+ <FormLayout>+ <Checkbox+ checked={(localRule.allowBlank ?? true)}+ onChange={() => handleUpdateRuleSetting({+ ...baseRule,+ allowBlank: !(localRule.allowBlank ?? true),+ })}+ >+ {localeService.t('dataValidation.panel.allowBlank')}+ </Checkbox>+ </FormLayout><DataValidationOptions value={options} onChange={handleUpdateRuleOptions} extraComponent={validator.optionsInput} /><div className={styles.dataValidationDetailButtons}><Button className={styles.dataValidationDetailButton} onClick={handleDelete}>diff --git a/packages/sheets-data-validation-ui/src/views/widgets/checkbox-widget.ts b/packages/sheets-data-validation-ui/src/views/widgets/checkbox-widget.tsindex 554d0b111e..e9c5ddb3b3 100644--- a/packages/sheets-data-validation-ui/src/views/widgets/checkbox-widget.ts+++ b/packages/sheets-data-validation-ui/src/views/widgets/checkbox-widget.ts@@ -22,7 +22,7 @@ import type { CheckboxValidator } from '@univerjs/sheets-data-validation';import { HorizontalAlign, ICommandService, Inject, isFormulaString, ThemeService, VerticalAlign } from '@univerjs/core';import { Checkbox, fixLineWidthByScale, Transform } from '@univerjs/engine-render';import { SetRangeValuesCommand } from '@univerjs/sheets';-import { CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2, DataValidationFormulaService, getCellValueOrigin, getFormulaResult, transformCheckboxValue } from '@univerjs/sheets-data-validation';+import { CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2, DataValidationFormulaService, getCellValueOrigin, getFormulaResult, isLegalFormulaResult, transformCheckboxValue } from '@univerjs/sheets-data-validation';const MARGIN_H = 6;@@ -83,9 +83,14 @@ export class CheckboxRender implements IBaseDataValidationWidget {private async _parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult> {const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule;const results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);+ const formulaResult1 = getFormulaResult(results?.[0]?.result);+ const formulaResult2 = getFormulaResult(results?.[1]?.result);+ const isFormulaValid = isLegalFormulaResult(String(formulaResult1)) && isLegalFormulaResult(String(formulaResult2));+return {formula1: isFormulaString(formula1) ? getFormulaResult(results?.[0]?.result) : formula1,- formula2: isFormulaString(formula2) ? getFormulaResult(results?.[1]?.result) : formula2,+ formula2: isFormulaString(formula2) ? formulaResult2 : formula2,+ isFormulaValid,};}diff --git a/packages/sheets-data-validation/src/commands/commands/data-validation.command.ts b/packages/sheets-data-validation/src/commands/commands/data-validation.command.tsindex ee75622ae3..2c7c365843 100644--- a/packages/sheets-data-validation/src/commands/commands/data-validation.command.ts+++ b/packages/sheets-data-validation/src/commands/commands/data-validation.command.ts@@ -20,6 +20,7 @@ import type { ISetRangeValuesMutationParams, ISheetCommandSharedParams } from '@import type { RangeMutation } from '../../models/rule-matrix';import { CommandType, DataValidationType, ICommandService, IUndoRedoService, IUniverInstanceService, ObjectMatrix, Range, sequenceExecute, Tools } from '@univerjs/core';import { AddDataValidationMutation, DataValidatorRegistryService, getRuleOptions, getRuleSetting, RemoveDataValidationMutation, UpdateDataValidationMutation, UpdateRuleType } from '@univerjs/data-validation';+import { LexerTreeBuilder } from '@univerjs/engine-formula';import { getSheetCommandTarget, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory } from '@univerjs/sheets';import { SheetDataValidationModel } from '../../models/sheet-data-validation-model';import { getStringCellValue } from '../../utils/get-cell-data-origin';@@ -54,6 +55,7 @@ export function getDataValidationDiffMutations(source: DataValidationChangeSource = 'command',fillDefaultValue = true) {+ const lexerTreeBuilder = accessor.get(LexerTreeBuilder);const redoMutations: IMutationInfo[] = [];const undoMutations: IMutationInfo[] = [];const sheetDataValidationModel = accessor.get(SheetDataValidationModel);@@ -124,6 +126,7 @@ export function getDataValidationDiffMutations(source,} as IUpdateDataValidationMutationParams,});+undoMutations.unshift({id: UpdateDataValidationMutation.id,params: {@@ -137,6 +140,48 @@ export function getDataValidationDiffMutations(source,} as IUpdateDataValidationMutationParams,});++ if (diff.rule.type === DataValidationType.CUSTOM) {+ const originRow = diff.oldRanges[0].startRow;+ const originColumn = diff.oldRanges[0].startColumn;+ const newRow = diff.newRanges[0].startRow;+ const newColumn = diff.newRanges[0].startColumn;+ const rowDiff = newRow - originRow;+ const columnDiff = newColumn - originColumn;+ const newFormula = lexerTreeBuilder.moveFormulaRefOffset(diff.rule.formula1!, columnDiff, rowDiff);++ if (newFormula !== diff.rule.formula1) {+ redoMutations.push({+ id: UpdateDataValidationMutation.id,+ params: {+ unitId,+ subUnitId,+ ruleId: diff.ruleId,+ payload: {+ type: UpdateRuleType.SETTING,+ payload: {+ ...getRuleSetting(diff.rule),+ formula1: newFormula,+ },+ },+ } as IUpdateDataValidationMutationParams,+ });++ undoMutations.unshift({+ id: UpdateDataValidationMutation.id,+ params: {+ unitId,+ subUnitId,+ ruleId: diff.ruleId,+ payload: {+ type: UpdateRuleType.SETTING,+ payload: getRuleSetting(diff.rule),+ },+ } as IUpdateDataValidationMutationParams,+ });+ }+ }+const rule = sheetDataValidationModel.getRuleById(unitId, subUnitId, diff.ruleId);if (rule && rule.type === DataValidationType.CHECKBOX) {const validator = sheetDataValidationModel.getValidator(DataValidationType.CHECKBOX) as CheckboxValidator;diff --git a/packages/sheets-data-validation/src/controllers/dv-ref-range.controller.ts b/packages/sheets-data-validation/src/controllers/dv-ref-range.controller.tsindex 652613e648..c9b1c56d4b 100644--- a/packages/sheets-data-validation/src/controllers/dv-ref-range.controller.ts+++ b/packages/sheets-data-validation/src/controllers/dv-ref-range.controller.ts@@ -110,19 +110,22 @@ export class DataValidationRefRangeController extends Disposable {const currentFormula = this._dataValidationCustomFormulaService.getRuleFormulaInfo(unitId, subUnitId, ruleId);if (currentFormula) {const disposable = this._formulaRefRangeService.registerFormula(+ unitId,+ subUnitId,currentFormula.formula,(newFormulaString) => handleFormulaChange('formula1', newFormulaString));disposeSet.add(() => disposable.dispose());}- }-- if (rule.type !== DataValidationType.CUSTOM) {+ } else {const currentFormula = this._dataValidationFormulaService.getRuleFormulaInfo(unitId, subUnitId, ruleId);+if (currentFormula) {const [formula1, formula2] = currentFormula;if (formula1) {const disposable = this._formulaRefRangeService.registerFormula(+ unitId,+ subUnitId,formula1.text,(newFormulaString) => handleFormulaChange('formula1', newFormulaString));@@ -131,6 +134,8 @@ export class DataValidationRefRangeController extends Disposable {if (formula2) {const disposable = this._formulaRefRangeService.registerFormula(+ unitId,+ subUnitId,formula2.text,(newFormulaString) => handleFormulaChange('formula2', newFormulaString));diff --git a/packages/sheets-data-validation/src/controllers/dv.controller.ts b/packages/sheets-data-validation/src/controllers/dv.controller.tsindex 8297355431..31fe0bf5e4 100644--- a/packages/sheets-data-validation/src/controllers/dv.controller.ts+++ b/packages/sheets-data-validation/src/controllers/dv.controller.ts@@ -21,6 +21,7 @@ import { ClearSelectionAllCommand, SheetInterceptorService, SheetsSelectionsServimport { getDataValidationDiffMutations } from '../commands/commands/data-validation.command';import { SheetDataValidationModel } from '../models/sheet-data-validation-model';import { CheckboxValidator, DateValidator, DecimalValidator, ListValidator, TextLengthValidator } from '../validators';+import { AnyValidator } from '../validators/any-validator';import { CustomFormulaValidator } from '../validators/custom-validator';import { ListMultipleValidator } from '../validators/list-multiple-validator';import { WholeValidator } from '../validators/whole-validator';@@ -45,6 +46,7 @@ export class DataValidationController extends RxDisposable {private _registerValidators(): void {([+ AnyValidator,DecimalValidator,WholeValidator,TextLengthValidator,diff --git a/packages/sheets-data-validation/src/index.ts b/packages/sheets-data-validation/src/index.tsindex a83e40299d..9cd2815f7b 100644--- a/packages/sheets-data-validation/src/index.ts+++ b/packages/sheets-data-validation/src/index.ts@@ -31,6 +31,7 @@ export { DateValidator } from './validators/date-validator';export { CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2, CheckboxValidator, transformCheckboxValue } from './validators/checkbox-validator';export { ListMultipleValidator } from './validators/list-multiple-validator';export { deserializeListOptions, getDataValidationCellValue, serializeListOptions } from './validators/util';+export { isLegalFormulaResult } from './utils/formula';// #region - all commandsdiff --git a/packages/sheets-data-validation/src/models/rule-matrix.ts b/packages/sheets-data-validation/src/models/rule-matrix.tsindex 1a90af654f..1085af945e 100644--- a/packages/sheets-data-validation/src/models/rule-matrix.ts+++ b/packages/sheets-data-validation/src/models/rule-matrix.ts@@ -29,6 +29,7 @@ export type RangeMutation = {ruleId: string;oldRanges: IRange[];newRanges: IRange[];+ rule: ISheetDataValidationRule;} | {type: 'delete';rule: ISheetDataValidationRule;@@ -202,7 +203,8 @@ export class RuleMatrix {type: 'update',ruleId: rule.uid,oldRanges,- newRanges,+ newRanges: Rectangle.sort(newRanges),+ rule,});}@@ -231,7 +233,8 @@ export class RuleMatrix {type: 'update',ruleId: rule.uid,oldRanges,- newRanges,+ newRanges: Rectangle.sort(newRanges),+ rule,});}@@ -251,7 +254,7 @@ export class RuleMatrix {type: 'add',rule: {...rule,- ranges: newRanges,+ ranges: Rectangle.sort(newRanges),},});});diff --git a/packages/sheets-data-validation/src/models/sheet-data-validation-model.ts b/packages/sheets-data-validation/src/models/sheet-data-validation-model.tsindex 1991ce0d32..5e2fbb7410 100644--- a/packages/sheets-data-validation/src/models/sheet-data-validation-model.ts+++ b/packages/sheets-data-validation/src/models/sheet-data-validation-model.ts@@ -89,6 +89,8 @@ export class SheetDataValidationModel extends Disposable {for (const [unitId, subUnitMap] of allRules) {for (const [subUnitId, rules] of subUnitMap) {for (const rule of rules) {+ this._addRule(unitId, subUnitId, rule);+this._ruleChange$.next({type: 'add',unitId,@@ -96,14 +98,12 @@ export class SheetDataValidationModel extends Disposable {rule,source: 'patched',});- this._addRule(unitId, subUnitId, rule);}}}this.disposeWithMe(this._dataValidationModel.ruleChange$.subscribe((ruleChange) => {- this._ruleChange$.next(ruleChange);switch (ruleChange.type) {case 'add':this._addRule(ruleChange.unitId, ruleChange.subUnitId, ruleChange.rule);@@ -115,6 +115,8 @@ export class SheetDataValidationModel extends Disposable {this._removeRule(ruleChange.unitId, ruleChange.subUnitId, ruleChange.rule);break;}++ this._ruleChange$.next(ruleChange);}));}diff --git a/packages/sheets-data-validation/src/utils/formula.ts b/packages/sheets-data-validation/src/utils/formula.tsindex 154c519167..d9f9acaacc 100644--- a/packages/sheets-data-validation/src/utils/formula.ts+++ b/packages/sheets-data-validation/src/utils/formula.ts@@ -15,6 +15,7 @@*/import type { ICellData, Nullable } from '@univerjs/core';+import { ERROR_TYPE_SET } from '@univerjs/engine-formula';export function getFormulaResult(result: Nullable<Nullable<ICellData>[][]>) {return result?.[0]?.[0]?.v;@@ -23,3 +24,7 @@ export function getFormulaResult(result: Nullable<Nullable<ICellData>[][]>) {export function getFormulaCellData(result: Nullable<Nullable<ICellData>[][]>) {return result?.[0]?.[0];}++export function isLegalFormulaResult(res: string) {+ return !(ERROR_TYPE_SET as Set<string>).has(res);+}diff --git a/packages/sheets-data-validation/src/validators/any-validator.ts b/packages/sheets-data-validation/src/validators/any-validator.tsnew file mode 100644index 0000000000..2b34438103--- /dev/null+++ b/packages/sheets-data-validation/src/validators/any-validator.ts@@ -0,0 +1,49 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * 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 type { CellValue, DataValidationOperator, IDataValidationRule, IDataValidationRuleBase } from '@univerjs/core';+import type { IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';+import { DataValidationType } from '@univerjs/core';+import { BaseDataValidator } from '@univerjs/data-validation';++export class AnyValidator extends BaseDataValidator {+ override id: string = DataValidationType.ANY;+ override title: string = 'dataValidation.any.title';+ override operators: DataValidationOperator[] = [];+ override scopes: string | string[] = ['sheet'];++ override async parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult> {+ return {+ formula1: rule.formula1,+ formula2: rule.formula2,+ isFormulaValid: true,+ };+ }++ override validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult {+ return {+ success: true,+ };+ }++ override async isValidType(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean> {+ return true;+ }++ override generateRuleErrorMessage(rule: IDataValidationRuleBase): string {+ return this.localeService.t('dataValidation.any.error');+ }+}diff --git a/packages/sheets-data-validation/src/validators/checkbox-validator.ts b/packages/sheets-data-validation/src/validators/checkbox-validator.tsindex ab89c7498a..ae2e4ea4fc 100644--- a/packages/sheets-data-validation/src/validators/checkbox-validator.ts+++ b/packages/sheets-data-validation/src/validators/checkbox-validator.ts@@ -19,7 +19,7 @@ import type { IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@uimport { DataValidationType, isFormulaString, Tools, WrapStrategy } from '@univerjs/core';import { BaseDataValidator } from '@univerjs/data-validation';import { DataValidationFormulaService } from '../services/dv-formula.service';-import { getFormulaResult } from '../utils/formula';+import { getFormulaResult, isLegalFormulaResult } from '../utils/formula';export const CHECKBOX_FORMULA_1 = 1;export const CHECKBOX_FORMULA_2 = 0;@@ -96,13 +96,17 @@ export class CheckboxValidator extends BaseDataValidator {override async parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<ICheckboxFormulaResult> {const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule;const results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);+const originFormula1 = isFormulaString(formula1) ? getFormulaResult(results?.[0]?.result) : formula1;const originFormula2 = isFormulaString(formula2) ? getFormulaResult(results?.[1]?.result) : formula2;+ const isFormulaValid = isLegalFormulaResult(String(originFormula1)) && isLegalFormulaResult(String(originFormula2));+return {formula1: transformCheckboxValue(originFormula1),formula2: transformCheckboxValue(originFormula2),originFormula1,originFormula2,+ isFormulaValid,};}diff --git a/packages/sheets-data-validation/src/validators/custom-validator.ts b/packages/sheets-data-validation/src/validators/custom-validator.tsindex 4660078bdf..4d14eb767b 100644--- a/packages/sheets-data-validation/src/validators/custom-validator.ts+++ b/packages/sheets-data-validation/src/validators/custom-validator.ts@@ -18,13 +18,8 @@ import type { CellValue, DataValidationOperator, IDataValidationRule, IDataValidimport type { IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';import { CellValueType, DataValidationType, isFormulaString, Tools } from '@univerjs/core';import { BaseDataValidator } from '@univerjs/data-validation';-import { ERROR_TYPE_SET } from '@univerjs/engine-formula';import { DataValidationCustomFormulaService } from '../services/dv-custom-formula.service';-import { getFormulaCellData } from '../utils/formula';--function isLegalFormulaResult(res: string) {- return !(ERROR_TYPE_SET as Set<string>).has(res);-}+import { getFormulaCellData, isLegalFormulaResult } from '../utils/formula';export class CustomFormulaValidator extends BaseDataValidator {override id: string = DataValidationType.CUSTOM;@@ -46,6 +41,7 @@ export class CustomFormulaValidator extends BaseDataValidator {return {formula1: undefined,formula2: undefined,+ isFormulaValid: false,};}@@ -55,6 +51,10 @@ export class CustomFormulaValidator extends BaseDataValidator {const cellData = getFormulaCellData(result?.result);const formulaResult = cellData?.v;+ if (!isLegalFormulaResult(String(formulaResult))) {+ return false;+ }+if (Tools.isDefine(formulaResult) && formulaResult !== '') {if (cellData!.t === CellValueType.BOOLEAN) {return Boolean(formulaResult);@@ -81,4 +81,8 @@ export class CustomFormulaValidator extends BaseDataValidator {override generateRuleErrorMessage(rule: IDataValidationRuleBase): string {return this.localeService.t('dataValidation.custom.error');}++ override generateRuleName(rule: IDataValidationRuleBase): string {+ return (this.localeService.t('dataValidation.custom.ruleName')).replace('{FORMULA1}', rule.formula1 ?? '');+ }}diff --git a/packages/sheets-data-validation/src/validators/date-validator.ts b/packages/sheets-data-validation/src/validators/date-validator.tsindex 2287eb5587..de5a120329 100644--- a/packages/sheets-data-validation/src/validators/date-validator.ts+++ b/packages/sheets-data-validation/src/validators/date-validator.ts@@ -22,7 +22,7 @@ import dayjs from 'dayjs';import { DateOperatorErrorTitleMap, DateOperatorNameMap, DateOperatorTitleMap } from '../common/date-text-map';import { DataValidationFormulaService } from '../services/dv-formula.service';import { TWO_FORMULA_OPERATOR_COUNT } from '../types/const/two-formula-operators';-import { getFormulaResult } from '../utils/formula';+import { getFormulaResult, isLegalFormulaResult } from '../utils/formula';const FORMULA1 = '{FORMULA1}';const FORMULA2 = '{FORMULA2}';@@ -66,10 +66,14 @@ export class DateValidator extends BaseDataValidator<number> {override async parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult<number | undefined>> {const results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);const { formula1, formula2 } = rule;+ const formulaResult1 = getFormulaResult(results?.[0]?.result);+ const formulaResult2 = getFormulaResult(results?.[1]?.result);+ const isFormulaValid = isLegalFormulaResult(String(formulaResult1)) && isLegalFormulaResult(String(formulaResult2));return {- formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult(results?.[0]?.result) : formula1),- formula2: transformDate2SerialNumber(isFormulaString(formula2) ? getFormulaResult(results?.[1]?.result) : formula2),+ formula1: transformDate2SerialNumber(isFormulaString(formula1) ? formulaResult1 : formula1),+ formula2: transformDate2SerialNumber(isFormulaString(formula2) ? formulaResult2 : formula2),+ isFormulaValid,};}diff --git a/packages/sheets-data-validation/src/validators/decimal-validator.ts b/packages/sheets-data-validation/src/validators/decimal-validator.tsindex 16b2fa08f1..90fed3db12 100644--- a/packages/sheets-data-validation/src/validators/decimal-validator.ts+++ b/packages/sheets-data-validation/src/validators/decimal-validator.ts@@ -20,6 +20,7 @@ import { DataValidationOperator, DataValidationType, isFormulaString, Tools } frimport { BaseDataValidator } from '@univerjs/data-validation';import { DataValidationFormulaService } from '../services/dv-formula.service';import { TWO_FORMULA_OPERATOR_COUNT } from '../types/const/two-formula-operators';+import { getFormulaResult, isLegalFormulaResult } from '../utils/formula';export function getCellValueNumber(cellValue: CellValue) {let str = cellValue;@@ -84,9 +85,14 @@ export class DecimalValidator extends BaseDataValidator<number> {const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);const { formula1, formula2 } = rule;+ const formulaResult1 = getFormulaResult(formulaInfo?.[0]?.result);+ const formulaResult2 = getFormulaResult(formulaInfo?.[1]?.result);+ const isFormulaValid = isLegalFormulaResult(String(formulaResult1)) && isLegalFormulaResult(String(formulaResult2));+const info = {- formula1: this._parseNumber(isFormulaString(formula1) ? formulaInfo?.[0]?.result?.[0]?.[0]?.v : formula1),- formula2: this._parseNumber(isFormulaString(formula2) ? formulaInfo?.[1]?.result?.[0]?.[0]?.v : formula2),+ formula1: this._parseNumber(isFormulaString(formula1) ? formulaResult1 : formula1),+ formula2: this._parseNumber(isFormulaString(formula2) ? formulaResult2 : formula2),+ isFormulaValid,};return info;diff --git a/packages/sheets-data-validation/src/validators/list-validator.ts b/packages/sheets-data-validation/src/validators/list-validator.tsindex 6138c9c551..8526d2cdb0 100644--- a/packages/sheets-data-validation/src/validators/list-validator.ts+++ b/packages/sheets-data-validation/src/validators/list-validator.ts@@ -20,6 +20,7 @@ import { DataValidationRenderMode, DataValidationType, isFormulaString, IUniverIimport { BaseDataValidator } from '@univerjs/data-validation';import { deserializeRangeWithSheet, isReferenceString, LexerTreeBuilder, sequenceNodeType } from '@univerjs/engine-formula';import { DataValidationFormulaService } from '../services/dv-formula.service';+import { getFormulaResult, isLegalFormulaResult } from '../utils/formula';import { getCellValueOrigin } from '../utils/get-cell-data-origin';import { deserializeListOptions } from './util';@@ -37,7 +38,10 @@ export function getRuleFormulaResultSet(result: Nullable<Nullable<ICellData>[][]resultSet.add(numfmt.format(cell.s.n.pattern, value, { throws: false }));return;}- resultSet.add(value.toString());++ if (isLegalFormulaResult(value.toString())) {+ resultSet.add(value.toString());+ }}});}@@ -145,10 +149,13 @@ export class ListValidator extends BaseDataValidator {override async parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult<string[] | undefined>> {const { formula1 = '' } = rule;const results = await this.formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);+ const formulaResult1 = getFormulaResult(results?.[0]?.result);+ const isFormulaValid = isLegalFormulaResult(String(formulaResult1));return {formula1: isFormulaString(formula1) ? getRuleFormulaResultSet(results?.[0]?.result) : deserializeListOptions(formula1),formula2: undefined,+ isFormulaValid,};}diff --git a/packages/sheets-data-validation/src/validators/text-length-validator.ts b/packages/sheets-data-validation/src/validators/text-length-validator.tsindex b56a9c898a..ff03b63398 100644--- a/packages/sheets-data-validation/src/validators/text-length-validator.ts+++ b/packages/sheets-data-validation/src/validators/text-length-validator.ts@@ -20,6 +20,7 @@ import { DataValidationOperator, DataValidationType, isFormulaString, Tools } frimport { BaseDataValidator, TextLengthErrorTitleMap } from '@univerjs/data-validation';import { DataValidationFormulaService } from '../services/dv-formula.service';import { TWO_FORMULA_OPERATOR_COUNT } from '../types/const/two-formula-operators';+import { getFormulaResult, isLegalFormulaResult } from '../utils/formula';const FORMULA1 = '{FORMULA1}';const FORMULA2 = '{FORMULA2}';@@ -88,9 +89,14 @@ export class TextLengthValidator extends BaseDataValidator<number> {const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);const { formula1, formula2 } = rule;+ const formulaResult1 = getFormulaResult(formulaInfo?.[0]?.result);+ const formulaResult2 = getFormulaResult(formulaInfo?.[1]?.result);+ const isFormulaValid = isLegalFormulaResult(String(formulaResult1)) && isLegalFormulaResult(String(formulaResult2));+return {- formula1: this._parseNumber(isFormulaString(formula1) ? formulaInfo?.[0]?.result?.[0]?.[0]?.v : formula1),- formula2: this._parseNumber(isFormulaString(formula2) ? formulaInfo?.[1]?.result?.[0]?.[0]?.v : formula2),+ formula1: this._parseNumber(isFormulaString(formula1) ? formulaResult1 : formula1),+ formula2: this._parseNumber(isFormulaString(formula2) ? formulaResult2 : formula2),+ isFormulaValid,};}diff --git a/packages/sheets-data-validation/src/validators/whole-validator.ts b/packages/sheets-data-validation/src/validators/whole-validator.tsindex 138c55101d..2c8763fd7f 100644--- a/packages/sheets-data-validation/src/validators/whole-validator.ts+++ b/packages/sheets-data-validation/src/validators/whole-validator.ts@@ -20,6 +20,7 @@ import { DataValidationOperator, DataValidationType, isFormulaString, Tools } frimport { BaseDataValidator } from '@univerjs/data-validation';import { DataValidationFormulaService } from '../services/dv-formula.service';import { TWO_FORMULA_OPERATOR_COUNT } from '../types/const/two-formula-operators';+import { isLegalFormulaResult } from '../utils/formula';import { getCellValueNumber } from './decimal-validator';export class WholeValidator extends BaseDataValidator<number> {@@ -67,13 +68,18 @@ export class WholeValidator extends BaseDataValidator<number> {return +formula;}- async parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string) {+ override async parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string) {const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);const { formula1, formula2 } = rule;+ const formula1Result = isFormulaString(formula1) ? formulaInfo?.[0]?.result?.[0]?.[0]?.v : formula1;+ const formula2Result = isFormulaString(formula2) ? formulaInfo?.[1]?.result?.[0]?.[0]?.v : formula2;+ const isFormulaValid = isLegalFormulaResult(`${formula1Result}`) && isLegalFormulaResult(`${formula2Result}`);+const info = {- formula1: this._parseNumber(isFormulaString(formula1) ? formulaInfo?.[0]?.result?.[0]?.[0]?.v : formula1),- formula2: this._parseNumber(isFormulaString(formula2) ? formulaInfo?.[1]?.result?.[0]?.[0]?.v : formula2),+ formula1: this._parseNumber(formula1Result),+ formula2: this._parseNumber(formula2Result),+ isFormulaValid,};return info;diff --git a/packages/sheets-formula/src/services/formula-ref-range.service.ts b/packages/sheets-formula/src/services/formula-ref-range.service.tsindex 00d8e2fcd5..320b6ba8bb 100644--- a/packages/sheets-formula/src/services/formula-ref-range.service.ts+++ b/packages/sheets-formula/src/services/formula-ref-range.service.ts@@ -15,9 +15,9 @@*/import type { IDisposable, IMutationInfo, IRange, Workbook } from '@univerjs/core';-import { Disposable, DisposableCollection, Inject, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';-import { deserializeRangeWithSheet, ErrorType, generateStringWithSequence, LexerTreeBuilder, sequenceNodeType, serializeRange, serializeRangeWithSheet, serializeRangeWithSpreadsheet } from '@univerjs/engine-formula';import type { EffectRefRangeParams } from '@univerjs/sheets';+import { Disposable, DisposableCollection, Inject, IUniverInstanceService, moveRangeByOffset, UniverInstanceType } from '@univerjs/core';+import { deserializeRangeWithSheet, ErrorType, generateStringWithSequence, LexerTreeBuilder, sequenceNodeType, serializeRange, serializeRangeWithSheet, serializeRangeWithSpreadsheet } from '@univerjs/engine-formula';import { handleDefaultRangeChangeWithEffectRefCommands, RefRangeService } from '@univerjs/sheets';export type FormulaChangeMap = Record<string, Record<string, Record<string, string>>>;@@ -27,6 +27,11 @@ export type FormulaChangeCallback = (formulaString: string) => {undos: IMutationInfo[];};+export type RangeFormulaChangeCallback = (formulas: { formulaString: string; ranges: IRange[] }[]) => {+ redos: IMutationInfo[];+ undos: IMutationInfo[];+};+export class FormulaRefRangeService extends Disposable {constructor(@Inject(RefRangeService) private readonly _refRangeService: RefRangeService,@@ -36,31 +41,92 @@ export class FormulaRefRangeService extends Disposable {super();}- registerFormula(formula: string, callback: FormulaChangeCallback): IDisposable {+ transformFormulaByEffectCommand(unitId: string, subUnitId: string, formula: string, params: EffectRefRangeParams) {+ const sequenceNodes = this._lexerTreeBuilder.sequenceNodesBuilder(formula);+ const currentUnit = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ const currentSheet = currentUnit.getActiveSheet();+ const currentUnitId = currentUnit.getUnitId();+ const currentSheetId = currentSheet.getSheetId();++ const transformSequenceNodes = sequenceNodes?.map((node) => {+ if (typeof node === 'object' && node.nodeType === sequenceNodeType.REFERENCE) {+ const gridRangeName = deserializeRangeWithSheet(node.token);+ const { range, unitId: rangeUnitId, sheetName: rangeSheetName } = gridRangeName;+ const workbook = this._univerInstanceService.getUnit<Workbook>(rangeUnitId || unitId);+ const worksheet = rangeSheetName ? workbook?.getSheetBySheetName(rangeSheetName) : workbook?.getSheetBySheetId(subUnitId);+ if (!worksheet) {+ throw new Error('Sheet not found');+ }++ const realUnitId = workbook!.getUnitId();+ const realSheetId = worksheet.getSheetId();+ if ((realUnitId !== currentUnitId) || (realSheetId !== currentSheetId)) {+ return node;+ }+ const newRange = handleDefaultRangeChangeWithEffectRefCommands(range, params);+ let newToken = '';++ if (newRange) {+ const offsetX = newRange.startColumn - range.startColumn;+ const offsetY = newRange.startRow - range.startRow;+ const finalRange = moveRangeByOffset(range, offsetX, offsetY);+ if (rangeUnitId && rangeSheetName) {+ newToken = serializeRangeWithSpreadsheet(rangeUnitId, rangeSheetName, finalRange);+ } else if (rangeSheetName) {+ newToken = serializeRangeWithSheet(rangeSheetName, finalRange);+ } else {+ newToken = serializeRange(finalRange);+ }+ } else {+ newToken = ErrorType.ERROR;+ }++ return {+ ...node,+ token: newToken,+ };+ } else {+ return node;+ };+ });++ return transformSequenceNodes ? `=${generateStringWithSequence(transformSequenceNodes)}` : '';+ }++ registerFormula(unitId: string, subUnitId: string, formula: string, callback: FormulaChangeCallback): IDisposable {const rangeMap = new Map<string, { unitId: string; subUnitId: string; range: IRange; sheetName: string }>();const sequenceNodes = this._lexerTreeBuilder.sequenceNodesBuilder(formula);const disposableCollection = new DisposableCollection();+const handleChange = (params: EffectRefRangeParams) => {- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;- const worksheet = workbook.getActiveSheet();- const unitId = workbook.getUnitId();- const subUnitId = worksheet?.getSheetId();+ const currentUnit = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ const currentSheet = currentUnit.getActiveSheet();+ const currentUnitId = currentUnit.getUnitId();+ const currentSheetId = currentSheet.getSheetId();const transformSequenceNodes = sequenceNodes?.map((node) => {if (typeof node === 'object' && node.nodeType === sequenceNodeType.REFERENCE) {const rangeInfo = rangeMap.get(node.token)!;- if ((rangeInfo.unitId && rangeInfo.unitId !== unitId) && (rangeInfo.subUnitId && rangeInfo.subUnitId !== subUnitId)) {+ if ((rangeInfo.unitId !== currentUnitId) || (rangeInfo.subUnitId !== currentSheetId)) {return node;}- const newRange = handleDefaultRangeChangeWithEffectRefCommands(rangeInfo.range, params);+ const newRange = handleDefaultRangeChangeWithEffectRefCommands(rangeInfo.range, params);let newToken = '';- if (rangeInfo.unitId && rangeInfo.sheetName) {- newToken = serializeRangeWithSpreadsheet(rangeInfo.unitId, rangeInfo.sheetName, rangeInfo.range);- } else if (rangeInfo.sheetName) {- newToken = serializeRangeWithSheet(rangeInfo.sheetName, rangeInfo.range);++ if (newRange) {+ const offsetX = newRange.startColumn - rangeInfo.range.startColumn;+ const offsetY = newRange.startRow - rangeInfo.range.startRow;+ const finalRange = moveRangeByOffset(rangeInfo.range, offsetX, offsetY);+ if (rangeInfo.unitId && rangeInfo.sheetName) {+ newToken = serializeRangeWithSpreadsheet(rangeInfo.unitId, rangeInfo.sheetName, finalRange);+ } else if (rangeInfo.sheetName) {+ newToken = serializeRangeWithSheet(rangeInfo.sheetName, finalRange);+ } else {+ newToken = serializeRange(finalRange);+ }} else {- newToken = newRange ? serializeRange(newRange) : ErrorType.ERROR;+ newToken = ErrorType.ERROR;}return {@@ -69,30 +135,31 @@ export class FormulaRefRangeService extends Disposable {};} else {return node;- }- ;+ };});const newFormulaString = transformSequenceNodes && generateStringWithSequence(transformSequenceNodes);return callback(`=${newFormulaString}`);};+sequenceNodes?.forEach((node) => {if (typeof node === 'object' && node.nodeType === sequenceNodeType.REFERENCE) {const gridRangeName = deserializeRangeWithSheet(node.token);- const { range, unitId, sheetName } = gridRangeName;- const workbook = unitId ? this._univerInstanceService.getUniverSheetInstance(unitId) : this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;- const worksheet = sheetName ? workbook?.getSheetBySheetName(sheetName) : workbook?.getActiveSheet();+ const { range, unitId: rangeUnitId, sheetName: rangeSheetName } = gridRangeName;+ const workbook = this._univerInstanceService.getUnit<Workbook>(rangeUnitId || unitId);+ const worksheet = rangeSheetName ? workbook?.getSheetBySheetName(rangeSheetName) : workbook?.getSheetBySheetId(subUnitId);if (!worksheet) {return;}- const sheetId = worksheet.getSheetId();+ const realUnitId = workbook!.getUnitId();+ const realSheetId = worksheet.getSheetId();const item = {- unitId,- subUnitId: sheetId,+ unitId: realUnitId,+ subUnitId: realSheetId,range,- sheetName,+ sheetName: rangeSheetName,};rangeMap.set(node.token, item);- disposableCollection.add(this._refRangeService.registerRefRange(range, handleChange, unitId, sheetId));+ disposableCollection.add(this._refRangeService.registerRefRange(range, handleChange, realUnitId, realSheetId));}});