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(sheet): add info type for Message component, use barColor in ProgressBar (#2277)
Dushusir7b411b398d5a
diff --git a/packages/design/src/components/message/Message.stories.tsx b/packages/design/src/components/message/Message.stories.tsxindex f13bfa1a8c..d24b78054a 100644--- a/packages/design/src/components/message/Message.stories.tsx+++ b/packages/design/src/components/message/Message.stories.tsx@@ -46,6 +46,9 @@ export const Playground = {<Button type="primary" onClick={() => handleOpen(MessageType.Success)}>Click Me</Button>+ <Button type="primary" onClick={() => handleOpen(MessageType.Info)}>+ Click Me+ </Button><Button type="primary" onClick={() => handleOpen(MessageType.Warning)}>Click Me</Button>diff --git a/packages/design/src/components/message/Message.tsx b/packages/design/src/components/message/Message.tsxindex b840224e86..60ee2dee27 100644--- a/packages/design/src/components/message/Message.tsx+++ b/packages/design/src/components/message/Message.tsx@@ -26,6 +26,7 @@ import styles from './index.module.less';export enum MessageType {Success = 'success',+ Info = 'info',Warning = 'warning',Error = 'error',}@@ -43,6 +44,7 @@ export interface IMessageMethodOptions {const iconMap = {[MessageType.Success]: <SuccessSingle className={styles.messageIconSuccess} />,+ [MessageType.Info]: <WarningSingle className={styles.messageIconInfo} />,[MessageType.Warning]: <WarningSingle className={styles.messageIconWarning} />,[MessageType.Error]: <ErrorSingle className={styles.messageIconError} />,};@@ -127,6 +129,10 @@ export class Message {return this.append(MessageType.Success, options);}+ info(options: IMessageMethodOptions): IDisposable {+ return this.append(MessageType.Info, options);+ }+warning(options: IMessageMethodOptions): IDisposable {return this.append(MessageType.Warning, options);}diff --git a/packages/design/src/components/message/index.module.less b/packages/design/src/components/message/index.module.lessindex ffbfd87432..49496f2b5e 100644--- a/packages/design/src/components/message/index.module.less+++ b/packages/design/src/components/message/index.module.less@@ -44,6 +44,10 @@color: rgb(var(--success-color));}+ &-info {+ color: rgb(var(--info-color));+ }+&-warning {color: rgb(var(--warning-color));}diff --git a/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx b/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsxindex 1654997db3..e9bfb02338 100644--- a/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx+++ b/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx@@ -15,7 +15,7 @@*/import type { Nullable } from '@univerjs/core';-import { DEFAULT_EMPTY_DOCUMENT_VALUE, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, HorizontalAlign, VerticalAlign, WrapStrategy } from '@univerjs/core';+import { DEFAULT_EMPTY_DOCUMENT_VALUE, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, HorizontalAlign, ThemeService, VerticalAlign, WrapStrategy } from '@univerjs/core';import { DeviceInputEventType } from '@univerjs/engine-render';import { CheckMarkSingle, CloseSingle, DropdownSingle, FxSingle } from '@univerjs/icons';import { KeyCode, ProgressBar, TextEditor } from '@univerjs/ui';@@ -40,6 +40,8 @@ export function FormulaBar() {const formulaEditorManagerService = useDependency(IFormulaEditorManagerService);const editorBridgeService = useDependency(IEditorBridgeService);+ const themeService = useDependency(ThemeService);+ const progressBarColor = themeService.getCurrentTheme().primaryColor;const INITIAL_SNAPSHOT = {id: DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY,@@ -176,7 +178,7 @@ export function FormulaBar() {</div></div>- <ProgressBar />+ <ProgressBar barColor={progressBarColor} /></div>);}diff --git a/packages/ui/src/components/progress-bar/ProgressBar.tsx b/packages/ui/src/components/progress-bar/ProgressBar.tsxindex 466507b41d..eeb5fa2d2e 100644--- a/packages/ui/src/components/progress-bar/ProgressBar.tsx+++ b/packages/ui/src/components/progress-bar/ProgressBar.tsx@@ -14,17 +14,20 @@* limitations under the License.*/-import { ThemeService } from '@univerjs/core';import { useDependency } from '@wendellhu/redi/react-bindings';import React, { useEffect, useState } from 'react';import type { IProgressStep } from '../../services/progress/progress.service';import { IProgressService } from '../../services/progress/progress.service';import styles from './index.module.less';-export function ProgressBar() {- const themeService = useDependency(ThemeService);+export interface IProgressBarProps {+ barColor: string;+}++export function ProgressBar(props: IProgressBarProps) {+ const { barColor } = props;const progressService = useDependency(IProgressService);- const barColor = themeService.getCurrentTheme().primaryColor;+const [progress, setProgress] = useState(0);const [visible, setVisible] = useState(false);diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.tsindex deb3ed9d07..706be96194 100644--- a/packages/ui/src/index.ts+++ b/packages/ui/src/index.ts@@ -89,5 +89,6 @@ export { IRangeSelectorService } from './services/range-selector/range-selector.export { DesktopLocalStorageService } from './services/local-storage/local-storage.service';export { CanvasPopupService, ICanvasPopupService, type IPopup } from './services/popup/canvas-popup.service';export { ProgressBar } from './components/progress-bar/ProgressBar';-export { IProgressService } from './services/progress/progress.service';export { mergeMenuConfigs } from './common/menu-merge-configs';+export { IProgressService, ProgressService } from './services/progress/progress.service';+export type { IProgressStep } from './services/progress/progress.service';