agilebuilder-ui 1.1.48 → 1.1.50-rc1

package/src/i18n/langs/cn.js

@@ -56,7 +56,7 @@ const cn = {
     pleaseRemoveallpersonnelBeforeSelectingSpecificPersonnel: '请先移除所有人员，再选择具体人员',
     queryResultIsEmpty: '查询结果为空',
     pleaseSelectATeam: '请选择工作组',
-    pleaseEnterTeamName: '请输入工作组名称',
+    pleaseEnterTeamName: '请输入工作组信息筛选',
     validationFailed: '验证失败',
     selectionDate: '选择日期',
     selectTime: '选择时间',
@@ -142,7 +142,7 @@ const cn = {
   departmentTree: {},
   // 嵌入部门树组件
   departmentTreeInline: {
-    pleaseEnterDepartmentName: '请输入部门名称',
+    pleaseEnterDepartmentName: '请输入部门信息筛选',
     name: '部门名称',
     code: '部门编码',
     removeDepartment: '移除部门',
@@ -156,7 +156,7 @@ const cn = {
   },
   // 用户树
   departmentUserTree: {
-    pleaseEnterUserInformation: '请输入用户信息',
+    pleaseEnterUserInformation: '请输入用户信息筛选',
     selectedPeople: '已选人员',
     searchFieldUserName: '姓名',
     searchFieldLoginName: '登录名',

package/src/i18n/langs/en.js

@@ -57,7 +57,7 @@ const en = {
       'Please Remove All Personnel Before Selecting Specific Personnel',
     queryResultIsEmpty: 'Query Result Is Empty',
     pleaseSelectATeam: 'Please Select A Team',
-    pleaseEnterTeamName: 'Please Enter Team Name',
+    pleaseEnterTeamName: 'Please Enter Team Info Filter',
     validationFailed: 'Validation Failed',
     selectionDate: 'Selection Date',
     selectTime: 'Select Time',
@@ -140,7 +140,7 @@ const en = {
   },
   departmentTree: {},
   departmentTreeInline: {
-    pleaseEnterDepartmentName: 'Please Enter Department Name',
+    pleaseEnterDepartmentName: 'Please Enter Department Info Filter',
     name: 'Department Name',
     code: 'Department Code',
     removeDepartment: 'Remove Department',
@@ -154,7 +154,7 @@ const en = {
   },
   // 用户树
   departmentUserTree: {
-    pleaseEnterUserInformation: 'Please Enter User Information',
+    pleaseEnterUserInformation: 'Please Enter User Information Filter',
     selectedPeople: 'Selected People',
     searchFieldUserName: 'Name',
     searchFieldLoginName: 'Login Name',

package/src/styles/index.scss

@@ -322,4 +322,30 @@ body .el-table colgroup.gutter {
   position: absolute;
   top: 3px;
   right: 5px;
+}
+
+
+// "暂无更多" 样式
+.empty_center_area {
+  width: 100%;
+  position: relative;
+
+  .empty_notAvailable {
+    background-image: url('../assets/nonemessage.png');
+    background-size: 100%;
+    position: absolute;
+    top: 30%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+
+    .empty_notAvailable_text {
+      position: absolute;
+      bottom: 0;
+      left: 50%;
+      transform: translate(-50%, 100%);
+      color: #313233;
+      font-weight: regular;
+      font-size: 14px;
+    }
+  }
 }

package/src/utils/auth.js

@@ -1,5 +1,6 @@
 import authApi from './auth-api'
 import { removeAllSystemPermissions } from './permissionAuth'
+import { removeGlobalPropCache } from './global-prop'
 
 export function getToken() {
   return authApi.getToken()
@@ -85,13 +86,12 @@ function removeAllLanguages() {
   authApi.removeAllLanguages()
 }
 
-
 export function getTheme() {
   return authApi.getTheme()
 }
 
 export function setTheme(theme) {
-  if(theme) {
+  if (theme) {
     authApi.setTheme(theme)
   } else {
     removeTheme()
@@ -122,9 +122,9 @@ function removePublishControl() {
  */
 export function removeDevpPermissions() {
   let devpJWTKey = '_devpJWT'
-let currentRoleKey = '_CURRENT_ROLE'
-authApi.removeSessionCache(devpJWTKey)
-authApi.removeSessionCache(currentRoleKey)
+  let currentRoleKey = '_CURRENT_ROLE'
+  authApi.removeSessionCache(devpJWTKey)
+  authApi.removeSessionCache(currentRoleKey)
 }
 
 export function isDevpSystem() {
@@ -149,7 +149,7 @@ export function removeSystemCacheUrl() {
 
 export function getRunCurrentRole() {
   let runCurrentRoleKey = '_RUN_CURRENT_ROLE'
-  if(!isDevpSystem()){
+  if (!isDevpSystem()) {
     return authApi.getSessionCache(runCurrentRoleKey)
   }
 }
@@ -165,4 +165,7 @@ export function clearPermission() {
   removeAllSystemPermissions()
   removePublishControl()
   removeSystemCacheUrl()
-}
+
+  // 清除系统参数设置的全局属性缓存
+  removeGlobalPropCache()
+}

package/src/utils/chat-ai-util.ts

@@ -18,10 +18,10 @@ function setActiveMenuToChatAiStore(activeMenu) {
   }
 }
 
-function setPageInfoToChatStore(menuCode, info) {
+function setPageInfoToChatStore(pageContext, info) {
   try {
-    if (window.top.ChatAiStore) {
-      window.top.ChatAiStore.setPageInfoToChatStore(menuCode, info)
+    if (pageContext && window.top.ChatAiStore) {
+      window.top.ChatAiStore.setPageInfoToChatStore(pageContext.menuCode, info)
     }
   } catch (error) {
     console.error('ChatAiStore not found', error)

package/src/utils/common-util.js

@@ -8,6 +8,9 @@ import i18nUtil from './i18n-util'
  * 获得相对地址
  */
 export function getRelativeBaseUrl(originalBaseUrl) {
+  if(!originalBaseUrl){
+    return originalBaseUrl
+  }
   if (
     window.$vueApp.config.globalProperties.projectModel === undefined ||
     window.$vueApp.config.globalProperties.projectModel !== 'developing.model'
@@ -796,3 +799,44 @@ export function cacheSystemUrl() {
 export function getAuthSource() {
   return window.localStorage.getItem('auth_source')
 }
+/**
+ * 把路径中的参数转为对象
+ * @param {*} fullPath 全路径。例如：hash路径：http://xx:8090/#/sss/dd?p1=1&p2=2 或 普通路径：http://xx:8090/sss/dd?p1=1&p2=2
+ * @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); 
+    // 转换为普通对象
+    return Object.fromEntries(params)
+  }catch(error){
+    console.error('error===',error)
+  }
+}
+/**
+ * 获得KKFileView的路径。
+ * @returns 
+ */
+export function getKkFileBackendUrl() {
+  let kkFileViewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl
+  let kkFileViewUrlResult = kkFileViewUrl
+  let baseURL = window.$vueApp.config.globalProperties.baseURL
+  if(kkFileViewUrl && baseURL){
+    let baseUrls = baseURL.split('/')
+    let prefixUrl = baseUrls[0]+ '//' + baseUrls[2]
+    let kkFileViewUrls = kkFileViewUrl.split('/')
+    let kkFilePrefixUrl = kkFileViewUrls[0]+ '//' + kkFileViewUrls[2]
+    if(prefixUrl === kkFilePrefixUrl){
+      // 如果baseURL和kkFileViewUrl的ip和端口一致，则表示kkFileView服务被nginx代理了，此时需要做内网、外网域名替换，例如：西安西开项目
+      // 如果baseURL和kkFileViewUrl的ip和端口不一致，则表示kkFileView服务没有被nginx代理，此时不需要处理kkFileViewUrl路径，例如：公司产品项目
+      kkFileViewUrlResult = getRelativeBaseUrl(kkFileViewUrl)
+    }
+  }
+  console.log('获得kkFile服务部署路径', kkFileViewUrlResult)
+  return kkFileViewUrlResult
+}

package/src/utils/global-prop.js

@@ -0,0 +1,17 @@
+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)
+}

package/src/views/dsc-component/Sidebar/SidebarItem.vue

@@ -53,6 +53,7 @@ import AppLink from './Link.vue'
 import * as Vue from 'vue'
 import tabJs from '../../../api/tab'
 import { getI18nName } from '../../../utils/menu'
+import { getRelativeBaseUrl, getURLSearchParamObj } from '../../../utils/common-util'
 // import { SidebarItemChild } from './SidebarItemChild.vue'
 export default {
   name: 'SidebarItem',
@@ -171,6 +172,11 @@ export default {
             url = url.substring(0, url.lastIndexOf('&'))
           }
         }
+        const paramObj = getURLSearchParamObj(url)
+        if(paramObj && paramObj._isThird && paramObj._isThird === 'false') {
+          // 表示不是第3方系统，需要替换域名，内网外网部署时需要使用
+          url = getRelativeBaseUrl(url)
+        }
         window.open(url, toPathObj.query._menuName)
       } else {
         // 刷新页签打开菜单

package/src/views/dsc-component/tabs/tab-content.vue

@@ -35,6 +35,7 @@
 <script>
 import * as Vue from 'vue'
 import { mapGetters } from 'vuex'
+import { getRelativeBaseUrl, getURLSearchParamObj } from '../../../utils/common-util'
 export default {
   name: 'TabContent',
   data() {
@@ -158,6 +159,11 @@ export default {
       ) {
         path = path.substring(0, path.lastIndexOf('&'))
       }
+      const paramObj = getURLSearchParamObj(path)
+      if(paramObj && paramObj._isThird && paramObj._isThird === 'false') {
+        // 表示不是第3方系统，需要替换域名，内网外网部署时需要使用
+        path = getRelativeBaseUrl(path)
+      }
       return path
     },
     recieveMessage(event) {