ru.coon 2.7.8 → 2.7.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +17 -0
- package/package.json +1 -1
- package/src/common/component/ChooseColorField.js +1 -0
- package/src/report/component/ReportPanel.js +1 -1
- package/src/report/component/settings/property/ReportPropertiesPanelController.js +3 -0
- package/src/uielement/component/formchips/Chip.js +12 -3
- package/src/uielement/component/formchips/FilterConditionToolbarController.js +4 -2
- package/src/uielement/plugin/configPanel/OpenPanelPluginConfigPanelFormEditor.js +28 -30
- package/src/uielement/plugin/configPanel/executeCommand/ExecuteCommandPluginConfigPanelFormEditor.js +5 -2
- package/src/version.js +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
# Version 2.7.10, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/04fed1c0e11f95f9e7602fb6750dd43ee4a9ee68)
|
|
2
|
+
* ## Fixes
|
|
3
|
+
* <span style='color:red'>fix ReportPropertiesGrid columns definition</span> ([7c2524], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7c25244edcecc801f13f8522353c669423489be6))
|
|
4
|
+
|
|
5
|
+
* HT-7850 fix: В FilterConditionToolbar изменено отображения чипа для чекбокса. ([833d6a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/833d6a3277d03418c6d423d137b4e6e10ff403bb))
|
|
6
|
+
* update: CHANGELOG.md ([31c596], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/31c5968590483ae78460bda88c9647e1c86ea467))
|
|
7
|
+
|
|
8
|
+
# Version 2.7.9, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b687fd4d4c5294233d74ca8f6b87c7448891da77)
|
|
9
|
+
* ## Features
|
|
10
|
+
* <span style='color:green'>feat: HT-7823: set max width picker width 600 px</span> ([001228], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/00122840bb50e6895a72e8a3b3cd8acfbccb3c94))
|
|
11
|
+
|
|
12
|
+
* ## Fixes
|
|
13
|
+
* <span style='color:red'>fix HT-8330: set prepared command properties</span> ([b11e05], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b11e0550b9c8a378960e84ed50e6cc4a3cf3589e))
|
|
14
|
+
|
|
15
|
+
* HT-8429 fix: Исправление кнопки создания отчета. ([24012f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/24012f9fcec90b4e48f1c1935e35a3f7f046b832))
|
|
16
|
+
* update: CHANGELOG.md ([dbe8d3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dbe8d39f92f24d147496f0f6b3fb96e8ccc6e76c))
|
|
17
|
+
|
|
1
18
|
# Version 2.7.8, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/360535550b87a8cfd8a9186d1264809edd226ada)
|
|
2
19
|
* ## Features
|
|
3
20
|
* <span style='color:green'>feat: HT-8397: publish state properties grid on change</span> ([9d65e5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9d65e5e871e9778c9ec1d9770ee2e8804b229b47))
|
package/package.json
CHANGED
|
@@ -323,6 +323,9 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
|
|
|
323
323
|
},
|
|
324
324
|
|
|
325
325
|
setData: function(data) {
|
|
326
|
+
if (!Array.isArray(data)) {
|
|
327
|
+
return;
|
|
328
|
+
}
|
|
326
329
|
const customPropStore = this.lookup('customPropertyGrid').getStore();
|
|
327
330
|
|
|
328
331
|
const customProps = [];
|
|
@@ -20,8 +20,18 @@ Ext.define('Coon.uielement.component.formchips.Chip', {
|
|
|
20
20
|
removeFilterCallback: undefined,
|
|
21
21
|
},
|
|
22
22
|
tpl: new Ext.XTemplate(
|
|
23
|
-
'<span class="chip-value">{
|
|
24
|
-
'<span class="closebtn">×</span>'
|
|
23
|
+
'<span class="chip-value">{[this.renderChipContent(values)]}</span>',
|
|
24
|
+
'<span class="closebtn">×</span>',
|
|
25
|
+
{
|
|
26
|
+
renderChipContent: function(values) {
|
|
27
|
+
const {chipLabel, label, rawValue} = (values || {});
|
|
28
|
+
const booleanMap = {Y: 'Да', N: 'Нет', y: 'Да', n: 'Нет'};
|
|
29
|
+
const value = Object.keys(booleanMap).includes(rawValue) ? booleanMap[rawValue]: rawValue;
|
|
30
|
+
return chipLabel ?
|
|
31
|
+
`${typeof chipLabel === 'string' ? chipLabel: label}: ${value}`:
|
|
32
|
+
rawValue;
|
|
33
|
+
},
|
|
34
|
+
}
|
|
25
35
|
),
|
|
26
36
|
|
|
27
37
|
listeners: {
|
|
@@ -33,7 +43,6 @@ Ext.define('Coon.uielement.component.formchips.Chip', {
|
|
|
33
43
|
if (this.forRemoteSearch && this.data) {
|
|
34
44
|
this.originalValue = this.data.rawValue;
|
|
35
45
|
}
|
|
36
|
-
|
|
37
46
|
this.configureCls();
|
|
38
47
|
this.callParent();
|
|
39
48
|
},
|
|
@@ -214,15 +214,17 @@ Ext.define('Coon.uielement.component.formchips.FilterConditionToolbarController'
|
|
|
214
214
|
*/
|
|
215
215
|
getCompletedFields: function(formPanel) {
|
|
216
216
|
const fields = Coon.Function.getFormFields(formPanel);
|
|
217
|
-
|
|
218
217
|
const result = [];
|
|
219
218
|
for (const field of fields) {
|
|
220
219
|
const value = Ext.isFunction(field.getRawValue) ? field.getRawValue(): field.getValue();
|
|
221
220
|
const isInitiallyHidden = field.initialConfig && field.initialConfig.hidden;
|
|
222
221
|
if (!isInitiallyHidden && value) {
|
|
222
|
+
const label = field.fieldLabel || field.boxLabel;
|
|
223
|
+
const chipLabel = ['Y', 'N'].includes(value);
|
|
223
224
|
result.push({
|
|
224
225
|
fieldLink: field,
|
|
225
|
-
label
|
|
226
|
+
label,
|
|
227
|
+
chipLabel,
|
|
226
228
|
rawValue: value,
|
|
227
229
|
value: field.getValue(),
|
|
228
230
|
});
|
|
@@ -92,39 +92,37 @@ Ext.define('Coon.uielement.plugin.configPanel.OpenPanelPluginConfigPanelFormEdit
|
|
|
92
92
|
xtype: 'ReportPropertiesGrid',
|
|
93
93
|
title: 'panelEventListeners',
|
|
94
94
|
flex: 2,
|
|
95
|
-
columns:
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
allowBlank: false,
|
|
105
|
-
},
|
|
95
|
+
columns: [
|
|
96
|
+
{
|
|
97
|
+
text: 'event',
|
|
98
|
+
dataIndex: 'key',
|
|
99
|
+
required: true,
|
|
100
|
+
xtype: 'hintColumn',
|
|
101
|
+
editor: {
|
|
102
|
+
xtype: 'textfield',
|
|
103
|
+
allowBlank: false,
|
|
106
104
|
},
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
105
|
+
},
|
|
106
|
+
{
|
|
107
|
+
text: 'handler',
|
|
108
|
+
dataIndex: 'value',
|
|
109
|
+
required: true,
|
|
110
|
+
xtype: 'hintColumn',
|
|
111
|
+
editor: {
|
|
112
|
+
xtype: 'textfield',
|
|
113
|
+
allowBlank: false,
|
|
116
114
|
},
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
115
|
+
},
|
|
116
|
+
{
|
|
117
|
+
xtype: 'widgetcolumn',
|
|
118
|
+
widget: {
|
|
119
|
+
xtype: 'SearchByPropButton',
|
|
120
|
+
tooltip: 'перейти к плагину с таким обработчиком',
|
|
121
|
+
handler() {
|
|
124
122
|
},
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
|
|
123
|
+
},
|
|
124
|
+
}
|
|
125
|
+
],
|
|
128
126
|
bind: {
|
|
129
127
|
data: '{panelEventListeners}',
|
|
130
128
|
},
|
package/src/uielement/plugin/configPanel/executeCommand/ExecuteCommandPluginConfigPanelFormEditor.js
CHANGED
|
@@ -124,7 +124,7 @@ Ext.define('Coon.uielement.plugin.configPanel.executeCommand.ExecuteCommandPlugi
|
|
|
124
124
|
const result = {};
|
|
125
125
|
const vm = this.getViewModel();
|
|
126
126
|
this.prepareDataMapping();
|
|
127
|
-
const
|
|
127
|
+
const commandProperties = this.lookup('reportPropertiesGrid').getData();
|
|
128
128
|
|
|
129
129
|
if (this.lookup('parametersRef').rendered) {
|
|
130
130
|
if (this.lookup('parametersRef').links.editor.isJSON5Valid()) {
|
|
@@ -135,7 +135,10 @@ Ext.define('Coon.uielement.plugin.configPanel.executeCommand.ExecuteCommandPlugi
|
|
|
135
135
|
}
|
|
136
136
|
|
|
137
137
|
result['parameters'] = JSON5.parse(vm.get('parameters'));
|
|
138
|
-
result['parameters']['_commandProperties'] =
|
|
138
|
+
result['parameters']['_commandProperties'] = commandProperties.reduce((acc, prop) => {
|
|
139
|
+
acc[prop.key] = prop.value;
|
|
140
|
+
return acc;
|
|
141
|
+
}, {});
|
|
139
142
|
if (vm.get('mappingMode') === 'map') {
|
|
140
143
|
result['dataMapping'] = JSON5.parse(this.getViewModel().get('dataMapping'));
|
|
141
144
|
} else if (vm.get('mappingMode') === 'object') {
|
package/src/version.js
CHANGED