agilebuilder-ui 1.1.53-rc5 → 1.1.53-rc6

package/lib/{tab-content-iframe-index-9ad40367.js → tab-content-iframe-index-9e07d77b.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-2b362c08.js";
+import { _ as s } from "./index-5713357a.js";
 const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-8faba618.js → tab-content-index-5d9aba1e.js}

@@ -1,4 +1,4 @@
-import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-2b362c08.js";
+import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-5713357a.js";
 import { resolveComponent as u, openBlock as d, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
 const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);

package/lib/{tache-subprocess-history-098fc139.js → tache-subprocess-history-8a078a8c.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-2b362c08.js";
+import { _ as I } from "./index-5713357a.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.53-rc5",
+  "version": "1.1.53-rc6",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/department-user-tree-inline/src/department-user-multiple-tree-inline.vue

@@ -364,7 +364,9 @@ export default {
             loginName: user.loginName,
             email: user.email,
             telephone: user.telephone,
+            mainDepartmentCode: user.mainDepartmentCode,
             mainDepartmentName: user.mainDepartmentName,
+            subCompanyCode: user.subCompanyCode,
             subCompanyName: user.subCompanyName,
             user: user,
             enName: user.enName,
@@ -619,7 +621,9 @@ export default {
         telephones: [],
         users: [],
         divisionManager: [],
-        divisionManagerName: []
+        divisionManagerName: [],
+        subCompanyName: [],
+        subCompanyCode: []
       }
       // 是否需要显示提示框，默认不显示
       var showTip = false
@@ -632,6 +636,8 @@ export default {
           // 不存在该用户则放到结果集合中，去掉重复使用
           selectNodeInfo.userIds.push(userData.id)
           selectNodeInfo.loginNames.push(userData.loginName)
+          selectNodeInfo.subCompanyName.push(userData.subCompanyName)
+          selectNodeInfo.subCompanyCode.push(userData.subCompanyCode)
           if (userData.divisionManager && userData.divisionManager !== '') {
             selectNodeInfo.divisionManager.push(userData.divisionManager)
           }
@@ -649,6 +655,7 @@ export default {
           } else {
             selectNodeInfo.users.push(userData)
           }
+
           var name = userData.name
           selectNodeInfo.userZhNames.push(name)
           if (userData.enName && userData.enName.trim() !== '') {

package/packages/department-user-tree-inline/src/department-user-single-tree-inline.vue

@@ -261,6 +261,9 @@ export default {
         containBranch: this.containBranch,
         user: user,
         enName: user.enName,
+        mainDepartmentCode: user.mainDepartmentCode,
+        mainDepartmentName: user.mainDepartmentName,
+        subCompanyCode: user.subCompanyCode,
         subCompanyName: user.subCompanyName,
         divisionManager: user.divisionManager,
         divisionManagerName: user.divisionManagerName

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

@@ -249,7 +249,11 @@ export default {
     // 上传成功
     uploadOnSuccess(response, file) {
       if (response) {
-        ElMessage.success(this.$t('fsUpload.uploadSucceeded'))
+        this.$message({
+          showClose: true,
+          type: 'success',
+          message: this.$t('fsUpload.uploadSucceeded')
+        })
         $emit(this, 'upload-success', {
           showName: response.name,
           serverPath: response.serverPath
@@ -320,7 +324,6 @@ export default {
     },
     onError(error) {
       $emit(this, 'on-error', error)
-
     }
   },
   emits: ['close', 'upload-success', 'delete-success', 'delete', 'update:value', 'close', 'update:value', 'on-error']

package/packages/organization-input/src/organization-input.vue

@@ -414,20 +414,20 @@ export default {
             }
           }
           return branchNames.join(this.separator)
-        } else if (orgDataType === 'subCompanyId') {
-          // 分支id
-          const branchDeptIds = []
+        } else if (orgDataType === 'subCompanyId' || orgDataType === 'subCompanyCode') {
+          // 分支id或code
+          const branchDeptInfos = []
           if (isUserTree) {
             const users = selectNodeInfo.users
             if (users) {
               users.forEach((user) => {
-                if (user.subCompanyId) {
-                  branchDeptIds.push(user.subCompanyId)
+                if (user[orgDataType]) {
+                  branchDeptInfos.push(user[orgDataType])
                 }
               })
             }
           }
-          return branchDeptIds.join(this.separator)
+          return branchDeptInfos.join(this.separator)
         } else if (orgDataType === 'divisionManager' || orgDataType === 'divisionManagerName') {
           let divisionManagerArr = []
           if (isUserTree) {

package/packages/utils/utils.js

@@ -1,6 +1,6 @@
 import { getI18n } from '../../src/utils/util'
 import * as Vue from 'vue'
-import { cacheCanShowOrgTree, getCanShowOrgTree } from '../../src/utils/global-prop.js'
+import { cacheCanShowOrgTree, getCanShowOrgTree } from '../../src/utils/global-prop.ts'
 const utils = {
   getSearchUserFields() {
     const i18n = getI18n()

package/src/permission.js

@@ -8,7 +8,12 @@ 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,
+  cacheAllEnableGlobalPropUtil
+} from './utils/common-util'
 
 // 首次加载业务系统时，获得用户的语言
 function initUserLanguage() {
@@ -27,6 +32,11 @@ function cacheAllLanguages() {
   return cacheAllLanguagesUtil(window.$http)
 }
 
+// 首次加载业务系统时，缓存所有语言
+function cacheAllEnableGlobalProp() {
+  return cacheAllEnableGlobalPropUtil(window.$http)
+}
+
 const whiteList = ['/login', '/update-password', '/forget-password', '/reset-password', '/redirect'] // 不重定向白名单
 
 let devpJWTKey = '_devpJWT'
@@ -143,6 +153,7 @@ router.beforeEach((to, from, next) => {
                     cacheAllLanguages().then(() => {
                       resolve(user)
                     })
+                    cacheAllEnableGlobalProp()
                   })
                 })
                 .then((user) => {
@@ -156,13 +167,13 @@ router.beforeEach((to, from, next) => {
                   } else {
                     // 开发平台本身的功能或直接平台功能时
                     // console.log('开发平台本身的功能或直接平台功能时')
-                    let systemCode = to.query ? to.query.customSystem: null
+                    let systemCode = to.query ? to.query.customSystem : null
                     console.log('getCurrentUserPermissions---systemCode111=', systemCode)
                     if (!systemCode) {
                       systemCode = window.$vueApp.config.globalProperties.currentSystem
                     }
                     console.log('getCurrentUserPermissions---systemCode222=', systemCode)
-                    return store.dispatch('getCurrentUserPermissions', {loginName:user.loginName, systemCode})
+                    return store.dispatch('getCurrentUserPermissions', { loginName: user.loginName, systemCode })
                   }
                 })
                 .then((permissions) => {

package/src/utils/auth.js

@@ -1,6 +1,6 @@
 import authApi from './auth-api'
 import { removeAllSystemPermissions } from './permissionAuth'
-import { removeGlobalPropCache } from './global-prop'
+import { removeAllGlobalPropCache } from './global-prop'
 import { removeWatermark} from './watermark-cache'
 
 export function getToken() {
@@ -168,7 +168,7 @@ export function clearPermission() {
   removeSystemCacheUrl()
 
   // 清除系统参数设置的全局属性缓存
-  removeGlobalPropCache()
+  removeAllGlobalPropCache()
   // 清除水印配置
   removeWatermark()
 }

package/src/utils/common-util.js

@@ -5,12 +5,13 @@ import { getCookieCache } from './auth'
 import i18nUtil from './i18n-util'
 import { Base64 } from 'js-base64'
 import { getWatermarkSetting } from './watermark'
+import { cacheAllGlobalPropCache, GLOBAL_PROP, } from './global-prop'
 
 /**
  * 获得相对地址
  */
 export function getRelativeBaseUrl(originalBaseUrl) {
-  if(!originalBaseUrl){
+  if (!originalBaseUrl) {
     return originalBaseUrl
   }
   if (
@@ -237,13 +238,13 @@ export function getServerConfigUtil(http) {
   return new Promise((resolve, reject) => {
     let timestamp = '1'
     try {
-      if(__BUILD_TIME__) {
+      if (__BUILD_TIME__) {
         timestamp = __BUILD_TIME__
       }
     } catch (error) {
       console.log('__BUILD_TIME__ not define')
     }
-    http.get('./server-config.json?t='+timestamp).then((result) => {
+    http.get('./server-config.json?t=' + timestamp).then((result) => {
       const config = result
       for (const key in config) {
         window.$vueApp.config.globalProperties[key] = config[key]
@@ -265,16 +266,16 @@ export function getServerConfigUtil(http) {
   })
 }
 
-export function insertFontIconCss(config){
-  if(!window.insertCssFile){
-      return
-    }
-  if(!config){
+export function insertFontIconCss(config) {
+  if (!window.insertCssFile) {
+    return
+  }
+  if (!config) {
     config = window.$vueApp.config.globalProperties
   }
   let timestamp = '1'
   try {
-    if(__BUILD_TIME__) {
+    if (__BUILD_TIME__) {
       timestamp = __BUILD_TIME__
     }
   } catch (error) {
@@ -288,27 +289,29 @@ export function insertFontIconCss(config){
   }
 }
 
-export function insertThirdLoginJs(config){
-    if(!window.insertJsFile ){
-      return
-    }
-    if(!config){
-      config = window.$vueApp.config.globalProperties
-    }
-    if(!config  || (config.systemCode !== 'portal' && config.systemCode !== 'devp')){
-      return
-    }
-    // 只有portal和devp需要动态添加这些js
-    // userName,dingtalk,feishu,qiwei
-    if (!config.loginMethod || config.loginMethod.indexOf('dingtalk')>=0) {
-      window.insertJsFile(`https://g.alicdn.com/dingding/h5-dingtalk-login/0.21.0/ddlogin.js`)
-    }
-    if (!config.loginMethod || config.loginMethod.indexOf('feishu')>=0) {
-      window.insertJsFile(`https://lf-package-cn.feishucdn.com/obj/feishu-static/lark/passport/qrcode/LarkSSOSDKWebQRCode-1.0.3.js`)
-    }
-    if (!config.loginMethod || config.loginMethod.indexOf('qiwei')>=0) {
-      window.insertJsFile(`https://wwcdn.weixin.qq.com/node/open/js/wecom-jssdk-2.3.1.js`)
-    }
+export function insertThirdLoginJs(config) {
+  if (!window.insertJsFile) {
+    return
+  }
+  if (!config) {
+    config = window.$vueApp.config.globalProperties
+  }
+  if (!config || (config.systemCode !== 'portal' && config.systemCode !== 'devp')) {
+    return
+  }
+  // 只有portal和devp需要动态添加这些js
+  // userName,dingtalk,feishu,qiwei
+  if (!config.loginMethod || config.loginMethod.indexOf('dingtalk') >= 0) {
+    window.insertJsFile(`https://g.alicdn.com/dingding/h5-dingtalk-login/0.21.0/ddlogin.js`)
+  }
+  if (!config.loginMethod || config.loginMethod.indexOf('feishu') >= 0) {
+    window.insertJsFile(
+      `https://lf-package-cn.feishucdn.com/obj/feishu-static/lark/passport/qrcode/LarkSSOSDKWebQRCode-1.0.3.js`
+    )
+  }
+  if (!config.loginMethod || config.loginMethod.indexOf('qiwei') >= 0) {
+    window.insertJsFile(`https://wwcdn.weixin.qq.com/node/open/js/wecom-jssdk-2.3.1.js`)
+  }
 }
 /**
  * postmessage跨域传message时获得orign路径使用
@@ -615,45 +618,49 @@ async function handlePlateSysLang(currentLanguage) {
 }
 // 缓存项目设值信息
 export function cacheProjectSetting() {
-  return new Promise((resolve,reject)=>{
+  return new Promise((resolve, reject) => {
     const projectSettingCache = localStorage.getItem('PROJECT_SETTINGS')
     let projectSettings = null
-    if(projectSettingCache && projectSettingCache === '_EMPTY_VALUE') {
-       resolve(projectSettings)
+    if (projectSettingCache && projectSettingCache === '_EMPTY_VALUE') {
+      resolve(projectSettings)
     } else if (projectSettingCache) {
       projectSettings = JSON.parse(projectSettingCache)
       setBrowserFavicon(projectSettings)
       resolve(projectSettings)
     } else {
-      window.$vueApp.config.globalProperties.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/cfg/project-settings').then((data) => {
-        if(data){
-          localStorage.setItem('PROJECT_SETTINGS', JSON.stringify(data))
-          projectSettings = data
-          setBrowserFavicon(projectSettings)
-        } else {
-          localStorage.setItem('PROJECT_SETTINGS', '_EMPTY_VALUE')
-        }
-        resolve(projectSettings)
-      }).catch((error)=>{
-        reject(error)
-      })
+      window.$vueApp.config.globalProperties.$http
+        .get(window.$vueApp.config.globalProperties.baseAPI + '/cfg/project-settings')
+        .then((data) => {
+          if (data) {
+            localStorage.setItem('PROJECT_SETTINGS', JSON.stringify(data))
+            projectSettings = data
+            setBrowserFavicon(projectSettings)
+          } else {
+            localStorage.setItem('PROJECT_SETTINGS', '_EMPTY_VALUE')
+          }
+          resolve(projectSettings)
+        })
+        .catch((error) => {
+          reject(error)
+        })
     }
   })
 }
 
-function setBrowserFavicon(projectSettings){
+function setBrowserFavicon(projectSettings) {
   const linkElement = document.getElementById('ambBrowserIcon')
-  if(!linkElement){
+  if (!linkElement) {
     return
   }
   if (projectSettings) {
-    const browserIconUrl = window.$vueApp.config.globalProperties.baseAPI + '/cfg/project/icon/browserIcon?t='+__BUILD_TIME__
-    if(projectSettings.browserImageUuid && (!linkElement.href || linkElement.href !== browserIconUrl) ){
+    const browserIconUrl =
+      window.$vueApp.config.globalProperties.baseAPI + '/cfg/project/icon/browserIcon?t=' + __BUILD_TIME__
+    if (projectSettings.browserImageUuid && (!linkElement.href || linkElement.href !== browserIconUrl)) {
       linkElement.href = browserIconUrl
     }
   }
-  if(!linkElement.href) {
-    linkElement.href = 'favicon.svg?t='+__BUILD_TIME__
+  if (!linkElement.href) {
+    linkElement.href = 'favicon.svg?t=' + __BUILD_TIME__
   }
 }
 
@@ -804,37 +811,43 @@ export function getAuthSource() {
 /**
  * 把路径中的参数转为对象
  * @param {*} fullPath 全路径。例如：hash路径：http://xx:8090/#/sss/dd?p1=1&p2=2 或 普通路径：http://xx:8090/sss/dd?p1=1&p2=2
- * @returns 
+ * @returns
  */
 export function getURLSearchParamObj(fullPath) {
-  try{
-    // 提取hash部分 
-    const hash = fullPath.includes('#') ? fullPath.split('#')[1] : fullPath; 
-    // 提取查询参数 
-    const queryString = hash.includes('?') ? hash.split('?')[1] : hash; 
-    // 解析参数 
-    const params = new URLSearchParams(queryString); 
+  try {
+    // 提取hash部分
+    const hash = fullPath.includes('#') ? fullPath.split('#')[1] : fullPath
+    // 提取查询参数
+    const queryString = hash.includes('?') ? hash.split('?')[1] : hash
+    // 解析参数
+    const params = new URLSearchParams(queryString)
     // 转换为普通对象
     return Object.fromEntries(params)
-  }catch(error){
-    console.error('error===',error)
+  } catch (error) {
+    console.error('error===', error)
   }
 }
 
 // 获得KKFileView预览url，处理水印
 export function getKkFilePreviewUrl(previewUrl) {
-  let myPreviewUrl = getKkFileBackendUrl()+'?url='+encodeURIComponent(Base64.encode(previewUrl))
-  return new Promise((resolve,reject)=>{
-    getWatermarkSetting().then((watermark)=>{
-      if(watermark && watermark.useRange && watermark.useRange.indexOf('annex')>=0){
-        // 表示适用范围有附件时
-        myPreviewUrl = myPreviewUrl + '&watermarkTxt='+watermark.content+'&watermarkXSpace=60&watermarkYSpace=100&watermarkWidth=500&watermarkHeight=100'
-      }
-      resolve(myPreviewUrl)
-    }).catch((error)=>{
-      console.error('获得水印失败',error)
-      resolve(myPreviewUrl)
-    })
+  let myPreviewUrl = getKkFileBackendUrl() + '?url=' + encodeURIComponent(Base64.encode(previewUrl))
+  return new Promise((resolve, reject) => {
+    getWatermarkSetting()
+      .then((watermark) => {
+        if (watermark && watermark.useRange && watermark.useRange.indexOf('annex') >= 0) {
+          // 表示适用范围有附件时
+          myPreviewUrl =
+            myPreviewUrl +
+            '&watermarkTxt=' +
+            watermark.content +
+            '&watermarkXSpace=60&watermarkYSpace=100&watermarkWidth=500&watermarkHeight=100'
+        }
+        resolve(myPreviewUrl)
+      })
+      .catch((error) => {
+        console.error('获得水印失败', error)
+        resolve(myPreviewUrl)
+      })
   })
 }
 
@@ -842,12 +855,12 @@ function getKkFileBackendUrl() {
   let kkFileViewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl
   let kkFileViewUrlResult = kkFileViewUrl
   let baseURL = window.$vueApp.config.globalProperties.baseURL
-  if(kkFileViewUrl && baseURL){
+  if (kkFileViewUrl && baseURL) {
     let baseUrls = baseURL.split('/')
-    let prefixUrl = baseUrls[0]+ '//' + baseUrls[2]
+    let prefixUrl = baseUrls[0] + '//' + baseUrls[2]
     let kkFileViewUrls = kkFileViewUrl.split('/')
-    let kkFilePrefixUrl = kkFileViewUrls[0]+ '//' + kkFileViewUrls[2]
-    if(prefixUrl === kkFilePrefixUrl){
+    let kkFilePrefixUrl = kkFileViewUrls[0] + '//' + kkFileViewUrls[2]
+    if (prefixUrl === kkFilePrefixUrl) {
       // 如果baseURL和kkFileViewUrl的ip和端口一致，则表示kkFileView服务被nginx代理了，此时需要做内网、外网域名替换，例如：西安西开项目
       // 如果baseURL和kkFileViewUrl的ip和端口不一致，则表示kkFileView服务没有被nginx代理，此时不需要处理kkFileViewUrl路径，例如：公司产品项目
       kkFileViewUrlResult = getRelativeBaseUrl(kkFileViewUrl)
@@ -856,3 +869,17 @@ function getKkFileBackendUrl() {
   console.log('获得kkFile服务部署路径', kkFileViewUrlResult)
   return kkFileViewUrlResult
 }
+
+export function cacheAllEnableGlobalPropUtil() {
+  const hasLoadState = localStorage.getItem(GLOBAL_PROP.loadState)
+  if (hasLoadState && hasLoadState === 'true') {
+    return
+  }
+  // window.$http
+  //   .get(window.$vueApp.config.globalProperties.baseAPI + '/component/common/prop-setting')
+  //   .then((propMap) => {
+  //     if (propMap) {
+  //       cacheAllGlobalPropCache(propMap)
+  //     }
+  //   })
+}

package/src/utils/global-prop.ts

@@ -0,0 +1,44 @@
+const GLOBAL_PROP = {
+  loadState: 'GLOBAL_PROP_LOAD_STATE',
+  CAN_SHOW_ORG_TREE: 'global-show-org-tree',
+  PORTAL_CHART_LAYOUT_COL: 'portal-chart-layout-col'
+} as const
+
+export function cacheAllGlobalPropCache(propMap: Record<string, string>) {
+  for (const key in propMap) {
+    localStorage.setItem(key, propMap[key])
+  }
+  localStorage.setItem(GLOBAL_PROP.loadState, 'true')
+}
+
+export function removeAllGlobalPropCache() {
+  localStorage.removeItem(GLOBAL_PROP.loadState)
+  localStorage.removeItem(GLOBAL_PROP.CAN_SHOW_ORG_TREE)
+  localStorage.removeItem(GLOBAL_PROP.PORTAL_CHART_LAYOUT_COL)
+}
+
+export function getCanShowOrgTree() {
+  return localStorage.getItem(GLOBAL_PROP.CAN_SHOW_ORG_TREE)
+}
+
+export function cacheCanShowOrgTree(value: string) {
+  localStorage.setItem(GLOBAL_PROP.CAN_SHOW_ORG_TREE, value)
+}
+
+export function removeCanShowOrgTree() {
+  localStorage.removeItem(GLOBAL_PROP.CAN_SHOW_ORG_TREE)
+}
+
+export function cacheGlobalProp(key: string, value: string) {
+  localStorage.setItem(key, value)
+}
+
+export function getGlobalProp(key: string) {
+  return localStorage.getItem(key)
+}
+
+export function removeGlobalProp(key: string) {
+  localStorage.removeItem(key)
+}
+
+export { GLOBAL_PROP }

package/src/utils/global-prop.js

@@ -1,17 +0,0 @@
-const canShowOrgTree = 'CAN_SHOW_ORG_TREE'
-
-export function removeGlobalPropCache() {
-  localStorage.removeItem(canShowOrgTree)
-}
-
-export function getCanShowOrgTree() {
-  return localStorage.getItem(canShowOrgTree)
-}
-
-export function cacheCanShowOrgTree(value) {
-  localStorage.setItem(canShowOrgTree, value)
-}
-
-export function removeCanShowOrgTree() {
-  localStorage.removeItem(canShowOrgTree)
-}