@univerjs/sheets-conditional-formatting-ui 0.2.14 → 0.2.15

package/lib/es/index.js

@@ -2,8 +2,8 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { CommandType, ICommandService, IUniverInstanceService, IUndoRedoService, ObjectMatrix, Range, sequenceExecute, ColorKit, BooleanNumber, Disposable, OnLifecycle, LifecycleStages, Inject, LocaleService, useDependency, Injector, UniverInstanceType, Rectangle, createInterceptorKey, createInternalEditorID, Tools, InterceptorManager, generateRandomId, toDisposable, Plugin, DependentOn, IConfigService } from "@univerjs/core";
-import { ConditionalFormattingRuleModel, CFRuleType, CFSubRuleType, AddConditionalRuleMutation, CFNumberOperator, setConditionalRuleMutationUndoFactory, SetConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, DeleteConditionalRuleMutation, transformSupportSymmetryAnchor, MoveConditionalRuleMutationUndoFactory, MoveConditionalRuleMutation, getColorScaleFromValue, iconMap, DEFAULT_BG_COLOR, DEFAULT_FONT_COLOR, defaultDataBarPositiveColor, defaultDataBarNativeColor, AddConditionalRuleMutationUndoFactory, CFValueType, createDefaultValueByValueType, SHEET_CONDITIONAL_FORMATTING_PLUGIN, removeUndefinedAttr, createDefaultValue, CFTextOperator, CFTimePeriodOperator, iconGroup, getOppositeOperator, compareWithNumber, EMPTY_ICON_TYPE, createDefaultRule, DEFAULT_PADDING, DEFAULT_WIDTH, ConditionalFormattingService, ConditionalFormattingViewModel, isRangesEqual, UniverSheetsConditionalFormattingPlugin, getStringFromDataStream } from "@univerjs/sheets-conditional-formatting";
+import { CommandType, ICommandService, IUniverInstanceService, IUndoRedoService, ObjectMatrix, Range, sequenceExecute, ColorKit, BooleanNumber, Disposable, OnLifecycle, LifecycleStages, Inject, LocaleService, useDependency, Injector, UniverInstanceType, Rectangle, createInterceptorKey, createInternalEditorID, Tools, InterceptorManager, generateRandomId, toDisposable, Plugin, DependentOn, IConfigService, BuildTextUtils } from "@univerjs/core";
+import { ConditionalFormattingRuleModel, CFRuleType, CFSubRuleType, AddConditionalRuleMutation, CFNumberOperator, setConditionalRuleMutationUndoFactory, SetConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, DeleteConditionalRuleMutation, transformSupportSymmetryAnchor, MoveConditionalRuleMutationUndoFactory, MoveConditionalRuleMutation, getColorScaleFromValue, iconMap, DEFAULT_BG_COLOR, DEFAULT_FONT_COLOR, defaultDataBarPositiveColor, defaultDataBarNativeColor, AddConditionalRuleMutationUndoFactory, CFValueType, createDefaultValueByValueType, SHEET_CONDITIONAL_FORMATTING_PLUGIN, removeUndefinedAttr, createDefaultValue, CFTextOperator, CFTimePeriodOperator, iconGroup, getOppositeOperator, compareWithNumber, EMPTY_ICON_TYPE, createDefaultRule, DEFAULT_PADDING, DEFAULT_WIDTH, ConditionalFormattingService, ConditionalFormattingViewModel, isRangesEqual, UniverSheetsConditionalFormattingPlugin } from "@univerjs/sheets-conditional-formatting";
 import { getSheetCommandTarget, SheetsSelectionsService, findAllRectangle, createTopMatrixFromMatrix, SetWorksheetActiveOperation, SetSelectionsOperation, checkRangesEditablePermission, RemoveSheetMutation, setEndForRange, INTERCEPTOR_POINT, SheetInterceptorService, RefRangeService, handleDefaultRangeChangeWithEffectRefCommands, WorkbookEditablePermission, RangeProtectionPermissionEditPoint, WorksheetEditPermission, WorksheetSetCellStylePermission, ClearSelectionFormatCommand, ClearSelectionAllCommand, RangeMergeUtil } from "@univerjs/sheets";
 import { useObservable, ComponentManager, TextEditor, ILayoutService, useScrollYOverContainer, RangeSelector, ISidebarService, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, IMenuManagerService } from "@univerjs/ui";
 import require$$0, { forwardRef, useRef, createElement, useMemo, useState, useEffect } from "react";
@@ -7524,11 +7524,12 @@ let ConditionalFormattingEditorController = (_a11 = class extends Disposable {
           this._editorBridgeService.interceptor.getInterceptPoints().AFTER_CELL_EDIT,
           {
             handler: /* @__PURE__ */ __name((value, context, next) => {
+              var _a15, _b;
               const result = this._conditionalFormattingService.composeStyle(context.unitId, context.subUnitId, context.row, context.col);
               if (result != null && result.style && (value != null && value.p)) {
                 const keys = Object.keys(result == null ? void 0 : result.style);
                 if (keys.length > 0) {
-                  const v = getStringFromDataStream(value.p), s = { ...(typeof value.s == "string" ? context.workbook.getStyles().get(value.s) : value.s) || {} };
+                  const v = BuildTextUtils.transform.getPlainText((_b = (_a15 = value.p.body) == null ? void 0 : _a15.dataStream) != null ? _b : ""), s = { ...(typeof value.s == "string" ? context.workbook.getStyles().get(value.s) : value.s) || {} };
                   keys.forEach((key) => {
                     delete s[key];
                   });

package/lib/types/controllers/cf.editor.controller.d.ts

@@ -1,6 +1,6 @@
 import { Disposable } from '@univerjs/core';
-import { IEditorBridgeService } from '@univerjs/sheets-ui';
 import { ConditionalFormattingService } from '@univerjs/sheets-conditional-formatting';
+import { IEditorBridgeService } from '@univerjs/sheets-ui';
 export declare class ConditionalFormattingEditorController extends Disposable {
     private _editorBridgeService;
     private _conditionalFormattingService;