agilebuilder-ui 1.0.74 → 1.0.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.74",
+  "version": "1.0.76",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",
@@ -25,6 +25,7 @@
   "devDependencies": {
     "@element-plus/icons-vue": "^2.1.0",
     "@vitejs/plugin-vue": "^4.2.3",
+    "axios": "^1.5.1",
     "element-plus": "^2.4.1",
     "nprogress": "^0.2.0",
     "sass": "^1.69.4",

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

@@ -244,6 +244,7 @@ function removeFile(param) {
     emits('remove', { rmFiles: [file], serverFiles: fileListResult.value, index: param.index })
   }
 }
+defineExpose({pickFileDone,uploadFileDone})
 </script>
 
 <style lang="scss" scoped></style>

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

@@ -6,8 +6,6 @@
       :file-list="fileList"
       :multiple="multiple"
       :disabled="disabled"
-      :open-camera-or-choose-photo="openCameraOrChoosePhoto"
-      :options="options"
       :fileInfo="fileInfo"
       :systemCode="systemCode"
       :accept="accept"
@@ -24,6 +22,11 @@
       :pageContext="pageContext"
       :configure="configure"
       :openFsUpload="openFsUpload"
+      :componentId="componentId"
+      :componentName="componentName"
+      :listCode="listCode"
+      :options="options"
+      :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
       @uploadend="uploadedFile"
       @remove="removeFile"
     />
@@ -33,8 +36,6 @@
       :file-list="fileList"
       :multiple="multiple"
       :disabled="disabled"
-      :open-camera-or-choose-photo="openCameraOrChoosePhoto"
-      :options="options"
       :fileInfo="fileInfo"
       :systemCode="systemCode"
       :accept="accept"
@@ -51,6 +52,11 @@
       :pageContext="pageContext"
       :configure="configure"
       :openFsUpload="openFsUpload"
+      :componentId="componentId"
+      :componentName="componentName"
+      :listCode="listCode"
+      :options="options"
+      :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
       @uploadend="uploadedFile"
       @remove="removeFile"
     />

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/permission.js

@@ -8,17 +8,17 @@ import { ElMessage as Message } from 'element-plus'
 import * as Vue from 'vue'
 import authApi from './utils/auth-api'
 
-import {cacheAllLanguagesUtil, getLocaleByLang, cacheCurrentLanguageUtil} from './utils/common-util'
+import { cacheAllLanguagesUtil, getLocaleByLang, cacheCurrentLanguageUtil } from './utils/common-util'
 
 // 首次加载业务系统时，获得用户的语言
 function initUserLanguage() {
   return new Promise((resolve, reject) => {
-      cacheCurrentLanguageUtil(window.$http).then((lang) => {
-              const locale = getLocaleByLang(lang)
-              // i18n.locale = locale // 关键语句
-              window.$locale = locale
-              resolve()
-          })
+    cacheCurrentLanguageUtil(window.$http).then((lang) => {
+      const locale = getLocaleByLang(lang)
+      // i18n.locale = locale // 关键语句
+      window.$locale = locale
+      resolve()
+    })
   })
 }
 
@@ -27,13 +27,7 @@ function cacheAllLanguages() {
   return cacheAllLanguagesUtil(window.$http)
 }
 
-const whiteList = [
-  '/login',
-  '/update-password',
-  '/forget-password',
-  '/reset-password',
-  '/redirect',
-] // 不重定向白名单
+const whiteList = ['/login', '/update-password', '/forget-password', '/reset-password', '/redirect'] // 不重定向白名单
 
 let devpJWTKey = '_devpJWT'
 let runDevpJWTKey = '_runDevpJWT'
@@ -59,12 +53,12 @@ router.beforeEach((to, from, next) => {
   let token
   // 是否是开发环境功能
   let isDevp = isDevpSystem()
-  if(authApi.getSessionCache(runDevpJWTKey)) {
+  if (authApi.getSessionCache(runDevpJWTKey)) {
     // setToken(authApi.getSessionCache(runDevpJWTKey))
     token = authApi.getSessionCache(runDevpJWTKey)
     console.log('router.beforeEach-authApi.getSessionCache(_runDevpJWT)=', authApi.getSessionCache(runDevpJWTKey))
   }
-  if(!token) {
+  if (!token) {
     token = getToken()
   }
   console.log('router.beforeEach-token=', token)
@@ -83,10 +77,15 @@ router.beforeEach((to, from, next) => {
       setToken(token)
     }
   }
-  if (to.query && to.query._systemName_) {
-    // 表示需要设置浏览器页签名
-    window.top.document.title = to.query._systemName_
-  }
+  // if (to.query) {
+  //   if (to.query._systemName_) {
+  //     window.top.document.title = to.query._systemName_
+  //   }
+  //   if (to.query.customSystem) {
+  //     window.$vueApp.config.globalProperties.currentSystem = to.query.customSystem
+  //   }
+  //   // 表示需要设置浏览器页签名
+  // }
   // console.log('router.beforeEach-getToken()=', token)
   // 表示需要显示菜单。为了控制是否需要走获得有权限的菜单集合的接口。单点登录跳转到表单页面时不需要请求菜单，提高页面显示速度。
   let isNeedMenu
@@ -100,14 +99,9 @@ router.beforeEach((to, from, next) => {
   }
   console.log('iMatrix-router.beforeEach2-isNeedMenu==', isNeedMenu)
   if (
-      ([
-            '/update-password',
-            '/forget-password',
-            '/reset-password',
-            '/redirect',
-          ].indexOf(to.path) === -1 ||
-          store.getters.whiteList.indexOf(to.path) !== -1) &&
-      token
+    (['/update-password', '/forget-password', '/reset-password', '/redirect'].indexOf(to.path) === -1 ||
+      store.getters.whiteList.indexOf(to.path) !== -1) &&
+    token
   ) {
     if (to.path === '/login') {
       next({ path: '/', query: to.query })
@@ -115,104 +109,99 @@ router.beforeEach((to, from, next) => {
     } else {
       console.log('router.beforeEach-to.path!=login')
       if (store.getters.name === '') {
+        if (to.query) {
+          if (to.query._systemName_) {
+            window.top.document.title = to.query._systemName_
+          }
+          if (to.query.customSystem && to.query.customSystem !== 'undefined' && to.query.customSystem !== 'null') {
+            window.$vueApp.config.globalProperties.currentSystem = to.query.customSystem
+          }
+          // 表示需要设置浏览器页签名
+        }
         // 表示刷新了页面（例如点击了一级菜单）后，会重新走该方法
         console.log('router.beforeEach-store.getters.name === ""')
         store
-            .dispatch('isLoginTimeOut')
-            .then((result) => {
-              if (result === true) {
-                store.dispatch('clearToken').then(() => {
-                  next({ path: '/', replace: true })
-                  NProgress.done()
-                })
-              } else {
-                store
-                    .dispatch('getCurrentUser')
-                    .then((user) => {
-                      return new Promise((resolve, reject) => {
-                        initUserLanguage().then(()=>{
-                          resolve(user)
-                        })
-                      })
-                    }).then((user)=>{
-                      return new Promise((resolve, reject) => {
-                        cacheAllLanguages().then(()=>{
-                          resolve(user)
-                        })
-                      })
-                    }).then((user)=>{
-                      console.log('router.beforeEach-getCurrentUser')
-                      const devpRoleCodes = authApi.getSessionCache(runCurrentRoleKey)
-                      if(!isDevp && devpRoleCodes){
-                          // 表示是开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码，对应运行平台的岗位编码
-                      // console.log('开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码时，!isDevp && devpRoleCodes')
-                          return store.dispatch(
-                            'getDevPlatformPermissions',
-                            devpRoleCodes
-                          )
-                      } else {
-                        // 开发平台本身的功能或直接平台功能时
-                      // console.log('开发平台本身的功能或直接平台功能时')
-                        return store.dispatch(
-                            'getCurrentUserPermissions',
-                            user.loginName
-                        )
-                      }
-                    })
-                    .then((permissions) => {
-                      return store.dispatch('generateRoutes', permissions)
-                    })
-                    .then(() => {                      
-                      if (isNeedMenu) {
-                        // 需要显示左侧菜单 并 不是开发平台时，开发平台的菜单需要在设计项目时获得
-                        console.log('iMatrix-router.beforeEach2-getPermissionMenus')
-                        return store.dispatch('getPermissionMenus', window.$vueApp.config.globalProperties.currentSystem)
-                      } else {
-                        return new Promise((resolve, reject) => {
-                          resolve()
-                        })
-                      }
+          .dispatch('isLoginTimeOut')
+          .then((result) => {
+            if (result === true) {
+              store.dispatch('clearToken').then(() => {
+                next({ path: '/', replace: true })
+                NProgress.done()
+              })
+            } else {
+              store
+                .dispatch('getCurrentUser')
+                .then((user) => {
+                  return new Promise((resolve, reject) => {
+                    initUserLanguage().then(() => {
+                      resolve(user)
                     })
-                    .then(() => {
-                      // 根据roles权限生成可访问的路由表
-                      console.log(
-                          'router.beforeEach-generateRoutes==to=',
-                          to,
-                          ',from=',
-                          from
-                      )
-                      store.getters.protectedRouters.forEach(item =>{
-                        router.addRoute(item)
-                      })
-                      // 404等错误路由一定要放到受权限保护的路由之后
-                      // router.addRoutes(errorRouterMap)
-                      window.sessionStorage.setItem(
-                          new Date().getTime() + '-name=null-from~~toPath',
-                          from.path + '~~' + to.path
-                      )
-                      next({ ...to, replace: true })
+                  })
+                })
+                .then((user) => {
+                  return new Promise((resolve, reject) => {
+                    cacheAllLanguages().then(() => {
+                      resolve(user)
                     })
-                    .catch((err) => {
-                      store.dispatch('clearToken').then(() => {
-                        Message.error(
-                            err || 'Verification failed, please login again'
-                        )
-                        next({ path: '/' })
-                      })
+                  })
+                })
+                .then((user) => {
+                  console.log('router.beforeEach-getCurrentUser')
+                  const devpRoleCodes = authApi.getSessionCache(runCurrentRoleKey)
+                  if (!isDevp && devpRoleCodes) {
+                    // 表示是开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码，对应运行平台的岗位编码
+                    // console.log('开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码时，!isDevp && devpRoleCodes')
+                    return store.dispatch('getDevPlatformPermissions', devpRoleCodes)
+                  } else {
+                    // 开发平台本身的功能或直接平台功能时
+                    // console.log('开发平台本身的功能或直接平台功能时')
+                    return store.dispatch('getCurrentUserPermissions', user.loginName)
+                  }
+                })
+                .then((permissions) => {
+                  return store.dispatch('generateRoutes', permissions)
+                })
+                .then(() => {
+                  if (isNeedMenu) {
+                    // 需要显示左侧菜单 并 不是开发平台时，开发平台的菜单需要在设计项目时获得
+                    console.log('iMatrix-router.beforeEach2-getPermissionMenus')
+                    return store.dispatch('getPermissionMenus', window.$vueApp.config.globalProperties.currentSystem)
+                  } else {
+                    return new Promise((resolve, reject) => {
+                      resolve()
                     })
-              }
-            })
-            .catch((err) => {
-              store.dispatch('clearToken').then(() => {
-                Message.error(err || 'Verification failed, please login again')
-                next({ path: '/' })
-              })
+                  }
+                })
+                .then(() => {
+                  // 根据roles权限生成可访问的路由表
+                  console.log('router.beforeEach-generateRoutes==to=', to, ',from=', from)
+                  store.getters.protectedRouters.forEach((item) => {
+                    router.addRoute(item)
+                  })
+                  // 404等错误路由一定要放到受权限保护的路由之后
+                  // router.addRoutes(errorRouterMap)
+                  window.sessionStorage.setItem(
+                    new Date().getTime() + '-name=null-from~~toPath',
+                    from.path + '~~' + to.path
+                  )
+                  next({ ...to, replace: true })
+                })
+                .catch((err) => {
+                  store.dispatch('clearToken').then(() => {
+                    Message.error(err || 'Verification failed, please login again')
+                    next({ path: '/' })
+                  })
+                })
+            }
+          })
+          .catch((err) => {
+            store.dispatch('clearToken').then(() => {
+              Message.error(err || 'Verification failed, please login again')
+              next({ path: '/' })
             })
+          })
       } else {
-        console.log(
-            'router.beforeEach-store.getters.name ==',
-            store.getters.name
-        )
+        console.log('router.beforeEach-store.getters.name ==', store.getters.name)
         if (isNeedMenu) {
           // 需要显示左侧菜单
           let systemCode = window.$vueApp.config.globalProperties.currentSystem
@@ -228,10 +217,7 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
-    if (
-        whiteList.indexOf(to.path) !== -1 ||
-        store.getters.whiteList.indexOf(to.path) !== -1
-    ) {
+    if (whiteList.indexOf(to.path) !== -1 || store.getters.whiteList.indexOf(to.path) !== -1) {
       next()
     } else {
       // 必须使用to.fullPath，fullPath是带有参数的，to.path没有参数，会导致跳转到的页面参数丢失

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/styles/theme/dark-blue/sidebar.scss

@@ -265,4 +265,14 @@
       }
     }
   }
+
+  运行时工具栏样式
+  .amb-widget-tools-parent{
+    margin-bottom: 20px;
+  }
+  .amb-widget-container-tool{
+    display: flex;
+    overflow-x: auto;
+    padding: 10px 0;
+  }
 }

package/src/styles/theme/green/sidebar.scss

@@ -286,7 +286,7 @@
   }
 
   .el-menu-item{
-    color: $--menu-dont-color;
+    color: #FFFFFF;
   }
 
   .el-menu-item:hover{
@@ -320,4 +320,13 @@
     color: #FFFFFF;
     background-color: $--menu-hove-background-color;
   }
+  运行时工具栏样式
+  .amb-widget-tools-parent{
+    margin-bottom: 20px;
+  }
+  .amb-widget-container-tool{
+    display: flex;
+    overflow-x: auto;
+    padding: 10px 0;
+  }
 }

package/src/styles/theme/ocean-blue/sidebar.scss

@@ -276,4 +276,14 @@
   .el-sub-menu__title:hover{
     background-color: $--menu-hove-background-color;
   }
+
+  运行时工具栏样式
+  .amb-widget-tools-parent{
+    margin-bottom: 20px;
+  }
+  .amb-widget-container-tool{
+    display: flex;
+    overflow-x: auto;
+    padding: 10px 0;
+  }
 }