Merge pull request #586 from DocHubTeam/v3.13.3-fixed

V3.13.3 fixed

Author: rpiontik

distrib/idea/IDEAPlugin-4.1.5.zip

@@ -2,4 +2,4 @@ $package:
   dochub-doc:
     version: 3.0.0
 imports:
-  - root.yaml
+  - root.yaml

public/documentation/dochub.yaml

@@ -8,8 +8,18 @@ info:
     встраивания DocHub в свои производственные процессы.
     Подробнее тут http://dochub.info/docs/dochub.deployment
 servers:
-  - url: "http://localhost:3030/"
-    description: Локальный сервер
+  - url: https://{URL}
+    description: API server secure
+    variables:
+      URL:
+        default: localhost:3030
+        description: Сервер http для запроса
+  - url: http://{URL}
+    description: API server insecure
+    variables:
+      URL:
+        default: localhost:3030
+        description: Сервер https для запроса
 tags:
 - name: DataLake
   description: "API для доступа в озеро данных архитектуры"

public/documentation/docs/manual/backend/api.yaml

@@ -159,11 +159,15 @@ export default {
             return this.profile?.template;
         },
         baseURI() {
-            return uriTool.getBaseURIOfPath(this.path);
+            let result = uriTool.getBaseURIOfPath(this.path);
+            result?.startsWith('res://') && (result = requests.expandResourceURI(result));
+            return result;
         },
         url() {
             const contentBasePath = uriTool.getBaseURIOfPath(`${this.path}/${this.isTemplate ? 'template' : 'source'}`) || this.baseURI;
-            let result = this.profile ? uriTool.makeURIByBaseURI(this.profile.template || this.profile.source, contentBasePath).toString() : null;
+            let uri = this.profile.template || this.profile.source;
+            uri?.startsWith('res://') && (uri = requests.expandResourceURI(uri));
+            let result = this.profile ? uriTool.makeURIByBaseURI(uri, contentBasePath).toString() : null;
             if (!result) return null;
             result += result.indexOf('?') > 0 ? '&' : '?';
             result += `id=${this.id}&path=${encodeURI(this.path)}`;

src/assets/libs/smartants.js

@@ -6,24 +6,26 @@
           {{ isFullScreen ? 'mdi-close-box-outline' : 'fullscreen' }}
         </v-icon>
       </div>
-      <smartants-bar
-        v-bind:warnings="warnings"
-        v-bind:selected-nodes="selectedNodes"
-        v-bind:focus-nodes="focusNodes"
-        v-bind:scenario="scenario"
-        v-bind:scenarios="scenarios"
-        v-bind:is-print-version="isPrintVersion"
-        v-bind:is-show-links="isShowLinks"
-        v-bind:is-unwisp="isUnwisp"
-        v-bind:is-paying="isPaying"
-        v-on:exportToExcalidraw="exportToExcalidraw"
-        v-on:doFocus="doFocus"
-        v-on:clearFocus="clearFocus"
-        v-on:playScenario="playScenario"
-        v-on:playNext="playNext"
-        v-on:setScenario="setScenario"
-        v-on:setUnwisp="setUnwisp"
-        v-on:setShowLinks="setShowLinks" />
+      <div class="fixed">
+        <smartants-bar
+          v-bind:warnings="warnings"
+          v-bind:selected-nodes="selectedNodes"
+          v-bind:focus-nodes="focusNodes"
+          v-bind:scenario="scenario"
+          v-bind:scenarios="scenarios"
+          v-bind:is-print-version="isPrintVersion"
+          v-bind:is-show-links="isShowLinks"
+          v-bind:is-unwisp="isUnwisp"
+          v-bind:is-paying="isPaying"
+          v-on:exportToExcalidraw="exportToExcalidraw"
+          v-on:doFocus="doFocus"
+          v-on:clearFocus="clearFocus"
+          v-on:playScenario="playScenario"
+          v-on:playNext="playNext"
+          v-on:setScenario="setScenario"
+          v-on:setUnwisp="setUnwisp"
+          v-on:setShowLinks="setShowLinks" />
+      </div>
       <schema
         ref="schema"
         v-model="status"
@@ -242,10 +244,13 @@
 
         const svgElement = this.$refs.schema.$el;
         addStyle(svgElement.childNodes);
+        svgElement.style.width = svgElement.clientWidth;
 
         const serializer = new XMLSerializer();
         let source = serializer.serializeToString(svgElement);
 
+        svgElement.style.width = '';
+
         // eslint-disable-next-line no-useless-escape
         if(!source.match(/^<svg[^>]+xmlns="http\:\/\/www\.w3\.org\/2000\/svg"/)){
           source = source.replace(/^<svg/, '<svg xmlns="http://www.w3.org/2000/svg"');
@@ -371,17 +376,29 @@
   };
 </script>
 
+<style>
+.fixed {
+  width: inherit;
+  position: fixed;
+  background: transparent;
+}
+.markdown-document .fixed {
+  position: static;
+}
+
+</style>
+
 <style scoped>
 .schema {
   /* border: solid 2px #ff0000; */
   aspect-ratio : 1 / 0.6;
   width: 100%;
   min-width: 100%;
+  margin-top: 60px;
 }
 
 .container {
   position: relative;
-  position: relative;
 }
 
 .container:hover > .fullscreen-icon,

src/frontend/components/Docs/DocMixin.js

@@ -38,6 +38,7 @@
 
   import DocMixin from './DocMixin';
   import { getAsyncApiContext } from '@front/helpers/misc';
+  import env from '@front/helpers/env';
 
   export default {
     name: 'DocSwagger',
@@ -70,7 +71,7 @@
           SwaggerUI({
             dom_id: `#${this.dom_id}`,
             spec: this.data,
-            deepLinking: true,
+            deepLinking: !env.isPlugin(),
             docExpansion: this.isPrintVersion ? 'full' : 'list',
             presets: [
               SwaggerUI.presets.apis

src/frontend/components/Docs/DocSmartAnts.vue

@@ -128,6 +128,7 @@
   max-width: calc(100% - 32px);
   display: inline-flex;
   left: 10px;
+  background: transparent !important;
 }
 
 

src/frontend/components/Docs/DocSwagger.vue

@@ -15,7 +15,6 @@
 </template>
 
 <script>
-
   /*
   Copyright (C) 2021 owner Roman Piontik R.Piontik@mail.ru
 

src/frontend/components/Docs/SmartAntsBar.vue

@@ -256,7 +256,7 @@
       log(value, tag) {
         this.logItems.push({
           id: this.logItems.length,
-          moment: (((new Date()).getTime() - this.jsonata.trace?.start || 0) * 0.001).toFixed(5),
+          moment: (((new Date()).getTime() - this.jsonata.expOrigin?.trace?.start || 0) * 0.001).toFixed(5),
           value: value ? JSON.parse(JSON.stringify(value)) : value,
           tag
         });
@@ -272,7 +272,7 @@
           const result = JSON.stringify(data, null, 4);
           this.logItems.push({
             id: this.logItems.length,
-            moment: ((this.jsonata.trace?.end - this.jsonata.trace?.start || 0) * 0.001).toFixed(5),
+            moment: ((this.jsonata.expOrigin?.trace?.end - this.jsonata.expOrigin?.trace?.start || 0) * 0.001).toFixed(5),
             tag: 'END',
             value: result
           });