@univerjs/sheets-conditional-formatting-ui 1.2.0 → 1.3.0

package/lib/index.js

@@ -1006,7 +1006,7 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-conditional-formatting-ui";
-var version = "1.2.0";
+var version = "1.3.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -3995,7 +3995,7 @@ const getSubUnitId = (univerInstanceService) => {
 	return (_getActiveSheet = univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET).getActiveSheet()) === null || _getActiveSheet === void 0 ? void 0 : _getActiveSheet.getSheetId();
 };
 const RuleEdit = (props) => {
-	var _props$rule, _props$rule5;
+	var _props$rule, _props$rule2, _props$rule6;
 	const { SelectComponent = Select, DropdownComponent, ColorPickerComponent, RangeSelectorComponent = RangeSelector, FormulaEditorComponent = FormulaEditor } = props;
 	const localeService = useDependency(LocaleService);
 	const commandService = useDependency(ICommandService);
@@ -4005,11 +4005,12 @@ const RuleEdit = (props) => {
 	const unitId = getUnitId(univerInstanceService);
 	const subUnitId = getSubUnitId(univerInstanceService);
 	const [errorText, setErrorText] = useState(void 0);
-	const rangeResult = useRef(((_props$rule = props.rule) === null || _props$rule === void 0 ? void 0 : _props$rule.ranges) ?? []);
+	const [stopIfTrue, setStopIfTrue] = useState(!!((_props$rule = props.rule) === null || _props$rule === void 0 ? void 0 : _props$rule.stopIfTrue));
+	const rangeResult = useRef(((_props$rule2 = props.rule) === null || _props$rule2 === void 0 ? void 0 : _props$rule2.ranges) ?? []);
 	const rangeSelectorTouched = useRef(false);
 	const rangeString = useMemo(() => {
-		var _props$rule2;
-		let ranges = (_props$rule2 = props.rule) === null || _props$rule2 === void 0 ? void 0 : _props$rule2.ranges;
+		var _props$rule3;
+		let ranges = (_props$rule3 = props.rule) === null || _props$rule3 === void 0 ? void 0 : _props$rule3.ranges;
 		if (!(ranges === null || ranges === void 0 ? void 0 : ranges.length)) {
 			var _selectionManagerServ;
 			ranges = ((_selectionManagerServ = selectionManagerService.getCurrentSelections()) === null || _selectionManagerServ === void 0 ? void 0 : _selectionManagerServ.map((s) => s.range)) ?? [];
@@ -4048,14 +4049,14 @@ const RuleEdit = (props) => {
 		}
 	];
 	const [ruleType, setRuleType] = useState(() => {
-		var _props$rule3;
-		const type = (_props$rule3 = props.rule) === null || _props$rule3 === void 0 ? void 0 : _props$rule3.rule.type;
+		var _props$rule4;
+		const type = (_props$rule4 = props.rule) === null || _props$rule4 === void 0 ? void 0 : _props$rule4.rule.type;
 		const defaultType = options[0].value;
 		if (!type) return defaultType;
 		switch (type) {
 			case CFRuleType.highlightCell:
-				var _props$rule4;
-				switch ((_props$rule4 = props.rule) === null || _props$rule4 === void 0 ? void 0 : _props$rule4.rule.subType) {
+				var _props$rule5;
+				switch ((_props$rule5 = props.rule) === null || _props$rule5 === void 0 ? void 0 : _props$rule5.rule.subType) {
 					case CFSubRuleType.number:
 					case CFSubRuleType.text:
 					case CFSubRuleType.duplicateValues:
@@ -4090,6 +4091,7 @@ const RuleEdit = (props) => {
 			default: return HighlightCellStyleEditor;
 		}
 	}, [ruleType]);
+	const supportsStopIfTrue = StyleEditor === HighlightCellStyleEditor || StyleEditor === RankStyleEditor || StyleEditor === FormulaStyleEditor;
 	useEffect(() => {
 		const disposable = commandService.onCommandExecuted((commandInfo) => {
 			if (commandInfo.id === RemoveSheetMutation.id) {
@@ -4131,7 +4133,8 @@ const RuleEdit = (props) => {
 					rule = {
 						...props.rule,
 						ranges,
-						rule: result
+						rule: result,
+						stopIfTrue: result.type === CFRuleType.highlightCell && stopIfTrue
 					};
 					commandService.executeCommand(SetCfCommand.id, {
 						unitId,
@@ -4144,7 +4147,7 @@ const RuleEdit = (props) => {
 						cfId: conditionalFormattingRuleModel.createCfId(unitId, subUnitId),
 						ranges,
 						rule: result,
-						stopIfTrue: false
+						stopIfTrue: result.type === CFRuleType.highlightCell && stopIfTrue
 					};
 					commandService.executeCommand(AddCfCommand.id, {
 						unitId,
@@ -4199,13 +4202,21 @@ const RuleEdit = (props) => {
 		}),
 		/* @__PURE__ */ jsx(StyleEditor, {
 			interceptorManager,
-			rule: (_props$rule5 = props.rule) === null || _props$rule5 === void 0 ? void 0 : _props$rule5.rule,
+			rule: (_props$rule6 = props.rule) === null || _props$rule6 === void 0 ? void 0 : _props$rule6.rule,
 			onChange: onStyleChange,
 			SelectComponent,
 			DropdownComponent,
 			ColorPickerComponent,
 			FormulaEditorComponent
 		}),
+		supportsStopIfTrue && /* @__PURE__ */ jsx("div", {
+			className: "univer-mt-4",
+			children: /* @__PURE__ */ jsx(Checkbox, {
+				checked: stopIfTrue,
+				onChange: (checked) => setStopIfTrue(!!checked),
+				children: localeService.t("sheets-conditional-formatting-ui.panel.stopIfTrue")
+			})
+		}),
 		/* @__PURE__ */ jsxs("div", {
 			className: "univer-mt-4 univer-flex univer-justify-end univer-gap-2",
 			children: [/* @__PURE__ */ jsx(Button, {
@@ -4437,7 +4448,7 @@ function RuleList(props) {
 		onDragStop: handleDragStop,
 		onDragStart: handleDragStart,
 		itemRender: (rule) => /* @__PURE__ */ jsxs("div", {
-			className: clsx("univer-group univer-relative univer-flex univer-items-center univer-justify-between univer-rounded univer-py-2 univer-pl-5 univer-pr-8 hover:univer-bg-gray-100 rtl:univer-pl-8 rtl:univer-pr-5 dark:hover:!univer-bg-gray-700", { "univer-bg-gray-100 dark:!univer-bg-gray-700": draggingId === rule.cfId }),
+			className: clsx("univer-group univer-relative univer-flex univer-flex-wrap univer-items-center univer-justify-between univer-rounded univer-py-2 univer-pl-5 univer-pr-8 hover:univer-bg-gray-100 rtl:univer-pl-8 rtl:univer-pr-5 dark:hover:!univer-bg-gray-700", { "univer-bg-gray-100 dark:!univer-bg-gray-700": draggingId === rule.cfId }),
 			onMouseMove: () => {
 				rule.ranges !== currentRuleRanges && setCurrentRuleRanges(rule.ranges);
 			},
@@ -4462,6 +4473,16 @@ function RuleList(props) {
 					})]
 				}),
 				/* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(ConditionalFormattingRulePreview, { rule: rule.rule }) }),
+				rule.rule.type === CFRuleType.highlightCell && /* @__PURE__ */ jsx("div", {
+					className: "univer-pointer-events-none univer-mt-2 univer-w-full",
+					children: /* @__PURE__ */ jsx(Checkbox, {
+						className: "univer-max-w-full",
+						contentClassName: "univer-min-w-0",
+						checked: !!rule.stopIfTrue,
+						disabled: true,
+						children: localeService.t("sheets-conditional-formatting-ui.panel.stopIfTrue")
+					})
+				}),
 				/* @__PURE__ */ jsx("div", {
 					className: clsx("univer-absolute univer-right-1 univer-hidden univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded univer-text-red-500 group-hover:univer-flex hover:univer-bg-gray-200 rtl:univer-left-1 rtl:univer-right-auto", { "univer-flex univer-items-center univer-justify-center": draggingId === rule.cfId }),
 					onClick: (e) => {

package/lib/locale/ar-SA.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "الإيقاف إذا تحقق الشرط",
 		createRule: "إنشاء قاعدة",
 		clear: "مسح كل القواعد",
 		range: "نطاق التطبيق",

package/lib/locale/ca-ES.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "Atura si és cert",
 		createRule: "Crea regla",
 		clear: "Esborra totes les regles",
 		range: "Aplica rang",

package/lib/locale/de-DE.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "Anhalten, wenn wahr",
 		createRule: "Regel erstellen",
 		clear: "Alle Regeln löschen",
 		range: "Bereich anwenden",

package/lib/locale/en-US.js

@@ -49,6 +49,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "Stop If True",
 		createRule: "Create Rule",
 		clear: "Clear All Rules",
 		range: "Apply Range",

package/lib/locale/es-ES.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "Detener si es verdadero",
 		createRule: "Crear regla",
 		clear: "Borrar todas las reglas",
 		range: "Aplicar rango",

package/lib/locale/fa-IR.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "توقف در صورت درست بودن",
 		createRule: "ایجاد قانون",
 		clear: "پاک کردن همه قوانین",
 		range: "اعمال محدوده",

package/lib/locale/fr-FR.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "Interrompre si vrai",
 		createRule: "Créer une règle",
 		clear: "Effacer toutes les règles",
 		range: "Appliquer la plage",

package/lib/locale/id-ID.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "Hentikan Jika Benar",
 		createRule: "Buat Aturan",
 		clear: "Hapus Semua Aturan",
 		range: "Terapkan Rentang",

package/lib/locale/it-IT.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "Interrompi se vero",
 		createRule: "Crea Regola",
 		clear: "Cancella Tutte le Regole",
 		range: "Applica Intervallo",

package/lib/locale/ja-JP.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "≤"
 	},
 	panel: {
+		stopIfTrue: "条件を満たす場合は停止",
 		createRule: "新しいルール",
 		clear: "ルールのクリア",
 		range: "適用先",

package/lib/locale/ko-KR.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "≤"
 	},
 	panel: {
+		stopIfTrue: "참이면 중지",
 		createRule: "규칙 만들기",
 		clear: "모든 규칙 지우기",
 		range: "적용 범위",

package/lib/locale/pl-PL.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "Zatrzymaj, gdy warunek jest prawdziwy",
 		createRule: "Utwórz regułę",
 		clear: "Wyczyść wszystkie reguły",
 		range: "Zakres zastosowania",

package/lib/locale/pt-BR.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "Parar se Verdadeiro",
 		createRule: "Criar Regra",
 		clear: "Limpar Todas as Regras",
 		range: "Aplicar ao Intervalo",

package/lib/locale/ru-RU.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "Остановить, если истина",
 		createRule: "Создать правило",
 		clear: "Очистить все правила",
 		range: "Применить диапазон",

package/lib/locale/sk-SK.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "Zastaviť, ak je pravda",
 		createRule: "Vytvoriť pravidlo",
 		clear: "Vymazať všetky pravidlá",
 		range: "Rozsah použitia",

package/lib/locale/vi-VN.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "Dừng nếu đúng",
 		createRule: "Tạo quy tắc mới",
 		clear: "Xóa tất cả quy tắc",
 		range: "Phạm vi áp dụng",

package/lib/locale/zh-CN.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "如果为真则停止",
 		createRule: "新增规则",
 		clear: "清空所有规则",
 		range: "应用范围",

package/lib/locale/zh-HK.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "若為真則停止",
 		createRule: "新增規則",
 		clear: "清空所有規則",
 		range: "應用範圍",

package/lib/locale/zh-TW.js

@@ -34,6 +34,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lessThanOrEqual: "<="
 	},
 	panel: {
+		stopIfTrue: "若為真則停止",
 		createRule: "新增規則",
 		clear: "清空所有規則",
 		range: "應用範圍",

package/lib/types/locale/en-US.d.ts

@@ -49,6 +49,7 @@ declare const locale: {
             lessThanOrEqual: string;
         };
         panel: {
+            stopIfTrue: string;
             createRule: string;
             clear: string;
             range: string;

package/lib/types/views/panel/RuleEdit.d.ts

@@ -16,8 +16,8 @@
 import type { IDropdownProps, ISelectProps } from '@univerjs/design';
 import type { IConditionFormattingRule } from '@univerjs/sheets-conditional-formatting';
 import type { ComponentType } from 'react';
-import type { IConditionalColorPickerProps } from '../ColorPicker';
 import { FormulaEditor, RangeSelector } from '@univerjs/sheets-formula-ui';
+import type { IConditionalColorPickerProps } from '../ColorPicker';
 export interface IRuleEditProps {
     rule?: IConditionFormattingRule;
     onCancel: () => void;