From 6c4fe8984f7e3ed91cd5d059a71a991e4f7251c4 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Wed, 14 Jul 2021 16:25:30 +0300
Subject: [PATCH 1/2] [SSE] Fix Bug 51272

---
 .../main/app/view/FormatRulesManagerDlg.js                  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
index 821b0f3fce..31d51f9978 100644
--- a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
@@ -674,11 +674,13 @@ define([  'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
                 rec = this.rulesList.getSelectedRec();
             if (rec) {
                 var index = store.indexOf(rec);
-                var newrec = store.at(up ? this.getPrevRuleIndex(index) : this.getNextRuleIndex(index)),
+                var newindex = up ? this.getPrevRuleIndex(index) : this.getNextRuleIndex(index),
+                    newrec = store.at(newindex),
                     prioritynew = newrec.get('priority');
                 newrec.set('priority', rec.get('priority'));
                 rec.set('priority', prioritynew);
-                store.add(store.remove(rec), {at: up ? Math.max(0, index-1) : Math.min(length-1, index+1)});
+                store.add(store.remove(rec), {at: up ? Math.max(0, newindex) : Math.min(length-1, newindex)});
+                store.add(store.remove(newrec), {at: up ? Math.max(0, index) : Math.min(length-1, index)});
                 this.rulesList.selectRecord(rec);
                 this.rulesList.scrollToRecord(rec);
             }

From fc69eb3b2a808832a1e39cc3546a6286fc4b6678 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Wed, 14 Jul 2021 18:57:23 +0300
Subject: [PATCH 2/2] [SSE] Fix Bug 51288

---
 .../main/app/view/FormatRulesEditDlg.js               | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
index 07fc6fbe3a..020fecac18 100644
--- a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
@@ -1322,7 +1322,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
 
             if (rec) {
                 props = this._originalProps || new Asc.asc_CConditionalFormattingRule();
-                var type = rec.get('type');
+                var type = rec.get('type'),
+                    type_changed = (type!==props.asc_getType());
                 props.asc_setType(type);
                 if (type == Asc.c_oAscCFType.containsText || type == Asc.c_oAscCFType.containsBlanks || type == Asc.c_oAscCFType.duplicateValues ||
                     type == Asc.c_oAscCFType.timePeriod || type == Asc.c_oAscCFType.aboveAverage ||
@@ -1364,7 +1365,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
                         props.asc_setValue1(this.txtRange1.getValue());
                         break;
                     case Asc.c_oAscCFType.colorScale:
-                        var scaleProps = new Asc.asc_CColorScale();
+                        var scaleProps = !type_changed ? props.asc_getColorScaleOrDataBarOrIconSetRule() : new Asc.asc_CColorScale();
                         var scalesCount = rec.get('num');
                         var arr = (scalesCount==2) ? [this.scaleControls[0], this.scaleControls[2]] : this.scaleControls;
                         var colors = [], scales = [];
@@ -1381,7 +1382,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
                         props.asc_setColorScaleOrDataBarOrIconSetRule(scaleProps);
                         break;
                     case Asc.c_oAscCFType.dataBar:
-                        var barProps = new Asc.asc_CDataBar();
+                        var barProps = !type_changed ? props.asc_getColorScaleOrDataBarOrIconSetRule() : new Asc.asc_CDataBar();
+                        type_changed && barProps.asc_setInterfaceDefault();
                         var arr = this.barControls;
                         var bars = [];
                         for (var i=0; i<arr.length; i++) {
@@ -1417,7 +1419,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
                         props.asc_setColorScaleOrDataBarOrIconSetRule(barProps);
                         break;
                     case Asc.c_oAscCFType.iconSet:
-                        var iconsProps = new Asc.asc_CIconSet();
+                        var iconsProps = !type_changed ? props.asc_getColorScaleOrDataBarOrIconSetRule() : new Asc.asc_CIconSet();
                         iconsProps.asc_setShowValue(this.chIconShow.getValue()!=='checked');
                         iconsProps.asc_setReverse(!!this.iconsProps.isReverse);
                         iconsProps.asc_setIconSet(this.iconsProps.iconsSet);
@@ -1506,6 +1508,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
                     this._changedProps.asc_setColorScaleOrDataBarOrIconSetRule(this.scaleProps);
                 } else if (type == Asc.c_oAscCFType.dataBar) {
                     this.barProps = new Asc.asc_CDataBar();
+                    this.barProps.asc_setInterfaceDefault();
                     this.barProps.asc_setGradient(this.cmbFill.getValue());
                     this.barProps.asc_setColor(Common.Utils.ThemeColor.getRgbColor(this.btnPosFill.colorPicker.currentColor));
                     var hasBorder = !this.cmbBorder.getValue();