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
fix(sheets-ui): enforce min/max constraints for row and column height settings (#5294)
白熱e6254f405c7f
diff --git a/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx b/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsxindex 9a1c75e541..74258a1b6b 100644--- a/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx+++ b/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx@@ -45,7 +45,13 @@ export const MenuItemInput = (props: IMenuItemInputProps) => {}, [contextMenuService.visible]);useEffect(() => {- setInputValue(value);+ if (+value < min) {+ setInputValue(min.toString());+ } else if (+value > max) {+ setInputValue(max.toString());+ } else {+ setInputValue(value);+ }}, [value]);function handlePressEnter() {diff --git a/packages/sheets-ui/src/controllers/menu/menu.ts b/packages/sheets-ui/src/controllers/menu/menu.tsindex 12f7bce344..7ea55b0f58 100644--- a/packages/sheets-ui/src/controllers/menu/menu.ts+++ b/packages/sheets-ui/src/controllers/menu/menu.ts@@ -1272,7 +1272,7 @@ export function SetRowHeightMenuItemFactory(accessor: IAccessor): IMenuButtonIteconst univerInstanceService = accessor.get(IUniverInstanceService);const selectionManagerService = accessor.get(SheetsSelectionsService);- const defaultValue = 0;+ const min = 2;return {id: SetRowHeightCommand.id,@@ -1283,14 +1283,14 @@ export function SetRowHeightMenuItemFactory(accessor: IAccessor): IMenuButtonIteprops: {prefix: 'rightClick.rowHeight',suffix: 'px',- min: 2,+ min,max: 1000,},},- value$: deriveStateFromActiveSheet$(univerInstanceService, defaultValue, ({ worksheet }) => new Observable((subscriber) => {+ value$: deriveStateFromActiveSheet$(univerInstanceService, min, ({ worksheet }) => new Observable((subscriber) => {function update() {const primary = selectionManagerService.getCurrentLastSelection()?.primary;- const rowHeight = primary ? worksheet.getRowHeight(primary.startRow) : defaultValue;+ const rowHeight = primary ? worksheet.getRowHeight(primary.startRow) : worksheet.getConfig().defaultRowHeight;subscriber.next(rowHeight);}@@ -1317,7 +1317,7 @@ export function SetColWidthMenuItemFactory(accessor: IAccessor): IMenuButtonItemconst univerInstanceService = accessor.get(IUniverInstanceService);const selectionManagerService = accessor.get(SheetsSelectionsService);- const defaultValue = 0;+ const min = 2;return {id: SetColWidthCommand.id,@@ -1328,17 +1328,14 @@ export function SetColWidthMenuItemFactory(accessor: IAccessor): IMenuButtonItemprops: {prefix: 'rightClick.columnWidth',suffix: 'px',- min: 2,+ min,max: 1000,},},- value$: deriveStateFromActiveSheet$(univerInstanceService, defaultValue, ({ worksheet }) => new Observable((subscriber) => {+ value$: deriveStateFromActiveSheet$(univerInstanceService, min, ({ worksheet }) => new Observable((subscriber) => {function update() {const primary = selectionManagerService.getCurrentLastSelection()?.primary;- let colWidth: number = defaultValue;- if (primary != null) {- colWidth = worksheet.getColumnWidth(primary.startColumn);- }+ const colWidth = primary ? worksheet.getColumnWidth(primary.startColumn) : worksheet.getConfig().defaultColumnWidth;subscriber.next(colWidth);}