Merge branch 'release/3.403.0'

VirtoCommerce · Oct 23, 2023 · b32f8ad · b32f8ad
2 parents dd30a9b + 35eaa97
commit b32f8ad
Show file tree

Hide file tree

Showing 5 changed files with 183 additions and 156 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.402.0</VersionPrefix>
+    <VersionPrefix>3.403.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.CoreModule.Web/Scripts/dynamicConditions/expression-directives.js b/src/VirtoCommerce.CoreModule.Web/Scripts/dynamicConditions/expression-directives.js
@@ -20,6 +20,23 @@ angular.module('virtoCommerce.coreModule.common')
             //    source: '='
             //},
             link: function ($scope, $element, $attrs) {
+                $scope.toggle = function ($event) {
+                    var elem = $event.target;
+                    var childUlElement = $(elem).find("ul");
+                    if (childUlElement.length > 0) {
+                        var iconElement = $(elem).find("i");
+                        if (iconElement.hasClass("fa-caret-down")) {
+                            iconElement.removeClass("fa-caret-down");
+                            iconElement.addClass("fa-caret-right");
+                        }
+                        else {
+                            iconElement.removeClass("fa-caret-right");
+                            iconElement.addClass("fa-caret-down");
+                        }
+                        childUlElement.toggle();
+                        $event.stopPropagation();
+                    }
+                };
                 $scope.addChild = function (chosenMenuElement, parentBlock) {
                     if (!parentBlock.children) {
                         parentBlock.children = [];

diff --git a/src/VirtoCommerce.CoreModule.Web/Scripts/dynamicConditions/expression-tree.tpl.html b/src/VirtoCommerce.CoreModule.Web/Scripts/dynamicConditions/expression-tree.tpl.html
@@ -26,9 +26,9 @@
         </ul>
         <a class="add __link __usergroup" left-click-menu data-target="det_add_{{element.id}}">{{element.newChildLabel}}</a>
         <ul class="menu __context" role="menu" id="det_add_{{element.id}}">
-            <li class="menu-item" ng-class="{'__right': child.subitems}" ng-click='!child.subitems && addChild(child, element)' ng-repeat="child in element.availableChildren">
-                <i class="menu-ico fa fa-caret-right" ng-if="child.subitems"></i>{{child.displayName}}
-                <ul class="menu __sub" ng-if="child.subitems">
+            <li class="menu-item" ng-class="{'__right': child.subitems}" ng-click='child.subitems ? toggle($event) : addChild(child, element)' ng-repeat="child in element.availableChildren">
+                <i class="menu-ico fa fa-caret-down" ng-if="child.subitems"></i>{{child.displayName}}
+                <ul class="menu" ng-if="child.subitems">
                     <li class="menu-item" ng-click='addChild(child, element)' ng-repeat="child in child.subitems">{{child.displayName}}</li>
                 </ul>
             </li>

diff --git a/src/VirtoCommerce.CoreModule.Web/module.manifest b/src/VirtoCommerce.CoreModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Core</id>
-  <version>3.402.0</version>
+  <version>3.403.0</version>
   <version-tag />
   <platformVersion>3.429.0</platformVersion>
   <title>Commerce core module</title>