ru.coon 2.7.67 → 2.7.69

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

@@ -92,6 +92,9 @@ Ext.define('Coon.uielement.plugin.configPanel.executeCommand.ExecuteCommandPlugi
         commandProperties && this.lookup('reportPropertiesGrid').setData(
             this.convertProperties(commandProperties)
         );
+        if (typeof config.successMessage !== 'string' && config.successMessage) {
+            config.successMessage = 'alert';
+        }
         this.getViewModel().set('description', this.description);
         for (const parameterName in config) {
             if (!config.hasOwnProperty(parameterName) || parameterName === 'ptype') {
@@ -265,29 +268,74 @@ Ext.define('Coon.uielement.plugin.configPanel.executeCommand.ExecuteCommandPlugi
                             align: 'stretch',
                         },
                         scrollable: true,
+                        defaults: {
+                            margin: 4,
+                        },
                         items: [
                             {
-                                xtype: 'checkbox',
-                                boxLabel: 'successMessage',
-                                boxLabelAlign: 'after',
-                                padding: '0 0 0 10',
-                                bind: '{successMessage}',
-                            },
-                            {
-                                xtype: 'textfield',
-                                fieldLabel: 'successText',
-                                bind: {
-                                    value: '{successText}',
-                                    visible: '{successMessage}',
-                                },
-                            },
-                            {
-                                xtype: 'textfield',
-                                fieldLabel: 'successTitle',
-                                bind: {
-                                    value: '{successTitle}',
-                                    visible: '{successMessage}',
+                                xtype: 'fieldset',
+                                title: 'Выводить сообщение об успешном выполнении',
+                                layout: {type: 'vbox', align: 'stretch'},
+                                defaults: {
+                                    margin: 4,
                                 },
+                                items: [
+                                    {
+                                        xtype: 'container',
+                                        layout: 'vbox',
+                                        defaults: {
+                                            margin: 4,
+                                        },
+                                        items: [
+                                            {
+                                                xtype: 'segmentedbutton',
+                                                bind: {
+                                                    value: '{successMessage}',
+                                                },
+                                                items: [
+                                                    {
+                                                        value: false,
+                                                        iconCls: 'svg-fa svg-fa-xmark',
+                                                    },
+                                                    {
+                                                        text: 'alert',
+                                                        value: 'alert',
+                                                    },
+                                                    {
+                                                        text: 'toast',
+                                                        value: 'toast',
+                                                    }
+                                                ],
+                                            },
+                                            {
+                                                xtype: 'button',
+                                                ui: 'green-button',
+                                                text: 'протестировать',
+                                                handler: this.successMessageExample.bind(this),
+                                                bind: {
+                                                    visible: '{!!successMessage}',
+                                                },
+                                            }
+                                        ],
+
+                                    },
+                                    {
+                                        xtype: 'textfield',
+                                        fieldLabel: 'successText',
+                                        bind: {
+                                            value: '{successText}',
+                                            visible: '{!!successMessage}',
+                                        },
+                                    },
+                                    {
+                                        xtype: 'textfield',
+                                        fieldLabel: 'successTitle',
+                                        bind: {
+                                            value: '{successTitle}',
+                                            visible: '{!!successMessage}',
+                                        },
+                                    }
+                                ],
                             },
                             {
                                 xtype: 'checkbox',
@@ -641,4 +689,38 @@ Ext.define('Coon.uielement.plugin.configPanel.executeCommand.ExecuteCommandPlugi
                 Ext.ClassManager.classes[fullSource].prototype.inputParameters();
         }
     },
+
+    successMessageExample() {
+        const vm = this.getViewModel();
+        const successTitle = vm.get('successTitle');
+        const exampleSuccessText= 'Сообщение для примера с <b>html</b> разметкой. <br>Оно используется потому что вы не ввели свой текст';
+        const successText = vm.get('successText') || exampleSuccessText;
+        this.self.showMessage(
+            vm.get('successMessage'),
+            successTitle,
+            successText
+        );
+    },
+
+    statics: {
+        /**
+         * Вывод сообщения об результате
+         * @param successMessage
+         * @param title
+         * @param html
+         */
+        showMessage(successMessage, title, html) {
+            if (successMessage === 'alert') {
+                return Ext.Msg.alert(title, html);
+            }
+            if (successMessage === 'toast') {
+                const toastConfig = {
+                    closable: true,
+                    html,
+                };
+                title && (toastConfig.title = title);
+                return Ext.toast(toastConfig);
+            }
+        },
+    },
 });

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

@@ -1,22 +1,21 @@
-.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;
+  .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.67',
+    number: '2.7.69',
 });