agilebuilder-ui 1.1.3 → 1.1.4-temp2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.3",
+  "version": "1.1.4-temp2",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -53,7 +53,7 @@
         <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 v-if="downloadable" @click="donwloadFile(scope.$index, fileList)" style="cursor: pointer"
                 ><el-icon-download
               /></el-icon>
             </el-tooltip>
@@ -110,10 +110,14 @@ export default {
       showPreviewSingleImage: false,
       showPreviewMulti: false,
       previewImageInfo: {},
-      fileList: []
+      fileList: [],
+      downloadable: true
     }
   },
   created() {
+    if (this.fileSetObj && this.fileSetObj.downloadable !== undefined && this.fileSetObj.downloadable !== null) {
+      this.downloadable = this.fileSetObj.downloadable
+    }
     // let fileList = []
     // if (this.column.fileSet && this.column.fileSet !== '' && (this.column.componentType === 'annex' || this.column.componentType === 'multipartUpload')) {
     //   const fileSetObj = JSON.parse(this.column.fileSet)
@@ -154,22 +158,26 @@ export default {
     previewMuti() {
       const keyValueParam = this.analysisFileSetObj(this.fileSetObj, this.isSql)
       let serverPath = null
-			if (this.fileInfo.showName && this.fileInfo.serverPath) {
-				serverPath = this.fileInfo.serverPath
+      if (this.fileInfo.showName && this.fileInfo.serverPath) {
+        serverPath = this.fileInfo.serverPath
       } else if (this.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)
-          .then((result) => {
-            this.fileList = []
-            uuids.forEach((uuid) => {
-              this.fileList.push({ showName: result[uuid], serverPath: uuid })
-            })
-            this.showPreviewMulti = true
+        const baseURL = window.$vueApp.config.globalProperties.baseURL
+        const baseAPI = window.$vueApp.config.globalProperties.baseAPI
+        const tempAction = baseURL + '/common/fs-upload/search-file-names'
+        if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
+          tempAction = baseAPI + '/api/search-file-names'
+        }
+        this.$http.post(tempAction, uuids).then((result) => {
+          this.fileList = []
+          uuids.forEach((uuid) => {
+            this.fileList.push({ showName: result[uuid], serverPath: uuid })
           })
+          this.showPreviewMulti = true
+        })
       }
 
       // var that = this

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

@@ -139,7 +139,6 @@ import FsPreview from '../../fs-preview/src/fs-preview.vue'
 import { packageFile } from '../../super-grid/src/utils'
 import FileUploadInputMobile from '../../fs-upload-new/src/file-upload-mobile/file-upload-input.vue'
 
-
 export default {
   name: 'FsUploadList',
   props: {
@@ -196,9 +195,9 @@ export default {
       type: Boolean,
       default: false
     },
-    openFsUpload:{
-        type: Boolean,
-        default: true
+    openFsUpload: {
+      type: Boolean,
+      default: true
     },
     pageContext: {
       type: Object,
@@ -220,7 +219,7 @@ export default {
       defaultAction = window.$vueApp.config.globalProperties.baseAPI + '/component/super-form/uploads'
     }
     const isMobile = isMobileBrowser()
-    const systemCode = this.pageContext && this.pageContext.systemCode? this.pageContext.systemCode: null
+    const systemCode = this.pageContext && this.pageContext.systemCode ? this.pageContext.systemCode : null
     return {
       deleteUuids: [],
       headers,
@@ -247,9 +246,9 @@ export default {
   mounted() {},
   methods: {
     openAnnexUpload() {
-						if (this.openFsUpload){
-								this.annexUploadFlag = true
-						}
+      if (this.openFsUpload) {
+        this.annexUploadFlag = true
+      }
     },
     handleBeforeUpload(file) {
       let limitFileSize = this.fileSetObj.limitFileSize
@@ -307,15 +306,19 @@ export default {
     preview() {
       this.fileList.length = 0
       const uuids = this.fileInfo.serverPath.split(',')
-      this.$http
-        .post(window.$vueApp.config.globalProperties.baseURL + '/common/fs-upload/search-file-names', uuids)
-        .then((result) => {
-          uuids.forEach((uuid) => {
-            this.fileList.push({ showName: result[uuid], serverPath: uuid })
-          })
-          this.showFileList = this.fileList
-          this.showPreviewMulti = true
+      const baseURL = window.$vueApp.config.globalProperties.baseURL
+      const baseAPI = window.$vueApp.config.globalProperties.baseAPI
+      const tempAction = baseURL + '/common/fs-upload/search-file-names'
+      if (isPlateSys(this.systemCode)) {
+        tempAction = baseAPI + '/api/search-file-names'
+      }
+      this.$http.post(tempAction, uuids).then((result) => {
+        uuids.forEach((uuid) => {
+          this.fileList.push({ showName: result[uuid], serverPath: uuid })
         })
+        this.showFileList = this.fileList
+        this.showPreviewMulti = true
+      })
     },
     previewSingle(fileInfo) {
       fileInfo = packageFile(fileInfo.showName, fileInfo.serverPath)
@@ -402,15 +405,15 @@ export default {
       $emit(this, 'upload-success', this.fileList)
     },
     // 移动端删除附件
-    onRemoveMobile(){
+    onRemoveMobile() {
       console.log('onRemoveMobile-------this.fileList=', this.fileList)
       $emit(this, 'delete', this.fileList)
     },
-    pickFileDone(data){
+    pickFileDone(data) {
       console.log('fs-upload-list------pickFileDone-------data=', data)
       this.$refs.fileUploadRef.pickFileDone(data)
     },
-    uploadFileDone(data){
+    uploadFileDone(data) {
       this.$refs.fileUploadRef.uploadFileDone(data)
     }
   },

package/packages/fs-upload-new/src/file-upload-mobile/file-upload.vue

@@ -205,7 +205,7 @@ if (userAgentOrg.indexOf(' uni-app ') > 0) {
 
 // 点击确定（上传）按钮的回调方法
 function uploadedFile(fileList) {
-    emits('uploadend', fileList)
+  emits('uploadend', fileList)
 }
 function deleteServerFiles() {
   return window.$vueApp.config.globalProperties.$http.post(deleteServerFileUrl, rmFileServerPaths.value)
@@ -249,7 +249,7 @@ function clearTempFile() {
     fileUploadRef.value.clearQueenFile()
   }
 }
-defineExpose({pickFileDone,uploadFileDone})
+defineExpose({ pickFileDone, uploadFileDone })
 </script>
 
 <style lang="scss" scoped></style>

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

@@ -16,11 +16,21 @@
   >
     <el-button size="small" type="primary">{{ placeholder }}</el-button>
     <template #tip>
-      <el-text size="small"> {{ accept }} {{$t('imatrixUIMessage.uploadFileTip',{fileSzie: limitFileSize})}}</el-text>
+      <el-text size="small">
+        {{ accept }} {{ $t('imatrixUIMessage.uploadFileTip', { fileSzie: limitFileSize }) }}</el-text
+      >
     </template>
   </el-upload>
   <template v-if="fileList && fileList.length > 0">
-    <fs-preview-new :disabled="disabled" :file-list="fileList" :system-code="systemCode" :before-remove="beforeRemove" :on-remove="onRemove" :before-download="beforeDownload"/>
+    <fs-preview-new
+      :disabled="disabled"
+      :file-list="fileList"
+      :system-code="systemCode"
+      :before-remove="beforeRemove"
+      :on-remove="onRemove"
+      :before-download="beforeDownload"
+      :downloadable="downloadable"
+    />
   </template>
 </template>
 
@@ -43,6 +53,11 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
+  // 可下载
+  downloadable: {
+    type: Boolean,
+    default: true
+  },
   accept: {
     type: String,
     default: ''
@@ -123,7 +138,13 @@ if (!props.headers || !props.headers['Authorization']) {
 }
 const handleBeforeUpload = (file: File) => {
   const isMobile = false
-  return props.beforeUpload({fileObj: file, files:[file], isMobile, pageContext: props.pageContext, configureObj: props.configure})
+  return props.beforeUpload({
+    fileObj: file,
+    files: [file],
+    isMobile,
+    pageContext: props.pageContext,
+    configureObj: props.configure
+  })
 }
 const onSuccess = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
   // eslint-disable-next-line vue/no-mutating-props

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

@@ -10,7 +10,7 @@
     :headers="headers"
     :action="defaultAction"
     :multiple="multiple"
-				:disabled="!openFsUpload"
+    :disabled="!openFsUpload"
     :before-upload="handleBeforeUpload"
     :before-remove="beforeRemove"
     :on-success="onSuccess"
@@ -18,11 +18,20 @@
     <el-icon class="el-icon--upload"><upload-filled /></el-icon>
     <div class="el-upload__text">{{ placeholder }}</div>
     <template #tip>
-      <el-text size="small"> {{ accept }} {{$t('imatrixUIMessage.uploadFileTip',{fileSzie: limitFileSize})}}</el-text>
+      <el-text size="small">
+        {{ accept }} {{ $t('imatrixUIMessage.uploadFileTip', { fileSzie: limitFileSize }) }}</el-text
+      >
     </template>
   </el-upload>
   <template v-if="fileList && fileList.length > 0">
-    <fs-preview-new :disabled="disabled" :file-list="fileList" :system-code="systemCode"  :before-remove="beforeRemove" :on-remove="onRemove" :before-download="beforeDownload" />
+    <fs-preview-new
+      :disabled="disabled"
+      :file-list="fileList"
+      :system-code="systemCode"
+      :before-remove="beforeRemove"
+      :on-remove="onRemove"
+      :before-download="beforeDownload"
+    />
   </template>
 </template>
 
@@ -34,10 +43,10 @@ import { getToken } from '../../../src/utils/auth'
 import type { UploadFile, UploadFiles } from 'element-plus'
 import fsPreviewNew from './fs-preview-new.vue'
 const props = defineProps({
-		openFsUpload:{
-				type: Boolean,
-				default: true
-		},
+  openFsUpload: {
+    type: Boolean,
+    default: true
+  },
   systemCode: {
     type: String,
     default: ''
@@ -46,6 +55,11 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
+  // 可下载
+  downloadable: {
+    type: Boolean,
+    default: true
+  },
   accept: {
     type: String,
     default: ''

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

@@ -1,7 +1,7 @@
 <template>
-<div>
-  <div v-if="!isMobile">
-    <div v-for="(file, index) in fileList" :key="index" style="width: 100%">
+  <div>
+    <div v-if="!isMobile">
+      <div v-for="(file, index) in fileList" :key="index" style="width: 100%">
         <el-tag>
           <el-tooltip content="预览" placement="top">
             <span style="cursor: pointer" @click="preview(file.showName, file.serverPath)">
@@ -10,7 +10,7 @@
             </span>
           </el-tooltip>
           <el-tooltip v-if="!disabled" content="下载" placement="top">
-            <el-icon  @click="handleDownload(file)">
+            <el-icon @click="handleDownload(file)">
               <Download />
             </el-icon>
           </el-tooltip>
@@ -19,34 +19,26 @@
           </el-tooltip>
         </el-tag>
       </div>
-  </div>
-  <span v-else class="el-upload-list__item-actions mobile-item-action">
-    <span
-      v-if="isPreview(file.showName ? file.showName: file.name)"
-      class="el-upload-list__item-preview"
-      @click="preview(file.showName ? file.showName: file.name, file.serverPath)"
-    >
-      <el-icon><zoom-in /></el-icon>
-    </span>
-    <span
-      v-if="!disabled"
-      class="el-upload-list__item-delete"
-      @click="handleDownload(file)"
-    >
-      <el-icon><Download /></el-icon>
-    </span>
-    <span
-      v-if="!disabled"
-      class="el-upload-list__item-delete"
-      @click="handleOnRemove(file)"
-    >
-      <el-icon><Delete /></el-icon>
+    </div>
+    <span v-else class="el-upload-list__item-actions mobile-item-action">
+      <span
+        v-if="isPreview(file.showName ? file.showName : file.name)"
+        class="el-upload-list__item-preview"
+        @click="preview(file.showName ? file.showName : file.name, file.serverPath)"
+      >
+        <el-icon><zoom-in /></el-icon>
+      </span>
+      <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleDownload(file)">
+        <el-icon><Download /></el-icon>
+      </span>
+      <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleOnRemove(file)">
+        <el-icon><Delete /></el-icon>
+      </span>
     </span>
-  </span>
-  <el-dialog v-model="dialogVisible" title="预览" width="500">
-    <el-image :preview-src-list="previewSrcList" :src="previewImageInfo.src" />
-  </el-dialog>
-</div>
+    <el-dialog v-model="dialogVisible" title="预览" width="500">
+      <el-image :preview-src-list="previewSrcList" :src="previewImageInfo.src" />
+    </el-dialog>
+  </div>
 </template>
 <style scoped>
 /* .el-upload-list--picture-card .el-upload-list__item-actions, */
@@ -69,6 +61,11 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
+  // 可下载
+  downloadable: {
+    type: Boolean,
+    default: true
+  },
   fileList: {
     type: Array<{ showName: string; serverPath: string }>,
     default: () => []
@@ -102,7 +99,7 @@ const props = defineProps({
     default: null
   }
 })
-const baseURL = props.baseURL ? props.baseURL: window.$vueApp.config.globalProperties.baseURL
+const baseURL = props.baseURL ? props.baseURL : window.$vueApp.config.globalProperties.baseURL
 const baseAPI = window.$vueApp.config.globalProperties.baseAPI
 
 const dialogVisible = ref<boolean>(false)
@@ -129,7 +126,7 @@ const handleDownload = (file: any) => {
 }
 const download = (file: any) => {
   const token = getToken()
-  const fileName = file.showName ? file.showName: file.name
+  const fileName = file.showName ? file.showName : file.name
   const showName = fileName.replace('#', '~~').replace('?', '~$').replace('&', '$')
   let url =
     baseURL +
@@ -157,14 +154,16 @@ const handleOnRemove = (file: any) => {
     const isMobile = true
     isCanRemove = props.beforeRemove(props.pageContext, props.configure, file, isMobile)
   }
-  if (isCanRemove!==undefined && !isCanRemove) {
+  if (isCanRemove !== undefined && !isCanRemove) {
     // 不能删除文件
     return
   }
-  const index = props.fileList.findIndex((item: any) => (item.serverPath === file.uuid || item.serverPath === file.serverPath))
+  const index = props.fileList.findIndex(
+    (item: any) => item.serverPath === file.uuid || item.serverPath === file.serverPath
+  )
   console.log('handleOnRemove----props.fileList=', props.fileList, 'index=', index)
   props.fileList.splice(index, 1)
-  emits('remove', {file, index: index})
+  emits('remove', { file, index: index })
   props.onRemove(file)
 }
 
@@ -182,7 +181,7 @@ const preview = (showName: string, serverPath: string) => {
     previewImageInfo.value.src = getPreviewSrc(showName, serverPath)
     const srcList: string[] = []
     props.fileList.forEach((item: any) => {
-      const fileName = item.showName ? item.showName: item.name
+      const fileName = item.showName ? item.showName : item.name
       srcList.push(getPreviewSrc(fileName, item.serverPath))
     })
     previewSrcList.value = srcList
@@ -253,7 +252,7 @@ const formatName = (showName: string) => {
 }
 
 const isPreview = (fileName: string) => {
-  if(isMobile.value){
+  if (isMobile.value) {
     if (fileName && isImage(fileName)) {
       // 移动端时，只能预览图片
       return true

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

@@ -5,8 +5,14 @@
     :row="entity"
     :disabled="disabled"
     :fileInfo="fileInfo"
-		:openFsUpload="openFsUpload"
-    :fileSetObj="{ accept: accept, multiple: multiple, limitFileSize: limitFileSize, limit: limitNum }"
+    :openFsUpload="openFsUpload"
+    :fileSetObj="{
+      accept: accept,
+      multiple: multiple,
+      limitFileSize: limitFileSize,
+      limit: limitNum,
+      downloadable: downloadable
+    }"
     @upload-success="onInputUploadSuccess"
     @delete-success="onInputDeleteSuccess"
   />
@@ -30,7 +36,7 @@
     :beforeDownload="beforeDownload"
     :pageContext="pageContext"
     :configure="configure"
-		:openFsUpload="openFsUpload"
+    :openFsUpload="openFsUpload"
   />
   <fs-drag-upload
     v-else-if="!isMobile && displayType === 'drag'"
@@ -52,7 +58,7 @@
     :beforeDownload="beforeDownload"
     :pageContext="pageContext"
     :configure="configure"
-		:openFsUpload="openFsUpload"
+    :openFsUpload="openFsUpload"
   />
   <FileUploadInputMobile
     v-else-if="isMobile && displayType === 'input'"
@@ -75,13 +81,14 @@
     :beforeDownload="beforeDownload"
     :pageContext="pageContext"
     :configure="configure"
-		:openFsUpload="openFsUpload"
+    :openFsUpload="openFsUpload"
     :componentId="componentId"
     :componentName="componentName"
     :listCode="listCode"
     :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
   />
-  <FileUploadMobile v-else-if="isMobile"
+  <FileUploadMobile
+    v-else-if="isMobile"
     ref="fileUploadRef"
     :disabled="disabled"
     :fileInfo="fileInfo"
@@ -101,7 +108,7 @@
     :beforeDownload="beforeDownload"
     :pageContext="pageContext"
     :configure="configure"
-		:openFsUpload="openFsUpload"
+    :openFsUpload="openFsUpload"
     :componentId="componentId"
     :componentName="componentName"
     :listCode="listCode"
@@ -117,11 +124,12 @@ import FileUploadMobile from './file-upload-mobile/file-upload.vue'
 import FileUploadInputMobile from './file-upload-mobile/file-upload-input.vue'
 import { ref, defineProps } from 'vue'
 import { getReplaceUrlDomain, isMobileBrowser, isPlateSys } from '../../../src/utils/common-util'
+import { Download } from '@element-plus/icons-vue/dist/types'
 const props = defineProps({
-		openFsUpload:{
-				type: Object,
-				default: true
-		},
+  openFsUpload: {
+    type: Object,
+    default: true
+  },
   entity: {
     type: Object,
     default: () => {
@@ -144,6 +152,11 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
+  // 可下载
+  downloadable: {
+    type: Boolean,
+    default: true
+  },
   accept: {
     type: String,
     default: ''
@@ -231,18 +244,27 @@ const props = defineProps({
 })
 const isMobile = ref(isMobileBrowser())
 const pageType = ref(props.pageContext.pageType)
-console.log('附件上传控件---fs-upload-new---isMobile=', isMobile.value, 'pageType=', pageType.value , 'systemCode=', props.systemCode ,'configure=', props.configure, 'props.pageContext=', props.pageContext)
+console.log(
+  '附件上传控件---fs-upload-new---isMobile=',
+  isMobile.value,
+  'pageType=',
+  pageType.value,
+  'systemCode=',
+  props.systemCode,
+  'configure=',
+  props.configure,
+  'props.pageContext=',
+  props.pageContext
+)
 const listFileLabel = ref<string>('')
 if (props.displayType === 'input') {
   listFileLabel.value = props.fileInfo.showName || ''
 }
-let limitNum = ref(null)
-if(props.limit){
+let limitNum = ref(1)
+if (props.limit) {
   limitNum.value = props.limit
-} else if(props.multiple){
+} else if (props.multiple) {
   limitNum.value = 9
-} else {
-  limitNum.value = 1
 }
 const onInputUploadSuccess = (res: any) => {
   if (listFileLabel.value) {
@@ -274,11 +296,11 @@ const onInputDeleteSuccess = (res: any) => {
 }
 
 function uploadendMobile(fileList) {
-  const fileServerPaths = Array.from(props.fileList,({serverPath})=>serverPath)
+  const fileServerPaths = Array.from(props.fileList, ({ serverPath }) => serverPath)
   // console.log('uploadendMobile---props.fileList=', props.fileList,'fileServerPaths=',fileServerPaths, 'fileList=', fileList)
-  fileList.forEach(file=>{
+  fileList.forEach((file) => {
     // 如果已经存在就不要重复添加到fileList中了
-    if(fileServerPaths.indexOf(file.serverPath) < 0){
+    if (fileServerPaths.indexOf(file.serverPath) < 0) {
       props.fileList.push({
         showName: file.name,
         serverPath: file.serverPath
@@ -288,11 +310,10 @@ function uploadendMobile(fileList) {
   props.onSuccess()
 }
 
-
 function removeMobileFile(param) {
   // console.log('removeMobileFile---props.fileList=', props.fileList, 'param=', param)
   const deleteFile = param.rmFiles && param.rmFiles.length > 0 ? param.rmFiles[0] : null
-  if(deleteFile){
+  if (deleteFile) {
     let index = props.fileList.findIndex((item: any) => item.serverPath === deleteFile.serverPath)
     if (index > -1) {
       // eslint-disable-next-line vue/no-mutating-props
@@ -302,9 +323,8 @@ function removeMobileFile(param) {
   props.onRemove()
 }
 
-
-const userAgent = ref(null)
-const fileUploadRef = ref(null)
+const userAgent = ref<string | null>(null)
+const fileUploadRef = ref()
 const userAgentOrg = navigator.userAgent
 if (userAgentOrg.indexOf(' uni-app ') > 0) {
   // 表示uni-app中访问的
@@ -325,5 +345,5 @@ function uploadFileDone(data) {
     fileUploadRef.value.uploadFileDone(data)
   }
 }
-defineExpose({pickFileDone,uploadFileDone})
+defineExpose({ pickFileDone, uploadFileDone })
 </script>