opensource/univer
3
0
Fork 0
mirror of https://github.com/dream-num/univer.git synced 2026-09-21 05:44:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(sheets-data-validation-ui): reorder SetCellEditVisibleOperation command execution (#5541)

Browse Source
This commit is contained in:
白熱
2025-07-16 16:39:19 +08:00
committed by GitHub
parent 8115c3254b
commit bbef1553a0
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/sheets-data-validation-ui/src/services/dropdown-manager.service.ts
+9 -9
View File
@@ -206,12 +206,6 @@ export class DataValidationDropdownManagerService extends Disposable {
t: CellValueType.NUMBER,
}, rule))
) {
await this._commandService.executeCommand(SetCellEditVisibleOperation.id, {
visible: false,
eventType: DeviceInputEventType.Keyboard,
unitId,
keycode: KeyCode.ESC,
} as IEditorBridgeServiceVisibleParam);
await this._commandService.executeCommand(SetRangeValuesCommand.id, {
unitId,
subUnitId,
@@ -234,6 +228,12 @@ export class DataValidationDropdownManagerService extends Disposable {
},
},
});
await this._commandService.executeCommand(SetCellEditVisibleOperation.id, {
visible: false,
eventType: DeviceInputEventType.Keyboard,
unitId,
keycode: KeyCode.ESC,
} as IEditorBridgeServiceVisibleParam);
return true;
} else {
if (this._injector.has(DataValidationRejectInputController)) {
@@ -316,6 +316,7 @@ export class DataValidationDropdownManagerService extends Disposable {
},
};
this._commandService.executeCommand(SetRangeValuesCommand.id, params);
if (this._editorBridgeService.isVisible().visible) {
await this._commandService.executeCommand(SetCellEditVisibleOperation.id, {
visible: false,
@@ -324,7 +325,6 @@ export class DataValidationDropdownManagerService extends Disposable {
keycode: KeyCode.ESC,
} as IEditorBridgeServiceVisibleParam);
}
this._commandService.executeCommand(SetRangeValuesCommand.id, params);
if (multiple) {
return false;
@@ -382,6 +382,7 @@ export class DataValidationDropdownManagerService extends Disposable {
},
};
this._commandService.syncExecuteCommand(SetRangeValuesCommand.id, params);
if (this._editorBridgeService.isVisible().visible) {
this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
visible: false,
@@ -390,7 +391,6 @@ export class DataValidationDropdownManagerService extends Disposable {
keycode: KeyCode.ESC,
} as IEditorBridgeServiceVisibleParam);
}
this._commandService.syncExecuteCommand(SetRangeValuesCommand.id, params);
return true;
};
@@ -425,6 +425,7 @@ export class DataValidationDropdownManagerService extends Disposable {
},
};
this._commandService.syncExecuteCommand(SetRangeValuesCommand.id, params);
if (this._editorBridgeService.isVisible().visible) {
this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
visible: false,
@@ -433,7 +434,6 @@ export class DataValidationDropdownManagerService extends Disposable {
keycode: KeyCode.ESC,
} as IEditorBridgeServiceVisibleParam);
}
this._commandService.syncExecuteCommand(SetRangeValuesCommand.id, params);
return true;
};
packages/sheets-ui/src/views/dropdown/date-dropdown/index.tsx
+4 -4
View File
@@ -36,11 +36,11 @@ export function DateDropdown(props: { popup: IPopup<IDateDropdownProps & IBaseDr
const defaultDate = useMemo(() => patternType !== 'time' ? dayjs() : dayjs('1900-01-01 00:00:00'), []);
const date = localDate && localDate.isValid() ? localDate : defaultDate;
const localeService = useDependency(LocaleService);
const handleSave = async () => {
if (!date) {
return;
}
if ((await onChange?.(date)) !== false) {
if (!date) return;
const result = await onChange?.(date);
if (result) {
hideFn();
}
};