ru.coon 2.7.41 → 2.7.43

package/src/uielement/component/formchips/FilterConditionToolbar.scss

@@ -1,74 +1,74 @@
-.x-menu-body .x-box-target, .FilterConditionToolbar {
-
-    .closable-chip, .unusable-chip, .chip, .service-chip {
-        display: inline-block;
-        cursor: default;
-        padding: 0 15px;
-        height: 26px;
-        line-height: 26px;
-        border-radius: 13px;
-        .chip-value {
-            font-size: 13px;
-        }
-        .closebtn {
-            padding-left: 10px;
-            color: #888;
-            font-weight: bold;
-            float: right;
-            font-size: 15px;
-            cursor: pointer;
-        }
-        .closebtn:hover {
-            color: #000;
-        }
-    }
-    .remote-search-chip {
-        background-color: #f5f5f5;
-        .chip-value {
-            font-size: 12px;
-            color: rgba(17,17,17,0.8);
-            font-weight: 400;
-            line-height: 16px;
-        }
-    }
-
-    .local-search-chip {
-        background-color: #dffad3;
-    }
-
-    /* Неиспользованное для поиска поле и сервисное поле */
-    .unusable-chip {
-        .chip-value {
-            font-size: 12px;
-            font-style: italic;
-            color: #111111;
-            font-weight: 400;
-            line-height: 16px;
-        }
-    }
-
-    .service-chip {
-        .chip-value {
-            font-size: 12px;
-            color: rgba(17,17,17,0.8);
-            font-weight: 400;
-            line-height: 16px;
-        }
-    }
-
-    .chip, .service-chip, .unusable-chip {
-        .closebtn {
-            display: none;
-        }
-    }
-
-    .closable-chip {
-        .closebtn {
-            display: block;
-        }
-    }
-
-    .tool-eye-horus {
-        color: #002453;
-    }
-}
+.x-menu-body .x-box-target, .FilterConditionToolbar {
+
+    .closable-chip, .unusable-chip, .chip, .service-chip {
+        display: inline-block;
+        cursor: default;
+        padding: 0 15px;
+        height: 26px;
+        line-height: 26px;
+        border-radius: 13px;
+        .chip-value {
+            font-size: 13px;
+        }
+        .closebtn {
+            padding-left: 10px;
+            color: #888;
+            font-weight: bold;
+            float: right;
+            font-size: 15px;
+            cursor: pointer;
+        }
+        .closebtn:hover {
+            color: #000;
+        }
+    }
+    .remote-search-chip {
+        background-color: #f5f5f5;
+        .chip-value {
+            font-size: 12px;
+            color: rgba(17,17,17,0.8);
+            font-weight: 400;
+            line-height: 16px;
+        }
+    }
+
+    .local-search-chip {
+        background-color: #dffad3;
+    }
+
+    /* Неиспользованное для поиска поле и сервисное поле */
+    .unusable-chip {
+        .chip-value {
+            font-size: 12px;
+            font-style: italic;
+            color: #111111;
+            font-weight: 400;
+            line-height: 16px;
+        }
+    }
+
+    .service-chip {
+        .chip-value {
+            font-size: 12px;
+            color: rgba(17,17,17,0.8);
+            font-weight: 400;
+            line-height: 16px;
+        }
+    }
+
+    .chip, .service-chip, .unusable-chip {
+        .closebtn {
+            display: none;
+        }
+    }
+
+    .closable-chip {
+        .closebtn {
+            display: block;
+        }
+    }
+
+    .tool-eye-horus {
+        color: #002453;
+    }
+}

package/src/uielement/component/settings/UiCustomPanelEditor.scss

@@ -1,10 +1,10 @@
-.UiCustomPanelEditor {
-    .good-hash {
-        color: #64AA2B;
-        font-size: 19px;
-    }
-    .bad-hash {
-        color: red;
-        font-size: 19px;
-    }
+.UiCustomPanelEditor {
+    .good-hash {
+        color: #64AA2B;
+        font-size: 19px;
+    }
+    .bad-hash {
+        color: red;
+        font-size: 19px;
+    }
 }

package/src/uielement/component/settings/config/UiCPConfigPanelController.scss

@@ -1,24 +1,24 @@
-.errorsCountMsg, .errorsCountBtn span[data-ref="btnInnerEl"] {
-	color: red !important;
-}
-
-.errorsCountBtn, .warningsCountBtn {
-	font-size: 15px !important;
-	background-color: white !important;
-}
-
-.warningsCountBtn span[data-ref="btnInnerEl"] {
-	color: #b9b92d !important;
-}
-
-.errorsCountMsg {
-	margin-top: 12px !important;
-}
-
-.x-warningsCountBtn-focus {
-	background-color: white !important;
-}
-
-.x-warningsCountMenuItem-focus a[data-ref="itemEl"] {
-	background-color: #d0d0d0 !important;
-}
+.errorsCountMsg, .errorsCountBtn span[data-ref="btnInnerEl"] {
+	color: red !important;
+}
+
+.errorsCountBtn, .warningsCountBtn {
+	font-size: 15px !important;
+	background-color: white !important;
+}
+
+.warningsCountBtn span[data-ref="btnInnerEl"] {
+	color: #b9b92d !important;
+}
+
+.errorsCountMsg {
+	margin-top: 12px !important;
+}
+
+.x-warningsCountBtn-focus {
+	background-color: white !important;
+}
+
+.x-warningsCountMenuItem-focus a[data-ref="itemEl"] {
+	background-color: #d0d0d0 !important;
+}

package/src/uielement/component/settings/plugin/UiCustomPanelPluginGrid.js

@@ -69,7 +69,7 @@ Ext.define('Coon.uielement.component.settings.plugin.UiCustomPanelPluginGrid', {
         this.fireEvent('dataUpdated');
     },
     getData: function() {
-        return this.getStore().getRange().map((rec) => rec.getData());
+        return this.getStore().getDataSource().getRange().map((rec) => rec.getData());
     },
 
     excludePtypes() {
@@ -113,6 +113,23 @@ Ext.define('Coon.uielement.component.settings.plugin.UiCustomPanelPluginGrid', {
                 listeners: {
                     select: 'addHandler',
                 },
+            },
+            {
+                xtype: 'textfield',
+                emptyText: 'фильтр по тексту в плагинах',
+                flex: 1,
+                listeners: {
+                    change: 'searchInPlugins',
+                },
+                triggers: {
+                    clear: {
+                        cls: 'svg-icon svg-icon-cancel-small',
+                        tooltip: 'Очистить поле',
+                        handler: function() {
+                            this.clear();
+                        },
+                    },
+                },
             }
         ],
     }],
@@ -201,6 +218,5 @@ Ext.define('Coon.uielement.component.settings.plugin.UiCustomPanelPluginGrid', {
         this.callParent(arguments);
         const state = Ext.state.Manager.getProvider().get('UiCustomPanelPluginGrid') || {};
         this.setPinned(state.pinned);
-        Coon.log.debug(state, this);
     },
 });

package/src/uielement/component/settings/plugin/UiCustomPanelPluginGrid.scss

@@ -1,11 +1,11 @@
-.UiCustomPanelPluginGrid {
-    .x-title-icon {
-        color: gray!important;
-    }
-    .deletedRecord {
-        text-decoration: line-through;
-    }
-    .newRecord {
-        font-style:italic;
-    }
-}
+.UiCustomPanelPluginGrid {
+    .x-title-icon {
+        color: gray!important;
+    }
+    .deletedRecord {
+        text-decoration: line-through;
+    }
+    .newRecord {
+        font-style:italic;
+    }
+}

package/src/uielement/component/settings/plugin/UiCustomPanelPluginGridController.js

@@ -25,6 +25,16 @@ Ext.define('Coon.uielement.component.settings.plugin.UiCustomPanelPluginGridCont
         });
     },
 
+    searchInPlugins(field, value) {
+        const filterByText = (plugin) => JSON.stringify(plugin.get('jsonProperties')).includes(value);
+        const store = this.getView().getStore();
+        if (value) {
+            store.addFilter(filterByText);
+        } else {
+            store.clearFilter();
+        }
+    },
+
     getNextIDSeq: function() {
         let maxSeqID = 0;
         this.getView().getStore().each(function(record) {

package/src/uielement/component/settings/plugin/UiCustomPanelPluginPanel.scss

@@ -1,30 +1,30 @@
-.UiCustomPanelPluginPanel {
-    .pluginInfo .x-form-display-field{
-        text-align: left;
-        font-size: 1em;
-        font-weight: bold;
-        padding: 8px;
-    }
-    .x-docked.x-panel-header-collapsed {
-        padding: 8px 4px!important;
-    }
-
-    .deletedRecord {
-        color: darkred;
-        text-decoration: line-through;
-    }
-    .readOnlyRecord {
-        .x-grid-td {
-            background-color: #f5f5f5;
-            color: #555;
-        }
-    }
-
-    .readOnlyDeletedRecord {
-        .x-grid-td {
-            color: darkred;
-            text-decoration: line-through;
-            background-color: #f5f5f5;
-        }
-    }
-}
+.UiCustomPanelPluginPanel {
+    .pluginInfo .x-form-display-field{
+        text-align: left;
+        font-size: 1em;
+        font-weight: bold;
+        padding: 8px;
+    }
+    .x-docked.x-panel-header-collapsed {
+        padding: 8px 4px!important;
+    }
+
+    .deletedRecord {
+        color: darkred;
+        text-decoration: line-through;
+    }
+    .readOnlyRecord {
+        .x-grid-td {
+            background-color: #f5f5f5;
+            color: #555;
+        }
+    }
+
+    .readOnlyDeletedRecord {
+        .x-grid-td {
+            color: darkred;
+            text-decoration: line-through;
+            background-color: #f5f5f5;
+        }
+    }
+}

package/src/uielement/component/settings/version/UiCPVersionPanel.scss

@@ -1,15 +1,15 @@
-.headerAceDiffContainerLeftSection{
-  width: 50%;
-  height: 20px;
-  float: left;
-  text-align: center;
-}
-.headerAceDiffContainerRightSection{
-  width: 50%;
-  height: 20px;
-  float: right;
-  text-align: center;
-}
-.x-btn-icon-el-default-toolbar-small{
-  height: 24px;
-}
+.headerAceDiffContainerLeftSection{
+  width: 50%;
+  height: 20px;
+  float: left;
+  text-align: center;
+}
+.headerAceDiffContainerRightSection{
+  width: 50%;
+  height: 20px;
+  float: right;
+  text-align: center;
+}
+.x-btn-icon-el-default-toolbar-small{
+  height: 24px;
+}

package/src/uielement/component/settings/version/UiCPVersionPanelController.js

@@ -83,7 +83,8 @@ Ext.define('Coon.uielement.component.settings.version.UiCPVersionPanelController
         const record = grid.getSelection()[0];
         const version = vm.get('version');
         if (record && version) {
-            this.getView().fireEvent('loadUiElementBean', version);
+            const controller = this.getView().up('UiCustomPanelEditor').getController();
+            controller.loadUiElementBean(version);
         }
     },
     onApplyChanges: function(elem) {

package/src/uielement/plugin/AddOutputParamsPlugin.js

@@ -1,5 +1,5 @@
 Ext.define('Coon.uielement.plugin.AddOutputParamsPlugin', {
-    extend: 'Ext.plugin.Abstract',
+    extend: 'Coon.uielement.plugin.CustomPanelPlugin',
     alias: 'plugin.AddOutputParamsPlugin',
     configurePanelWizardForFormEditor: 'AddOutputParamsPluginConfigPanelFormEditor',
     config: {

package/src/uielement/plugin/configPanel/AddBindingsPluginConfigPanelFormEditor.scss

@@ -1,29 +1,29 @@
-.ace-editor-content .x-grid-cell-inner {
-  overflow: auto;
-  white-space: pre-wrap;
-}
-
-.middle-align-elem{
-  vertical-align: middle;
-}
-
-.is-used-action{
-  background-color: #ddfdd2;
-  color: #111 !important;
-}
-
-.not-in-list-action{
-  cursor: pointer;
-  color: rgba(243, 173, 22, 0.89);
-  float:right;
-  width:18px;
-  height: 20px;
-}
-
-.already-exists-in-list-action{
-  cursor: pointer;
-  color: rgba(231, 70, 70, 0.91);
-  float:right;
-  width:18px;
-  height: 20px;
-}
+.ace-editor-content .x-grid-cell-inner {
+  overflow: auto;
+  white-space: pre-wrap;
+}
+
+.middle-align-elem{
+  vertical-align: middle;
+}
+
+.is-used-action{
+  background-color: #ddfdd2;
+  color: #111 !important;
+}
+
+.not-in-list-action{
+  cursor: pointer;
+  color: rgba(243, 173, 22, 0.89);
+  float:right;
+  width:18px;
+  height: 20px;
+}
+
+.already-exists-in-list-action{
+  cursor: pointer;
+  color: rgba(231, 70, 70, 0.91);
+  float:right;
+  width:18px;
+  height: 20px;
+}

package/src/uielement/plugin/configPanel/executeCommand/ExecuteCommandPluginConfigPanelFormEditor.scss

@@ -1,22 +1,22 @@
-.ExecuteCommandPluginConfigPanelFormEditor {
-  $required-flag-color: dynamic(#bf1313);
-  font-size: 12px;
-  margin: 5px;
-  .required-flag {
-    font-size: 18px;
-    color: $required-flag-color;
-  }
-  span.code {
-    color: green;
-    font-family: "Lucida Console", "Courier New", monospace;
-  }
-  .x-form-trigger-default.helpicon {
-    background-color: white;
-  }
-
-  .wrong-parameters {
-    color: green;
-    font-style: italic;
-    font-family: "Lucida Console", "Courier New", monospace;
-  }
-}
+.ExecuteCommandPluginConfigPanelFormEditor {
+  $required-flag-color: dynamic(#bf1313);
+  font-size: 12px;
+  margin: 5px;
+  .required-flag {
+    font-size: 18px;
+    color: $required-flag-color;
+  }
+  span.code {
+    color: green;
+    font-family: "Lucida Console", "Courier New", monospace;
+  }
+  .x-form-trigger-default.helpicon {
+    background-color: white;
+  }
+
+  .wrong-parameters {
+    color: green;
+    font-style: italic;
+    font-family: "Lucida Console", "Courier New", monospace;
+  }
+}

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '2.7.41',
+    number: '2.7.43',
 });

package/src/common/panel/StopwatchWindow.js

@@ -1,44 +0,0 @@
-Ext.define('Coon.common.panel.StopwatchWindow',
-    {
-        extend: 'Ext.window.Window',
-        xtype: 'stopwatch-window',
-        bodyPadding: 0,
-        layout: {
-            type: 'vbox',
-            align: 'center',
-        },
-        height: 240,
-        width: 300,
-        modal: true,
-        closable: false,
-        resizable: false,
-        draggable: false,
-        closeAction: 'destroy',
-        textPrefix: 'Время выполнения: ',
-        items: [{
-            xtype: 'container',
-            itemId: 'stopwatch-window-mask-target',
-            width: '100%',
-            flex: 1,
-        }],
-        listeners: {
-            render: function(win) {
-                win.tick();
-                win.timerId = setInterval(win.tick.bind(win), 1000);
-            },
-            destroy: function(win) {
-                win.timerId && clearInterval(win.timerId);
-            },
-        },
-        tick: function() {
-            this.setLoading(
-                (this.textPrefix || '') + new Date(this.secondsVisible++ * 1000).toISOString().substr(11, 8),
-                this.getComponent('stopwatch-window-mask-target'));
-        },
-        constructor: function(config) {
-            Ext.apply(this, config);
-            this.self.superclass['constructor'].apply(this);
-            this.secondsVisible = 1;
-        },
-    }
-);