agilebuilder-ui 1.0.71 → 1.0.73

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

@@ -1,6 +1,6 @@
 <template>
   <FsUploadList
-    v-if="displayType === 'input'"
+    v-if="!isMobile && displayType === 'input'"
     :value="props.fileInfo.showName"
     :row="entity"
     :disabled="disabled"
@@ -11,7 +11,7 @@
     @delete-success="onInputDeleteSuccess"
   />
   <fs-button-upload
-    v-else-if="displayType === 'button'"
+    v-else-if="!isMobile && displayType === 'button'"
     :disabled="disabled"
     :fileInfo="fileInfo"
     :systemCode="systemCode"
@@ -23,17 +23,17 @@
     :action="action"
     :headers="headers"
     :file-list="fileList"
-    :handleBeforeUpload="handleBeforeUpload"
+    :beforeUpload="beforeUpload"
     :onSuccess="onSuccess"
     :beforeRemove="beforeRemove"
     :onRemove="onRemove"
     :beforeDownload="beforeDownload"
     :pageContext="pageContext"
     :configure="configure"
-				:openFsUpload="openFsUpload"
+		:openFsUpload="openFsUpload"
   />
   <fs-drag-upload
-    v-else-if="displayType === 'drag'"
+    v-else-if="!isMobile && displayType === 'drag'"
     :disabled="disabled"
     :fileInfo="fileInfo"
     :systemCode="systemCode"
@@ -45,20 +45,68 @@
     :action="action"
     :headers="headers"
     :file-list="fileList"
-    :handleBeforeUpload="handleBeforeUpload"
+    :beforeUpload="beforeUpload"
     :onSuccess="onSuccess"
     :beforeRemove="beforeRemove"
     :onRemove="onRemove"
     :beforeDownload="beforeDownload"
     :pageContext="pageContext"
     :configure="configure"
-				:openFsUpload="openFsUpload"
+		:openFsUpload="openFsUpload"
+  />
+  <FileUploadInputMobile
+    v-else-if="isMobile && displayType === 'input'"
+    :disabled="disabled"
+    :fileInfo="fileInfo"
+    :systemCode="systemCode"
+    :accept="accept"
+    :multiple="multiple"
+    :limit="limit"
+    :limitFileSize="limitFileSize"
+    :placeholder="placeholder"
+    :action="action"
+    :headers="headers"
+    :file-list="fileList"
+    :beforeUpload="beforeUpload"
+    :onSuccess="onSuccess"
+    :beforeRemove="beforeRemove"
+    :onRemove="onRemove"
+    :beforeDownload="beforeDownload"
+    :pageContext="pageContext"
+    :configure="configure"
+		:openFsUpload="openFsUpload"
+  />
+  <FileUploadMobile v-else-if="isMobile"
+    :disabled="disabled"
+    :fileInfo="fileInfo"
+    :systemCode="systemCode"
+    :accept="accept"
+    :multiple="multiple"
+    :limit="limit"
+    :limitFileSize="limitFileSize"
+    :placeholder="placeholder"
+    :action="action"
+    :headers="headers"
+    :file-list="fileList"
+    :beforeUpload="beforeUpload"
+    :onSuccess="onSuccess"
+    :beforeRemove="beforeRemove"
+    :onRemove="onRemove"
+    :beforeDownload="beforeDownload"
+    :pageContext="pageContext"
+    :configure="configure"
+		:openFsUpload="openFsUpload"
+    @uploadend="uploadendMobile"
+    @remove="removeMobileFile"
   />
 </template>
 <script setup lang="ts">
 import FsDragUpload from './fs-drag-upload.vue'
 import FsButtonUpload from './fs-button-upload.vue'
+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'
 const props = defineProps({
 		openFsUpload:{
 				type: Object,
@@ -118,7 +166,7 @@ const props = defineProps({
     type: Array<{ showName: string; serverPath: string }>,
     default: () => []
   },
-  handleBeforeUpload: {
+  beforeUpload: {
     type: Function,
     default: () => {}
   },
@@ -147,6 +195,9 @@ const props = defineProps({
     default: () => ({})
   }
 })
+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)
 const listFileLabel = ref<string>('')
 if (props.displayType === 'input') {
   listFileLabel.value = props.fileInfo.showName || ''
@@ -179,4 +230,33 @@ const onInputDeleteSuccess = (res: any) => {
   listFileLabel.value = props.fileList.map((item: any) => item.showName).join(',')
   props.onRemove()
 }
+
+function uploadendMobile(fileList) {
+  const fileServerPaths = Array.from(props.fileList,({serverPath})=>serverPath)
+  // console.log('uploadendMobile---props.fileList=', props.fileList,'fileServerPaths=',fileServerPaths, 'fileList=', fileList)
+  fileList.forEach(file=>{
+    // 如果已经存在就不要重复添加到fileList中了
+    if(fileServerPaths.indexOf(file.serverPath) < 0){
+      props.fileList.push({
+        showName: file.name,
+        serverPath: file.serverPath
+      })
+    }
+  })
+  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){
+    let index = props.fileList.findIndex((item: any) => item.serverPath === deleteFile.serverPath)
+    if (index > -1) {
+      // eslint-disable-next-line vue/no-mutating-props
+      props.fileList.splice(index, 1)
+    }
+  }
+  props.onRemove()
+}
 </script>

package/src/api/sso-service.js

@@ -220,7 +220,7 @@ function getDevPlatformPermissions(roleCodes) {
 
 
 function getCurrentUserMobilePermissions (loginName) {
-  return request.get(Vue.prototype.baseAPI + '/sso/current-users/mobile-permissions?loginName=' + encodeURI(loginName) + '&_t=' + new Date().getTime())
+  return request.get(window.$vueApp.config.globalProperties.baseAPI + '/sso/current-users/mobile-permissions?loginName=' + encodeURI(loginName) + '&_t=' + new Date().getTime())
 }
 
 export default {

package/src/i18n/langs/cn.js

@@ -259,6 +259,8 @@ const cn = {
         operating: '操作',
         uploadSucceeded: '上传成功',
         theNumberOfUploadsExceedsTheLimitTheLimitIs: '上传数量超过限制,限制数量为',
+        image: '图片',
+        video: '视频'
     },
     messageVideo: {
         attemptingToIdentify: '正在尝试识别....',

package/src/i18n/langs/en.js

@@ -269,6 +269,8 @@ const en = {
         uploadSucceeded: 'Upload succeeded',
         theNumberOfUploadsExceedsTheLimitTheLimitIs:
             'The number of uploads exceeds the limit. The limit is',
+        image: 'Image',
+        video: 'Video'
     },
     messageVideo: {
         attemptingToIdentify: 'Attempting to identify',

package/src/utils/common-util.js

@@ -535,12 +535,12 @@ function isOpenMobileGateway () {
 export function getReplaceUrlDomain (url) {
   const isOpenMobileGatewayCache = isOpenMobileGateway()
   console.log('===getReplaceUrlDomain==isOpenMobileGatewayCache=', isOpenMobileGatewayCache)
-  if (isOpenMobileGatewayCache === 'true' && url !== undefined && Vue.prototype.replaceUrl) {
+  if (isOpenMobileGatewayCache === 'true' && url !== undefined && window.$vueApp.config.globalProperties.replaceUrl) {
     // 表示需要替换url中的"https://域名"
-    const baseApi = Vue.prototype.baseAPI
-    if ((url + '').indexOf(Vue.prototype.replaceUrl + '/') < 0 && (url + '').indexOf('://') > 0) {
+    const baseApi = uswindow.$vueApp.config.globalProperties.baseAPI
+    if ((url + '').indexOf(uswindow.$vueApp.config.globalProperties.replaceUrl + '/') < 0 && (url + '').indexOf('://') > 0) {
       // 表示路径还未替换
-      console.log('===getReplaceUrlDomain==url.indexOf(Vue.prototype.replaceUrl) !== 0')
+      console.log('===getReplaceUrlDomain==url.indexOf(uswindow.$vueApp.config.globalProperties.replaceUrl) !== 0')
       const prefixUrl1 = baseApi.substring(0, baseApi.indexOf('://'))
       const urlSuffix1 = baseApi.substring(baseApi.indexOf('://') + 3)
       const domainUrl1 = urlSuffix1.substring(0, urlSuffix1.indexOf('/'))
@@ -551,7 +551,7 @@ export function getReplaceUrlDomain (url) {
       const prefixUrl = prefixUrl2 + '://' + domainUrl2
       if (prefixUrl === prefixUrlBase) {
         urlSuffix = urlSuffix.substring(urlSuffix.indexOf('/'))
-        url = Vue.prototype.replaceUrl + urlSuffix
+        url = uswindow.$vueApp.config.globalProperties.replaceUrl + urlSuffix
         console.log('===getReplaceUrlDomain==url=', url)
       }
     } else {

package/src/views/layout/EmptyLayout.vue

@@ -1,3 +1,46 @@
 <template>
   <router-view />
 </template>
+<script>
+import eventBus from '../../../src/utils/eventBus'
+export default {
+  created(){
+    window.addEventListener('message', this.receiveMessage, false)
+  },
+  destroyed () {
+    window.removeEventListener('message', this.receiveMessage, false)
+  },
+  methods: {
+    receiveMessage (event) {
+      const result = event.data
+      console.log('receiveMessage-----result111=', result)
+      if (result && typeof result === 'string') {
+        console.log('receiveMessage-----result2222=', result)
+        // console.log('接收手机端传过来的信息--receiveMessage===', result)
+        try {
+          const data = JSON.parse(result)
+          // console.log('接收手机端传过来的信息--data=', data)
+          const type = data.type // 'pickFileDone' 选择文件完成,'uploadFileDone' 上传文件完成
+          console.log('receiveMessage-----result3333=', type, 'data.files=', data.files)
+          // console.log('接收手机端传过来的信息--type=', type)
+          if (type && type === 'onResize') {
+            // 横竖屏切换时重新计算高度
+            eventBus.$emit('onResize')
+          } else if (type && type === 'pickFileDone') {
+            // 选择文件完成
+            console.log('receiveMessage-----result4444=', type)
+            // fileNames:[{name:'xx',base64Path:'xxx'},{name:'xxx',base64Path:'xxxxx'}]
+            eventBus.$emit('pickFileDone', data)
+          } else if (type && type === 'uploadFileDone') {
+            eventBus.$emit('uploadFileDone', data)
+          } else if (type && type === 'scan') {
+            eventBus.$emit('scan', data)
+          }
+        } catch (error) {
+          console.log(error)
+        }
+      }
+    }
+  }
+}
+</script>

package/src/views/layout/Layout.vue

@@ -17,6 +17,7 @@
 import { Sidebar, AppMain, Breadcrumb } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
 import { isShowMenuRoute } from '../../../src/utils/common-util'
+import eventBus from '../../../src/utils/eventBus'
 
 export default {
   name: 'Layout',
@@ -49,10 +50,46 @@ export default {
       }
     },
   },
+  created(){
+    window.addEventListener('message', this.receiveMessage, false)
+  },
+  destroyed () {
+    window.removeEventListener('message', this.receiveMessage, false)
+  },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('closeSidebar', { withoutAnimation: false })
     },
+    receiveMessage (event) {
+      const result = event.data
+      console.log('receiveMessage-----result111=', result)
+      if (result && typeof result === 'string') {
+        console.log('receiveMessage-----result2222=', result)
+        // console.log('接收手机端传过来的信息--receiveMessage===', result)
+        try {
+          const data = JSON.parse(result)
+          // console.log('接收手机端传过来的信息--data=', data)
+          const type = data.type // 'pickFileDone' 选择文件完成,'uploadFileDone' 上传文件完成
+          console.log('receiveMessage-----result3333=', type, 'data.files=', data.files)
+          // console.log('接收手机端传过来的信息--type=', type)
+          if (type && type === 'onResize') {
+            // 横竖屏切换时重新计算高度
+            eventBus.$emit('onResize')
+          } else if (type && type === 'pickFileDone') {
+            // 选择文件完成
+            console.log('receiveMessage-----result4444=', type)
+            // fileNames:[{name:'xx',base64Path:'xxx'},{name:'xxx',base64Path:'xxxxx'}]
+            eventBus.$emit('pickFileDone', data)
+          } else if (type && type === 'uploadFileDone') {
+            eventBus.$emit('uploadFileDone', data)
+          } else if (type && type === 'scan') {
+            eventBus.$emit('scan', data)
+          }
+        } catch (error) {
+          console.log(error)
+        }
+      }
+    }
   },
 }
 </script>