Merge branch 'dev' into fix/selection-expand-with-shift

dream-num · Dec 3, 2024 · 6a534c1 · 6a534c1
2 parents 58c59a9 + 1de083c
commit 6a534c1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/...docs/docs-visual-comparison.spec.ts-snapshots/default-doc-ci-chromium-linux.png b/...docs/docs-visual-comparison.spec.ts-snapshots/default-doc-ci-chromium-linux.png
diff --git a/packages/sheets-conditional-formatting/src/models/conditional-formatting-view-model.ts b/packages/sheets-conditional-formatting/src/models/conditional-formatting-view-model.ts
@@ -132,7 +132,7 @@ export class ConditionalFormattingViewModel extends Disposable {
      */
     public markRuleDirty = (() => {
         const rxItem = new Subject<{ unitId: string; subUnitId: string; cfId: string; isNeedResetPreComputingCache: boolean }>();
-        rxItem.pipe(bufferTime(100), filter((e) => !!e.length), map((list) => {
+        this.disposeWithMe(rxItem.pipe(bufferTime(100), filter((e) => !!e.length), map((list) => {
             const set = new Set();
             const result: typeof list = [];
             list.forEach((item) => {
@@ -152,7 +152,7 @@ export class ConditionalFormattingViewModel extends Disposable {
             list.forEach((item) => {
                 this._markRuleDirtyAtOnce(item.unitId, item.subUnitId, item.cfId, item.isNeedResetPreComputingCache);
             });
-        });
+        }));
         return (unitId: string, subUnitId: string, cfId: string, isNeedResetPreComputingCache: boolean = true) => {
             rxItem.next({ unitId, subUnitId, cfId, isNeedResetPreComputingCache });
         };

diff --git a/packages/ui/src/views/components/ribbon/Ribbon.tsx b/packages/ui/src/views/components/ribbon/Ribbon.tsx
@@ -215,8 +215,8 @@ export function Ribbon(props: IRibbonProps) {
                 style={{
                     position: 'absolute',
                     top: -9999,
-                    left: -9999,
-                    opacity: 0,
+                    left: 0,
+                    right: 0,
                     // top: 0,
                     // left: 0,
                     // opacity: 1,

diff --git a/packages/ui/src/views/components/ribbon/index.module.less b/packages/ui/src/views/components/ribbon/index.module.less
@@ -86,6 +86,7 @@
     border-bottom: 1px solid rgb(var(--border-color));
 
     &-container {
+        flex: 1;
         padding: 0 var(--padding-lg);
         display: flex;
         gap: var(--margin-xs);