agilebuilder-ui 1.0.73 → 1.0.74-tmp2

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

@@ -25,7 +25,7 @@
         multiple="multiple"
         :capture="'environment'"
         name="file"
-        :accept="myAccept"
+        :accept="accept"
         style="display: none"
         @change="uploadFiles"
       />
@@ -36,7 +36,7 @@
         :capture="'environment'"
         name="file"
         style="display: none"
-        :accept="myAccept"
+        :accept="accept"
         @change="uploadFiles"
       />
     </template>
@@ -47,7 +47,7 @@
         type="file"
         multiple="multiple"
         name="file"
-        :accept="myAccept"
+        :accept="accept"
         style="display: none"
         @change="uploadFiles"
       />
@@ -57,7 +57,7 @@
         type="file"
         name="file"
         style="display: none"
-        :accept="myAccept"
+        :accept="accept"
         @change="uploadFiles"
       />
     </template>
@@ -264,7 +264,7 @@ function removeFile(param) {
     emits('remove', { rmFiles: [file], serverFiles: fileListResult.value, index: param.index })
   }
 }
-function pickBrowserFiles() {
+function pickBrowserFiles(grid) {
   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, files:selectFiles, isMobile, pageContext: props.pageContext, configureObj: props.configure})
+        isCanUpload = props.beforeUpload({fileObj, selectFiles, files:selectFiles, isMobile, pageContext: props.pageContext, configureObj: props.configure})
       }
     }
   }

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

@@ -80,6 +80,19 @@ 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.vue

@@ -1,34 +1,24 @@
 <template>
   <div>
-    <file-upload-app
+    <!-- <file-upload-app
       v-if="userAgent === 'app'"
       ref="fileUploadRef"
-      :file-list="fileList"
+      :file-lis="fileList"
+      :system-code="systemCode"
       :multiple="multiple"
       :disabled="disabled"
-      :open-camera-or-choose-photo="openCameraOrChoosePhoto"
+      :limit-file-size="limitFileSize"
+      :component-id="componentId"
+      :component-name="componentName"
       :options="options"
-      :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"
+      :list-code="listCode"
       @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"
@@ -51,6 +41,7 @@
       :pageContext="pageContext"
       :configure="configure"
       :openFsUpload="openFsUpload"
+      @pickup-file="pickupFiles"
       @uploadend="uploadedFile"
       @remove="removeFile"
     />
@@ -60,7 +51,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'
 
@@ -232,6 +223,10 @@ function removeFile({ rmFiles, serverFiles, newFiles }) {
     emits('remove', { rmFiles, serverFiles, newFiles })
   }
 }
+// 选择文件之后的事件
+function pickupFiles(files) {
+  emits('pickup-file', files)
+}
 // 移动端选择文件结束
 function pickFileDone(data) {
   if (userAgent.value === 'app') {
@@ -249,7 +244,6 @@ 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,8 +122,7 @@ if (!props.headers || !props.headers['Authorization']) {
   props.headers.Authorization = getToken()
 }
 const handleBeforeUpload = (file: File) => {
-  const isMobile = false
-  return props.beforeUpload({fileObj: file, files:[file], isMobile, pageContext: props.pageContext, configureObj: props.configure})
+  return props.beforeUpload(file)
 }
 const onSuccess = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
   // eslint-disable-next-line vue/no-mutating-props

package/src/api/sso-service.js

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

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/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;
+  }
 }