agilebuilder-ui 1.0.18 → 1.0.19-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.18",
+  "version": "1.0.19-beta2",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -45,25 +45,17 @@
         <el-table-column prop="showName" width="200" />
         <el-table-column align="right">
           <template v-slot="scope">
-            <el-tooltip
-              :content="$t('imatrixUIPublicModel.preview')"
-              class="item"
-              effect="dark"
-              placement="top"
-            >
+            <el-tooltip :content="$t('imatrixUIPublicModel.preview')" class="item" effect="dark" placement="top">
               <el-icon @click="previewSingle(scope.row)" style="cursor: pointer"><el-icon-view /></el-icon>
             </el-tooltip>
           </template>
         </el-table-column>
         <el-table-column>
           <template v-slot="scope">
-            <el-tooltip
-              :content="$t('imatrixUIPublicModel.download')"
-              class="item"
-              effect="dark"
-              placement="top"
-            >
-              <el-icon @click="donwloadFile(scope.$index, fileList)" style="cursor: pointer"><el-icon-download /></el-icon>
+            <el-tooltip :content="$t('imatrixUIPublicModel.download')" class="item" effect="dark" placement="top">
+              <el-icon @click="donwloadFile(scope.$index, fileList)" style="cursor: pointer"
+                ><el-icon-download
+              /></el-icon>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -73,53 +65,52 @@
 </template>
 
 <script>
-import {
-  Paperclip as ElIconPaperclip,
-  View as ElIconView,
-  Download as ElIconDownload,
-} from '@element-plus/icons-vue'
+import { Paperclip as ElIconPaperclip, View as ElIconView, Download as ElIconDownload } from '@element-plus/icons-vue'
 import * as Vue from 'vue'
-import {
-  isPlateSys,
-  getSystemFrontendUrl,
-} from '../../../src/utils/common-util'
+import { isPlateSys, getSystemFrontendUrl } 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'
-import {Base64} from 'js-base64'
+import { Base64 } from 'js-base64'
 export default {
   components: {
     ElIconPaperclip,
     ElIconView,
-    ElIconDownload,
+    ElIconDownload
   },
   name: 'FsPreview',
   props: {
     label: {
       type: String,
-      default: null,
+      default: null
     },
     fileSetObj: {
       type: Object,
-      default: null,
+      default: null
     },
     isSql: {
       type: Boolean,
-      default: false,
+      default: false
     },
     entity: {
       type: Object,
       default: () => {
         return {}
-      },
+      }
     },
+    fileInfo: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
   },
   data() {
     return {
       showPreviewSingleImage: false,
       showPreviewMulti: false,
       previewImageInfo: {},
-      fileList: [],
+      fileList: []
     }
   },
   created() {
@@ -162,18 +153,16 @@ export default {
     },
     previewMuti() {
       const keyValueParam = this.analysisFileSetObj(this.fileSetObj, this.isSql)
-      const serverPath = getEntityFieldValue(
-        this.entity,
-        keyValueParam.serverPath
-      )
+      let serverPath = null
+			if (this.fileInfo.showName && this.fileInfo.serverPath) {
+				serverPath = this.fileInfo.serverPath
+      } else if (entity) {
+        serverPath = getEntityFieldValue(this.entity, keyValueParam.serverPath)
+      }
       if (serverPath) {
         const uuids = serverPath.split(',')
         this.$http
-          .post(
-            window.$vueApp.config.globalProperties.baseURL +
-              '/common/fs-upload/search-file-names',
-            uuids
-          )
+          .post(window.$vueApp.config.globalProperties.baseURL + '/common/fs-upload/search-file-names', uuids)
           .then((result) => {
             this.fileList = []
             uuids.forEach((uuid) => {
@@ -193,9 +182,7 @@ export default {
       const showName = fileInfo.showName
       if (window.$vueApp.config.globalProperties.customPreviewUrl) {
         window.open(
-          getSystemFrontendUrl(
-            window.$vueApp.config.globalProperties.portalUrl
-          ) +
+          getSystemFrontendUrl(window.$vueApp.config.globalProperties.portalUrl) +
             '/#/file-service/preview?serverPath=' +
             fileInfo.serverPath +
             '&showName=' +
@@ -209,54 +196,39 @@ export default {
         }
         let previewUrl
         if (window.$vueApp.config.globalProperties.kkFileViewUrl) {
-          const originUrl = baseUrl + '/common/super-form/downloads?jwt=' + token+
-              '&showName=' +
-              encodeURI(showName) +
-              '&serverPath=' +
-              fileInfo.serverPath
+          const originUrl =
+            baseUrl +
+            '/common/super-form/downloads?jwt=' +
+            token +
+            '&showName=' +
+            encodeURI(showName) +
+            '&serverPath=' +
+            fileInfo.serverPath
           //要预览文件的访问地址
-          const myPreviewUrl = originUrl + '&fullfilename='+showName
+          const myPreviewUrl = originUrl + '&fullfilename=' + showName
           console.log('myPreviewUrl====', myPreviewUrl)
           // http://127.0.0.1:8012/onlinePreview
-          previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
+          previewUrl =
+            window.$vueApp.config.globalProperties.kkFileViewUrl +
+            '?url=' +
+            encodeURIComponent(Base64.encode(myPreviewUrl))
           console.log('previewUrl====', previewUrl)
         } else {
-          previewUrl =
-            baseUrl +
-            '/common/fs-upload/preview?jwt=' +
-            token
-          previewUrl = previewUrl +
-                '&showName=' +
-                encodeURI(showName) +
-                '&serverPath=' +
-                fileInfo.serverPath
+          previewUrl = baseUrl + '/common/fs-upload/preview?jwt=' + token
+          previewUrl = previewUrl + '&showName=' + encodeURI(showName) + '&serverPath=' + fileInfo.serverPath
         }
-        window.open(
-          previewUrl,
-          showName
-        )
+        window.open(previewUrl, showName)
       }
     },
     donwloadFile(index, fileList) {
       const token = getToken()
       const showName = this.formatFileName(this.fileList[index].showName)
       if (!this.fileList[index].src) {
-        let url =
-          window.$vueApp.config.globalProperties.baseURL +
-          '/common/super-form/downloads?jwt=' +
-          token
+        let url = window.$vueApp.config.globalProperties.baseURL + '/common/super-form/downloads?jwt=' + token
         if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
-          url =
-            window.$vueApp.config.globalProperties.baseAPI +
-            '/component/super-form/downloads?jwt=' +
-            token
+          url = window.$vueApp.config.globalProperties.baseAPI + '/component/super-form/downloads?jwt=' + token
         }
-        const src =
-          url +
-          '&showName=' +
-          encodeURI(showName) +
-          '&serverPath=' +
-          this.fileList[index].serverPath
+        const src = url + '&showName=' + encodeURI(showName) + '&serverPath=' + this.fileList[index].serverPath
         window.open(src)
       } else {
         window.open(this.fileList[index].src)
@@ -291,13 +263,13 @@ export default {
       }
       return {
         showName: showName,
-        serverPath: serverPath,
+        serverPath: serverPath
       }
     },
     formatFileName(fileName) {
       return fileName.replace('#', '~~').replace('?', '~$').replace('&', '$')
-    },
+    }
   },
-  emits: ['close'],
+  emits: ['close']
 }
 </script>