Merge pull request #578 from RabotaRu/v3.13.2

v3.13.2
DocHubTeam · Nov 2, 2024 · a3b6de6 · a3b6de6
2 parents 60d2c9a + 7bd2200
commit a3b6de6
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 29 deletions.
diff --git a/distrib/idea/IDEAPlugin-4.1.3.zip → distrib/idea/IDEAPlugin-4.1.4.zip b/distrib/idea/IDEAPlugin-4.1.3.zip → distrib/idea/IDEAPlugin-4.1.4.zip
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/documentation/docs/conception/introduction.md b/public/documentation/docs/conception/introduction.md
@@ -9,6 +9,7 @@ DocHub - инструмент описания архитектуры через
 3. [Управление архитектурой холдинга (экосистем)](#ecosystem);
 4. [Создание архитектурных фасадов](#facade).
 
+
 ![](@anchor/versions)
 ## 1. Управление версиями архитектуры 
 ![>Управление версиями](@document/dochub.archver)

diff --git a/public/documentation/docs/welcome.md b/public/documentation/docs/welcome.md
diff --git a/src/frontend/components/Docs/DocMarkdown.vue b/src/frontend/components/Docs/DocMarkdown.vue
@@ -111,6 +111,10 @@
       tocShow: {
         type: Boolean,
         default: true
+      },
+      inline: {
+        type: Boolean,
+        default: true
       }
     },
     data() {
@@ -177,7 +181,7 @@
       tocRendered(tocHTML) {
         // Не выводим оглавление, если в нем всего три раздела или меньше
         // eslint-disable-next-line no-useless-escape
-        if (this.tocShow && ((tocHTML.match(/\<li\>.*\<\/li\>/g) || []).length > 3))
+        if (!this.inline && this.tocShow && ((tocHTML.match(/\<li\>.*\<\/li\>/g) || []).length > 3))
           this.toc = tocHTML;
       },
       prepareMarkdown(content) {

diff --git a/src/frontend/components/Schema/PlantUML.vue b/src/frontend/components/Schema/PlantUML.vue
@@ -117,7 +117,6 @@
     ],
     data() {
       return {
-        original: null,
         menu: { // Контекстное меню
           show: false,  // Признак отображения
           x : 0,  // Позиция x
@@ -145,18 +144,21 @@
         return this.svgEl;
       },
       viewBox() {
-        if (!this.svgEl) {
-          return {
-            x: 0,
-            y : 0,
-            width : 0,
-            height : 0
-          };
-        } else
-          return this.cacheViewBox ?
-            this.cacheViewBox
-            // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-            : this.cacheViewBox = this.svgEl.viewBox.baseVal;
+        if (this.cacheViewBox) return this.cacheViewBox;
+        let result = null;
+        if (navigator.userAgent.toLowerCase().includes('firefox')) {
+          // eslint-disable-next-line no-useless-escape
+          const regex = /<svg.*?viewBox=\"(-?(?:\d+(?:\.\d+)?|\.\d+)(?:e\d+)?)\s*(-?(?:\d+(?:\.\d+)?|\.\d+)(?:e\d+)?)\s*(-?(?:\d+(?:\.\d+)?|\.\d+)(?:e\d+)?)\s*(-?(?:\d+(?:\.\d+)?|\.\d+)(?:e\d+)?)\".*?>/;
+          const parsed = this.svg.match(regex);
+          parsed && (result = {
+            x: Number.parseFloat(parsed[1]),
+            y: Number.parseFloat(parsed[2]),
+            width: Number.parseFloat(parsed[3]),
+            height: Number.parseFloat(parsed[4])
+          });
+        } else if (this.svgEl) result = this.svgEl.viewBox.baseVal;
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        return result ? (this.cacheViewBox = result) : { x:0, y:0, width:0, height:0 };
       },
       menuItems() {
         const result = [].concat(this.contextMenu);
@@ -206,6 +208,7 @@
       },
       doResize() {
         if (!this.svgEl || !this.svgEl.clientWidth || !this.svgEl.clientHeight) return;
+        
         const originWidth = this.viewBox.width;
 
         if (this.$el.clientWidth > this.viewBox.width) {
@@ -227,17 +230,6 @@
         this.viewBox.x -= offsetX;
         this.viewBox.y -= offsetY > 0 ? offsetY : 0;
       },
-      saveOriginal() {
-        const originalHeight = this.viewBox.height * (this.svgEl.clientWidth / this.viewBox.width);
-        this.original = {
-          height: originalHeight,
-          viewBoxHeight: this.$el.clientHeight * this.viewBox.height / originalHeight
-        };
-      },
-      resetToDefault() {
-        this.viewBox.height = this.original.viewBoxHeight;
-        this.svgEl.style.height = this.original.height;
-      },
       prepareSVG() {
         this.svgEl = this.$el.querySelectorAll('svg')[0];
         this.cacheViewBox = null;