@univerjs/sheets-conditional-formatting 0.2.15 → 0.3.0-alpha.0

package/lib/es/index.js

@@ -2,7 +2,7 @@ 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 { Tools, Inject, Injector, CommandType, ObjectMatrix, Range, ICommandService, Disposable, toDisposable, RefAlias, CellValueType, BooleanNumber, ColorKit, Rectangle, createInterceptorKey, OnLifecycle, LifecycleStages, IUniverInstanceService, IResourceManagerService, InterceptorManager, UniverInstanceType, Plugin, IConfigService } from "@univerjs/core";
+import { Tools, Inject, Injector, ObjectMatrix, Range, CommandType, ICommandService, Disposable, toDisposable, RefAlias, CellValueType, BooleanNumber, ColorKit, Rectangle, createInterceptorKey, OnLifecycle, LifecycleStages, IUniverInstanceService, IResourceManagerService, InterceptorManager, UniverInstanceType, Plugin, IConfigService } from "@univerjs/core";
 import { Subject, Observable } from "rxjs";
 import { bufferTime, filter, map } from "rxjs/operators";
 import { SheetInterceptorService, RemoveSheetCommand, ReorderRangeMutation, MoveRangeMutation, MoveColsMutation, MoveRowsMutation, InsertRowMutation, RemoveRowMutation, RemoveColMutation, InsertColMutation, SetRangeValuesMutation } from "@univerjs/sheets";
@@ -237,98 +237,7 @@ let ConditionalFormattingRuleModel = (_a = class {
 ConditionalFormattingRuleModel = __decorateClass$3([
   __decorateParam$3(0, Inject(Injector))
 ], ConditionalFormattingRuleModel);
-const MoveConditionalRuleMutation = {
-  type: CommandType.MUTATION,
-  id: "sheet.mutation.move-conditional-rule",
-  handler(accessor, params) {
-    if (!params)
-      return !1;
-    const { unitId, subUnitId, start, end } = params;
-    return accessor.get(ConditionalFormattingRuleModel).moveRulePriority(unitId, subUnitId, start, end), !0;
-  }
-}, MoveConditionalRuleMutationUndoFactory = /* @__PURE__ */ __name((param) => {
-  const { unitId, subUnitId } = param, undo = anchorUndoFactory(param.start, param.end);
-  if (!undo)
-    return [];
-  const [start, end] = undo;
-  return [
-    {
-      id: MoveConditionalRuleMutation.id,
-      params: { unitId, subUnitId, start, end }
-    }
-  ];
-}, "MoveConditionalRuleMutationUndoFactory"), DeleteConditionalRuleMutationUndoFactory = /* @__PURE__ */ __name((accessor, param) => {
-  const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel), { unitId, subUnitId, cfId } = param, ruleList = [...conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId) || []], index = ruleList.findIndex((item) => item.cfId === cfId), beforeRule = ruleList[index - 1];
-  if (index > -1) {
-    const rule = ruleList[index], result = [{
-      id: AddConditionalRuleMutation.id,
-      params: { unitId, subUnitId, rule: Tools.deepClone(rule) }
-    }];
-    if (ruleList.splice(index, 1), index !== 0) {
-      const firstRule = ruleList[0];
-      if (firstRule) {
-        const transformResult = transformSupportSymmetryAnchor({ id: firstRule.cfId, type: "before" }, { id: beforeRule.cfId, type: "after" }, ruleList, (rule2) => rule2.cfId);
-        if (!transformResult)
-          return result;
-        const [start, end] = transformResult, params = {
-          unitId,
-          subUnitId,
-          start,
-          end
-        };
-        result.push({ id: MoveConditionalRuleMutation.id, params });
-      }
-    }
-    return result;
-  }
-  return [];
-}, "DeleteConditionalRuleMutationUndoFactory"), DeleteConditionalRuleMutation = {
-  type: CommandType.MUTATION,
-  id: "sheet.mutation.delete-conditional-rule",
-  handler(accessor, params) {
-    if (!params)
-      return !1;
-    const { unitId, subUnitId, cfId } = params;
-    return accessor.get(ConditionalFormattingRuleModel).deleteRule(unitId, subUnitId, cfId), !0;
-  }
-}, AddConditionalRuleMutationUndoFactory = /* @__PURE__ */ __name((accessor, param) => ({ id: DeleteConditionalRuleMutation.id, params: { unitId: param.unitId, subUnitId: param.subUnitId, cfId: param.rule.cfId } }), "AddConditionalRuleMutationUndoFactory"), AddConditionalRuleMutation = {
-  type: CommandType.MUTATION,
-  id: "sheet.mutation.add-conditional-rule",
-  handler(accessor, params) {
-    if (!params)
-      return !1;
-    const { unitId, subUnitId, rule } = params;
-    return accessor.get(ConditionalFormattingRuleModel).addRule(unitId, subUnitId, rule), !0;
-  }
-}, ConditionalFormattingFormulaMarkDirty = {
-  type: CommandType.MUTATION,
-  id: "sheet.mutation.conditional-formatting-formula-mark-dirty",
-  handler() {
-    return !0;
-  }
-}, SetConditionalRuleMutation = {
-  type: CommandType.MUTATION,
-  id: "sheet.mutation.set-conditional-rule",
-  handler(accessor, params) {
-    if (!params)
-      return !1;
-    const { unitId, subUnitId, rule } = params, cfId = params.cfId || params.rule.cfId;
-    return accessor.get(ConditionalFormattingRuleModel).setRule(unitId, subUnitId, rule, cfId), !0;
-  }
-}, setConditionalRuleMutationUndoFactory = /* @__PURE__ */ __name((accessor, param) => {
-  const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel), { unitId, subUnitId } = param, cfId = param.cfId || param.rule.cfId, rule = conditionalFormattingRuleModel.getRule(unitId, subUnitId, cfId);
-  return rule ? [
-    {
-      id: SetConditionalRuleMutation.id,
-      params: {
-        unitId,
-        subUnitId,
-        cfId,
-        rule: Tools.deepClone(rule)
-      }
-    }
-  ] : [];
-}, "setConditionalRuleMutationUndoFactory"), _ConditionalFormattingViewModel = class _ConditionalFormattingViewModel {
+const _ConditionalFormattingViewModel = class _ConditionalFormattingViewModel {
   constructor() {
     //  Map<unitID ,<sheetId ,ObjectMatrix>>
     __publicField(this, "_model", /* @__PURE__ */ new Map());
@@ -575,7 +484,76 @@ for (const key in iconMap) {
   const v = iconMap[key];
   Object.freeze(v);
 }
-const EMPTY_ICON_TYPE = "EMPTY_ICON_TYPE";
+const EMPTY_ICON_TYPE = "EMPTY_ICON_TYPE", AddConditionalRuleMutationUndoFactory = /* @__PURE__ */ __name((accessor, param) => ({ id: DeleteConditionalRuleMutation.id, params: { unitId: param.unitId, subUnitId: param.subUnitId, cfId: param.rule.cfId } }), "AddConditionalRuleMutationUndoFactory"), AddConditionalRuleMutation = {
+  type: CommandType.MUTATION,
+  id: "sheet.mutation.add-conditional-rule",
+  handler(accessor, params) {
+    if (!params)
+      return !1;
+    const { unitId, subUnitId, rule } = params;
+    return accessor.get(ConditionalFormattingRuleModel).addRule(unitId, subUnitId, rule), !0;
+  }
+}, MoveConditionalRuleMutation = {
+  type: CommandType.MUTATION,
+  id: "sheet.mutation.move-conditional-rule",
+  handler(accessor, params) {
+    if (!params)
+      return !1;
+    const { unitId, subUnitId, start, end } = params;
+    return accessor.get(ConditionalFormattingRuleModel).moveRulePriority(unitId, subUnitId, start, end), !0;
+  }
+}, MoveConditionalRuleMutationUndoFactory = /* @__PURE__ */ __name((param) => {
+  const { unitId, subUnitId } = param, undo = anchorUndoFactory(param.start, param.end);
+  if (!undo)
+    return [];
+  const [start, end] = undo;
+  return [
+    {
+      id: MoveConditionalRuleMutation.id,
+      params: { unitId, subUnitId, start, end }
+    }
+  ];
+}, "MoveConditionalRuleMutationUndoFactory"), DeleteConditionalRuleMutationUndoFactory = /* @__PURE__ */ __name((accessor, param) => {
+  const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel), { unitId, subUnitId, cfId } = param, ruleList = [...conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId) || []], index = ruleList.findIndex((item) => item.cfId === cfId), beforeRule = ruleList[index - 1];
+  if (index > -1) {
+    const rule = ruleList[index], result = [{
+      id: AddConditionalRuleMutation.id,
+      params: { unitId, subUnitId, rule: Tools.deepClone(rule) }
+    }];
+    if (ruleList.splice(index, 1), index !== 0) {
+      const firstRule = ruleList[0];
+      if (firstRule) {
+        const transformResult = transformSupportSymmetryAnchor({ id: firstRule.cfId, type: "before" }, { id: beforeRule.cfId, type: "after" }, ruleList, (rule2) => rule2.cfId);
+        if (!transformResult)
+          return result;
+        const [start, end] = transformResult, params = {
+          unitId,
+          subUnitId,
+          start,
+          end
+        };
+        result.push({ id: MoveConditionalRuleMutation.id, params });
+      }
+    }
+    return result;
+  }
+  return [];
+}, "DeleteConditionalRuleMutationUndoFactory"), DeleteConditionalRuleMutation = {
+  type: CommandType.MUTATION,
+  id: "sheet.mutation.delete-conditional-rule",
+  handler(accessor, params) {
+    if (!params)
+      return !1;
+    const { unitId, subUnitId, cfId } = params;
+    return accessor.get(ConditionalFormattingRuleModel).deleteRule(unitId, subUnitId, cfId), !0;
+  }
+}, ConditionalFormattingFormulaMarkDirty = {
+  type: CommandType.MUTATION,
+  id: "sheet.mutation.conditional-formatting-formula-mark-dirty",
+  handler() {
+    return !0;
+  }
+};
 var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
@@ -766,7 +744,7 @@ const dataBarUKey = "sheet-conditional-rule-data-bar", defaultDataBarPositiveCol
         return;
       const cellData = worksheet.getCell(row, col);
       if (cellData && cellData.dataBar) {
-        const { color, value, startPoint, isGradient } = cellData.dataBar, cellInfo = spreadsheetSkeleton.getCellByIndex(row, col);
+        const { color, value, startPoint, isGradient } = cellData.dataBar, cellInfo = spreadsheetSkeleton.getCellByIndexWithNoHeader(row, col);
         let { isMerged, isMergedMainCell, mergeInfo, startY, endY, startX, endX } = cellInfo;
         if (isMerged || (isMergedMainCell && (startY = mergeInfo.startY, endY = mergeInfo.endY, startX = mergeInfo.startX, endX = mergeInfo.endX), !this.isRenderDiffRangesByCell(mergeInfo, diffRanges)))
           return;
@@ -1613,7 +1591,29 @@ ConditionalFormattingService = __decorateClass$1([
 const getUnitId = /* @__PURE__ */ __name((u) => u.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getUnitId(), "getUnitId"), getSubUnitId = /* @__PURE__ */ __name((u) => {
   var _a5;
   return (_a5 = u.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getActiveSheet()) == null ? void 0 : _a5.getSheetId();
-}, "getSubUnitId"), PLUGIN_CONFIG_KEY = "ssheets-conditional-formatting.config", defaultPluginConfig = {};
+}, "getSubUnitId"), SetConditionalRuleMutation = {
+  type: CommandType.MUTATION,
+  id: "sheet.mutation.set-conditional-rule",
+  handler(accessor, params) {
+    if (!params)
+      return !1;
+    const { unitId, subUnitId, rule } = params, cfId = params.cfId || params.rule.cfId;
+    return accessor.get(ConditionalFormattingRuleModel).setRule(unitId, subUnitId, rule, cfId), !0;
+  }
+}, setConditionalRuleMutationUndoFactory = /* @__PURE__ */ __name((accessor, param) => {
+  const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel), { unitId, subUnitId } = param, cfId = param.cfId || param.rule.cfId, rule = conditionalFormattingRuleModel.getRule(unitId, subUnitId, cfId);
+  return rule ? [
+    {
+      id: SetConditionalRuleMutation.id,
+      params: {
+        unitId,
+        subUnitId,
+        cfId,
+        rule: Tools.deepClone(rule)
+      }
+    }
+  ] : [];
+}, "setConditionalRuleMutationUndoFactory"), PLUGIN_CONFIG_KEY = "ssheets-conditional-formatting.config", defaultPluginConfig = {};
 var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);

package/lib/types/index.d.ts

@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 export * from './base/const';
-export { AddConditionalRuleMutation, AddConditionalRuleMutationUndoFactory, type IAddConditionalRuleMutationParams } from './commands/mutations/add-conditional-rule.mutation';
-export { DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, type IDeleteConditionalRuleMutationParams } from './commands/mutations/delete-conditional-rule.mutation';
-export { ConditionalFormattingFormulaMarkDirty } from './commands/mutations/formula-mark-dirty.mutation';
-export { type IMoveConditionalRuleMutationParams, MoveConditionalRuleMutation, MoveConditionalRuleMutationUndoFactory } from './commands/mutations/move-conditional-rule.mutation';
-export { type ISetConditionalRuleMutationParams, SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory } from './commands/mutations/set-conditional-rule.mutation';
 export * from './models/conditional-formatting-rule-model';
 export * from './models/conditional-formatting-view-model';
 export * from './models/icon-map';
@@ -36,3 +31,8 @@ export * from './utils/create-cf-id';
 export * from './utils/is-ranges-equal';
 export * from './utils/remove-undefined-attr';
 export * from './utils/type';
+export { AddConditionalRuleMutation, AddConditionalRuleMutationUndoFactory, type IAddConditionalRuleMutationParams, } from './commands/mutations/add-conditional-rule.mutation';
+export { DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, type IDeleteConditionalRuleMutationParams, } from './commands/mutations/delete-conditional-rule.mutation';
+export { ConditionalFormattingFormulaMarkDirty } from './commands/mutations/formula-mark-dirty.mutation';
+export { type IMoveConditionalRuleMutationParams, MoveConditionalRuleMutation, MoveConditionalRuleMutationUndoFactory, } from './commands/mutations/move-conditional-rule.mutation';
+export { type ISetConditionalRuleMutationParams, SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory, } from './commands/mutations/set-conditional-rule.mutation';

package/lib/types/models/conditional-formatting-view-model.d.ts

@@ -19,7 +19,7 @@ export declare class ConditionalFormattingViewModel {
     }>;
     private _ensureMatrix;
     getMatrix(unitId: string, subUnitId: string): ObjectMatrix<ICellItem> | undefined;
-    getCellCf(unitId: string, subUnitId: string, row: number, col: number, matrix?: ObjectMatrix<ICellItem>): ICellItem | null;
+    getCellCf(unitId: string, subUnitId: string, row: number, col: number, matrix?: ObjectMatrix<ICellItem>): import('@univerjs/core').Nullable<ICellItem>;
     setCellCfRuleCache(unitId: string, subUnitId: string, row: number, col: number, cfId: string, value: any): void;
     deleteCellCf(unitId: string, subUnitId: string, row: number, col: number, cfId: string, matrix?: ObjectMatrix<ICellItem>): void;
     pushCellCf(unitId: string, subUnitId: string, row: number, col: number, cfId: string): void;