ru.coon 2.7.41 → 2.7.43

package/src/nav/AppNavigationMenu.scss

@@ -1,60 +1,60 @@
-.AppNavigationMenu {
-
-  .x-btn-arrow-right:after {
-    color: white;
-  }
-
-  .x-panel-body-default {
-    .x-box-inner {
-      width: 260px !important;
-
-      .x-box-target {
-        width: 260px !important;
-
-        .x-btn-default-small {
-          width: 260px !important;
-        }
-
-        .x-menuview {
-          width: 260px !important;
-        }
-      }
-    }
-  }
-
-  .x-panel-body-default {
-    background-color: $base-color;
-    scrollbar-width: none;
-  }
-
-  .x-treelist-menu {
-    width: 260px !important;
-  }
-
-  .x-btn-button-default-small {
-    .x-btn-icon-el {
-      &.svg-icon {
-        background-color: lighten(lightgray, 5%);
-        width: 24px;
-        height: 24px;
-        margin-left: 2px;
-      }
-    }
-  }
-
-  .x-btn-default-small {
-    padding: 4px 6px;
-  }
-
-  .x-btn-inner-default-small {
-    letter-spacing: 0.03em;
-    font-size: 16px;
-    font-weight: 500;
-    padding-left: 8px;
-    color: white;
-  }
-
-  .x-btn-arrow-right:after {
-    color: white;
-  }
-}
+.AppNavigationMenu {
+
+  .x-btn-arrow-right:after {
+    color: white;
+  }
+
+  .x-panel-body-default {
+    .x-box-inner {
+      width: 260px !important;
+
+      .x-box-target {
+        width: 260px !important;
+
+        .x-btn-default-small {
+          width: 260px !important;
+        }
+
+        .x-menuview {
+          width: 260px !important;
+        }
+      }
+    }
+  }
+
+  .x-panel-body-default {
+    background-color: $base-color;
+    scrollbar-width: none;
+  }
+
+  .x-treelist-menu {
+    width: 260px !important;
+  }
+
+  .x-btn-button-default-small {
+    .x-btn-icon-el {
+      &.svg-icon {
+        background-color: lighten(lightgray, 5%);
+        width: 24px;
+        height: 24px;
+        margin-left: 2px;
+      }
+    }
+  }
+
+  .x-btn-default-small {
+    padding: 4px 6px;
+  }
+
+  .x-btn-inner-default-small {
+    letter-spacing: 0.03em;
+    font-size: 16px;
+    font-weight: 500;
+    padding-left: 8px;
+    color: white;
+  }
+
+  .x-btn-arrow-right:after {
+    color: white;
+  }
+}

package/src/nav/AppNavigationToggleButton.scss

@@ -1,6 +1,6 @@
-.AppNavigationToggleButton{
-    .x-btn-icon-el.svg-icon{
-        width: 33px;
-        height: 24px;
-    }
-}
+.AppNavigationToggleButton{
+    .x-btn-icon-el.svg-icon{
+        width: 33px;
+        height: 24px;
+    }
+}

package/src/nav/editor/menu/NavMenuTreeView.scss

@@ -1,104 +1,104 @@
-.NavMenuTreeView{
-    .svg-icon{
-            height: 24px;
-            width: 24px;
-    }
-    .fa{
-         height: 24px;
-         width: 24px;
-         padding-top: 6px;
-         color: black;
-    }
-
-    .rootText{
-        font-size:18px;
-        font-family: Bold;
-    }
-
-    .rootTextWorkspace{
-        color: #4c4c4ced;
-    }
-
-    .titleNavMenuTree{
-        color:grey;
-    }
-    .x-segmented-button-item{
-        background-color: transparent;
-    }
-    .x-segmented-button-item:hover{
-        background-color: rgba(61, 103, 128, 0.04);
-    }
-    .x-segmented-button-item:active{
-        background-color: rgba(61, 103, 128, 0.12);
-    }
-    .x-segmented-button .x-segmented-button-item .x-btn-inner{
-        color: #3D6780;
-    }
-    .x-segmented-button .x-segmented-button-item .x-btn-icon-el{
-        color: #3D6780;
-    }
-    .x-btn-icon-el{
-        color: #3D6780;
-    }
-}
-
-@include extjs-button-small-ui(
-        $ui: 'NavMenuTreeButton',
-        $padding: 8px 12px,
-        $color: #3D6780,
-        $icon-size: 16px,
-
-        $background-color-over: rgba(61, 103, 128, 0.04),
-        $background-color-focus-over: rgba(61, 103, 128, 0.04),
-
-        $background-color-pressed: rgba(61, 103, 128, 0.12),
-        $background-color-focus-pressed: rgba(61, 103, 128, 0.12),
-
-
-        $border-color: 'none',
-        $background-color: transparent,
-        $border-color-focus: #3D6780
-);
-
-@include extjs-button-small-ui(
-        $ui: 'NavMenuTreeSegmentedButton',
-        $padding: 8px 12px,
-        $color: #3D6780,
-        $icon-size: 16px,
-
-        $background-color-over: rgba(61, 103, 128, 0.04),
-        $background-color-focus-over: rgba(61, 103, 128, 0.04),
-
-        $background-color-pressed: rgba(61, 103, 128, 0.12),
-        $background-color-focus-pressed: rgba(61, 103, 128, 0.12),
-
-
-        $border-color: 'none',
-        $background-color: transparent,
-        $border-color-focus: #3D6780,
-        $background-color-focus: rgba(61, 103, 128, 0.12)
-);
-
-
-.NavMenuTreeSplitMenu{
-    .x-menu-item-icon-default{
-        width: 24px;
-        height: 24px;
-        top: 4px;
-        left: 16px;
-        line-height: 24px;
-    }
-}
-
-.invisibleMenuIcon{
-    .svg-icon{
-            height: 24px;
-            width: 24px;
-            background-color: #6b6b6b;
-        }
-}
-
-@include extjs-menu-ui(
-    $ui: 'NavMenuTreeContextMenu',
-    $ui-item-icon-size : 24px,
-  );
+.NavMenuTreeView{
+    .svg-icon{
+            height: 24px;
+            width: 24px;
+    }
+    .fa{
+         height: 24px;
+         width: 24px;
+         padding-top: 6px;
+         color: black;
+    }
+
+    .rootText{
+        font-size:18px;
+        font-family: Bold;
+    }
+
+    .rootTextWorkspace{
+        color: #4c4c4ced;
+    }
+
+    .titleNavMenuTree{
+        color:grey;
+    }
+    .x-segmented-button-item{
+        background-color: transparent;
+    }
+    .x-segmented-button-item:hover{
+        background-color: rgba(61, 103, 128, 0.04);
+    }
+    .x-segmented-button-item:active{
+        background-color: rgba(61, 103, 128, 0.12);
+    }
+    .x-segmented-button .x-segmented-button-item .x-btn-inner{
+        color: #3D6780;
+    }
+    .x-segmented-button .x-segmented-button-item .x-btn-icon-el{
+        color: #3D6780;
+    }
+    .x-btn-icon-el{
+        color: #3D6780;
+    }
+}
+
+@include extjs-button-small-ui(
+        $ui: 'NavMenuTreeButton',
+        $padding: 8px 12px,
+        $color: #3D6780,
+        $icon-size: 16px,
+
+        $background-color-over: rgba(61, 103, 128, 0.04),
+        $background-color-focus-over: rgba(61, 103, 128, 0.04),
+
+        $background-color-pressed: rgba(61, 103, 128, 0.12),
+        $background-color-focus-pressed: rgba(61, 103, 128, 0.12),
+
+
+        $border-color: 'none',
+        $background-color: transparent,
+        $border-color-focus: #3D6780
+);
+
+@include extjs-button-small-ui(
+        $ui: 'NavMenuTreeSegmentedButton',
+        $padding: 8px 12px,
+        $color: #3D6780,
+        $icon-size: 16px,
+
+        $background-color-over: rgba(61, 103, 128, 0.04),
+        $background-color-focus-over: rgba(61, 103, 128, 0.04),
+
+        $background-color-pressed: rgba(61, 103, 128, 0.12),
+        $background-color-focus-pressed: rgba(61, 103, 128, 0.12),
+
+
+        $border-color: 'none',
+        $background-color: transparent,
+        $border-color-focus: #3D6780,
+        $background-color-focus: rgba(61, 103, 128, 0.12)
+);
+
+
+.NavMenuTreeSplitMenu{
+    .x-menu-item-icon-default{
+        width: 24px;
+        height: 24px;
+        top: 4px;
+        left: 16px;
+        line-height: 24px;
+    }
+}
+
+.invisibleMenuIcon{
+    .svg-icon{
+            height: 24px;
+            width: 24px;
+            background-color: #6b6b6b;
+        }
+}
+
+@include extjs-menu-ui(
+    $ui: 'NavMenuTreeContextMenu',
+    $ui-item-icon-size : 24px,
+  );

package/src/nav/editor/menu/form/NavMenuFormView.js

@@ -67,7 +67,7 @@ Ext.define('Coon.nav.editor.menu.form.NavMenuFormView', {
             items: [
                 {
                     xtype: 'checkbox',
-                    fieldLabel: 'Видимый',
+                    boxLabel: 'Видимый',
                     bind: '{menu.visibleSwitch}',
                 }
             ],

package/src/nav/editor/menu/form/NavMenuFormViewController.js

@@ -23,7 +23,7 @@ Ext.define('Coon.nav.editor.menu.form.NavMenuFormViewController', {
 
     /**
      * получение данных об элементе меню по id при откртыии формы для редактирования
-     * @param {String} workspaceId
+     * @param {String} menuId
      */
 
     doInit: function(menuId) {
@@ -98,8 +98,8 @@ Ext.define('Coon.nav.editor.menu.form.NavMenuFormViewController', {
                 params: {reportId: 'MENU_ALLITEMS', parameterList: `[{"type":"MENU_ENTRY_CD","value":"${data.menuId}"}]`},
             })
                 .then((resp) => {
-                    if (resp.totalCount > 0) {
-                        Ext.Msg.alert('Ошибка', `Пункт мено с идентификатором ${data.menuId} уже существует`);
+                    if (vm.get('newMenu') && resp.totalCount > 0) {
+                        Ext.Msg.alert('Ошибка', `Пункт меню с идентификатором ${data.menuId} уже существует`);
                     } else {
                         Coon.util.promisifyCmd('command.' + commandClass, data)
                             .then((menuBean) => {
@@ -149,7 +149,6 @@ Ext.define('Coon.nav.editor.menu.form.NavMenuFormViewController', {
         win.show();
         win.content.doInit('UI_ELEMENTS_LIST', {
             UI_ELEMENT_CD: editorField.getValue(),
-            UI_ELEMENT_CD: editorField.getValue(),
         }, !!editorField.getValue());
     },
 

package/src/nav/editor/workspace/NavWorkspaceListView.scss

@@ -1,35 +1,35 @@
-.NavWorkspaceListView{
-    .svg-icon{
-            height: 24px;
-            width: 24px;
-    }
-
-    .titleNavWorkspaceList{
-        color: grey;
-    }
-    .x-btn-icon-el{
-        color: #3D6780;
-    }
-}
-
-@include extjs-button-small-ui(
-        $ui: 'NavMenuWorkspaceButton',
-        $padding: 8px 12px,
-        $color: #3D6780,
-        $icon-size: 16px,
-
-        $background-color-over: rgba(61, 103, 128, 0.04),
-        $background-color-focus-over: rgba(61, 103, 128, 0.04),
-
-        $background-color-pressed: rgba(61, 103, 128, 0.12),
-        $background-color-focus-pressed: rgba(61, 103, 128, 0.12),
-
-
-        $border-color: 'none',
-        $background-color: transparent
-);
-
-@include extjs-menu-ui(
-    $ui: 'NavWorkspaceListContextMenu',
-    $ui-item-icon-size : 24px,
-  );
+.NavWorkspaceListView{
+    .svg-icon{
+            height: 24px;
+            width: 24px;
+    }
+
+    .titleNavWorkspaceList{
+        color: grey;
+    }
+    .x-btn-icon-el{
+        color: #3D6780;
+    }
+}
+
+@include extjs-button-small-ui(
+        $ui: 'NavMenuWorkspaceButton',
+        $padding: 8px 12px,
+        $color: #3D6780,
+        $icon-size: 16px,
+
+        $background-color-over: rgba(61, 103, 128, 0.04),
+        $background-color-focus-over: rgba(61, 103, 128, 0.04),
+
+        $background-color-pressed: rgba(61, 103, 128, 0.12),
+        $background-color-focus-pressed: rgba(61, 103, 128, 0.12),
+
+
+        $border-color: 'none',
+        $background-color: transparent
+);
+
+@include extjs-menu-ui(
+    $ui: 'NavWorkspaceListContextMenu',
+    $ui-item-icon-size : 24px,
+  );

package/src/nav/editor/workspace/form/NavWorkspaceFormController.js

@@ -85,6 +85,22 @@ Ext.define('Coon.nav.editor.workspace.form.NavWorkspaceFormController', {
         iconClassButton && iconClassButton.setIconCls(iconClassField.getValue());
     },
 
+    /**
+     * Срабатывает при сохранении формы
+     * Пелучаем данные формы и обрабатывает пустые значения (для postgres)
+     */
+
+    getSavedData() {
+        const vmData = this.getViewModel().get('workspace');
+        const data = {};
+        if (Ext.isObject(vmData)) {
+            for (const [key, value] of Object.entries(vmData)) {
+                data[key] = !Ext.isString(value) || value.trim() ? value : null;
+            }
+        }
+        return data;
+    },
+
     /**
      * Срабатывает при сохранении формы
      * Вызывает команду по добавлению/сохранению данных о рабочем пространстве
@@ -94,15 +110,31 @@ Ext.define('Coon.nav.editor.workspace.form.NavWorkspaceFormController', {
         if (this.validate()) {
             const vm = this.getViewModel();
             const commandClass = vm.get('newWorkspace') ? 'AddWorkspaceCommand' : 'SaveWorkspaceCommand';
-            Coon.util.promisifyCmd('command.' + commandClass, vm.get('workspace'))
-                .then((workspaceBean) => {
-                    vm.set('workspace', workspaceBean);
-                    Ext.fireEvent('nav:reload');
-                    this.getView().close();
+            const data = this.getSavedData();
+            Coon.util.promisifyCmd({
+                command: 'command.GetDynamicReportDataCommand',
+                params: {reportId: 'WORKSPACE_LIST'},
+            })
+                .then((resp) => {
+                    const isDuplicateWorkspace = resp.list.find((workspace) => workspace.WORKSPACE_CD === data.workspaceId);
+                    if (vm.get('newWorkspace') && isDuplicateWorkspace) {
+                        Ext.Msg.alert('Ошибка', `Рабочее пространство с идентификатором ${data.workspaceId} уже существует`);
+                    } else {
+                        Coon.util.promisifyCmd('command.' + commandClass, vm.get('workspace'))
+                            .then((workspaceBean) => {
+                                vm.set('workspace', workspaceBean);
+                                Ext.fireEvent('nav:reload');
+                                this.getView().close();
+                            })
+                            .catch((error) => {
+                                Coon.log.debug(error);
+                                Ext.Msg.alert(error.toString());
+                            });
+                    }
                 })
                 .catch((error) => {
                     Coon.log.debug(error);
-                    Ext.Msg.alert(error.toString());
+                    Ext.Msg.alert('Ошибка', error.toString());
                 });
         }
     },

package/src/nav/menu/NavMenuPanel.scss

@@ -1,12 +1,12 @@
-.NavMenuPanel {
-    .menu-wrapper-ct {
-        display: flex;
-        flex-flow: row nowrap;
-        justify-content: flex-start;
-        align-items: flex-start;
-        gap: 10px 10px;
-        .menu-ct {
-            display: inline-block;
-        }
-    }
+.NavMenuPanel {
+    .menu-wrapper-ct {
+        display: flex;
+        flex-flow: row nowrap;
+        justify-content: flex-start;
+        align-items: flex-start;
+        gap: 10px 10px;
+        .menu-ct {
+            display: inline-block;
+        }
+    }
 }