From ff4ff15f166d7caeb3b298ce209163c3cc94bf73 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 14 Apr 2016 16:21:12 +0300 Subject: [PATCH] =?UTF-8?q?[SSE]=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=BA=D0=BD=D0=B0=20=D0=BD=D0=B0?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA=20=D0=B0=D0=B2=D1=82=D0=BE?= =?UTF-8?q?=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=20=D0=B2=20=D1=81?= =?UTF-8?q?=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=81=D1=82=D0=B2=D0=B8?= =?UTF-8?q?=D0=B8=20=D1=81=20=D0=BC=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=D0=BC?= =?UTF-8?q?=D0=B8=20https://nct.onlyoffice.com/products/files/#preview/487?= =?UTF-8?q?01.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/lib/component/ColorPaletteExt.js | 213 +++++++++ .../main/resources/less/colorpalette.less | 42 ++ .../main/app/view/AutoFilterDialog.js | 446 ++++++++++++++---- .../main/resources/less/filterdialog.less | 12 +- 4 files changed, 628 insertions(+), 85 deletions(-) create mode 100644 apps/common/main/lib/component/ColorPaletteExt.js diff --git a/apps/common/main/lib/component/ColorPaletteExt.js b/apps/common/main/lib/component/ColorPaletteExt.js new file mode 100644 index 000000000..f1c1f7fae --- /dev/null +++ b/apps/common/main/lib/component/ColorPaletteExt.js @@ -0,0 +1,213 @@ +/** + * ColorPaletteExt.js + * + * Created by Julia Radzhabova on 07/21/15 + * Copyright (c) 2014 Ascensio System SIA. All rights reserved. + * + */ + +if (Common === undefined) + var Common = {}; + +define([ + 'common/main/lib/component/BaseView' +], function () { 'use strict'; + + Common.UI.ColorPaletteExt = Common.UI.BaseView.extend({ + options: { + dynamiccolors: 10, + allowReselect: true, + cls: '', + style: '' + }, + + template: + _.template([ + '
', + '<% var me = this; %>', + '<% $(colors).each(function(num, item) { %>', + '<% if (me.isColor(item)) { %>', + '
', + ' ', + '
', + '<% } else if (me.isTransparent(item)) { %>', + '
', + ' ', + '
', + '<% } else if (me.isEffect(item)) { %>', + '
', + ' ', + '
', + '<% } %>', + '<% }); %>', + '
'].join('')), + + colorRe: /(?:^|\s)color-(.{6})(?:\s|$)/, + selectedCls: 'selected', + + initialize : function(options) { + Common.UI.BaseView.prototype.initialize.call(this, options); + + this.id = this.options.id; + this.cls = this.options.cls; + this.style = this.options.style; + this.colors = this.options.colors || []; + this.value = this.options.value; + + if (this.options.el) + this.render(); + + if (this.options.value) + this.select(this.options.value, true); + }, + + render: function (parentEl) { + var me = this; + + if (!me.rendered) { + this.cmpEl = $(this.template({ + id : this.id, + cls : this.cls, + style : this.style, + colors : this.colors + })); + + if (parentEl) { + this.setElement(parentEl, false); + parentEl.html(this.cmpEl); + } else { + $(this.el).html(this.cmpEl); + } + + this.cmpEl.on('click', _.bind(this.handleClick, this)); + } else { + this.cmpEl = $(this.el); + } + + me.rendered = true; + return this; + }, + + isColor: function(v) { + return typeof(v) == 'string' && (/[0-9A-F]{6}/).test(v); + }, + + isTransparent: function(v) { + return typeof(v) == 'string' && (v=='transparent'); + }, + + isEffect: function(v) { + return (typeof(v) == 'object' && v.effectId !== undefined); + }, + + getColor: function() { + return this.value; + }, + + handleClick: function(e) { + var me = this; + var target = $(e.target).closest('a'); + var color, cmp; + + if (target.length==0) return; + + if (target.hasClass('color-transparent') ) { + $(me.el).find('a.' + me.selectedCls).removeClass(me.selectedCls); + target.addClass(me.selectedCls); + me.value = 'transparent'; + me.trigger('select', me, 'transparent'); + } else { + if (!/^[a-fA-F0-9]{6}$/.test(me.value) || _.indexOf(me.colors, me.value)<0 ) + me.value = false; + + $(me.el).find('a.' + me.selectedCls).removeClass(me.selectedCls); + target.addClass(me.selectedCls); + + color = target[0].className.match(me.colorRe)[1]; + if ( target.hasClass('palette-color-effect') ) { + var effectId = parseInt(target.attr('effectid')); + if (color) { + me.value = color.toUpperCase(); + me.trigger('select', me, {color: color, effectId: effectId}); + } + } else { + if (/#?[a-fA-F0-9]{6}/.test(color)) { + color = /#?([a-fA-F0-9]{6})/.exec(color)[1].toUpperCase(); + me.value = color; + me.trigger('select', me, color); + } + } + } + }, + + select: function(color, suppressEvent) { + var el = $(this.el); + el.find('a.' + this.selectedCls).removeClass(this.selectedCls); + + if (!color) return; + + if (typeof(color) == 'object' ) { + var effectEl; + if (color.effectId !== undefined) { + effectEl = el.find('a[effectid="'+color.effectId+'"]').first(); + if (effectEl.length>0) { + effectEl.addClass(this.selectedCls); + this.value = effectEl[0].className.match(this.colorRe)[1].toUpperCase(); + } else + this.value = false; + } else if (color.effectValue !== undefined) { + effectEl = el.find('a[effectvalue="'+color.effectValue+'"].color-' + color.color.toUpperCase()).first(); + if (effectEl.length>0) { + effectEl.addClass(this.selectedCls); + this.value = effectEl[0].className.match(this.colorRe)[1].toUpperCase(); + } else + this.value = false; + } + } else { + if (/#?[a-fA-F0-9]{6}/.test(color)) { + color = /#?([a-fA-F0-9]{6})/.exec(color)[1].toUpperCase(); + this.value = color; + } + + if (/^[a-fA-F0-9]{6}|transparent$/.test(color) && _.indexOf(this.colors, color)>=0 ) { + if (_.indexOf(this.colors, this.value)<0) this.value = false; + + if (color != this.value || this.options.allowReselect) { + (color == 'transparent') ? el.find('a.color-transparent').addClass(this.selectedCls) : el.find('a.palette-color.color-' + color).first().addClass(this.selectedCls); + this.value = color; + if (suppressEvent !== true) { + this.fireEvent('select', this, color); + } + } + } else { + var co = el.find('#'+color).first(); + if (co.length==0) + co = el.find('a[color="'+color+'"]').first(); + if (co.length>0) { + co.addClass(this.selectedCls); + this.value = color.toUpperCase(); + } + } + } + }, + + updateColors: function(effectcolors) { + if (effectcolors===undefined) return; + + this.colors = effectcolors; + this.cmpEl = $(this.template({ + id : this.id, + cls : this.cls, + style : this.style, + colors : this.colors + })); + $(this.el).html(this.cmpEl); + this.cmpEl.on('click', _.bind(this.handleClick, this)); + }, + + clearSelection: function(suppressEvent) { + $(this.el).find('a.' + this.selectedCls).removeClass(this.selectedCls); + this.value = undefined; + } + }); +}); \ No newline at end of file diff --git a/apps/common/main/resources/less/colorpalette.less b/apps/common/main/resources/less/colorpalette.less index eb32981c4..08cd85b7b 100644 --- a/apps/common/main/resources/less/colorpalette.less +++ b/apps/common/main/resources/less/colorpalette.less @@ -10,4 +10,46 @@ .box-shadow(0 0 0 1px @primary); } } +} + +.palette-color-ext { + padding: 10px; + .palette-color-item { + padding: 0; + border: 1px solid #fff; + display: inline-block; + text-decoration: none; + -moz-outline: 0 none; + outline: 0 none; + cursor: pointer; + vertical-align: middle; + + em { + border: none; + display: block; + + span{ + height: 12px; + width: 12px; + cursor: pointer; + display: block; + border: 1px solid rgba(0, 0, 0, 0.2); + } + } + + &:hover, &.selected { + border-color: #000; + em span { + border-color: #fff; + } + } + } + + .color-transparent { + background-position: @nocolor-offset-x @nocolor-offset-y; + + em span { + border:solid 1px #C0C0C0; + } + } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js index 851a7542b..527526757 100644 --- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js @@ -41,7 +41,8 @@ */ define([ - 'common/main/lib/component/Window' + 'common/main/lib/component/Window', + 'common/main/lib/component/ColorPaletteExt' ], function () { 'use strict'; @@ -66,29 +67,22 @@ define([ this.template = options.template || [ '
', '
', - - '', - - '
', - '
', - '
', - '
', - - '
', - '
', - '
', - '
', - - '
', - '
', - '
', - '
', - + '', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', '
', '
', - '
', - '
', '', '', @@ -97,6 +91,7 @@ define([ this.api = options.api; this.handler = options.handler; + this.type = options.type || 'number'; _options.tpl = _.template(this.template, _options); @@ -104,38 +99,40 @@ define([ }, render: function () { Common.UI.Window.prototype.render.call(this); - - var conditions = [ + + this.conditions = [ {value: Asc.c_oAscCustomAutoFilter.equals, displayValue: this.capCondition1}, {value: Asc.c_oAscCustomAutoFilter.doesNotEqual, displayValue: this.capCondition2}, {value: Asc.c_oAscCustomAutoFilter.isGreaterThan, displayValue: this.capCondition3}, {value: Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo, displayValue: this.capCondition4}, {value: Asc.c_oAscCustomAutoFilter.isLessThan, displayValue: this.capCondition5}, - {value: Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo, displayValue: this.capCondition6}, + {value: Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo, displayValue: this.capCondition6} + ]; + if (this.type=='text') this.conditions = this.conditions.concat([ {value: Asc.c_oAscCustomAutoFilter.beginsWith, displayValue: this.capCondition7}, {value: Asc.c_oAscCustomAutoFilter.doesNotBeginWith, displayValue: this.capCondition8}, {value: Asc.c_oAscCustomAutoFilter.endsWith, displayValue: this.capCondition9}, {value: Asc.c_oAscCustomAutoFilter.doesNotEndWith, displayValue: this.capCondition10}, {value: Asc.c_oAscCustomAutoFilter.contains, displayValue: this.capCondition11}, {value: Asc.c_oAscCustomAutoFilter.doesNotContain, displayValue: this.capCondition12} - ]; + ]); this.cmbCondition1 = new Common.UI.ComboBox({ el : $('#id-search-begin-digital-combo', this.$window), menuStyle : 'min-width: 225px;', cls : 'input-group-nr', - data : conditions, + data : this.conditions, editable : false }); this.cmbCondition1.setValue(Asc.c_oAscCustomAutoFilter.equals); - conditions.splice(0, 0, {value: 0, displayValue: this.textNoFilter}); + this.conditions.splice(0, 0, {value: 0, displayValue: this.textNoFilter}); this.cmbCondition2 = new Common.UI.ComboBox({ el : $('#id-search-end-digital-combo', this.$window), menuStyle : 'min-width: 225px;', cls : 'input-group-nr', - data : conditions, + data : this.conditions, editable : false }); this.cmbCondition2.setValue(0); @@ -301,8 +298,8 @@ define([ var t = this, _options = {}; _.extend(_options, { - width : 270, - height : 450, + width : 423, + height : 326, contentWidth : 400, header : true, cls : 'filter-dlg', @@ -312,26 +309,23 @@ define([ }, options); this.template = options.template || [ - '
', - '
', + '
', + '
', '
', - '
', - '
', - '
', - '', - '', - '
', + '', + '
', '
', '
', '
', + '
', + '
', + '', + '
', + '
', + '
', + '
', + '', '
', - '
', - '
', - '
', - '
', - '', '
' ].join(''); @@ -364,45 +358,201 @@ define([ this.btnOk.on('click', _.bind(this.onApplyFilter, this)); } - this.btnSortDown = new Common.UI.Button({ - cls: 'btn-toolbar border', - iconCls: 'btn-icon btn-sort-down', - pressed : true, - enableToggle: true, - allowDepress: false + this.miSortLow2High = new Common.UI.MenuItem({ + caption : this.txtSortLow2High, + toggleGroup : 'menufiltersort', + checkable : true, + checked : false }); - if (this.btnSortDown) { - this.btnSortDown.render($('#id-btn-sort-down', this.$window)); - this.btnSortDown.on('click', _.bind(this.onSortType, this, 'ascending')); - } + this.miSortLow2High.on('click', _.bind(this.onSortType, this, 'ascending')); - this.btnSortUp = new Common.UI.Button({ - cls: 'btn-toolbar border', - iconCls: 'btn-icon btn-sort-up', - pressed : true, - enableToggle: true, - allowDepress: false + this.miSortHigh2Low = new Common.UI.MenuItem({ + caption : this.txtSortHigh2Low, + toggleGroup : 'menufiltersort', + checkable : true, + checked : false + }); + this.miSortHigh2Low.on('click', _.bind(this.onSortType, this, 'descending')); + + this.miSortCellColor = new Common.UI.MenuItem({ + caption : this.txtSortCellColor, + toggleGroup : 'menufiltersort', + checkable : true, + checked : false, + menu : new Common.UI.Menu({ + style: 'min-width: inherit; padding: 0px;', + menuAlign: 'tl-tr', + items: [ + { template: _.template('
') } + ] + }) }); - if (this.btnSortUp) { - this.btnSortUp.render($('#id-btn-sort-up', this.$window)); - this.btnSortUp.on('click', _.bind(this.onSortType, this, 'descending')); - } - - this.chCustomFilter = new Common.UI.CheckBox({ - el: $('#id-checkbox-custom-filter', this.$window) + this.miSortFontColor = new Common.UI.MenuItem({ + caption : this.txtSortFontColor, + toggleGroup : 'menufiltersort', + checkable : true, + checked : false, + menu : new Common.UI.Menu({ + style: 'min-width: inherit; padding: 0px;', + menuAlign: 'tl-tr', + items: [ + { template: _.template('
') } + ] + }) }); - this.chCustomFilter.setDisabled(true); - this.btnCustomFilter = new Common.UI.Button({ - el : $('#id-btn-custom-filter', this.$window) - }).on('click', _.bind(this.onShowCustomFilterDialog, this)); + this.miNumFilter = new Common.UI.MenuItem({ + caption : this.txtNumFilter, + toggleGroup : 'menufilterfilter', + checkable : true, + checked : false, + menu : new Common.UI.Menu({ + menuAlign: 'tl-tr', + items: [ + {value: 0, caption: this.textNoFilter, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.equals, caption: this.txtEquals, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.doesNotEqual, caption: this.txtNotEquals, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.isGreaterThan, caption: this.txtGreater, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo, caption: this.txtGreaterEquals,checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.isLessThan, caption: this.txtLess, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo, caption: this.txtLessEquals, checkable: true}, + {value: -2, caption: this.txtBetween, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.top10, caption: this.txtTop10, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.aboveAverage, caption: this.txtAboveAve, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.belowAverage, caption: this.txtBelowAve, checkable: true}, + {value: -1, caption: this.btnCustomFilter + '...'} + ] + }) + }); + this.miNumFilter.menu.on('item:click', _.bind(this.onNumFilterMenuClick, this)); + + this.miTextFilter = new Common.UI.MenuItem({ + caption : this.txtTextFilter, + toggleGroup : 'menufilterfilter', + checkable : true, + checked : false, + menu : new Common.UI.Menu({ + menuAlign: 'tl-tr', + items: [ + {value: 0, caption: this.textNoFilter, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.equals, caption: this.txtEquals, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.doesNotEqual, caption: this.txtNotEquals, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.beginsWith, caption: this.txtBegins, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.doesNotBeginWith, caption: this.txtNotBegins, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.endsWith, caption: this.txtEnds, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.doesNotEndWith, caption: this.txtNotEnds, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.contains, caption: this.txtContains, checkable: true}, + {value: Asc.c_oAscCustomAutoFilter.doesNotContain, caption: this.txtNotContains, checkable: true}, + {value: -1, caption: this.btnCustomFilter + '...'} + ] + }) + }); + this.miTextFilter.menu.on('item:click', _.bind(this.onTextFilterMenuClick, this)); + + this.miFilterCellColor = new Common.UI.MenuItem({ + caption : this.txtFilterCellColor, + toggleGroup : 'menufilterfilter', + checkable : true, + checked : false, + menu : new Common.UI.Menu({ + style: 'min-width: inherit; padding: 0px;', + menuAlign: 'tl-tr', + items: [ + { template: _.template('
') } + ] + }) + }); + + this.miFilterFontColor = new Common.UI.MenuItem({ + caption : this.txtFilterFontColor, + toggleGroup : 'menufilterfilter', + checkable : true, + checked : false, + menu : new Common.UI.Menu({ + style: 'min-width: inherit; padding: 0px;', + menuAlign: 'tl-tr', + items: [ + { template: _.template('
') } + ] + }) + }); + + this.miClear = new Common.UI.MenuItem({ + caption : this.txtClear, + checkable : false + }); + this.miReapply = new Common.UI.MenuItem({ + caption : this.txtReapply, + checkable : false + }); + + this.filtersMenu = new Common.UI.Menu({ + items: [ + this.miSortLow2High, + this.miSortHigh2Low, + this.miSortCellColor, + this.miSortFontColor, + {caption : '--'}, + this.miNumFilter, + this.miTextFilter, + this.miFilterCellColor, + this.miFilterFontColor, + {caption : '--'}, + this.miClear, + this.miReapply + ] + }); + + // Prepare menu container + var menuContainer = this.$window.find('#menu-container-filters'); + this.filtersMenu.render(menuContainer); + this.filtersMenu.cmpEl.attr({tabindex: "-1"}); + + this.mnuSortColorCellsPicker = new Common.UI.ColorPaletteExt({ + el: $('#filter-dlg-sort-cells-color'), + colors: [ + 'transparent', 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3' + ] + }); + + this.mnuSortColorFontPicker = new Common.UI.ColorPaletteExt({ + el: $('#filter-dlg-sort-font-color'), + colors: [ + 'transparent', 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3' + ] + }); + + this.mnuFilterColorCellsPicker = new Common.UI.ColorPaletteExt({ + el: $('#filter-dlg-filter-cells-color'), + colors: [ + 'transparent', 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3' + ] + }); + + this.mnuFilterColorFontPicker = new Common.UI.ColorPaletteExt({ + el: $('#filter-dlg-filter-font-color'), + colors: [ + 'transparent', 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3' + ] + }); this.input = new Common.UI.InputField({ el : $('#id-sd-cell-search', this.$window), allowBlank : true, placeHolder : this.txtEmpty, - style : 'margin-top: 10px;', validateOnChange : true, validation : function () { return true; } }).on ('changing', function (input, value) { @@ -480,6 +630,7 @@ define([ this.close(); } }, + onSortType: function (type) { if (this.api && this.configTo) { this.api.asc_sortColFilter(type, this.configTo.asc_getCellId(), this.configTo.asc_getDisplayName()); @@ -500,6 +651,106 @@ define([ dlgDigitalFilter.setSettings(this.configTo); dlgDigitalFilter.show(); }, + + onNumFilterMenuClick: function(menu, item) { + var filterObj = this.configTo.asc_getFilterObj(), + value1 = '', value2 = '', + cond1 = Asc.c_oAscCustomAutoFilter.equals, + cond2 = 0, isAnd = true; + if (filterObj.asc_getType() == Asc.c_oAscAutoFilterTypes.CustomFilters) { + var customFilter = filterObj.asc_getFilter(), + customFilters = customFilter.asc_getCustomFilters(); + + isAnd = (customFilter.asc_getAnd()); + cond1 = customFilters[0].asc_getOperator(); + cond2 = ((customFilters.length>1) ? (customFilters[1].asc_getOperator() || 0) : 0); + + value1 = (null === customFilters[0].asc_getVal() ? '' : customFilters[0].asc_getVal()); + value2 = ((customFilters.length>1) ? (null === customFilters[1].asc_getVal() ? '' : customFilters[1].asc_getVal()) : ''); + } + + if (item.value==0) { + //clear filters + return; + } else if (item.value!==-1) { + var newCustomFilter = new Asc.CustomFilters(); + newCustomFilter.asc_setCustomFilters((item.value == -2) ? [new Asc.CustomFilter(), new Asc.CustomFilter()]: [new Asc.CustomFilter()]); + + var newCustomFilters = newCustomFilter.asc_getCustomFilters(); + newCustomFilter.asc_setAnd(true); + newCustomFilters[0].asc_setOperator((item.value == -2) ? Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo : item.value); + + if (item.value == -2) { + newCustomFilters[0].asc_setVal((cond1 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo) ? value1 : ''); + newCustomFilters[1].asc_setOperator(Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo); + newCustomFilters[1].asc_setVal((cond1 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo) ? value2 : ''); + } else { + newCustomFilters[0].asc_setVal((item.value == cond1) ? value1 : ''); + } + + filterObj.asc_setFilter(newCustomFilter); + filterObj.asc_setType(Asc.c_oAscAutoFilterTypes.CustomFilters); + } + + var me = this, + dlgDigitalFilter = new SSE.Views.DigitalFilterDialog({api:this.api, type: 'number'}).on({ + 'close': function() { + me.close(); + } + }); + + this.close(); + + dlgDigitalFilter.setSettings(this.configTo); + dlgDigitalFilter.show(); + }, + + onTextFilterMenuClick: function(menu, item) { + var filterObj = this.configTo.asc_getFilterObj(), + value1 = '', value2 = '', + cond1 = Asc.c_oAscCustomAutoFilter.equals, + cond2 = 0, isAnd = true; + if (filterObj.asc_getType() == Asc.c_oAscAutoFilterTypes.CustomFilters) { + var customFilter = filterObj.asc_getFilter(), + customFilters = customFilter.asc_getCustomFilters(); + + isAnd = (customFilter.asc_getAnd()); + cond1 = customFilters[0].asc_getOperator(); + cond2 = ((customFilters.length>1) ? (customFilters[1].asc_getOperator() || 0) : 0); + + value1 = (null === customFilters[0].asc_getVal() ? '' : customFilters[0].asc_getVal()); + value2 = ((customFilters.length>1) ? (null === customFilters[1].asc_getVal() ? '' : customFilters[1].asc_getVal()) : ''); + } + + if (item.value==0) { + //clear filters + return; + } else if (item.value!==-1) { + var newCustomFilter = new Asc.CustomFilters(); + newCustomFilter.asc_setCustomFilters([new Asc.CustomFilter()]); + + var newCustomFilters = newCustomFilter.asc_getCustomFilters(); + newCustomFilter.asc_setAnd(true); + newCustomFilters[0].asc_setOperator(item.value); + newCustomFilters[0].asc_setVal((item.value == cond1) ? value1 : ''); + + filterObj.asc_setFilter(newCustomFilter); + filterObj.asc_setType(Asc.c_oAscAutoFilterTypes.CustomFilters); + } + + var me = this, + dlgDigitalFilter = new SSE.Views.DigitalFilterDialog({api:this.api, type: 'text'}).on({ + 'close': function() { + me.close(); + } + }); + + this.close(); + + dlgDigitalFilter.setSettings(this.configTo); + dlgDigitalFilter.show(); + }, + onCellCheck: function (listView, itemView, record) { if (this.checkCellTrigerBlock) return; @@ -563,7 +814,7 @@ define([ } this.btnOk.setDisabled(false); - this.chCustomFilter.setValue(false); +// this.chCustomFilter.setValue(false); this.configTo.asc_getFilterObj().asc_setType(Asc.c_oAscAutoFilterTypes.Filters); listView.isSuspendEvents = false; @@ -636,21 +887,20 @@ define([ this.cells.at(0).set('check', !haveUnselectedCell); this.checkCellTrigerBlock = undefined; - this.btnSortDown.toggle(false, false); - this.btnSortUp.toggle(false, false); - //TODO: установка всех значений для UI в отдельный метод + this.miSortLow2High.setChecked(false, true); + this.miSortHigh2Low.setChecked(false, true); var sort = this.config.asc_getSortState(); if (sort) { if ('ascending' === sort) { - this.btnSortDown.toggle(true, false); + this.miSortLow2High.setChecked(true, true); } else { - this.btnSortUp.toggle(true, false); + this.miSortHigh2Low.setChecked(true, true); } } - this.chCustomFilter.setValue(isCustomFilter); +// this.chCustomFilter.setValue(isCustomFilter); this.btnOk.setDisabled(isCustomFilter); this.cellsList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true}); @@ -725,9 +975,9 @@ define([ this.cells.reset(arr); this.filterExcludeCells.reset(arrEx); - if (this.cells.length) { - this.chCustomFilter.setValue(this.configTo.asc_getFilterObj().asc_getType() === Asc.c_oAscAutoFilterTypes.CustomFilters); - } +// if (this.cells.length) { +// this.chCustomFilter.setValue(this.configTo.asc_getFilterObj().asc_getType() === Asc.c_oAscAutoFilterTypes.CustomFilters); +// } this.cellsList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true}); }, @@ -777,7 +1027,35 @@ define([ textWarning : 'Warning', cancelButtonText : 'Cancel', textEmptyItem : '{Blanks}', - txtEmpty : 'Enter cell\'s filter' + txtEmpty : 'Enter cell\'s filter', + txtSortLow2High : 'Sort Lowest to Highest', + txtSortHigh2Low : 'Sort Highest to Lowest', + txtSortCellColor : 'Sort by cells color', + txtSortFontColor : 'Sort by font color', + txtNumFilter : 'Number filter', + txtTextFilter : 'Text filter', + txtFilterCellColor : 'Filter by cells color', + txtFilterFontColor : 'Filter by font color', + txtClear : 'Clear', + txtReapply : 'Reapply', + txtEquals : "Equals...", + txtNotEquals : "Does not equal...", + txtGreater : "Greater than...", + txtGreaterEquals : "Greater than or equal to...", + txtLess : "Less than...", + txtLessEquals : "Less than or equal to...", + txtBetween : 'Between...', + txtTop10 : 'Top 10', + txtAboveAve : 'Above average', + txtBelowAve : 'Below average', + txtBegins : "Begins with...", + txtNotBegins : "Does not begin with...", + txtEnds : "Ends with...", + txtNotEnds : "Does not end with...", + txtContains : "Contains...", + txtNotContains : "Does not contain...", + textNoFilter : "None" + }, SSE.Views.AutoFilterDialog || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/less/filterdialog.less b/apps/spreadsheeteditor/main/resources/less/filterdialog.less index 58d5a690f..b13ed495c 100644 --- a/apps/spreadsheeteditor/main/resources/less/filterdialog.less +++ b/apps/spreadsheeteditor/main/resources/less/filterdialog.less @@ -2,7 +2,7 @@ .combo-values { width: 100%; - height: 265px; + height: 187px; overflow: hidden; .list-item { @@ -53,6 +53,16 @@ } } + #menu-container-filters > .dropdown-menu { + position: inherit !important; + left: 0 !important; + top: 0 !important; + width: 100%; + display: inline-block; + .box-shadow(none); + border: none; + } + .btn-placeholder { // background-color: red; display: inline-block;