agilebuilder-ui 1.0.72 → 1.0.74-tmp1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.72",
+  "version": "1.0.74-tmp1",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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/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>