From 20e2958b7d82525fda6947a8baafe93e40365681 Mon Sep 17 00:00:00 2001
From: clayzenx <clay.zenx@gmail.com>
Date: Thu, 23 May 2024 12:05:37 +0300
Subject: [PATCH 1/6] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=20=D0=BE=D1=82=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D1=80=D0=B0=D0=BC=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/components/Schema/DHSchema/DHSchemaNode.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/components/Schema/DHSchema/DHSchemaNode.vue b/src/frontend/components/Schema/DHSchema/DHSchemaNode.vue
index bbf2f5b8..8fcb2b76 100644
--- a/src/frontend/components/Schema/DHSchema/DHSchemaNode.vue
+++ b/src/frontend/components/Schema/DHSchema/DHSchemaNode.vue
@@ -8,7 +8,7 @@
         v-on:dblclick.stop.prevent="onNodeDblClick(box, true)">
         <template v-if="isShowArea">
           <rect
-            v-if="isArea(box)"
+            v-if="isArea(box) && !box.node.hideBorder"
             class="box"
             v-bind:fill="`${box.node.background || '#fff'}`"
             v-bind:fill-opacity="`${ box.node.background ? (box.node.opacity || 1) : 0}`"

From 52f0d84aebfa672cf2547d778b02bf7b0484e2f8 Mon Sep 17 00:00:00 2001
From: clayzenx <clay.zenx@gmail.com>
Date: Thu, 23 May 2024 12:13:50 +0300
Subject: [PATCH 2/6] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BE=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docs/manual/docs/examples/sa-complex-hide-title.yaml    | 1 +
 public/documentation/docs/manual/docs/smartants.md          | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/public/documentation/docs/manual/docs/examples/sa-complex-hide-title.yaml b/public/documentation/docs/manual/docs/examples/sa-complex-hide-title.yaml
index d42a33c7..1bfb9c25 100644
--- a/public/documentation/docs/manual/docs/examples/sa-complex-hide-title.yaml
+++ b/public/documentation/docs/manual/docs/examples/sa-complex-hide-title.yaml
@@ -5,6 +5,7 @@ nodes:
   # Внешняя среда
   outside:
     title: Внешняя среда
+    hideBorder: true
   outside.user:                # Пользователь
     title: Пользователь
     symbol: user
diff --git a/public/documentation/docs/manual/docs/smartants.md b/public/documentation/docs/manual/docs/smartants.md
index 47c9c7b9..593ae591 100644
--- a/public/documentation/docs/manual/docs/smartants.md
+++ b/public/documentation/docs/manual/docs/smartants.md
@@ -186,7 +186,13 @@ config:
 ![Результат на примере сложной диаграммы](@document/dochub.smartants.examples.complex.hideleaves)
 
 **hideTitle** - индивидуально выключить заголовок у элемента или области:
+Рамку для областей можно отключить параметром - **hideBorder**:
 ```yaml
+...
+  # Внешняя среда
+  outside:
+    title: Внешняя среда
+    hideBorder: true
 ...
   # Внутренняя среда
   inside:

From ccc0910163551d189bab569d645afc54518a757b Mon Sep 17 00:00:00 2001
From: clayzenx <clay.zenx@gmail.com>
Date: Thu, 23 May 2024 13:32:53 +0300
Subject: [PATCH 3/6] =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B5=D0=BB=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D1=81=20=D0=BA=D1=80=D1=83=D0=B6=D0=BE=D1=87=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Schema/DHSchema/DHSchemaTrack.vue         | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/frontend/components/Schema/DHSchema/DHSchemaTrack.vue b/src/frontend/components/Schema/DHSchema/DHSchemaTrack.vue
index 626b9ffa..a27da3ee 100644
--- a/src/frontend/components/Schema/DHSchema/DHSchemaTrack.vue
+++ b/src/frontend/components/Schema/DHSchema/DHSchemaTrack.vue
@@ -1,16 +1,16 @@
 <template>
   <g>
-    <path 
+    <path
       v-bind:class="classesArrow"
-      v-bind:d="arrows" 
+      v-bind:d="arrows"
       v-bind:style="{ opacity: track.opacity, stroke: trackColor }"
       v-on:mouseover="onTrackOver"
       v-on:mouseleave="onTrackLeave"
       v-on:mousedown.stop.prevent="onTrackClick" />
     <path
-      v-bind:id="id" 
+      v-bind:id="id"
       v-bind:class="classesLine"
-      v-bind:d="line" 
+      v-bind:d="line"
       v-bind:style="{ opacity: track.opacity, 'stroke-width':strokeWidth, stroke: trackColor }"
       v-bind:stroke-width="strokeWidth"
       v-on:mouseover="onTrackOver"
@@ -58,7 +58,7 @@
     data() {
       return {
       };
-    },  
+    },
     computed: {
       strokeWidth() {
         let width = ((this.isUnwisp || []).length || 1);
@@ -102,7 +102,7 @@
           rotate: 0
         };
 
-        if (maxSegment.from.x !== maxSegment.to.x) 
+        if (maxSegment.from.x !== maxSegment.to.x)
           result.point = {
             x: maxSegment.from.x - (maxSegment.from.x - maxSegment.to.x) * 0.5,
             y: maxSegment.from.y - 4
@@ -138,7 +138,7 @@
       classesArrow() {
         return this.makeClass(true);
       },
-      // Стиль линии 
+      // Стиль линии
       classesLine() {
         return this.makeClass();
       },
@@ -161,7 +161,7 @@
             arrow = this.makeArrow(pice.curr.x, pice.curr.y, pice.arrow, 'left');
           else if ((pice.prev.x > pice.curr.x) && (pice.prev.y === pice.curr.y))
             arrow = this.makeArrow(pice.curr.x, pice.curr.y, pice.arrow, 'right');
-          
+
           if (pice.after)
             result += ` ${arrow}`;
           else
@@ -176,7 +176,7 @@
         return this.track.path;
       },
 
-      // Путь 
+      // Путь
       line() {
         return rounding(
           this.simplePath
@@ -186,7 +186,7 @@
       }
     },
     methods: {
-      // 
+      //
       onTrackClick() {
         this.$emit('track-click', this.track);
       },
@@ -221,7 +221,14 @@
       },
       // Генерирует path стрелки
       makeArrow(x, y, style, direction) {
+        const shifts = {
+          left: -2,
+          right: 0,
+          up: -1,
+          down: -1
+        };
         switch(style) {
+          case '*': return `M ${x+shifts[direction]}, ${y} m 3, 0 a 2,2 0 1,0 -4,0 a 2,2 0 1,0  4,0`;
           case '>':
           case '<':
             switch (direction) {

From 934f6528a2d73ec60aadd7e5f04ae5305f4b84f1 Mon Sep 17 00:00:00 2001
From: clayzenx <clay.zenx@gmail.com>
Date: Thu, 23 May 2024 13:57:04 +0300
Subject: [PATCH 4/6] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=BC=D0=B5=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/documentation/docs/manual/docs/examples/sa-group.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/documentation/docs/manual/docs/examples/sa-group.yaml b/public/documentation/docs/manual/docs/examples/sa-group.yaml
index cdccff7f..6d21998b 100644
--- a/public/documentation/docs/manual/docs/examples/sa-group.yaml
+++ b/public/documentation/docs/manual/docs/examples/sa-group.yaml
@@ -44,7 +44,7 @@ links:
   # Внешняя среда         
   - from: outside
     to: third-level
-    style: "<->" 
+    style: "*-*" 
   - from: outside.customer
     to: third-level.manager
     style: "<->" 

From 42a050155555bb37d99edb64516c66e8bd51e36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?=
 =?UTF-8?q?=D0=9D=D0=B5=D1=84=D0=B5=D0=B4=D0=BE=D0=B2?=
 <devymurr@Vladislavs-MacBook-Air.local>
Date: Wed, 29 May 2024 13:15:47 +0300
Subject: [PATCH 5/6] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BA=D0=B8=D0=B4=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=B5=D0=BC=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=82=D1=80=20wrap=20=D0=B8=D0=B7=20=D0=BA=D0=BE=D0=BD=D1=84?=
 =?UTF-8?q?=D0=B8=D0=B3=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Schema/DHSchema/DHSchema.vue   | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/frontend/components/Schema/DHSchema/DHSchema.vue b/src/frontend/components/Schema/DHSchema/DHSchema.vue
index 85209ab1..90062cbd 100644
--- a/src/frontend/components/Schema/DHSchema/DHSchema.vue
+++ b/src/frontend/components/Schema/DHSchema/DHSchema.vue
@@ -143,10 +143,10 @@
       const queryID = message.data.queryID;
       listeners[queryID] && listeners[queryID](message.data);
     };
-    this.make = (grid, nodes, links, trackWidth, distance, symbols, availableWidth, isDebug) => {
+    this.make = (grid, nodes, links, trackWidth, distance, direction, height, symbols, availableWidth, wrap, isDebug) => {
       return new Promise((success, reject) => {
         const params = {
-          grid, nodes, links, trackWidth, distance, symbols, isDebug
+          grid, nodes, links, trackWidth, distance, direction, height, symbols, wrap, isDebug
         };
         const hash = window.localStorage ? md5(JSON.stringify(params)) : null;
         const cacheKey = `SmartAnts.cache.v${CACHE_VERSION}.${hash}`;
@@ -223,6 +223,16 @@
         type: Boolean,
         default: false
       },
+      // Направление диаграммы
+      direction: {
+        type: String,
+        default: 'row'
+      },
+      // Высота для колоночной диаграммы
+      height: {
+        type: Number,
+        default: 700
+      },
       // Варнинги генерации диаграммы
       warnings: {
         type: Array,
@@ -603,6 +613,8 @@
         this.recalcSymbols();
         const trackWidth = this.data.config?.trackWidth || this.trackWidth;
         const distance = this.data.config?.distance || this.distance;
+        const direction = this.data.config?.direction || this.direction;
+        const height = this.data.config?.height || this.height;
         let availableWidth = this.$el?.clientWidth || 0;
         if (availableWidth < 600) availableWidth = 600;
         this.isBuilding++;
@@ -612,9 +624,12 @@
           links || this.data.links || [],
           trackWidth,
           distance,
+          direction,
+          height,
           this.landscape.symbols,
           availableWidth,
           this.limitHeight,
+          this.data.config?.wrap,
           this.debug
         )
           .then((presentation) => {

From 9360506844bd9803698e01f93e2e4af7c982cf7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?=
 =?UTF-8?q?=D0=9D=D0=B5=D1=84=D0=B5=D0=B4=D0=BE=D0=B2?=
 <devymurr@Vladislavs-MacBook-Air.local>
Date: Thu, 13 Jun 2024 14:04:49 +0300
Subject: [PATCH 6/6] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BA=D0=B8=D0=B4=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B8=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/components/Schema/DHSchema/DHSchema.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/frontend/components/Schema/DHSchema/DHSchema.vue b/src/frontend/components/Schema/DHSchema/DHSchema.vue
index 90062cbd..257a0c3b 100644
--- a/src/frontend/components/Schema/DHSchema/DHSchema.vue
+++ b/src/frontend/components/Schema/DHSchema/DHSchema.vue
@@ -143,10 +143,10 @@
       const queryID = message.data.queryID;
       listeners[queryID] && listeners[queryID](message.data);
     };
-    this.make = (grid, nodes, links, trackWidth, distance, direction, height, symbols, availableWidth, wrap, isDebug) => {
+    this.make = (grid, styles, nodes, links, trackWidth, distance, direction, height, symbols, availableWidth, wrap, isDebug) => {
       return new Promise((success, reject) => {
         const params = {
-          grid, nodes, links, trackWidth, distance, direction, height, symbols, wrap, isDebug
+          grid, styles, nodes, links, trackWidth, distance, direction, height, symbols, wrap, isDebug
         };
         const hash = window.localStorage ? md5(JSON.stringify(params)) : null;
         const cacheKey = `SmartAnts.cache.v${CACHE_VERSION}.${hash}`;
@@ -620,6 +620,7 @@
         this.isBuilding++;
         Graph.make(
           this.data.config?.grid || {},
+          this.data.config?.styles || {},
           nodes || this.data.nodes || {},
           links || this.data.links || [],
           trackWidth,