ru.coon 2.5.25 → 2.5.26

package/src/uielement/component/UiCustomPanel.js

@@ -1,44 +1,44 @@
-Ext.define('Coon.uielement.component.UiCustomPanel', {
-    extend: 'Ext.panel.Panel',
-    alias: 'widget.UiCustomPanel',
-    xtype: 'UiCustomPanel',
-    uses: [],
-    requires: [
-        'Coon.uielement.component.UiCustomController'
-    ],
-    controller: {type: 'UiCustomController'},
-    viewModel: {type: 'UiCustomPanelViewModel'},
-
-    keyMap: {
-        'Ctrl+Alt+U': {
-            handler: function(_, scope) {
-                const inputParameters = scope.getController().inputParameters().map((el) => el.name);
-                const vm = scope.getViewModel();
-                const fields = inputParameters.reduce((acc, name) => {
-                    if (Ext.isEmpty(vm.get(name))) {
-                        return acc;
-                    }
-                    acc.push({
-                        name,
-                        value: vm.get(name),
-                    });
-                    return acc;
-                }, []);
-                if (fields && fields.length) {
-                    if (scope.uiElementCd) {
-                        Coon.util.copyToClipboard(
-                            location.origin + '/' + `#ui:${scope.uiElementCd}?${fields.map((el) => el.name + '=' + el.value).join('&')}`
-                        );
-                        Ext.toast('ссылка скопирована в буфер обмена(clipboard)');
-                    } else {
-                        Ext.toast('uiElement not found in location.hash');
-                        Coon.log.error('uiElement not found in location.hash');
-                    }
-                }
-            },
-        },
-    },
-
-    copyLink: false,
-
-});
+Ext.define('Coon.uielement.component.UiCustomPanel', {
+    extend: 'Ext.panel.Panel',
+    alias: 'widget.UiCustomPanel',
+    xtype: 'UiCustomPanel',
+    uses: [],
+    requires: [
+        'Coon.uielement.component.UiCustomController'
+    ],
+    controller: {type: 'UiCustomController'},
+    viewModel: {type: 'UiCustomPanelViewModel'},
+
+    keyMap: {
+        'Ctrl+Alt+U': {
+            handler: function(_, scope) {
+                const inputParameters = scope.getController().inputParameters().map((el) => el.name);
+                const vm = scope.getViewModel();
+                const fields = inputParameters.reduce((acc, name) => {
+                    if (Ext.isEmpty(vm.get(name))) {
+                        return acc;
+                    }
+                    acc.push({
+                        name,
+                        value: vm.get(name),
+                    });
+                    return acc;
+                }, []);
+                if (fields && fields.length) {
+                    if (scope.uiElementCd) {
+                        Coon.util.copyToClipboard(
+                            location.origin + '/' + `#ui:${scope.uiElementCd}?${fields.map((el) => el.name + '=' + el.value).join('&')}`
+                        );
+                        Ext.toast('ссылка скопирована в буфер обмена(clipboard)');
+                    } else {
+                        Ext.toast('uiElement not found in location.hash');
+                        Coon.log.error('uiElement not found in location.hash');
+                    }
+                }
+            },
+        },
+    },
+
+    copyLink: false,
+
+});

package/src/uielement/component/UiCustomPanelViewModel.js

@@ -1,15 +1,15 @@
-/**
- * Created by dbandurin on 31.03.2021.
- */
-Ext.define('Coon.uielement.component.UiCustomPanelViewModel', {
-    extend: 'Ext.app.ViewModel',
-    alias: 'viewmodel.UiCustomPanelViewModel',
-
-    stores: {
-    },
-
-    data: {
-        name: 'UiCustomPanel',
-        /* This object holds the arbitrary data that populates the ViewModel and is then available for binding. */
-    },
-});
+/**
+ * Created by dbandurin on 31.03.2021.
+ */
+Ext.define('Coon.uielement.component.UiCustomPanelViewModel', {
+    extend: 'Ext.app.ViewModel',
+    alias: 'viewmodel.UiCustomPanelViewModel',
+
+    stores: {
+    },
+
+    data: {
+        name: 'UiCustomPanel',
+        /* This object holds the arbitrary data that populates the ViewModel and is then available for binding. */
+    },
+});

package/src/uielement/component/UiElementController.js

@@ -1,205 +1,205 @@
-Ext.define('Coon.uielement.component.UiElementController', {
-    extend: 'Ext.app.ViewController',
-    alias: 'controller.uielementcontroller',
-
-    uiElementCommand: undefined,
-
-    init: function() {
-        this.uiElementCommand = Ext.create('command.GetUIElementCommand');
-        this.uiElementCommand.on('complete', this.loadUiElementHandler, this);
-    },
-
-    doInit: function(uiElementCd, mode) {
-        const vm = this.getViewModel();
-        vm.set('mode', mode);
-        if (uiElementCd) {
-            this.uiElementCommand.execute(uiElementCd);
-        } else {
-            vm.set('uiElement', {propertyData: '{}'});
-        }
-    },
-
-    inputParameters: function() {
-        return [
-            {name: 'uiElementCd', description: 'uiElementCd', required: true},
-            {name: 'mode', description: 'mode', required: true}
-        ];
-    },
-
-    close: function() {
-        this.getView().fireEvent('close');
-    },
-
-    loadUsedTabsAfterRenderHandlers: function(report) {
-        const vm = this.getViewModel();
-        report && report.doInit(undefined, {UI_ELEMENT_CD: vm.get('uiElement.id')}, true);
-    },
-
-    loadUiElementHandler: function(UIElementBean) {
-        const vm = this.getViewModel();
-        vm.set('uiElement', UIElementBean);
-        vm.get('mode') === 'COPY' && vm.set('uiElement.id', vm.get('uiElement.id') + '_COPY');
-    },
-
-    closeHandler: function() {
-        this.close();
-    },
-
-    saveHandler: function() {
-        const validation = this.validate();
-        if (validation.state) {
-            const vm = this.getViewModel();
-            const command = Ext.create('command.SaveUIElementCommand');
-            command.on('complete', function(uiElementBean) {
-                vm.set('uiElement', uiElementBean);
-                this.close();
-            }, this);
-            command.execute(vm.get('uiElement'));
-        } else {
-            Ext.Msg.alert('Сообщение системы', validation.context);
-        }
-    },
-
-    validate: function() {
-        const vm = this.getViewModel();
-        const uiElement = vm.get('uiElement');
-        const state = uiElement && uiElement.xtype && uiElement.id && uiElement.description;
-        let isPropertyValidJSON = false;
-        try {
-            isPropertyValidJSON = !!Ext.decode(uiElement.propertyData);
-        } catch (e) { }
-        return {
-            state: state && isPropertyValidJSON,
-            context: (state && isPropertyValidJSON) || (state ? 'Указан некорректный JSON' : 'Не заполнены обязательные поля'),
-        };
-    },
-
-    validatePropertyObject: function(propertyObject) {
-        let propertyWithError = false;
-        for (const property in propertyObject) {
-            if (propertyObject.hasOwnProperty(property)) {
-                const propertyValue = propertyObject[property];
-                if (Ext.isString(propertyValue)) {
-                    const trimmedItem = propertyValue.trimLeft();
-                    if (trimmedItem.startsWith('{') || trimmedItem.startsWith('[') || trimmedItem.startsWith('function')) {
-                        try {
-                            if (trimmedItem.startsWith('function')) {
-                                eval('(' + propertyValue + ')');
-                                propertyObject[property] = propertyValue;
-                            } else {
-                                try {
-                                    propertyObject[property] = Ext.decode(propertyValue);
-                                } catch (ex) {
-                                    propertyObject[property] = propertyValue;
-                                    Coon.log.error('[ERROR], propertyValue invalid: ', propertyValue);
-                                }
-                            }
-                        } catch (e) {
-                            propertyWithError = property;
-                            Coon.log.error(e);
-                        }
-                    }
-                }
-                if (propertyWithError) {
-                    break;
-                }
-            }
-        }
-        return propertyWithError;
-    },
-
-    loadFromPropertiesHandler: function() {
-        const vm = this.getViewModel();
-        const properties = vm && vm.get('uiElement.properties');
-        if (properties) {
-            let propertiesText = '';
-            if (properties) {
-                for (const property in properties) {
-                    if (properties.hasOwnProperty(property)) {
-                        if (properties[property] !== 'true' &&
-                            properties[property] !== 'false' &&
-                            !properties[property].startsWith('{') &&
-                            !properties[property].startsWith('[')
-                        ) {
-                            properties[property] = '"' + properties[property] + '"';
-                        }
-                        propertiesText += Ext.String.format('"{0}": {1},', property, properties[property]);
-                    }
-                }
-            }
-            propertiesText = propertiesText.length > 1 ?
-                propertiesText.substr(0, propertiesText.length - 1) : propertiesText;
-            vm.set('uiElement.propertyData', '{\n'+ propertiesText + '\n}');
-        }
-    },
-
-    propertiesModeHandler: function(btn) {
-        const vm = this.getViewModel();
-        vm && btn && Ext.isFunction(btn.getValue) && vm.set('propertyViewMode', btn.getValue());
-    },
-
-    propertyChangedHandler: function(source) {
-        const propertyWithError = this.validatePropertyObject(source);
-        const vm = this.getViewModel();
-        vm.set('invalidStateProperty', propertyWithError);
-        !propertyWithError && vm.set('uiElement.propertyData', JSON.stringify(source, undefined, 2));
-    },
-
-    stringifyJSONHandler: function() {
-        const vm = this.getViewModel();
-        const propertyObject = vm.get('propertyObject');
-        const propertyWithError = this.validatePropertyObject(propertyObject);
-        vm.set('invalidStateProperty', propertyWithError);
-        !propertyWithError && vm.set('uiElement.propertyData', JSON.stringify(propertyObject, undefined, 2));
-    },
-
-    changeObjectAsTextHandler: function(field, newValue) {
-        let propertyWithError;
-        try {
-            const propertyObject = Ext.decode(newValue);
-            propertyWithError = this.validatePropertyObject(propertyObject);
-        } catch (e) {
-            propertyWithError = 'JSON';
-        }
-        const vm = this.getViewModel();
-        vm.set('invalidStateProperty', propertyWithError);
-    },
-
-    addPropertyHandler: function() {
-        const vm = this.getViewModel();
-        const propertyObject = vm.get('propertyObject');
-        if (propertyObject) {
-            const openWindow = Ext.widget('WindowWrap', {
-                width: 400,
-                height: 400,
-                items: {
-                    xtype: 'uielementpropertypanel',
-                    callBackFn: (newPropertyName, newPropertyValue) => {
-                        if (newPropertyName) {
-                            propertyObject[newPropertyName] = newPropertyValue || '';
-                            vm.set('propertyObject', propertyObject);
-                        }
-                    },
-                },
-            });
-            const uiElementPanelXType = this.lookup('uiElementPanelXType');
-            const uiElementObject = vm.get('uiElement');
-            uiElementObject.uiElementClass = uiElementPanelXType && uiElementPanelXType.selection &&
-                uiElementPanelXType.selection.get(uiElementPanelXType.getDisplayField());
-            uiElementObject.propertyName = undefined;
-            openWindow.doInit(uiElementObject);
-            openWindow.show();
-        }
-    },
-
-    deletePropertyHandler: function() {
-        const vm = this.getViewModel();
-        const propertyObject = vm.get('propertyObject');
-        const selectedPropertyGridRow = vm.get('uiElementPanelPropertiesGrid.selection');
-        if (propertyObject && selectedPropertyGridRow) {
-            const name = selectedPropertyGridRow.get('name');
-            delete propertyObject[name];
-            vm.set('propertyObject', propertyObject);
-        }
-    },
-});
+Ext.define('Coon.uielement.component.UiElementController', {
+    extend: 'Ext.app.ViewController',
+    alias: 'controller.uielementcontroller',
+
+    uiElementCommand: undefined,
+
+    init: function() {
+        this.uiElementCommand = Ext.create('command.GetUIElementCommand');
+        this.uiElementCommand.on('complete', this.loadUiElementHandler, this);
+    },
+
+    doInit: function(uiElementCd, mode) {
+        const vm = this.getViewModel();
+        vm.set('mode', mode);
+        if (uiElementCd) {
+            this.uiElementCommand.execute(uiElementCd);
+        } else {
+            vm.set('uiElement', {propertyData: '{}'});
+        }
+    },
+
+    inputParameters: function() {
+        return [
+            {name: 'uiElementCd', description: 'uiElementCd', required: true},
+            {name: 'mode', description: 'mode', required: true}
+        ];
+    },
+
+    close: function() {
+        this.getView().fireEvent('close');
+    },
+
+    loadUsedTabsAfterRenderHandlers: function(report) {
+        const vm = this.getViewModel();
+        report && report.doInit(undefined, {UI_ELEMENT_CD: vm.get('uiElement.id')}, true);
+    },
+
+    loadUiElementHandler: function(UIElementBean) {
+        const vm = this.getViewModel();
+        vm.set('uiElement', UIElementBean);
+        vm.get('mode') === 'COPY' && vm.set('uiElement.id', vm.get('uiElement.id') + '_COPY');
+    },
+
+    closeHandler: function() {
+        this.close();
+    },
+
+    saveHandler: function() {
+        const validation = this.validate();
+        if (validation.state) {
+            const vm = this.getViewModel();
+            const command = Ext.create('command.SaveUIElementCommand');
+            command.on('complete', function(uiElementBean) {
+                vm.set('uiElement', uiElementBean);
+                this.close();
+            }, this);
+            command.execute(vm.get('uiElement'));
+        } else {
+            Ext.Msg.alert('Сообщение системы', validation.context);
+        }
+    },
+
+    validate: function() {
+        const vm = this.getViewModel();
+        const uiElement = vm.get('uiElement');
+        const state = uiElement && uiElement.xtype && uiElement.id && uiElement.description;
+        let isPropertyValidJSON = false;
+        try {
+            isPropertyValidJSON = !!Ext.decode(uiElement.propertyData);
+        } catch (e) { }
+        return {
+            state: state && isPropertyValidJSON,
+            context: (state && isPropertyValidJSON) || (state ? 'Указан некорректный JSON' : 'Не заполнены обязательные поля'),
+        };
+    },
+
+    validatePropertyObject: function(propertyObject) {
+        let propertyWithError = false;
+        for (const property in propertyObject) {
+            if (propertyObject.hasOwnProperty(property)) {
+                const propertyValue = propertyObject[property];
+                if (Ext.isString(propertyValue)) {
+                    const trimmedItem = propertyValue.trimLeft();
+                    if (trimmedItem.startsWith('{') || trimmedItem.startsWith('[') || trimmedItem.startsWith('function')) {
+                        try {
+                            if (trimmedItem.startsWith('function')) {
+                                eval('(' + propertyValue + ')');
+                                propertyObject[property] = propertyValue;
+                            } else {
+                                try {
+                                    propertyObject[property] = Ext.decode(propertyValue);
+                                } catch (ex) {
+                                    propertyObject[property] = propertyValue;
+                                    Coon.log.error('[ERROR], propertyValue invalid: ', propertyValue);
+                                }
+                            }
+                        } catch (e) {
+                            propertyWithError = property;
+                            Coon.log.error(e);
+                        }
+                    }
+                }
+                if (propertyWithError) {
+                    break;
+                }
+            }
+        }
+        return propertyWithError;
+    },
+
+    loadFromPropertiesHandler: function() {
+        const vm = this.getViewModel();
+        const properties = vm && vm.get('uiElement.properties');
+        if (properties) {
+            let propertiesText = '';
+            if (properties) {
+                for (const property in properties) {
+                    if (properties.hasOwnProperty(property)) {
+                        if (properties[property] !== 'true' &&
+                            properties[property] !== 'false' &&
+                            !properties[property].startsWith('{') &&
+                            !properties[property].startsWith('[')
+                        ) {
+                            properties[property] = '"' + properties[property] + '"';
+                        }
+                        propertiesText += Ext.String.format('"{0}": {1},', property, properties[property]);
+                    }
+                }
+            }
+            propertiesText = propertiesText.length > 1 ?
+                propertiesText.substr(0, propertiesText.length - 1) : propertiesText;
+            vm.set('uiElement.propertyData', '{\n'+ propertiesText + '\n}');
+        }
+    },
+
+    propertiesModeHandler: function(btn) {
+        const vm = this.getViewModel();
+        vm && btn && Ext.isFunction(btn.getValue) && vm.set('propertyViewMode', btn.getValue());
+    },
+
+    propertyChangedHandler: function(source) {
+        const propertyWithError = this.validatePropertyObject(source);
+        const vm = this.getViewModel();
+        vm.set('invalidStateProperty', propertyWithError);
+        !propertyWithError && vm.set('uiElement.propertyData', JSON.stringify(source, undefined, 2));
+    },
+
+    stringifyJSONHandler: function() {
+        const vm = this.getViewModel();
+        const propertyObject = vm.get('propertyObject');
+        const propertyWithError = this.validatePropertyObject(propertyObject);
+        vm.set('invalidStateProperty', propertyWithError);
+        !propertyWithError && vm.set('uiElement.propertyData', JSON.stringify(propertyObject, undefined, 2));
+    },
+
+    changeObjectAsTextHandler: function(field, newValue) {
+        let propertyWithError;
+        try {
+            const propertyObject = Ext.decode(newValue);
+            propertyWithError = this.validatePropertyObject(propertyObject);
+        } catch (e) {
+            propertyWithError = 'JSON';
+        }
+        const vm = this.getViewModel();
+        vm.set('invalidStateProperty', propertyWithError);
+    },
+
+    addPropertyHandler: function() {
+        const vm = this.getViewModel();
+        const propertyObject = vm.get('propertyObject');
+        if (propertyObject) {
+            const openWindow = Ext.widget('WindowWrap', {
+                width: 400,
+                height: 400,
+                items: {
+                    xtype: 'uielementpropertypanel',
+                    callBackFn: (newPropertyName, newPropertyValue) => {
+                        if (newPropertyName) {
+                            propertyObject[newPropertyName] = newPropertyValue || '';
+                            vm.set('propertyObject', propertyObject);
+                        }
+                    },
+                },
+            });
+            const uiElementPanelXType = this.lookup('uiElementPanelXType');
+            const uiElementObject = vm.get('uiElement');
+            uiElementObject.uiElementClass = uiElementPanelXType && uiElementPanelXType.selection &&
+                uiElementPanelXType.selection.get(uiElementPanelXType.getDisplayField());
+            uiElementObject.propertyName = undefined;
+            openWindow.doInit(uiElementObject);
+            openWindow.show();
+        }
+    },
+
+    deletePropertyHandler: function() {
+        const vm = this.getViewModel();
+        const propertyObject = vm.get('propertyObject');
+        const selectedPropertyGridRow = vm.get('uiElementPanelPropertiesGrid.selection');
+        if (propertyObject && selectedPropertyGridRow) {
+            const name = selectedPropertyGridRow.get('name');
+            delete propertyObject[name];
+            vm.set('propertyObject', propertyObject);
+        }
+    },
+});