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/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: "<->" 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: diff --git a/src/frontend/components/Schema/DHSchema/DHSchema.vue b/src/frontend/components/Schema/DHSchema/DHSchema.vue index 85209ab1..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, symbols, availableWidth, 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, symbols, 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}`; @@ -223,6 +223,16 @@ type: Boolean, default: false }, + // Направление диаграммы + direction: { + type: String, + default: 'row' + }, + // Высота для колоночной диаграммы + height: { + type: Number, + default: 700 + }, // Варнинги генерации диаграммы warnings: { type: Array, @@ -603,18 +613,24 @@ 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++; Graph.make( this.data.config?.grid || {}, + this.data.config?.styles || {}, nodes || this.data.nodes || {}, links || this.data.links || [], trackWidth, distance, + direction, + height, this.landscape.symbols, availableWidth, this.limitHeight, + this.data.config?.wrap, this.debug ) .then((presentation) => { 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)">