agilebuilder-ui 1.1.49 → 1.1.50-rc1

package/lib/{tab-content-iframe-index-483b398c.js → tab-content-iframe-index-87ac3b2b.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-7a601895.js";
+import { _ as s } from "./index-bece2c1c.js";
 const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-0862686f.js → tab-content-index-956a0533.js}

@@ -1,4 +1,4 @@
-import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-7a601895.js";
+import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-bece2c1c.js";
 import { resolveComponent as u, openBlock as l, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as C, renderList as T, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
 const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);

package/lib/{tache-subprocess-history-c80e8ed2.js → tache-subprocess-history-2c4f98f2.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-7a601895.js";
+import { _ as I } from "./index-bece2c1c.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.49",
+  "version": "1.1.50-rc1",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/fs-preview/src/fs-preview.vue

@@ -84,7 +84,7 @@
 // import { Image } from 'antd';
 import { Paperclip as ElIconPaperclip, View as ElIconView, Download as ElIconDownload } from '@element-plus/icons-vue'
 import * as Vue from 'vue'
-import { isPlateSys, getSystemFrontendUrl, getRelativeBaseUrl } from '../../../src/utils/common-util'
+import { isPlateSys, getSystemFrontendUrl, getRelativeBaseUrl, getKkFileBackendUrl } from '../../../src/utils/common-util'
 import { isImage, getEntityFieldValue } from '../../../src/utils/util'
 import { packageFile } from '../../super-grid/src/utils'
 import { getToken } from '../../../src/utils/auth'
@@ -294,16 +294,17 @@ export default {
           console.log('myPreviewUrl====', myPreviewUrl)
           // http://127.0.0.1:8012/onlinePreview
           previewUrl =
-            window.$vueApp.config.globalProperties.kkFileViewUrl +
+            getKkFileBackendUrl() +
             '?url=' +
             encodeURIComponent(Base64.encode(myPreviewUrl))
+          window.open(previewUrl, showName)
           console.log('previewUrl====', previewUrl)
         } else {
           previewUrl = baseUrl + '/common/fs-upload/preview?jwt=' + token
           previewUrl = previewUrl + '&showName=' + encodeURI(showName) + '&serverPath=' + fileInfo.serverPath
+          previewUrl = getRelativeBaseUrl(previewUrl)
+          window.open(previewUrl, showName)
         }
-        previewUrl = getRelativeBaseUrl(previewUrl)
-        window.open(previewUrl, showName)
       }
     },
     donwloadFile(index) {

package/packages/fs-upload/src/fs-upload-multi.vue

@@ -173,6 +173,7 @@ import {
 	isPlateSys,
 	getSystemFrontendUrl,
   getRelativeBaseUrl,
+  getKkFileBackendUrl,
 } from '../../../src//utils//common-util.js'
 
 export default {
@@ -381,7 +382,8 @@ export default {
 						//要预览文件的访问地址
 						const myPreviewUrl = originUrl + '&fullfilename='+myShowName
 						// http://127.0.0.1:8012/onlinePreview
-						previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
+						previewUrl = getKkFileBackendUrl()+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
+						window.open(previewUrl, showName)
 					} else {
 						previewUrl =
 						baseUrl +
@@ -392,9 +394,9 @@ export default {
 							encodeURI(myShowName) +
 							'&serverPath=' +
 							uuid
+						previewUrl = getRelativeBaseUrl(previewUrl)
+						window.open(previewUrl, showName)
 					}
-					previewUrl = getRelativeBaseUrl(previewUrl)
-					window.open(previewUrl, showName)
 				}
 			}
 		},

package/packages/fs-upload/src/fs-upload-single.vue

@@ -112,7 +112,7 @@ import {
 import {$emit} from '../../utils/gogocodeTransfer'
 import Cookies from 'js-cookie'
 import seeBigPicture from './see-big-picture.vue'
-import {getRelativeBaseUrl, getSystemFrontendUrl, isPlateSys,} from '../../../src/utils/common-util.js'
+import {getKkFileBackendUrl, getRelativeBaseUrl, getSystemFrontendUrl, isPlateSys,} from '../../../src/utils/common-util.js'
 import {getToken} from '../../../src/utils/auth'
 
 export default {
@@ -309,7 +309,7 @@ export default {
 						//要预览文件的访问地址
 						const myPreviewUrl = originUrl + '&fullfilename='+myShowName
 						// http://127.0.0.1:8012/onlinePreview
-						previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
+						previewUrl = getKkFileBackendUrl()+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
 					} else {
 						previewUrl =
 						baseUrl +

package/packages/fs-upload-new/src/fs-preview-new.vue

@@ -61,7 +61,7 @@
 <script setup lang="ts">
 import { Close, Paperclip, Download } from '@element-plus/icons-vue'
 import { ref, defineProps } from 'vue'
-import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getReplaceUrlDomain, getRelativeBaseUrl } from '../../../src/utils/common-util'
+import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getReplaceUrlDomain, getRelativeBaseUrl, getKkFileBackendUrl } from '../../../src/utils/common-util'
 import { getToken } from '../../../src/utils/auth'
 import { isImage } from '../../../src/utils/util'
 import { Base64 } from 'js-base64'
@@ -254,14 +254,15 @@ const previweDoc = (showName: string, serverPath: string) => {
       console.log('myPreviewUrl====', myPreviewUrl)
       // http://127.0.0.1:8012/onlinePreview
       previewUrl =
-        window.$vueApp.config.globalProperties.kkFileViewUrl + '?url=' + encodeURIComponent(Base64.encode(myPreviewUrl))
+        getKkFileBackendUrl() + '?url=' + encodeURIComponent(Base64.encode(myPreviewUrl))
+      window.open(previewUrl, showName)
       console.log('previewUrl====', previewUrl)
     } else {
       previewUrl = baseUrl + '/common/fs-upload/preview?jwt=' + token
       previewUrl = previewUrl + '&showName=' + encodeURI(showName) + '&serverPath=' + serverPath
+      previewUrl = getRelativeBaseUrl(previewUrl)
+      window.open(previewUrl, showName)
     }
-    previewUrl = getRelativeBaseUrl(previewUrl)
-    window.open(previewUrl, showName)
   }
 }
 function getPreviewSrc(showName: string, serverPath: string) {

package/packages/multipart-upload/src/multipart-upload-form.vue

@@ -132,6 +132,7 @@ import {isImage} from '../../../src/utils/util'
 import {
 	isPlateSys,
 	getSystemFrontendUrl,
+  getKkFileBackendUrl,
 } from '../../../src/utils/common-util'
 import * as Vue from 'vue'
 import FsPreview from '../../fs-preview/src/fs-preview.vue'
@@ -349,7 +350,7 @@ export default {
 					//要预览文件的访问地址
 					const myPreviewUrl = originUrl + '&fullfilename='+myShowName
 					// http://127.0.0.1:8012/onlinePreview
-					previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
+					previewUrl = getKkFileBackendUrl() +'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
 				} else {
 					previewUrl =
 					baseUrl +

package/packages/multipart-upload/src/multipart-upload-list.vue

@@ -170,6 +170,7 @@ import {isImage} from '../../../src/utils/util'
 import {
 	isPlateSys,
 	getSystemFrontendUrl,
+  getKkFileBackendUrl,
 } from '../../../src/utils/common-util'
 import * as Vue from 'vue'
 import FsPreview from '../../fs-preview/src/fs-preview.vue'
@@ -502,7 +503,7 @@ export default {
 					//要预览文件的访问地址
 					const myPreviewUrl = originUrl + '&fullfilename='+myShowName
 					// http://127.0.0.1:8012/onlinePreview
-					previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
+					previewUrl = getKkFileBackendUrl() +'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
 				} else {
 					previewUrl =
 					baseUrl +

package/packages/super-grid/src/view-image-dialog.vue

@@ -51,6 +51,7 @@ import * as Vue from 'vue'
 import {
 	isPlateSys,
 	getSystemFrontendUrl,
+  getKkFileBackendUrl,
 } from '../../../src/utils/common-util'
 import {getToken} from '../../../src/utils/auth'
 
@@ -154,7 +155,7 @@ export default {
 					//要预览文件的访问地址
 					const myPreviewUrl = originUrl + '&fullfilename='+myShowName
 					// http://127.0.0.1:8012/onlinePreview
-					previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
+					previewUrl = getKkFileBackendUrl() +'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
 				} else {
 					previewUrl =
 					this.baseUrl +

package/src/utils/common-util.js

@@ -818,3 +818,25 @@ export function getURLSearchParamObj(fullPath) {
     console.error('error===',error)
   }
 }
+/**
+ * 获得KKFileView的路径。
+ * @returns 
+ */
+export function getKkFileBackendUrl() {
+  let kkFileViewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl
+  let kkFileViewUrlResult = kkFileViewUrl
+  let baseURL = window.$vueApp.config.globalProperties.baseURL
+  if(kkFileViewUrl && baseURL){
+    let baseUrls = baseURL.split('/')
+    let prefixUrl = baseUrls[0]+ '//' + baseUrls[2]
+    let kkFileViewUrls = kkFileViewUrl.split('/')
+    let kkFilePrefixUrl = kkFileViewUrls[0]+ '//' + kkFileViewUrls[2]
+    if(prefixUrl === kkFilePrefixUrl){
+      // 如果baseURL和kkFileViewUrl的ip和端口一致，则表示kkFileView服务被nginx代理了，此时需要做内网、外网域名替换，例如：西安西开项目
+      // 如果baseURL和kkFileViewUrl的ip和端口不一致，则表示kkFileView服务没有被nginx代理，此时不需要处理kkFileViewUrl路径，例如：公司产品项目
+      kkFileViewUrlResult = getRelativeBaseUrl(kkFileViewUrl)
+    }
+  }
+  console.log('获得kkFile服务部署路径', kkFileViewUrlResult)
+  return kkFileViewUrlResult
+}