agilebuilder-ui 1.0.75 → 1.0.76

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

@@ -25,7 +25,7 @@
         multiple="multiple"
         :capture="'environment'"
         name="file"
-        :accept="accept"
+        :accept="myAccept"
         style="display: none"
         @change="uploadFiles"
       />
@@ -36,7 +36,7 @@
         :capture="'environment'"
         name="file"
         style="display: none"
-        :accept="accept"
+        :accept="myAccept"
         @change="uploadFiles"
       />
     </template>
@@ -47,7 +47,7 @@
         type="file"
         multiple="multiple"
         name="file"
-        :accept="accept"
+        :accept="myAccept"
         style="display: none"
         @change="uploadFiles"
       />
@@ -57,7 +57,7 @@
         type="file"
         name="file"
         style="display: none"
-        :accept="accept"
+        :accept="myAccept"
         @change="uploadFiles"
       />
     </template>
@@ -264,7 +264,7 @@ function removeFile(param) {
     emits('remove', { rmFiles: [file], serverFiles: fileListResult.value, index: param.index })
   }
 }
-function pickBrowserFiles(grid) {
+function pickBrowserFiles() {
   if (props.openCameraOrChoosePhoto && props.openCameraOrChoosePhoto === 'openCamera') {
     // 只打开相机
     myAccept.value = 'image/*'
@@ -324,7 +324,7 @@ async function uploadBrowserFile() {
       if (props.beforeUpload && typeof props.beforeUpload === 'function') {
         const isMobile = true
         // eslint-disable-next-line no-useless-call
-        isCanUpload = props.beforeUpload({fileObj, selectFiles, files:selectFiles, isMobile, pageContext: props.pageContext, configureObj: props.configure})
+        isCanUpload = props.beforeUpload({fileObj, files:selectFiles, isMobile, pageContext: props.pageContext, configureObj: props.configure})
       }
     }
   }

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

@@ -80,19 +80,6 @@ let baseURL = props.baseURL
 
 const baseAPI = window.$vueApp.config.globalProperties.baseAPI
 
-// const handleRemove = (file: Object) => {
-//   console.log(file)
-// }
-
-// const handlePictureCardPreview = (file: Object) => {
-//   dialogImageUrl.value = file.url!
-//   dialogVisible.value = true
-  
-// }
-
-// const handleDownload = (file: Object) => {
-//   console.log(file)
-// }
 const fileListResult = ref(props.fileList)
 console.log('file-upload-component---fileListResult=', fileListResult.value)
 function changeFileList(fileList: any) {

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

@@ -21,6 +21,7 @@
         @close="annexUploadFlag=false"
       >
         <FileUploadMobile
+           ref="fileUploadRef"
           :disabled="disabled"
           :fileInfo="fileInfo"
           :systemCode="systemCode"
@@ -40,6 +41,11 @@
           :pageContext="pageContext"
           :configure="configure"
           :openFsUpload="openFsUpload"
+          :componentId="componentId"
+          :componentName="componentName"
+          :listCode="listCode"
+          :options="options"
+          :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
           @uploadend="uploadendMobile"
           @remove="removeMobileFile"
         />
@@ -186,7 +192,7 @@ const openAnnexUpload = ()=>{
 
 function uploadendMobile(fileList) {
   const fileServerPaths = Array.from(props.fileList,({serverPath})=>serverPath)
-  // console.log('uploadendMobile---props.fileList=', props.fileList,'fileServerPaths=',fileServerPaths, 'fileList=', fileList)
+  console.log('uploadendMobile---props.fileList=', JSON.stringify(props.fileList),'fileServerPaths=',fileServerPaths, 'fileList=', JSON.stringify(fileList))
   fileList.forEach(file=>{
     // 如果已经存在就不要重复添加到fileList中了
     if(fileServerPaths.indexOf(file.serverPath) < 0){
@@ -196,7 +202,9 @@ function uploadendMobile(fileList) {
       })
     }
   })
+  console.log('uploadendMobile2222---props.fileList=', JSON.stringify(props.fileList),'fileServerPaths=',fileServerPaths, 'fileList=', JSON.stringify(fileList))
   fileNames.value =props.fileList.map((item: any) => item.showName).join(',')
+  console.log('uploadendMobile3333---fileNames.value=', fileNames.value)
   props.onSuccess()
 }
 
@@ -215,6 +223,29 @@ function removeMobileFile(param) {
   props.onRemove()
 }
 
+const userAgent = ref(null)
+const fileUploadRef = ref(null)
+const userAgentOrg = navigator.userAgent
+if (userAgentOrg.indexOf(' uni-app ') > 0) {
+  // 表示uni-app中访问的
+  userAgent.value = 'app'
+} else {
+  // 表示手机浏览器访问的
+  userAgent.value = 'browser'
+}
+// 移动端选择文件结束
+function pickFileDone(data) {
+  if (userAgent.value === 'app') {
+    fileUploadRef.value.pickFileDone(data)
+  }
+}
+// 移动端上传文件结束
+function uploadFileDone(data) {
+  if (userAgent.value === 'app') {
+    fileUploadRef.value.uploadFileDone(data)
+  }
+}
+defineExpose({pickFileDone,uploadFileDone})
 </script>
 
 <style lang="scss" scoped></style>

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

@@ -1,30 +1,41 @@
 <template>
   <div>
-    <!-- <file-upload-app
+    <file-upload-app
       v-if="userAgent === 'app'"
       ref="fileUploadRef"
-      :file-lis="fileList"
-      :system-code="systemCode"
+      :file-list="fileList"
       :multiple="multiple"
       :disabled="disabled"
-      :limit-file-size="limitFileSize"
-      :component-id="componentId"
-      :component-name="componentName"
+      :fileInfo="fileInfo"
+      :systemCode="systemCode"
+      :accept="accept"
+      :limit="limit"
+      :limitFileSize="limitFileSize"
+      :placeholder="placeholder"
+      :action="action"
+      :headers="headers"
+      :beforeUpload="beforeUpload"
+      :onSuccess="onSuccess"
+      :beforeRemove="beforeRemove"
+      :onRemove="onRemove"
+      :beforeDownload="beforeDownload"
+      :pageContext="pageContext"
+      :configure="configure"
+      :openFsUpload="openFsUpload"
+      :componentId="componentId"
+      :componentName="componentName"
+      :listCode="listCode"
       :options="options"
-      :list-code="listCode"
+      :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
       @uploadend="uploadedFile"
       @remove="removeFile"
-      @pickup-file="pickupFiles"
-      @close="$emit('close')"
-    /> -->
-      <!-- v-if="userAgent === 'browser'" -->
+    />
     <file-upload-browser
+      v-else-if="userAgent === 'browser'"
       ref="fileUploadRef"
       :file-list="fileList"
       :multiple="multiple"
       :disabled="disabled"
-      :open-camera-or-choose-photo="openCameraOrChoosePhoto"
-      :options="options"
       :fileInfo="fileInfo"
       :systemCode="systemCode"
       :accept="accept"
@@ -41,7 +52,11 @@
       :pageContext="pageContext"
       :configure="configure"
       :openFsUpload="openFsUpload"
-      @pickup-file="pickupFiles"
+      :componentId="componentId"
+      :componentName="componentName"
+      :listCode="listCode"
+      :options="options"
+      :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
       @uploadend="uploadedFile"
       @remove="removeFile"
     />
@@ -51,7 +66,7 @@
 import { ref, defineEmits } from 'vue'
 import { ElMessage } from 'element-plus'
 import { useI18n } from 'vue-i18n'
-// import FileUploadApp from './file-upload-app.vue'
+import FileUploadApp from './file-upload-app.vue'
 import FileUploadBrowser from './file-upload-browser.vue'
 import apis from './api.js'
 
@@ -223,10 +238,6 @@ function removeFile({ rmFiles, serverFiles, newFiles }) {
     emits('remove', { rmFiles, serverFiles, newFiles })
   }
 }
-// 选择文件之后的事件
-function pickupFiles(files) {
-  emits('pickup-file', files)
-}
 // 移动端选择文件结束
 function pickFileDone(data) {
   if (userAgent.value === 'app') {
@@ -244,6 +255,7 @@ function clearTempFile() {
     fileUploadRef.value.clearQueenFile()
   }
 }
+defineExpose({pickFileDone,uploadFileDone})
 </script>
 
 <style lang="scss" scoped></style>

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

@@ -122,7 +122,8 @@ if (!props.headers || !props.headers['Authorization']) {
   props.headers.Authorization = getToken()
 }
 const handleBeforeUpload = (file: File) => {
-  return props.beforeUpload(file)
+  const isMobile = false
+  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-upload-new.vue

@@ -56,6 +56,7 @@
   />
   <FileUploadInputMobile
     v-else-if="isMobile && displayType === 'input'"
+    ref="fileUploadRef"
     :disabled="disabled"
     :fileInfo="fileInfo"
     :systemCode="systemCode"
@@ -75,8 +76,14 @@
     :pageContext="pageContext"
     :configure="configure"
 		:openFsUpload="openFsUpload"
+    :componentId="componentId"
+    :componentName="componentName"
+    :listCode="listCode"
+    :options="options"
+    :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
   />
   <FileUploadMobile v-else-if="isMobile"
+    ref="fileUploadRef"
     :disabled="disabled"
     :fileInfo="fileInfo"
     :systemCode="systemCode"
@@ -96,6 +103,11 @@
     :pageContext="pageContext"
     :configure="configure"
 		:openFsUpload="openFsUpload"
+    :componentId="componentId"
+    :componentName="componentName"
+    :listCode="listCode"
+    :options="options"
+    :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
     @uploadend="uploadendMobile"
     @remove="removeMobileFile"
   />
@@ -193,6 +205,34 @@ const props = defineProps({
   configure: {
     type: Object,
     default: () => ({})
+  },
+  // 组件id，在表单或列表中应该唯一，一般传字段名即可
+  componentId: {
+    type: String,
+    default: function () {
+      return 'file-upload'
+    }
+  },
+  // 组件名称，一般是字段label
+  componentName: {
+    type: String,
+    default: function () {
+      return 'file-upload'
+    }
+  },
+  options: {
+    type: Object,
+    default: null
+  },
+  // 列表编码
+  listCode: {
+    type: String,
+    default: null
+  },
+  // 打开相机和相册选项，默认是都可以打开
+  openCameraOrChoosePhoto: {
+    type: String,
+    default: 'openCameraAndChoosePhoto'
   }
 })
 const isMobile = ref(isMobileBrowser())
@@ -259,4 +299,29 @@ function removeMobileFile(param) {
   }
   props.onRemove()
 }
+
+
+const userAgent = ref(null)
+const fileUploadRef = ref(null)
+const userAgentOrg = navigator.userAgent
+if (userAgentOrg.indexOf(' uni-app ') > 0) {
+  // 表示uni-app中访问的
+  userAgent.value = 'app'
+} else {
+  // 表示手机浏览器访问的
+  userAgent.value = 'browser'
+}
+// 移动端选择文件结束
+function pickFileDone(data) {
+  if (userAgent.value === 'app') {
+    fileUploadRef.value.pickFileDone(data)
+  }
+}
+// 移动端上传文件结束
+function uploadFileDone(data) {
+  if (userAgent.value === 'app') {
+    fileUploadRef.value.uploadFileDone(data)
+  }
+}
+defineExpose({pickFileDone,uploadFileDone})
 </script>

package/packages/super-grid/src/custom-formatter.js

@@ -379,6 +379,7 @@ const customFormatter = {
             null,
             parentFormData
         ).then((openPageParams) => {
+            console.log('doClickHyperLink----openPageParams----', openPageParams)
             if (openPageParams) {
                 // 点击列表组件中某元素弹出的页面
                 if (

package/packages/super-grid/src/super-grid.vue

@@ -2965,14 +2965,14 @@ export default {
       const popPageSetting = openPageParams
       if(this.pageContext){
         // 新页面设计组件中弹框或刷新区域时
-        if (jumpMode === 'popup' || jumpMode === 'refresh') {
+        const isMobile = this.isMobile
+        if (jumpMode === 'popup' || jumpMode === 'refresh' || (isMobile && jumpMode === 'newTab')) {
           // 弹出页面
           const gridParams = store.get(this.code)
           this.jumpPageSetting = popPageSetting
           const isSubTableShowPage = gridParams.isSubTableShowPage
           // 每页显示多少条
           const pageSize = gridParams.pagination && gridParams.pagination.pageSize
-          const isMobile = this.isMobile
           const row = popPageSetting.row
           const eventParams = {
             position: popPageSetting._position,

package/src/api/sso-service.js

@@ -61,6 +61,7 @@ function logout() {
 }
 
 function getCurrentUserPermissionsBySystem(loginName, systemCode) {
+  console.log('getCurrentUserPermissionsBySystem----loginName=', loginName, isMobileBrowser())
   if(isMobileBrowser()){
     return getCurrentUserMobilePermissions(loginName)
   } else {
@@ -220,7 +221,9 @@ function getDevPlatformPermissions(roleCodes) {
 
 
 function getCurrentUserMobilePermissions (loginName) {
-  return request.get(Vue.prototype.baseAPI + '/sso/current-users/mobile-permissions?loginName=' + encodeURI(loginName) + '&_t=' + new Date().getTime())
+  
+  console.log('getCurrentUserMobilePermissions----loginName=', loginName, 'window.$vueApp.config.globalProperties.baseAPI=', window.$vueApp.config.globalProperties.baseAPI)
+  return request.get(window.$vueApp.config.globalProperties.baseAPI + '/sso/current-users/mobile-permissions?loginName=' + encodeURI(loginName) + '&_t=' + new Date().getTime())
 }
 
 export default {

package/src/store/modules/user.js

@@ -81,6 +81,7 @@ const user = {
     },
     // 登录
     loginWithValidateCode({ commit }, userInfo) {
+      console.log('loginWithValidateCode----userInfo=', userInfo)
       const username = userInfo.username.trim()
       return new Promise((resolve, reject) => {
         ssoService
@@ -92,6 +93,7 @@ const user = {
             userInfo.imageCodeKey
           )
           .then((data) => {
+            console.log('loginWithValidateCode2222----data=', data)
             // const data = response.data
             setToken(data.jwt)
             setLanguage(data.language)

package/src/utils/jump-page-utils.js

@@ -658,8 +658,14 @@ function jumpWithSuperPage(
         const popPageSetting = {
           _path: path,
           pageCode: pageCode,
-          customSystem: system.code
+          customSystem: system.code,
+          jumpMode: jumpMode
         }
+        console.log(
+          '----jumpWithSuperPage---',
+          isMobile,
+          popPageSetting
+        )
       if(!isMobile){
         // 不是移动端时直接open打开pc新页签
         window.open(path)

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>